diff --git a/ElwynnFalls/CoilfangWaterElemental(600632).sql b/ElwynnFalls/CoilfangWaterElemental(600632).sql
index 7affffd..5099e4e 100644
--- a/ElwynnFalls/CoilfangWaterElemental(600632).sql
+++ b/ElwynnFalls/CoilfangWaterElemental(600632).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600632);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600632, 20627, 0, 0, 0, 0, 'Coilfang Water Elemental', 'Delve', NULL, 0, 83, 83, 1, 128, 0, 1, 1.28968, 1, 1, 20, 1, 1, 4, 13, 2000, 2000, 1, 1, 2, 0, 2048, 0, 0, 0, 0, 0, 0, 4, 8, 0, 0, 0, 0, 0, 0, 0, 'SmartAI', 1, 1, 5, 8, 1, 1, 0, 144, 1, 0, 0, 0, '', 12340);
+(600632, 20627, 0, 0, 0, 0, 'Coilfang Water Elemental', 'Delve', NULL, 0, 83, 83, 1, 168, 0, 1, 1.28968, 1, 1, 20, 1, 1, 4, 13, 2000, 2000, 1, 1, 2, 0, 2048, 0, 0, 0, 0, 0, 0, 4, 8, 0, 0, 0, 0, 0, 0, 0, 'SmartAI', 1, 1, 5, 8, 1, 1, 0, 144, 1, 0, 0, 0, '', 12340);
 
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
 (600632, 0, 5564, 1, 1, 12340);
