diff --git a/ACID/acid_classic.sql b/ACID/acid_classic.sql
index 5ea33b36b..ad2237e47 100644
--- a/ACID/acid_classic.sql
+++ b/ACID/acid_classic.sql
@@ -594,9 +594,9 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 -- Dark Iron Bombardier 4062
 ('406201','4062','9','0','100','1025','5','30','6000','9000','0','0','11','8858','1','0','0','0','0','0','0','0','0','0','Dark Iron Bombardier - Cast Bomb'),
 -- Feeboz 4063 - s.20823 classic only
-('406301','4063','11','0','100','0','0','0','0','0','0','0','57','2','35','0','1','808','807','815','0','0','0','0','Feeboz - Enable Range Mode and Say on Aggro'),
+('406301','4063','4','0','100','0','0','0','0','0','0','0','57','2','35','0','1','808','807','815','0','0','0','0','Feeboz - Enable Range Mode and Say on Aggro'),
 ('406302','4063','2','0','100','1024','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Feeboz - Flee at 15% HP'),
-('406303','4063','9','0','100','1025','8000','16000','25000','50000','0','0','11','6131','17','1024','0','0','0','0','0','0','0','0','Feeboz - Cast Frost Nova'),
+('406303','4063','0','0','100','1025','8000','16000','25000','50000','0','0','11','6131','17','1024','0','0','0','0','0','0','0','0','Feeboz - Cast Frost Nova'),
 ('406304','4063','0','0','100','1281','0','0','3000','4000','0','0','11','20823','1','256','0','0','0','0','0','0','0','0','Feeboz - Cast Fireball (Range Mode)'),
 ('406305','4063','0','0','100','1537','0','0','5000','20000','0','0','11','20823','1','256','0','0','0','0','0','0','0','0','Feeboz - Cast Fireball (Melee Mode)'),
 -- Fardel Dabyrie 4479 - s.3391 manually casted
@@ -4809,8 +4809,8 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 ('87902','879','2','0','100','1024','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Saltscale Hunter - Flee at 15% HP'),
 ('87903','879','9','0','100','1025','5','30','2600','4800','0','0','11','10277','1','256','0','0','0','0','0','0','0','0','Saltscale Hunter - Cast Throw'),
 -- Venture Co Lumberjack 921 - s.5532 classic only
-('92101','921','0','0','100','1025','5200','7500','5900','9800','0','0','11','5532','1','0','0','0','0','0','0','0','0','0','Venture Co Lumberjack - Cast Cleave'),
-('92102','921','2','0','100','0','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Venture Co Lumberjack - Flee at 15% HP'),
+('92101','921','0','0','100','1025','5200','7500','5900','9800','0','0','11','5532','1','0','0','0','0','0','0','0','0','0','Venture Co. Lumberjack - Cast Cleave'),
+('92102','921','2','0','100','0','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Venture Co. Lumberjack - Flee at 15% HP'),
 -- Kurzen Jungle Fighter 937
 ('93701','937','11','0','100','0','0','0','0','0','0','0','11','3637','0','34','0','0','0','0','0','0','0','0','Kurzen Jungle Fighter - Cast Improved Blocking III on Spawn'),
 ('93702','937','2','0','100','1024','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Kurzen Jungle Fighter - Flee at 15% HP'),
@@ -5009,7 +5009,7 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 -- Captain Stillwater 2550 - s.6146,6725,8439 classic only
 ('255001','2550','2','0','100','1024','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Captain Stillwater - Flee at 15% HP'),
 ('255002','2550','0','0','100','1025','2800','4300','9700','14800','0','0','11','6146','4','0','0','0','0','0','0','0','0','0','Captain Stillwater - Cast Slow'),
-('255003','2550','0','0','100','1057','500','1100','3500','10000','0','0','11','8439','15','0','11','6725','4','512','0','0','0','0','Captain Stillwater - Cast Arcane Explosion or Flame Spike'),
+('255003','2550','0','0','100','1057','500','1100','3500','10000','0','0','11','8439','17','0','11','6725','4','512','0','0','0','0','Captain Stillwater - Cast Arcane Explosion or Flame Spike'),
 -- Gazban 2624
 ('262401','2624','0','0','100','1025','6100','12800','7200','15700','0','0','11','5403','0','0','0','0','0','0','0','0','0','0','Gazban - Cast Crash of Waves'),
 ('262402','2624','0','0','100','1024','20000','20000','0','0','0','0','11','5402','0','2','22','1','0','0','1','1113','0','0','Gazban - Cast Gazban Transform and Set Phase 1 and Say'),
@@ -7678,7 +7678,7 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 ('1294002','12940','0','0','100','1025','5000','20000','5000','20000','0','0','11','3391','15','0','0','0','0','0','0','0','0','0','Vorsha the Lasher - Cast Thrash'),
 -- Kil'Hiwana (12961) - NSR
 -- Wik'Tar (12962) - NSR
--- Silverwing Elite 14715 s.22540 classic only
+-- Silverwing Elite 14715 - s.22540 classic only
 ('1471501','14715','4','0','100','0','0','0','0','0','0','0','57','2','25','0','0','0','0','0','0','0','0','0','Silverwing Elite - Enable Range Mode on Aggro'),
 ('1471502','14715','2','0','100','1024','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Silverwing Elite - Flee at 15% HP'),
 ('1471503','14715','0','0','100','1025','5000','15000','6000','24000','0','0','11','22540','1','0','0','0','0','0','0','0','0','0','Silverwing Elite - Cast Cleave'),
@@ -8576,7 +8576,7 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 -- Slitherblade Oracle 4718 - s.246 classic only
 ('471801','4718','2','0','100','1024','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Slitherblade Oracle - Flee at 15% HP'),
 ('471802','4718','0','0','100','1025','7000','12000','30000','40000','0','0','11','5605','0','0','0','0','0','0','0','0','0','0','Slitherblade Oracle - Cast Healing Ward'),
-('471803','4718','0','0','100','1025','8000','16000','13000','16000','0','0','11','11436','5','0','0','0','0','0','0','0','0','0','Slitherblade Oracle - Cast Slow'),
+('471803','4718','0','0','100','1025','8000','16000','13000','16000','0','0','11','246','5','0','0','0','0','0','0','0','0','0','Slitherblade Oracle - Cast Slow'),
 -- Slitherblade Sea Witch 4719
 ('471901','4719','1','0','100','1','1000','1000','1800000','1800000','0','0','11','12544','0','0','0','0','0','0','0','0','0','0','Slitherblade Sea Witch - Cast Frost Armor on Spawn'),
 ('471902','4719','27','0','100','1025','12544','1','15000','30000','0','0','11','12544','0','0','0','0','0','0','0','0','0','0','Slitherblade Sea Witch - Cast Frost Armor on Missing Buff'),
@@ -9619,7 +9619,7 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 ('710702','7107','0','0','100','1025','4000','20000','20000','25000','0','0','11','11980','1','32','0','0','0','0','0','0','0','0','Jadefire Trickster - Cast Curse of Weakness'),
 ('710703','7107','0','0','30','1025','8000','24000','20000','40000','0','0','11','12888','5','0','0','0','0','0','0','0','0','0','Jadefire Trickster - Cast Cause Insanity'),
 ('710704','7107','0','0','100','1025','6000','24000','20000','30000','0','0','11','13578','15','0','0','0','0','0','0','0','0','0','Jadefire Trickster - Cast Jadefire'),
--- Jadefire Betrayer 7108
+-- Jadefire Betrayer 7108 - s.5532 classic only
 ('710801','7108','0','0','100','1025','0','10000','8000','16000','0','0','11','5532','1','0','0','0','0','0','0','0','0','0','Jadefire Betrayer - Cast Cleave'),
 ('710802','7108','0','0','100','1025','5000','20000','18000','32000','0','0','11','13443','1','0','0','0','0','0','0','0','0','0','Jadefire Betrayer - Cast Rend'),
 ('710803','7108','0','0','100','1025','6000','24000','20000','30000','0','0','11','13578','15','0','0','0','0','0','0','0','0','0','Jadefire Betrayer - Cast Jadefire'),
@@ -10826,7 +10826,7 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 -- Great-father Winter 13445
 -- Frostwolf Ambassador Rokhstrom 13842
 -- Bounty Hunter Kolark 14182
--- Kor'kron Elite 14304
+-- Kor'kron Elite 14304 - s.15584 classic only
 ('1430401','14304','22','0','100','1','5','4','0','0','0','0','5','2','0','0','0','0','0','0','0','0','0','0','Kor''kron Elite - EMOTE_ONESHOT_BOW on TEXTEMOTE_APOLOGIZE'),
 ('1430402','14304','22','0','100','1','17','4','0','0','0','0','5','2','0','0','0','0','0','0','0','0','0','0','Kor''kron Elite - EMOTE_ONESHOT_BOW on TEXTEMOTE_BOW '),
 ('1430403','14304','22','0','100','1','19','4','0','0','0','0','5','3','0','0','0','0','0','0','0','0','0','0','Kor''kron Elite - EMOTE_ONESHOT_WAVE on TEXTEMOTE_BYE '),
@@ -13148,7 +13148,7 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 ('650001','6500','0','0','100','1025','6000','12000','11000','16000','0','0','11','14100','0','0','0','0','0','0','0','0','0','0','Tyrant Devilsaur - Cast Terrifying Roar'),
 -- Stegodon 6501
 ('650101','6501','9','0','100','1025','10','60','7000','9000','0','0','11','6268','0','0','0','0','0','0','0','0','0','0','Stegodon - Cast Rushing Charge'),
-('650102','6501','0','0','100','1025','6000','12000','12000','24000','0','0','11','14102','1','0','0','0','0','0','0','0','0','0','Stegodon - Cast Head Smash'),
+('650102','6501','0','0','100','1025','6000','12000','12000','24000','0','0','11','15652','1','0','0','0','0','0','0','0','0','0','Stegodon - Cast Head Smash'),
 -- Plated Stegodon 6502
 ('650201','6502','0','0','100','1025','6000','12000','12000','24000','0','0','11','14102','1','0','0','0','0','0','0','0','0','0','Plated Stegodon - Cast Head Smash'),
 -- Spiked Stegodon 6503
@@ -13164,44 +13164,54 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 -- Ravasaur Hunter
 ('650701','6507','0','0','100','1025','5000','8000','16000','21000','0','0','11','13443','1','0','0','0','0','0','0','0','0','0','Ravasaur Hunter - Cast Rend'),
 ('650702','6507','9','0','100','1025','0','5','20000','24000','0','0','11','3604','1','0','0','0','0','0','0','0','0','0','Ravasaur Hunter - Cast Tendon Rip'),
--- Venomhide Ravasaur 6508 - NSR
+-- Venomhide Ravasaur 6508
+('650801','6508','1','0','100','0','1000','1000','0','0','0','0','11','14108','0','32','0','0','0','0','0','0','0','0','Venomhide Ravasaur - Cast Venomhide Poison OOC'),
 -- Bloodpetal Lasher 6509
-('650901','6509','9','0','100','1025','0','5','8000','14000','0','0','11','6607','1','0','0','0','0','0','0','0','0','0','Bloodpetal Lasher - Cast Lash'),
+('650901','6509','1','0','100','0','1000','1000','0','0','0','0','11','14111','0','32','0','0','0','0','0','0','0','0','Bloodpetal Lasher - Cast Bloodpetal Poison OOC'),
+('650902','6509','9','0','100','1025','0','5','8000','14000','0','0','11','6607','1','0','0','0','0','0','0','0','0','0','Bloodpetal Lasher - Cast Lash'),
 -- Bloodpetal Flayer 6510
-('651001','6510','9','0','100','1025','0','5','6000','9000','0','0','11','14112','1','0','0','0','0','0','0','0','0','0','Bloodpetal Flayer - Cast Flaying Vine'),
+('651001','6510','1','0','100','0','1000','1000','0','0','0','0','11','14111','0','32','0','0','0','0','0','0','0','0','Bloodpetal Flayer - Cast Bloodpetal Poison OOC'),
+('651002','6510','9','0','100','1025','0','5','6000','9000','0','0','11','14112','1','0','0','0','0','0','0','0','0','0','Bloodpetal Flayer - Cast Flaying Vine'),
 -- Bloodpetal Thresher 6511
 ('651101','6511','11','0','100','0','0','0','0','0','0','0','11','8876','0','34','11','14111','0','34','0','0','0','0','Bloodpetal Thresher - Cast Thrash, Bloodpetal Poison Proc on Spawn'),
 -- Bloodpetal Trapper 6512
-('651201','6512','0','0','100','1025','4000','7000','9000','14000','0','0','11','11922','1','0','0','0','0','0','0','0','0','0','Bloodpetal Trapper - Cast Entangling Roots'),
+('651201','6512','1','0','100','0','1000','1000','0','0','0','0','11','14111','0','32','0','0','0','0','0','0','0','0','Bloodpetal Trapper - Cast Bloodpetal Poison OOC'),
+('651202','6512','0','0','100','1025','4000','7000','9000','14000','0','0','11','11922','1','0','0','0','0','0','0','0','0','0','Bloodpetal Trapper - Cast Entangling Roots'),
 -- Un'Goro Stomper 6513
 ('651301','6513','2','0','100','1024','50','0','0','0','0','0','11','8599','0','0','1','2384','0','0','0','0','0','0','Un''Goro Stomper - Cast Enrage at 50% HP'),
 -- Un'Goro Gorilla 6514
-('651401','6514','2','0','100','0','25','0','0','0','0','0','39','20','0','0','1','4837','0','0','0','0','0','0','Un''Goro Gorilla - Call for Help at 25% HP'),
+('651401','6514','2','0','100','0','25','0','0','0','0','0','39','20','0','0','1','4837','0','0','0','0','0','0','Un''Goro Gorilla - Call For Help, Emote at 25% HP'),
 -- Un'Goro Thunderer 6516
 ('651601','6516','4','0','100','0','0','0','0','0','0','0','47','0','0','0','0','0','0','0','0','0','0','0','Un''Goro Thunderer - Cast Set Stand State on Aggro'),
 ('651602','6516','0','0','100','1025','10000','15000','9000','15000','0','0','11','12553','1','0','0','0','0','0','0','0','0','0','Un''Goro Thunderer - Cast Shock'),
--- Tar Beast 6517 - NSR
+-- Tar Beast 6517
+('651701','6517','1','0','100','0','1000','1000','0','0','0','0','11','14178','0','32','0','0','0','0','0','0','0','0','Tar Beast - Cast Sticky Tar OOC'),
 -- Tar Lurker 6518
-('651801','6518','9','0','100','1025','0','5','12000','16000','0','0','11','7279','1','0','0','0','0','0','0','0','0','0','Tar Lurker - Cast Black Sludge'),
+('651801','6518','1','0','100','0','1000','1000','0','0','0','0','11','14178','0','32','0','0','0','0','0','0','0','0','Tar Lurker - Cast Sticky Tar OOC'),
+('651802','6518','9','0','100','1025','0','5','12000','16000','0','0','11','7279','1','0','0','0','0','0','0','0','0','0','Tar Lurker - Cast Black Sludge'),
 -- Tar Lord 6519
-('651901','6519','0','0','100','1025','4000','7000','9000','14000','0','0','11','12747','1','0','0','0','0','0','0','0','0','0','Tar Lord - Cast Entangling Roots'),
-('651902','6519','2','0','100','1024','40','0','0','0','0','0','11','11640','0','0','0','0','0','0','0','0','0','0','Tar Lord - Cast Renew at 40% HP'),
+('651901','6519','1','0','100','0','1000','1000','0','0','0','0','11','14178','0','32','0','0','0','0','0','0','0','0','Tar Lord - Cast Sticky Tar OOC'),
+('651902','6519','0','0','100','1025','4000','7000','9000','14000','0','0','11','12747','1','0','0','0','0','0','0','0','0','0','Tar Lord - Cast Entangling Roots'),
+('651903','6519','2','0','100','1024','40','0','0','0','0','0','11','11640','0','0','0','0','0','0','0','0','0','0','Tar Lord - Cast Renew at 40% HP'),
 -- Scorching Elemental 6520
 ('652001','6520','0','0','100','1025','3000','6000','3000','6000','0','0','11','13878','1','0','0','0','0','0','0','0','0','0','Scorching Elemental - Cast Scorch'),
 -- Living Blaze 6521
 ('652101','6521','11','0','100','0','0','0','0','0','0','0','11','11966','0','34','0','0','0','0','0','0','0','0','Living Blaze - Cast Fire Shield on Spawn'),
 -- Tar Creeper 6527
-('652701','6527','0','0','100','1025','5000','9000','8000','14000','0','0','11','5568','0','0','0','0','0','0','0','0','0','0','Tar Creeper - Cast Trample'),
+('652701','6527','1','0','100','0','1000','1000','0','0','0','0','11','14178','0','32','0','0','0','0','0','0','0','0','Tar Creeper - Cast Sticky Tar OOC'),
+('652702','6527','0','0','100','1025','5000','9000','8000','14000','0','0','11','5568','0','0','0','0','0','0','0','0','0','0','Tar Creeper - Cast Trample'),
 -- Gorishi Wasp 6551
-('655101','6551','9','0','100','1025','0','5','3000','6000','0','0','11','8137','1','32','0','0','0','0','0','0','0','0','Gorishi Wasp - Cast Silithid Pox'),
+('655101','6551','11','0','100','0','0','0','0','0','0','0','11','3616','0','34','0','0','0','0','0','0','0','0','Gorishi Wasp - Cast Poison Proc on Spawn'),
+('655102','6551','0','0','100','1025','10000','25000','15000','30000','0','0','11','8137','1','32','0','0','0','0','0','0','0','0','Gorishi Wasp - Cast Silithid Pox'),
 -- Gorishi Worker 6552
-('655201','6552','9','0','100','1025','0','5','3000','6000','0','0','11','8137','1','32','0','0','0','0','0','0','0','0','Gorishi Worker - Cast Silithid Pox'),
-('655202','6552','2','0','50','0','45','0','0','0','0','0','39','25','0','0','1','1064','0','0','0','0','0','0','Gorishi Worker - Call for Help at 45% HP'),
+('655201','6552','0','0','100','1025','10000','25000','15000','30000','0','0','11','8137','1','32','0','0','0','0','0','0','0','0','Gorishi Worker - Cast Silithid Pox'),
+('655202','6552','2','0','50','0','45','0','0','0','0','0','39','25','0','0','1','1064','0','0','0','0','0','0','Gorishi Worker - Call For Help, Emote at 45% HP'),
 -- Gorishi Reaver 6553 - s.11427 classic only
-('655302','6553','0','0','100','1025','10000','25000','12700','24800','0','0','11','8137','1','32','0','0','0','0','0','0','0','0','Gorishi Reaver - Cast Silithid Pox'),
-('655301','6553','0','0','100','1025','5000','15000','10000','16000','0','0','11','11427','1','0','0','0','0','0','0','0','0','0','Gorishi Reaver - Cast Cleave'),
+('655301','6553','0','0','100','1025','10000','25000','12700','24800','0','0','11','8137','1','32','0','0','0','0','0','0','0','0','Gorishi Reaver - Cast Silithid Pox'),
+('655302','6553','0','0','100','1025','5000','15000','10000','16000','0','0','11','11427','1','0','0','0','0','0','0','0','0','0','Gorishi Reaver - Cast Cleave'),
 -- Gorishi Stinger 6554
-('655402','6554','9','0','100','1025','0','5','3000','6000','0','0','11','8137','1','32','0','0','0','0','0','0','0','0','Gorishi Stinger - Cast Silithid Pox'),
+('655401','6554','11','0','100','0','0','0','0','0','0','0','11','8601','0','34','0','0','0','0','0','0','0','0','Gorishi Stinger - Cast Slowing Poison on Spawn'),
+('655402','6554','0','0','100','1025','10000','25000','15000','30000','0','0','11','8137','1','32','0','0','0','0','0','0','0','0','Gorishi Stinger - Cast Silithid Pox'),
 -- Gorishi Tunneler 6555
 ('655501','6555','4','0','100','0','0','0','0','0','0','0','22','1','0','0','0','0','0','0','0','0','0','0','Gorishi Tunneler - Set Phase 1 on Aggro'),
 ('655502','6555','9','5','100','1025','0','5','4000','6000','0','0','11','14120','1','0','0','0','0','0','0','0','0','0','Gorishi Tunneler - Cast Tunneler Acid (Phase 1)'),
@@ -13213,7 +13223,7 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 ('655602','6556','8','0','100','1','15702','-1','0','0','0','0','41','3000','0','0','0','0','0','0','0','0','0','0','Muculent Ooze - Delayed Despawn on Filling Empty Jar (q.4513) Spellhit'),
 -- Primal Ooze 6557
 ('655701','6557','2','0','100','1024','10','0','0','0','0','0','11','14146','0','0','1','2082','0','0','0','0','0','0','Primal Ooze - Cast Clone, Emote at 10% HP'),
-('655702','6557','30','0','100','1','5','10290','0','0','0','0','11','16032','0','16','36','9621','0','0','0','0','0','0','Primal Ooze - Cast Merging Oozes AND Transform into Gargantuan Ooze on Receive AI Event A'),
+('655702','6557','30','0','100','1','5','10290','0','0','0','0','11','16032','0','16','36','9621','0','0','0','0','0','0','Primal Ooze - Cast Merging Oozes and Transform into Gargantuan Ooze on Receive AI Event A'),
 ('655703','6557','8','0','100','1','15702','-1','0','0','0','0','41','3000','0','0','0','0','0','0','0','0','0','0','Primal Ooze - Delayed Despawn on Filling Empty Jar (q.4513) Spellhit'),
 -- Glutinous Ooze 6559
 ('655901','6559','6','0','100','0','0','0','0','0','0','0','11','14147','0','7','1','4838','0','0','0','0','0','0','Glutinous Ooze - Cast Acid Slime, Emote on Death'),
@@ -13221,8 +13231,8 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 -- Ravasaur Matriarch 6581
 ('658101','6581','11','0','100','0','0','0','0','0','0','0','11','8876','0','34','0','0','0','0','0','0','0','0','Ravasaur Matriarch - Cast Thrash on Spawn'),
 ('658102','6581','9','0','100','1025','0','5','12000','18000','0','0','11','13445','1','0','0','0','0','0','0','0','0','0','Ravasaur Matriarch - Cast Rend'),
--- Clutchmother Zavas 6582
-('658201','6582','9','0','100','1025','0','5','8000','12000','0','0','11','15584','1','0','0','0','0','0','0','0','0','0','Clutchmother Zavas - Cast Cleave'),
+-- Clutchmother Zavas 6582 - s.11427 classic only
+('658201','6582','9','0','100','1025','0','5','8000','12000','0','0','11','11427','1','0','0','0','0','0','0','0','0','0','Clutchmother Zavas - Cast Cleave'),
 ('658202','6582','0','0','100','1025','4000','8000','3000','6000','0','0','11','12097','1','32','0','0','0','0','0','0','0','0','Clutchmother Zavas - Cast Pierce Armor'),
 ('658203','6582','0','0','100','1025','9000','14000','10000','15000','0','0','11','14205','0','0','0','0','0','0','0','0','0','0','Clutchmother Zavas - Cast Gorishi Egg'),
 -- Gruff 6583
@@ -13260,15 +13270,18 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 -- Gorishi Egg 9496
 ('949601','9496','11','0','100','0','0','0','0','0','0','0','50','0','0','0','0','0','0','0','0','0','0','0','Gorishi Egg - Set ReactState Passive on Spawn'),
 ('949602','9496','29','0','100','0','8000','8000','0','0','0','0','11','14206','0','0','37','0','0','0','41','1000','0','0','Gorishi Egg - Cast Summon Gorishi Grub and Die and Delayed Despawn on Generic Timer'),
+-- Gargantuan Ooze 9621 - Primal Ooze 6557
 -- U'cha
 ('962201','9622','9','0','100','1025','0','5','5000','9000','0','0','11','8374','1','0','0','0','0','0','0','0','0','0','U''cha - Cast Arcing Smash'),
 ('962202','9622','0','0','100','1025','7000','10000','9000','13000','0','0','11','11428','1','0','0','0','0','0','0','0','0','0','U''cha - Cast Knockdown'),
+-- A-Me 01 9623 - npc_ame01
 -- Larkorwi Mate
 ('968301','9683','0','0','100','1025','5000','9000','12000','18000','0','0','11','13443','1','0','0','0','0','0','0','0','0','0','Larkorwi Mate - Cast Rend'),
 ('968302','9683','9','0','100','1025','0','5','3000','6000','0','0','11','3604','1','32','0','0','0','0','0','0','0','0','Larkorwi Mate - Cast Tendon Rip'),
 -- Larkorwi
 ('968401','9684','0','0','100','1025','5000','9000','12000','18000','0','0','11','13443','1','0','0','0','0','0','0','0','0','0','Larkorwi - Cast Rend'),
 ('968402','9684','9','0','100','1025','0','5','3000','6000','0','0','11','3604','1','32','0','0','0','0','0','0','0','0','Larkorwi - Cast Tendon Rip'),
+-- Ringo 9999 - npc_ringo
 -- Gorishi Hive Guard
 ('1004001','10040','4','0','100','0','0','0','0','0','0','0','22','1','0','0','0','0','0','0','0','0','0','0','Gorishi Hive Guard - Set Phase 1 on Aggro'),
 ('1004002','10040','9','5','100','1025','0','5','4000','6000','0','0','11','14120','1','0','0','0','0','0','0','0','0','0','Gorishi Hive Guard - Cast Tunneler Acid (Phase 1)'),
@@ -13764,7 +13777,7 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 ('890103','8901','9','0','100','1025','0','5','12000','15000','0','0','11','9080','1','0','0','0','0','0','0','0','0','0','Anvilrage Reservist - Cast Hamstring'),
 ('890104','8901','0','0','100','1025','8000','11000','7000','12000','0','0','11','11976','1','0','0','0','0','0','0','0','0','0','Anvilrage Reservist - Cast Strike'),
 ('890105','8901','9','0','100','1025','5','30','2200','3800','0','0','11','6660','1','256','0','0','0','0','0','0','0','0','Anvilrage Reservist - Cast Shoot'),
--- Shadowforge Citizen 8902
+-- Shadowforge Citizen 8902 - s.15496 classic only
 ('890201','8902','11','0','100','0','0','0','0','0','0','0','31','1','5','0','0','0','0','0','0','0','0','0','Shadowforge Citizen - Set Random Phase 1-5 on Spawn'),
 ('890202','8902','2','0','100','1024','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Shadowforge Citizen - Flee at 15% HP'),
 ('890203','8902','0','45','100','1024','0','0','0','0','0','0','57','0','0','0','0','0','0','0','0','0','0','0','Shadowforge Citizen - Enable Melee Mode (Phase 1,2)'),
@@ -16245,10 +16258,11 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 ('1040002','10400','1','0','100','0','2000','2000','0','0','0','0','11','12420','0','0','0','0','0','0','0','0','0','0','Thuzadin Necromancer - Cast Summon Skeletal Servant on OOC'),
 ('1040003','10400','0','0','100','1025','1000','3000','9000','11000','0','0','11','16431','0','0','0','0','0','0','0','0','0','0','Thuzadin Necromancer - Cast Bone Armor on Aggro'),
 ('1040004','10400','9','0','100','1025','0','10','21000','27000','0','0','11','16430','1','0','0','0','0','0','0','0','0','0','Thuzadin Necromancer - Cast Soul Tap'),
--- Plague Ghoul 10405 (3.0.8 Official Data)
-('1040501','10405','2','0','100','1024','30','0','0','0','0','0','11','8599','0','0','1','1191','0','0','0','0','0','0','Plague Ghoul - Cast Enrage at 30% HP'),
-('1040502','10405','0','0','100','1025','11300','20900','11300','27900','0','0','11','16458','4','32','0','0','0','0','0','0','0','0','Plague Ghoul - Cast Ghoul Plague'),
-('1040503','10405','9','0','100','1025','0','5','6300','10100','0','0','11','15584','1','0','0','0','0','0','0','0','0','0','Plague Ghoul - Cast Cleave'),
+-- Plague Ghoul 10405 - s.15584 classic only
+('1040501','10405','11','0','100','0','0','0','0','0','0','0','11','15088','0','34','11','15097','0','34','11','18950','0','34','Plague Ghoul - Cast Flurry, Enrage, Invisibility and Stealth Detection on Spawn'),
+('1040502','10405','2','0','100','1024','30','0','0','0','0','0','11','8599','0','0','1','1191','0','0','0','0','0','0','Plague Ghoul - Cast Enrage at 30% HP'),
+('1040503','10405','0','0','100','1025','11300','20900','11300','27900','0','0','11','16458','4','32','0','0','0','0','0','0','0','0','Plague Ghoul - Cast Ghoul Plague'),
+('1040504','10405','9','0','100','1025','0','5','6300','10100','0','0','11','15584','1','0','0','0','0','0','0','0','0','0','Plague Ghoul - Cast Cleave'),
 -- Ghoul Ravener 10406
 ('1040601','10406','11','0','100','0','0','0','0','0','0','0','11','26047','0','0','0','0','0','0','11','18950','0','34','Ghoul Ravener - Cast Birth, Invisibility and Stealth Detection on Spawn'),
 ('1040602','10406','9','0','100','1025','0','5','9000','16000','0','0','11','16172','1','32','0','0','0','0','0','0','0','0','Ghoul Ravener - Cast Head Crack'),
@@ -16629,7 +16643,7 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 ('571504','5715','0','0','100','1025','9400','18200','21200','31300','0','0','11','12279','4','544','0','0','0','0','0','0','0','0','Hukku - Cast Curse of Blood'),
 ('571505','5715','0','0','100','1025','0','10000','16400','29900','0','0','11','9081','0','0','0','0','0','0','0','0','0','0','Hukku - Cast Shadow Bolt Volley'),
 ('571506','5715','0','0','100','1025','0','0','3400','4800','0','0','11','12471','1','256','0','0','0','0','0','0','0','0','Hukku - Cast Shadow Bolt'),
--- Zul'Lor 5716
+-- Zul'Lor 5716 - s.15584 classic only
 ('571601','5716','1','0','100','0','0','0','0','0','0','0','11','13540','0','0','0','0','0','0','0','0','0','0','Zul''Lor - Cast Green Channelling OOC'),
 ('571602','5716','0','0','100','1025','9800','14300','7900','16200','0','0','11','15584','1','0','0','0','0','0','0','0','0','0','Zul''Lor - Cast Cleave'),
 ('571603','5716','0','0','100','1025','0','2000','6000','12000','0','0','11','12530','17','0','0','0','0','0','0','0','0','0','Zul''Lor - Cast Frailty'),
@@ -16732,7 +16746,7 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 ('63905','639','2','0','100','1024','50','0','0','0','0','0','11','5200','15','2','1','1048','0','0','0','0','0','0','Edwin VanCleef - Cast VanCleef''s Allies, Emote at 50% HP'),
 ('63906','639','2','0','100','1024','75','51','0','0','0','0','1','6063','0','0','0','0','0','0','0','0','0','0','Edwin VanCleef - Yell at 75% HP'),
 ('63907','639','0','0','100','1025','5000','20000','5000','20000','0','0','11','3391','15','0','0','0','0','0','0','0','0','0','Edwin VanCleef - Cast Thrash'),
--- Goblin Woodcarver 641
+-- Goblin Woodcarver 641 - s.5532 classic only
 ('64101','641','1','0','100','0','0','0','0','0','0','0','22','1','0','0','0','0','0','0','0','0','0','0','Defias Blackguard - Set Phase 1 OOC'),
 ('64102','641','0','3','100','1025','180000','180000','0','0','0','0','22','1','0','0','0','0','0','0','0','0','0','0','Goblin Woodcarver - Set Phase 1 (Phase 2)'),
 ('64103','641','0','5','80','1025','0','0','180000','180000','0','0','11','6466','4','544','11','6467','0','2','22','2','0','0','Goblin Woodcarver - Cast Axe Toss, Unarmed Woodcutter, Set Phase 2 (Phase 1)'),
@@ -16750,7 +16764,7 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 ('64502','645','2','0','100','1025','50','0','22200','33900','0','0','11','5174','0','0','0','0','0','0','0','0','0','0','Cookie - Cast Cookie''s Cooking at 50% HP'),
 ('64503','645','0','0','100','1025','2400','3700','57000','66200','0','0','11','6306','0','0','0','0','0','0','0','0','0','0','Cookie - Cast Acid Splash'),
 -- Mr Smite 646 - boss_mr_smite
--- Captain Greenskin 647
+-- Captain Greenskin 647 - s.5532 classic only
 ('64701','647','0','0','100','1025','6200','13400','37400','97500','0','0','11','5208','4','32','0','0','0','0','0','0','0','0','Captain Greenskin - Cast Poisoned Harpoon'),
 ('64702','647','0','0','100','1025','5000','18000','17700','42600','0','0','11','5532','1','0','0','0','0','0','0','0','0','0','Captain Greenskin - Cast Cleave'),
 -- Defias Pirate 657
@@ -17749,7 +17763,7 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 ('1644802','16448','0','0','100','1025','6000','12000','9000','16000','0','0','11','30121','1','0','0','0','0','0','0','0','0','0','Plagued Deathhound - Cast Forceful Howl'),
 -- Spirit of Naxxramas 16449 - 28383,28392,28599
 ('1644901','16449','11','0','100','0','0','0','0','0','0','0','11','18950','0','34','0','0','0','0','0','0','0','0','Spirit of Naxxramas - Cast Invisibility and Stealth Detection on Spawn'),
--- Deathknight Vindicator 16451 s.15754 classic only
+-- Deathknight Vindicator 16451 - s.15754 classic only
 ('1645101','16451','0','0','100','1025','0','0','8000','8000','0','0','11','28413','1','0','0','0','0','0','0','0','0','0','Deathknight Vindicator - Cast Aura of Agony'),
 ('1645102','16451','0','0','100','1025','3000','9000','3000','9000','0','0','11','15754','1','0','0','0','0','0','0','0','0','0','Deathknight Vindicator - Cast Cleave'),
 ('1645103','16451','0','0','100','1025','3000','15000','120000','120000','0','0','11','28412','1','0','0','0','0','0','0','0','0','0','Deathknight Vindicator - Cast Death Coil'),
@@ -18376,7 +18390,7 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 ('1160304','11603','28','3','100','1','15572','1','5000','5000','0','0','22','1','0','0','0','0','0','0','0','0','0','0','Whitewhisker Digger - Set Phase 1 on Target Missing Sunder Armor Aura Stack (Phase 2)'),
 ('1160305','11603','0','0','100','1025','4100','9300','10200','17900','0','0','11','12057','1','0','0','0','0','0','0','0','0','0','Whitewhisker Digger - Cast Strike'),
 ('1160306','11603','2','0','100','0','15','0','0','0','0','0','25','0','0','0','0','0','0','0','0','0','0','0','Whitewhisker Digger - Flee at 15% HP'),
-('1160307','11603','7','0','100','0','0','0','0','0','0','0','22','0','0','0','0','0','0','0','0','0','0','0','Whitewhisker Digger - Set Phase to 0 on Evade'),
+('1160307','11603','7','0','100','0','0','0','0','0','0','0','22','0','0','0','0','0','0','0','0','0','0','0','Whitewhisker Digger - Set Phase 0 on Evade'),
 -- Whitewhisker Geomancer 11604
 ('1160401','11604','11','0','100','0','0','0','0','0','0','0','57','2','35','0','0','0','0','0','0','0','0','0','Whitewhisker Geomancer - Enable Range Mode on Spawn'),
 ('1160402','11604','2','0','100','1024','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Whitewhisker Geomancer - Flee at 15% HP'),
@@ -18388,7 +18402,7 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 ('1160501','11605','1','0','100','0','1000','1000','0','0','0','0','11','13589','0','34','0','0','0','0','0','0','0','0','Whitewhisker Overseer - Cast Haste Aura OOC'),
 ('1160502','11605','0','0','100','1025','3000','12000','8000','13000','0','0','11','15663','1','0','0','0','0','0','0','0','0','0','Whitewhisker Overseer - Cast Cleave'),
 ('1160503','11605','2','0','100','0','15','0','0','0','0','0','25','0','0','0','0','0','0','0','0','0','0','0','Whitewhisker Overseer - Flee at 15% HP'),
--- Morloch 11657
+-- Morloch 11657 - s.43941
 ('1165701','11657','1','0','100','0','1000','1000','0','0','0','0','56','0','0','0','0','0','0','0','0','0','0','0','Morloch - Despawn Guardians on OOC'),
 ('1165702','11657','1','0','100','0','2000','2000','0','0','0','0','11','11939','0','0','0','0','0','0','0','0','0','0','Morloch - Cast Summon Imp on OOC'),
 ('1165703','11657','4','0','100','0','0','0','0','0','0','0','57','2','35','0','0','0','0','0','0','0','0','0','Morloch - Enable Range Mode on Aggro'),
@@ -18410,7 +18424,7 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 -- Wildpaw Shaman 11837
 ('1183701','11837','0','0','100','1025','6000','9000','16000','19000','0','0','11','12557','0','0','0','0','0','0','0','0','0','0','Wildpaw Shaman - Cast Cone of Cold'),
 ('1183702','11837','2','0','100','1025','50','0','60000','65000','0','0','11','18975','0','0','0','0','0','0','0','0','0','0','Wildpaw Shaman - Cast Summon Ice Totem at 50% HP'),
--- Wildpaw Mystic 11838
+-- Wildpaw Mystic 11838 - s.13901 classic only
 ('1183801','11838','4','0','100','0','0','0','0','0','0','0','57','2','35','0','0','0','0','0','0','0','0','0','Wildpaw Mystic - Enable Range Mode on Aggro'),
 ('1183802','11838','2','0','100','1025','50','0','12000','16000','0','0','11','11986','0','0','0','0','0','0','0','0','0','0','Wildpaw Mystic - Cast Healing Wave at 50% HP'),
 ('1183803','11838','0','0','100','1025','6000','9000','16000','19000','0','0','11','12058','1','0','0','0','0','0','0','0','0','0','Wildpaw Mystic - Cast Chain Lightning'),
@@ -18480,7 +18494,7 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 ('1307901','13079','0','0','100','1025','7000','10000','11000','24000','0','0','11','17207','0','0','0','0','0','0','0','0','0','0','Keetar - Cast Whirlwind'),
 ('1307902','13079','0','0','100','1025','4000','6000','7000','9000','0','0','11','14516','1','0','0','0','0','0','0','0','0','0','Keetar - Cast Strike'),
 ('1307903','13079','0','0','100','1025','4000','7000','7000','9000','0','0','11','15622','1','0','0','0','0','0','0','0','0','0','Keetar - Cast Cleave'),
--- Irondeep Guard 13080 s.15663 classic only
+-- Irondeep Guard 13080 - s.15663 classic only
 ('1308001','13080','0','0','100','1025','5000','8000','9000','13000','0','0','11','16856','1','0','0','0','0','0','0','0','0','0','Irondeep Guard - Cast Mortal Strike'),
 ('1308002','13080','0','0','100','1025','4000','7000','7000','9000','0','0','11','15663','1','0','0','0','0','0','0','0','0','0','Irondeep Guard - Cast Cleave'),
 -- Irondeep Raider 13081
@@ -18739,7 +18753,7 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 ('1342801','13428','2','0','100','1025','30','0','120000','130000','0','0','11','8599','0','0','1','1191','0','0','0','0','0','0','Champion Warrior - Cast Enrage at 30% HP'),
 ('1342802','13428','0','0','100','1025','5000','10000','5000','20000','0','0','11','11976','1','0','0','0','0','0','0','0','0','0','Champion Warrior - Cast Strike'),
 -- Wing Commander Ichman 13437
-('1343701','13437','1','0','100','0','1000','1000','0','0','0','0','11','16380','0','0','0','0','0','0','0','0','0','0','Wing Commander Ichman - Cast Greater Invisibility on Spawn'),
+('1343701','13437','1','0','100','0','1000','1000','0','0','0','0','11','16380','0','32','0','0','0','0','0','0','0','0','Wing Commander Ichman - Cast Greater Invisibility OOC'),
 ('1343702','13437','4','0','100','0','0','0','0','0','0','0','28','0','16380','0','0','0','0','0','0','0','0','0','Wing Commander Ichman - Remove Greater Invisibility on Aggro'),
 ('1343703','13437','0','0','100','1025','4000','6000','7000','9000','0','0','11','15580','1','0','0','0','0','0','0','0','0','0','Wing Commander Ichman - Cast Strike'),
 ('1343704','13437','0','0','100','1025','9000','13000','18000','34000','0','0','11','16509','1','0','0','0','0','0','0','0','0','0','Wing Commander Ichman - Cast Rend'),
@@ -18988,7 +19002,7 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 ('1477303','14773','0','0','100','1025','2000','4000','14000','20000','0','0','11','23511','0','0','0','0','0','0','0','0','0','0','Iceblood Warmaster - Cast Demoralizing Shout'),
 ('1477304','14773','0','0','100','1025','11000','14000','9000','13000','0','0','11','13736','0','0','0','0','0','0','0','0','0','0','Iceblood Warmaster - Cast Whirlwind'),
 ('1477305','14773','2','0','100','1025','30','0','120000','120000','0','0','11','8599','0','0','1','1191','0','0','0','0','0','0','Iceblood Warmaster - Cast Enrage at 30% HP'),
--- Icewing Warmaster 14774
+-- Icewing Warmaster 14774 - s.15579 classic only
 ('1477401','14774','0','0','100','1025','5000','7000','6000','9000','0','0','11','15579','1','0','0','0','0','0','0','0','0','0','Icewing Warmaster - Cast Cleave'),
 ('1477402','14774','0','0','100','1025','2000','4000','14000','20000','0','0','11','23511','0','0','0','0','0','0','0','0','0','0','Icewing Warmaster - Cast Demoralizing Shout'),
 ('1477403','14774','0','0','100','1025','11000','14000','9000','13000','0','0','11','13736','0','0','0','0','0','0','0','0','0','0','Icewing Warmaster - Cast Whirlwind'),
diff --git a/Updates/4629_VDB-20210521130439_world.sql b/Updates/4629_VDB-20210521130439_world.sql
index 119920f3c..66bc00f11 100644
--- a/Updates/4629_VDB-20210521130439_world.sql
+++ b/Updates/4629_VDB-20210521130439_world.sql
@@ -77,7 +77,7 @@ INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `Combat
 (329601, 1, 8599, 0, 5364, 0, 0, 100, 1, 0, 0, 600000, 600000, 'Orgrimmar - Orgrimmar Grunt - Enrage below 30');
 DELETE FROM `creature_spell_list_entry` WHERE `Id` = 329601;
 INSERT INTO `creature_spell_list_entry` (`Id`, `Name`, `ChanceSupportAction`, `ChanceRangedAttack`) VALUES
-(329601, 'Orgrimmar - Orgrimmar Grunt 2641', 0, 0);
+(329601, 'Orgrimmar - Orgrimmar Grunt 3296', 0, 0);
 DELETE FROM `creature_template_spells` WHERE `entry` = 3296;
 
 -- Nether Sorceress is using wrong spell id for Lash of Pain.