diff --git a/ElwynnFalls/DarkcrestSentry(600628).sql b/ElwynnFalls/DarkcrestSentry(600628).sql
index 9b1183e..e00aa22 100644
--- a/ElwynnFalls/DarkcrestSentry(600628).sql
+++ b/ElwynnFalls/DarkcrestSentry(600628).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600628);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600628, 0, 0, 0, 0, 0, 'Darkcrest Sentry', 'Delve', NULL, 0, 83, 83, 0, 128, 0, 1, 1.14286, 1, 1, 20, 1, 1, 4, 31.5, 2000, 2000, 1, 1, 1, 32768, 2048, 0, 0, 0, 0, 0, 0, 4, 0, 600628, 0, 0, 0, 0, 0, 0, 'SmartAI', 1, 1, 60, 0, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
+(600628, 0, 0, 0, 0, 0, 'Darkcrest Sentry', 'Delve', NULL, 0, 83, 83, 0, 168, 0, 1, 1.14286, 1, 1, 20, 1, 1, 4, 31.5, 2000, 2000, 1, 1, 1, 32768, 2048, 0, 0, 0, 0, 0, 0, 4, 0, 600628, 0, 0, 0, 0, 0, 0, 'SmartAI', 1, 1, 60, 0, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
 
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
 (600628, 0, 4606, 1, 1, 12340);
diff --git a/ElwynnFalls/DarkcrestSiren(600625).sql b/ElwynnFalls/DarkcrestSiren(600625).sql
index 5ab2fff..5103aed 100644
--- a/ElwynnFalls/DarkcrestSiren(600625).sql
+++ b/ElwynnFalls/DarkcrestSiren(600625).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600625);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600625, 0, 0, 0, 0, 0, 'Darkcrest Siren', 'Delve', NULL, 0, 83, 83, 1, 128, 0, 3.2, 1.71429, 1, 1, 20, 1, 1, 0, 7.5, 2000, 2000, 1, 1, 2, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600625, 600625, 0, 0, 0, 145, 195, 'SmartAI', 1, 1, 25, 10, 0.97, 1, 0, 0, 1, 0, 0, 0, '', 12340);
+(600625, 0, 0, 0, 0, 0, 'Darkcrest Siren', 'Delve', NULL, 0, 83, 83, 1, 168, 0, 3.2, 1.71429, 1, 1, 20, 1, 1, 0, 7.5, 2000, 2000, 1, 1, 2, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600625, 600625, 0, 0, 0, 145, 195, 'SmartAI', 1, 1, 25, 10, 0.97, 1, 0, 0, 1, 0, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600625);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/ElwynnFalls/DarkcrestSorceress(600627).sql b/ElwynnFalls/DarkcrestSorceress(600627).sql
index 9c5c49a..4e28d03 100644
--- a/ElwynnFalls/DarkcrestSorceress(600627).sql
+++ b/ElwynnFalls/DarkcrestSorceress(600627).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600627);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600627, 0, 0, 0, 0, 0, 'Darkcrest Sorceress', 'Delve', NULL, 0, 83, 83, 1, 128, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 1, 2000, 2000, 1, 1, 2, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600627, 600627, 0, 0, 0, 138, 1303, 'SmartAI', 1, 1, 25, 5, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
+(600627, 0, 0, 0, 0, 0, 'Darkcrest Sorceress', 'Delve', NULL, 0, 83, 83, 1, 168, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 1, 2000, 2000, 1, 1, 2, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600627, 600627, 0, 0, 0, 138, 1303, 'SmartAI', 1, 1, 25, 5, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600627);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/ElwynnFalls/DarkcrestTaskmaster(600624).sql b/ElwynnFalls/DarkcrestTaskmaster(600624).sql
index e48db3f..4acdef2 100644
--- a/ElwynnFalls/DarkcrestTaskmaster(600624).sql
+++ b/ElwynnFalls/DarkcrestTaskmaster(600624).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600624);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600624, 0, 0, 0, 0, 0, 'Darkcrest Taskmaster', 'Delve', NULL, 0, 83, 83, 1, 128, 0, 1, 1.19048, 1, 1, 20, 1, 1, 0, 36.9, 2000, 2000, 1, 1, 1, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600624, 600624, 0, 0, 0, 169, 225, 'SmartAI', 1, 1, 38, 1, 0.97, 1, 0, 0, 1, 0, 0, 0, '', 12340);
+(600624, 0, 0, 0, 0, 0, 'Darkcrest Taskmaster', 'Delve', NULL, 0, 83, 83, 1, 168, 0, 1, 1.19048, 1, 1, 20, 1, 1, 0, 36.9, 2000, 2000, 1, 1, 1, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600624, 600624, 0, 0, 0, 169, 225, 'SmartAI', 1, 1, 38, 1, 0.97, 1, 0, 0, 1, 0, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600624);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/ElwynnFalls/DarkcrestWavecaller(600626).sql b/ElwynnFalls/DarkcrestWavecaller(600626).sql
index a02f343..3d11c07 100644
--- a/ElwynnFalls/DarkcrestWavecaller(600626).sql
+++ b/ElwynnFalls/DarkcrestWavecaller(600626).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600626);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600626, 0, 0, 0, 0, 0, 'Darkcrest Wavecaller', 'Delve', NULL, 0, 83, 83, 1, 128, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 8.9, 2000, 2000, 1, 1, 2, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600626, 600626, 0, 0, 0, 139, 186, 'SmartAI', 1, 1, 6, 20, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
+(600626, 0, 0, 0, 0, 0, 'Darkcrest Wavecaller', 'Delve', NULL, 0, 83, 83, 1, 168, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 8.9, 2000, 2000, 1, 1, 2, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600626, 600626, 0, 0, 0, 139, 186, 'SmartAI', 1, 1, 6, 20, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600626);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/ElwynnFalls/Gurlgles(600634).sql b/ElwynnFalls/Gurlgles(600634).sql
index 3ef423e..9738aae 100644
--- a/ElwynnFalls/Gurlgles(600634).sql
+++ b/ElwynnFalls/Gurlgles(600634).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600634);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600634, 0, 0, 0, 0, 0, 'Gurlgles', 'Delve Boss', NULL, 0, 83, 83, 0, 128, 0, 1, 1.14286, 1, 1, 20, 1, 3, 0, 1.7, 1200, 2000, 1, 1, 1, 32832, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600634, 600634, 0, 0, 0, 231, 308, 'SmartAI', 1, 1, 6, 1, 1, 2, 0, 0, 1, 608908883, 0, 0, '', 12340);
+(600634, 0, 0, 0, 0, 0, 'Gurlgles', 'Delve Boss', NULL, 0, 83, 83, 0, 168, 0, 1, 1.14286, 1, 1, 20, 1, 3, 0, 1.7, 1200, 2000, 1, 1, 1, 32832, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600634, 600634, 0, 0, 0, 231, 308, 'SmartAI', 1, 1, 6, 1, 1, 2, 0, 0, 1, 608908883, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600634);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/ElwynnFalls/LordMwargadon(600633).sql b/ElwynnFalls/LordMwargadon(600633).sql
index c42d181..ce7b03d 100644
--- a/ElwynnFalls/LordMwargadon(600633).sql
+++ b/ElwynnFalls/LordMwargadon(600633).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600633);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600633, 0, 0, 0, 0, 0, 'Lord Mwargadon', 'Delve boss', NULL, 0, 83, 83, 1, 128, 0, 1, 1.42857, 1, 1, 20, 1, 3, 0, 24, 2000, 2000, 1, 1, 1, 32832, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600633, 600633, 0, 0, 0, 1039, 1362, 'SmartAI', 1, 1, 85, 10, 1.1, 1, 0, 0, 1, 1105, 0, 0, '', 12340);
+(600633, 0, 0, 0, 0, 0, 'Lord Mwargadon', 'Delve boss', NULL, 0, 83, 83, 1, 168, 0, 1, 1.42857, 1, 1, 20, 1, 3, 0, 24, 2000, 2000, 1, 1, 1, 32832, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600633, 600633, 0, 0, 0, 1039, 1362, 'SmartAI', 1, 1, 85, 10, 1.1, 1, 0, 0, 1, 1105, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600633);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/ElwynnFalls/MurlocHunter(600631).sql b/ElwynnFalls/MurlocHunter(600631).sql
index 3247841..47f81f2 100644
--- a/ElwynnFalls/MurlocHunter(600631).sql
+++ b/ElwynnFalls/MurlocHunter(600631).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600631);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600631, 0, 0, 0, 0, 0, 'Murloc Hunter', 'Delve', NULL, 0, 83, 83, 0, 128, 0, 1, 1.14286, 1, 1, 18, 1, 1, 0, 7.8, 2000, 2000, 1, 1, 1, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600631, 600631, 0, 0, 0, 14, 45, 'SmartAI', 1, 1, 12, 15, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
+(600631, 0, 0, 0, 0, 0, 'Murloc Hunter', 'Delve', NULL, 0, 83, 83, 0, 168, 0, 1, 1.14286, 1, 1, 18, 1, 1, 0, 7.8, 2000, 2000, 1, 1, 1, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600631, 600631, 0, 0, 0, 14, 45, 'SmartAI', 1, 1, 12, 15, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600631);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/ElwynnFalls/MurlocOracle(600630).sql b/ElwynnFalls/MurlocOracle(600630).sql
index cf54b31..015d318 100644
--- a/ElwynnFalls/MurlocOracle(600630).sql
+++ b/ElwynnFalls/MurlocOracle(600630).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600630);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600630, 0, 0, 0, 0, 0, 'Murloc Oracle', 'Delve', NULL, 0, 83, 83, 0, 128, 0, 1, 1.28571, 1, 1, 20, 1, 1, 0, 25, 2000, 2000, 1, 1, 2, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600630, 600630, 0, 0, 0, 10, 53, 'SmartAI', 1, 1, 35, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
+(600630, 0, 0, 0, 0, 0, 'Murloc Oracle', 'Delve', NULL, 0, 83, 83, 0, 168, 0, 1, 1.28571, 1, 1, 20, 1, 1, 0, 25, 2000, 2000, 1, 1, 2, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600630, 600630, 0, 0, 0, 10, 53, 'SmartAI', 1, 1, 35, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
 
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
 (600630, 0, 1079, 1, 1, 12340);
diff --git a/ElwynnFalls/MurlocTidecaller(600629).sql b/ElwynnFalls/MurlocTidecaller(600629).sql
index 95c678f..81bdf33 100644
--- a/ElwynnFalls/MurlocTidecaller(600629).sql
+++ b/ElwynnFalls/MurlocTidecaller(600629).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600629);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600629, 0, 0, 0, 0, 0, 'Murloc Tidecaller', 'Delve', NULL, 0, 83, 83, 0, 128, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 7.5, 2000, 2000, 1, 1, 2, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600629, 600629, 0, 0, 0, 13, 59, 'SmartAI', 1, 1, 40, 10, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
+(600629, 0, 0, 0, 0, 0, 'Murloc Tidecaller', 'Delve', NULL, 0, 83, 83, 0, 168, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 7.5, 2000, 2000, 1, 1, 2, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600629, 600629, 0, 0, 0, 13, 59, 'SmartAI', 1, 1, 40, 10, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
 
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
 (600629, 0, 5293, 1, 1, 12340);
diff --git a/OldIronforge/DarkIronBombardier(600604).sql b/OldIronforge/DarkIronBombardier(600604).sql
index 137065f..87a76f1 100644
--- a/OldIronforge/DarkIronBombardier(600604).sql
+++ b/OldIronforge/DarkIronBombardier(600604).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600604);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600604, 0, 0, 0, 0, 0, 'Dark Iron Bombardier', 'Delve', NULL, 0, 82, 82, 0, 128, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 7.5, 2000, 2000, 1, 1, 2, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600604, 600604, 0, 0, 0, 30, 180, 'SmartAI', 0, 1, 2, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
+(600604, 0, 0, 0, 0, 0, 'Dark Iron Bombardier', 'Delve', NULL, 0, 82, 82, 0, 168, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 7.5, 2000, 2000, 1, 1, 2, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600604, 600604, 0, 0, 0, 30, 180, 'SmartAI', 0, 1, 2, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600604);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/OldIronforge/DarkIronDemolitionist(600607).sql b/OldIronforge/DarkIronDemolitionist(600607).sql
index 26fe9a6..536fa67 100644
--- a/OldIronforge/DarkIronDemolitionist(600607).sql
+++ b/OldIronforge/DarkIronDemolitionist(600607).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600607);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600607, 0, 0, 0, 0, 0, 'Dark Iron Demolitionist', 'Delve', NULL, 0, 82, 82, 0, 128, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 7.5, 2000, 2000, 1, 1, 1, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600607, 600607, 0, 0, 0, 176, 308, 'SmartAI', 0, 1, 8, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
+(600607, 0, 0, 0, 0, 0, 'Dark Iron Demolitionist', 'Delve', NULL, 0, 82, 82, 0, 168, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 7.5, 2000, 2000, 1, 1, 1, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600607, 600607, 0, 0, 0, 176, 308, 'SmartAI', 0, 1, 8, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600607);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/OldIronforge/DarkIronLookout(600610).sql b/OldIronforge/DarkIronLookout(600610).sql
index a00cfa9..59b7da6 100644
--- a/OldIronforge/DarkIronLookout(600610).sql
+++ b/OldIronforge/DarkIronLookout(600610).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600610);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600610, 0, 0, 0, 0, 0, 'Dark Iron Lookout', 'Delve', NULL, 0, 82, 82, 0, 128, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 7.5, 2000, 2000, 1, 1, 1, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600610, 600610, 0, 0, 0, 80, 537, 'SmartAI', 1, 1, 25, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
+(600610, 0, 0, 0, 0, 0, 'Dark Iron Lookout', 'Delve', NULL, 0, 82, 82, 0, 168, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 7.5, 2000, 2000, 1, 1, 1, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600610, 600610, 0, 0, 0, 80, 537, 'SmartAI', 1, 1, 25, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600610);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/OldIronforge/DarkIronMarksman(600608).sql b/OldIronforge/DarkIronMarksman(600608).sql
index f457e30..5a87ab3 100644
--- a/OldIronforge/DarkIronMarksman(600608).sql
+++ b/OldIronforge/DarkIronMarksman(600608).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600608);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600608, 0, 0, 0, 0, 0, 'Dark Iron Marksman', 'Delve', NULL, 0, 82, 82, 0, 128, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 14, 2000, 2000, 1, 1, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'SmartAI', 0, 1, 3.915, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
+(600608, 0, 0, 0, 0, 0, 'Dark Iron Marksman', 'Delve', NULL, 0, 82, 82, 0, 168, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 14, 2000, 2000, 1, 1, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'SmartAI', 0, 1, 3.915, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600608);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/OldIronforge/DarkIronRaider(600605).sql b/OldIronforge/DarkIronRaider(600605).sql
index d28e2a3..3c64894 100644
--- a/OldIronforge/DarkIronRaider(600605).sql
+++ b/OldIronforge/DarkIronRaider(600605).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600605);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600605, 0, 0, 0, 0, 0, 'Dark Iron Raider', 'Delve', NULL, 0, 82, 82, 0, 128, 0, 3.2, 1.71429, 1, 1, 20, 1, 1, 0, 35.1, 2000, 2000, 1, 1, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600605, 0, 0, 0, 0, 16, 25, 'SmartAI', 0, 1, 30, 10, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
+(600605, 0, 0, 0, 0, 0, 'Dark Iron Raider', 'Delve', NULL, 0, 82, 82, 0, 168, 0, 3.2, 1.71429, 1, 1, 20, 1, 1, 0, 35.1, 2000, 2000, 1, 1, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600605, 0, 0, 0, 0, 16, 25, 'SmartAI', 0, 1, 30, 10, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600605);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/OldIronforge/DarkIronRifleman(600602).sql b/OldIronforge/DarkIronRifleman(600602).sql
index eeab143..da1cfa8 100644
--- a/OldIronforge/DarkIronRifleman(600602).sql
+++ b/OldIronforge/DarkIronRifleman(600602).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600602);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600602, 0, 0, 0, 0, 0, 'Dark Iron Rifleman', 'Delve', NULL, 0, 82, 82, 0, 128, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 7.5, 2000, 2000, 1, 1, 2, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600602, 600602, 0, 0, 0, 94, 357, 'SmartAI', 1, 1, 6.5, 5, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
+(600602, 0, 0, 0, 0, 0, 'Dark Iron Rifleman', 'Delve', NULL, 0, 82, 82, 0, 168, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 7.5, 2000, 2000, 1, 1, 2, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600602, 600602, 0, 0, 0, 94, 357, 'SmartAI', 1, 1, 6.5, 5, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600602);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/OldIronforge/DarkIronSapper(600606).sql b/OldIronforge/DarkIronSapper(600606).sql
index a4beed0..942826a 100644
--- a/OldIronforge/DarkIronSapper(600606).sql
+++ b/OldIronforge/DarkIronSapper(600606).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600606);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600606, 0, 0, 0, 0, 0, 'Dark Iron Sapper', 'Delve', NULL, 0, 82, 82, 0, 128, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 7.5, 2000, 2000, 1, 1, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600606, 0, 0, 0, 0, 20, 50, 'SmartAI', 0, 1, 20, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
+(600606, 0, 0, 0, 0, 0, 'Dark Iron Sapper', 'Delve', NULL, 0, 82, 82, 0, 168, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 7.5, 2000, 2000, 1, 1, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600606, 0, 0, 0, 0, 20, 50, 'SmartAI', 0, 1, 20, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600606);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/OldIronforge/DarkIronSentry(600609).sql b/OldIronforge/DarkIronSentry(600609).sql
index 44fc9c6..9dacd73 100644
--- a/OldIronforge/DarkIronSentry(600609).sql
+++ b/OldIronforge/DarkIronSentry(600609).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600609);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600609, 0, 0, 0, 0, 0, 'Dark Iron Sentry', 'Delve', NULL, 0, 82, 82, 0, 128, 0, 1, 0.992063, 1, 1, 20, 1, 1, 0, 7.5, 2000, 2000, 1, 1, 2, 32832, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600609, 600609, 0, 0, 0, 287, 380, '', 1, 1, 30, 25, 1, 1, 0, 0, 1, 8388624, 0, 0, '', 12340);
+(600609, 0, 0, 0, 0, 0, 'Dark Iron Sentry', 'Delve', NULL, 0, 82, 82, 0, 168, 0, 1, 0.992063, 1, 1, 20, 1, 1, 0, 7.5, 2000, 2000, 1, 1, 2, 32832, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600609, 600609, 0, 0, 0, 287, 380, '', 1, 1, 30, 25, 1, 1, 0, 0, 1, 8388624, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600609);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/OldIronforge/DarkIronShadowcaster(600603).sql b/OldIronforge/DarkIronShadowcaster(600603).sql
index 16e975e..ae5d562 100644
--- a/OldIronforge/DarkIronShadowcaster(600603).sql
+++ b/OldIronforge/DarkIronShadowcaster(600603).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600603);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600603, 0, 0, 0, 0, 0, 'Dark Iron Shadowcaster', 'Delve', NULL, 0, 82, 82, 0, 128, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 1.6, 2000, 2000, 1, 1, 8, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600603, 0, 0, 0, 0, 43, 134, 'SmartAI', 1, 1, 1.5, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
+(600603, 0, 0, 0, 0, 0, 'Dark Iron Shadowcaster', 'Delve', NULL, 0, 82, 82, 0, 168, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 1.6, 2000, 2000, 1, 1, 8, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600603, 0, 0, 0, 0, 43, 134, 'SmartAI', 1, 1, 1.5, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600603);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/OldIronforge/EhrirmosColdrock(600611).sql b/OldIronforge/EhrirmosColdrock(600611).sql
index 551cc7a..22ba3ba 100644
--- a/OldIronforge/EhrirmosColdrock(600611).sql
+++ b/OldIronforge/EhrirmosColdrock(600611).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600611);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600611, 0, 0, 0, 0, 0, 'Ehrirmos Coldrock', 'Delve Boss', NULL, 0, 84, 84, 0, 128, 0, 1, 1.14286, 1, 1, 20, 1, 3, 0, 18, 2000, 2000, 1, 1, 2, 32832, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600611, 600611, 0, 0, 0, 694, 912, 'SmartAI', 1, 1, 114.5, 20, 1, 2, 0, 0, 1, 613105499, 0, 0, '', 12340);
+(600611, 0, 0, 0, 0, 0, 'Ehrirmos Coldrock', 'Delve Boss', NULL, 0, 84, 84, 0, 168, 0, 1, 1.14286, 1, 1, 20, 1, 3, 0, 18, 2000, 2000, 1, 1, 2, 32832, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600611, 600611, 0, 0, 0, 694, 912, 'SmartAI', 1, 1, 114.5, 20, 1, 2, 0, 0, 1, 613105499, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600611);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/OldIronforge/RirruhmBrightfury(600612).sql b/OldIronforge/RirruhmBrightfury(600612).sql
index 4a06d4e..d49c455 100644
--- a/OldIronforge/RirruhmBrightfury(600612).sql
+++ b/OldIronforge/RirruhmBrightfury(600612).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600612);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600612, 0, 0, 0, 0, 0, 'Rirruhm Brightfury', 'Delve Boss', NULL, 0, 84, 84, 0, 128, 0, 1, 2.14286, 1, 1, 20, 1, 3, 0, 21.25, 1000, 2000, 1, 1, 1, 64, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600612, 0, 0, 0, 0, 553, 727, 'SmartAI', 1, 1, 110, 2, 1.3, 1, 0, 0, 1, 613105499, 0, 0, '', 12340);
+(600612, 0, 0, 0, 0, 0, 'Rirruhm Brightfury', 'Delve Boss', NULL, 0, 84, 84, 0, 168, 0, 1, 2.14286, 1, 1, 20, 1, 3, 0, 21.25, 1000, 2000, 1, 1, 1, 64, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600612, 0, 0, 0, 0, 553, 727, 'SmartAI', 1, 1, 110, 2, 1.3, 1, 0, 0, 1, 613105499, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600612);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/Sandfury/ChiefRunetusk(600623).sql b/Sandfury/ChiefRunetusk(600623).sql
index dad97aa..8ddeece 100644
--- a/Sandfury/ChiefRunetusk(600623).sql
+++ b/Sandfury/ChiefRunetusk(600623).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600623);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600623, 0, 0, 0, 0, 0, 'Chief Runetusk', 'Delve Boss', NULL, 0, 84, 84, 0, 128, 0, 1, 1.14286, 1, 1, 20, 1, 3, 0, 18.37, 2000, 2000, 1, 1, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600623, 600623, 0, 0, 0, 399, 1620, 'SmartAI', 1, 1, 110.7, 40, 1.2, 2, 0, 0, 1, 646659935, 0, 0, '', 12340);
+(600623, 0, 0, 0, 0, 0, 'Chief Runetusk', 'Delve Boss', NULL, 0, 84, 84, 0, 168, 0, 1, 1.14286, 1, 1, 20, 1, 3, 0, 18.37, 2000, 2000, 1, 1, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600623, 600623, 0, 0, 0, 399, 1620, 'SmartAI', 1, 1, 110.7, 40, 1.2, 2, 0, 0, 1, 646659935, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600623);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/Sandfury/SandfuryAxeThrower(600613).sql b/Sandfury/SandfuryAxeThrower(600613).sql
index 682c613..104db00 100644
--- a/Sandfury/SandfuryAxeThrower(600613).sql
+++ b/Sandfury/SandfuryAxeThrower(600613).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600613);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600613, 0, 0, 0, 0, 0, 'Sandfury Axe Thrower', 'Delve', NULL, 0, 83, 83, 1, 128, 0, 1, 1.42857, 1, 1, 20, 1, 1, 0, 7, 2000, 2000, 1, 1, 1, 32832, 2048, 0, 0, 0, 0, 0, 0, 7, 72, 600613, 600613, 0, 0, 0, 0, 0, 'SmartAI', 0, 1, 8.4, 1, 1, 1, 0, 144, 1, 0, 0, 0, '', 12340);
+(600613, 0, 0, 0, 0, 0, 'Sandfury Axe Thrower', 'Delve', NULL, 0, 83, 83, 1, 168, 0, 1, 1.42857, 1, 1, 20, 1, 1, 0, 7, 2000, 2000, 1, 1, 1, 32832, 2048, 0, 0, 0, 0, 0, 0, 7, 72, 600613, 600613, 0, 0, 0, 0, 0, 'SmartAI', 0, 1, 8.4, 1, 1, 1, 0, 144, 1, 0, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600613);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/Sandfury/SandfuryBloodDrinker(600616).sql b/Sandfury/SandfuryBloodDrinker(600616).sql
index 322738b..1ed777b 100644
--- a/Sandfury/SandfuryBloodDrinker(600616).sql
+++ b/Sandfury/SandfuryBloodDrinker(600616).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600616);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600616, 0, 0, 0, 0, 0, 'Sandfury Blood Drinker', 'Delve', NULL, 0, 83, 83, 0, 128, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 9, 2000, 2000, 1, 1, 1, 32832, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600616, 600616, 0, 0, 0, 209, 1360, 'SmartAI', 1, 1, 6, 4, 1.1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
+(600616, 0, 0, 0, 0, 0, 'Sandfury Blood Drinker', 'Delve', NULL, 0, 83, 83, 0, 168, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 9, 2000, 2000, 1, 1, 1, 32832, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600616, 600616, 0, 0, 0, 209, 1360, 'SmartAI', 1, 1, 6, 4, 1.1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600616);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/Sandfury/SandfuryExecutioner(600618).sql b/Sandfury/SandfuryExecutioner(600618).sql
index ce962b6..41b3f72 100644
--- a/Sandfury/SandfuryExecutioner(600618).sql
+++ b/Sandfury/SandfuryExecutioner(600618).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600618);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600618, 0, 0, 0, 0, 0, 'Sandfury Executioner', 'Delve', NULL, 0, 83, 83, 0, 128, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 7.8, 2600, 2000, 1, 1, 1, 32832, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600618, 600618, 0, 0, 0, 483, 1191, 'SmartAI', 1, 1, 12.3, 8, 1.1, 1, 0, 0, 1, 8388624, 0, 0, '', 12340);
+(600618, 0, 0, 0, 0, 0, 'Sandfury Executioner', 'Delve', NULL, 0, 83, 83, 0, 168, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 7.8, 2600, 2000, 1, 1, 1, 32832, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600618, 600618, 0, 0, 0, 483, 1191, 'SmartAI', 1, 1, 12.3, 8, 1.1, 1, 0, 0, 1, 8388624, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600618);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/Sandfury/SandfuryFirecaller(600614).sql b/Sandfury/SandfuryFirecaller(600614).sql
index 4d5abe2..0c6c657 100644
--- a/Sandfury/SandfuryFirecaller(600614).sql
+++ b/Sandfury/SandfuryFirecaller(600614).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600614);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600614, 0, 0, 0, 0, 0, 'Sandfury Firecaller', 'Delve', NULL, 0, 83, 83, 0, 128, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 7.3, 2000, 2000, 1, 1, 2, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600614, 600614, 0, 0, 0, 232, 878, 'SmartAI', 1, 1, 7.6, 4, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
+(600614, 0, 0, 0, 0, 0, 'Sandfury Firecaller', 'Delve', NULL, 0, 83, 83, 0, 168, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 7.3, 2000, 2000, 1, 1, 2, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600614, 600614, 0, 0, 0, 232, 878, 'SmartAI', 1, 1, 7.6, 4, 1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600614);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/Sandfury/SandfuryPlagueSpreader(600619).sql b/Sandfury/SandfuryPlagueSpreader(600619).sql
index f417c78..19ed449 100644
--- a/Sandfury/SandfuryPlagueSpreader(600619).sql
+++ b/Sandfury/SandfuryPlagueSpreader(600619).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600619);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600619, 0, 0, 0, 0, 0, 'Sandfury Plague Spreader', 'Delve', '', 0, 83, 83, 2, 128, 0, 0.66667, 1.14286, 1, 1, 20, 1, 1, 0, 8.3, 2000, 2000, 1, 1, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600619, 0, 0, 0, 0, 0, 0, 'SmartAI', 0, 1, 12.1, 2, 1.2, 1, 0, 0, 1, 8388624, 0, 0, '', 12340);
+(600619, 0, 0, 0, 0, 0, 'Sandfury Plague Spreader', 'Delve', '', 0, 83, 83, 2, 168, 0, 0.66667, 1.14286, 1, 1, 20, 1, 1, 0, 8.3, 2000, 2000, 1, 1, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600619, 0, 0, 0, 0, 0, 0, 'SmartAI', 0, 1, 12.1, 2, 1.2, 1, 0, 0, 1, 8388624, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600619);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/Sandfury/SandfuryShadowcaster(600615).sql b/Sandfury/SandfuryShadowcaster(600615).sql
index 4ea0cba..fbcad6b 100644
--- a/Sandfury/SandfuryShadowcaster(600615).sql
+++ b/Sandfury/SandfuryShadowcaster(600615).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600615);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600615, 0, 0, 0, 0, 0, 'Sandfury Shadowcaster', 'Delve', NULL, 0, 83, 83, 0, 128, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 8, 2000, 2000, 1, 1, 2, 32832, 2048, 0, 0, 0, 0, 0, 0, 7, 8, 600615, 600615, 0, 0, 0, 1155, 2162, 'SmartAI', 1, 1, 10, 6, 1.15, 1, 0, 0, 1, 0, 0, 0, '', 12340);
+(600615, 0, 0, 0, 0, 0, 'Sandfury Shadowcaster', 'Delve', NULL, 0, 83, 83, 0, 168, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 8, 2000, 2000, 1, 1, 2, 32832, 2048, 0, 0, 0, 0, 0, 0, 7, 8, 600615, 600615, 0, 0, 0, 1155, 2162, 'SmartAI', 1, 1, 10, 6, 1.15, 1, 0, 0, 1, 0, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600615);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/Sandfury/SandfuryShadowhunter(600620).sql b/Sandfury/SandfuryShadowhunter(600620).sql
index 5a34d3b..b21cd03 100644
--- a/Sandfury/SandfuryShadowhunter(600620).sql
+++ b/Sandfury/SandfuryShadowhunter(600620).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600620);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600620, 0, 0, 0, 0, 0, 'Sandfury Shadowhunter', 'Delve Boss', NULL, 0, 83, 83, 0, 128, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 6.4, 2000, 2000, 1, 1, 2, 32832, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600620, 600620, 0, 0, 0, 208, 1318, 'SmartAI', 1, 1, 8.2, 8, 1.1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
+(600620, 0, 0, 0, 0, 0, 'Sandfury Shadowhunter', 'Delve Boss', NULL, 0, 83, 83, 0, 168, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 6.4, 2000, 2000, 1, 1, 2, 32832, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600620, 600620, 0, 0, 0, 208, 1318, 'SmartAI', 1, 1, 8.2, 8, 1.1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600620);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/Sandfury/SandfuryWitchDoctor(600617).sql b/Sandfury/SandfuryWitchDoctor(600617).sql
index 600ad41..7728e8f 100644
--- a/Sandfury/SandfuryWitchDoctor(600617).sql
+++ b/Sandfury/SandfuryWitchDoctor(600617).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600617);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600617, 0, 0, 0, 0, 0, 'Sandfury Witch Doctor', 'Delve', '', 0, 83, 83, 2, 128, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 7.6, 1500, 2000, 1, 1, 2, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600617, 0, 0, 0, 0, 1178, 1964, 'SmartAI', 0, 1, 8.3, 12, 1.1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
+(600617, 0, 0, 0, 0, 0, 'Sandfury Witch Doctor', 'Delve', '', 0, 83, 83, 2, 168, 0, 1, 1.14286, 1, 1, 20, 1, 1, 0, 7.6, 1500, 2000, 1, 1, 2, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600617, 0, 0, 0, 0, 1178, 1964, 'SmartAI', 0, 1, 8.3, 12, 1.1, 1, 0, 0, 1, 0, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600617);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/Sandfury/SouseSanRhazon(600621).sql b/Sandfury/SouseSanRhazon(600621).sql
index 6d93afb..7f38584 100644
--- a/Sandfury/SouseSanRhazon(600621).sql
+++ b/Sandfury/SouseSanRhazon(600621).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600621);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600621, 0, 0, 0, 0, 0, 'Souse\'San Rhazon', 'Delve Boss', NULL, 0, 84, 84, 0, 128, 0, 1, 1.14286, 1, 1, 20, 1, 3, 0, 19.6, 2500, 2000, 1, 1, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 6, 0, 600621, 600621, 0, 0, 0, 320, 423, 'SmartAI', 1, 1, 114.7, 40, 1.2, 2, 0, 0, 1, 646659935, 0, 0, '', 12340);
+(600621, 0, 0, 0, 0, 0, 'Souse\'San Rhazon', 'Delve Boss', NULL, 0, 84, 84, 0, 168, 0, 1, 1.14286, 1, 1, 20, 1, 3, 0, 19.6, 2500, 2000, 1, 1, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 6, 0, 600621, 600621, 0, 0, 0, 320, 423, 'SmartAI', 1, 1, 114.7, 40, 1.2, 2, 0, 0, 1, 646659935, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600621);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/Sandfury/Xantosh(600622).sql b/Sandfury/Xantosh(600622).sql
index 855b64f..adae64e 100644
--- a/Sandfury/Xantosh(600622).sql
+++ b/Sandfury/Xantosh(600622).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600622);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600622, 0, 0, 0, 0, 0, 'Xan\'tosh', 'Delve Boss', NULL, 0, 84, 84, 0, 128, 0, 1, 1.14286, 1, 1, 20, 1, 3, 0, 9.4, 2000, 2000, 1, 1, 2, 64, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600622, 0, 0, 0, 0, 631, 1111, 'SmartAI', 1, 1, 98.7, 50, 1.1, 2, 0, 0, 1, 646659935, 0, 0, '', 12340);
+(600622, 0, 0, 0, 0, 0, 'Xan\'tosh', 'Delve Boss', NULL, 0, 84, 84, 0, 168, 0, 1, 1.14286, 1, 1, 20, 1, 3, 0, 9.4, 2000, 2000, 1, 1, 2, 64, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600622, 0, 0, 0, 0, 631, 1111, 'SmartAI', 1, 1, 98.7, 50, 1.1, 2, 0, 0, 1, 646659935, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600622);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES