diff --git a/data/sql/world/base/zone_alterac_mountains.sql b/data/sql/world/base/zone_alterac_mountains.sql
index 3b31cac..f320cc7 100644
--- a/data/sql/world/base/zone_alterac_mountains.sql
+++ b/data/sql/world/base/zone_alterac_mountains.sql
@@ -1,9 +1,10 @@
--- smart scripts
+/* smart scripts */
 UPDATE `creature_template` SET `AIName` = '' WHERE `entry` IN (2320, 2407);
 UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` IN 
-(2242, 2243, 2245, 2246, 2247, 2254, 2255, 2256, 2271, 2272, 2287, 2306, 2415, 2417, 2420, 2421, 2422, 2423, 2453);
+(2242, 2243, 2245, 2246, 2247, 2254, 2255, 2256, 2271, 2272, 2287, 2306, 2415, 2417, 2420, 2421, 2422, 2423, 2453, 4504);
 DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `entryorguid` IN 
-(2242, 2243, 2245, 2246, 2247, 2254, 2255, 2256, 2271, 2272, 2287, 2306, 2320, 2407, 2415, 2417, 2420, 2421, 2422, 2423, 2453);
+(2242, 2243, 2245, 2246, 2247, 2254, 2255, 2256, 2271, 2272, 2287, 2306, 2320, 2407, 2415, 2417, 2420, 2421, 2422, 2423, 2453, 4504);
+
 INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, 
 `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, 
 `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, 
@@ -12,7 +13,7 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
 (2242, 0, 0, 0, 1, 0, 100, 1, 1000, 1000, 0, 0, 0, 0, 11, 22766, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,              'Syndicate Spy - Out of Combat - Cast Sneak'),
 (2242, 0, 1, 0, 67, 0, 100, 0, 0, 0, 1800, 9800, 0, 5, 11, 7159, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0,              'Syndicate Spy - On Behind Target - Cast Backstab'),
 (2242, 0, 2, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,                       'Syndicate Spy - Between 0-15% Health - Flee For Assist (No Repeat)'),
-(2243, 0, 0, 0, 105, 0, 100, 0, 7000, 12000, 10000, 28000, 0, 5, 11, 11972, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0,   'Syndicate Sentry - Within 0-5 Range - Cast Shield Bash'),
+(2243, 0, 0, 0, 105, 0, 100, 0, 0, 0, 10000, 28000, 0, 5, 11, 11972, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0,          'Syndicate Sentry - Target Casting - Cast Shield Bash'),
 (2243, 0, 1, 0, 2, 0, 100, 0, 0, 50, 30800, 39200, 0, 0, 11, 15062, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,           'Syndicate Sentry - Between 0-50% Health - Cast Shield Wall'),
 (2243, 0, 2, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,                       'Syndicate Sentry - Between 0-15% Health - Flee For Assist'),
 (2245, 0, 0, 0, 9, 0, 100, 0, 0, 0, 4000, 4000, 30, 60, 21, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,                'Syndicate Saboteur - Outside 30 Range - Start Combat Movement'),
@@ -46,17 +47,17 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
 (2287, 0, 2, 3, 6, 0, 100, 0, 0, 0, 0, 0, 0, 0, 86, 8602, 2, 9, 2287, 0, 15, 1, 0, 0, 0, 0, 0, 0, 0, 0,                 'Crushridge Warmonger - On Death - Cross Cast Enrage'),
 (2287, 0, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 9, 2287, 0, 15, 1, 0, 0, 0, 0,                    'Crushridge Warmonger - On Death - Crushridge Warmonger Say Line 1'),
 --
-(2271, 0, 0, 0, 106, 0, 50, 0, 4800, 18100, 4800, 18100, 0, 5, 11, 3260, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,      'Dalaran Shield Guard - Within 0-5 Range - Cast Violet Shield Effect'),
+(2271, 0, 0, 0, 106, 0, 50, 0, 0, 0, 4800, 18100, 0, 5, 11, 3260, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,             'Dalaran Shield Guard - Within 0-5 Range - Cast Violet Shield Effect'),
 (2271, 0, 1, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,                       'Dalaran Shield Guard - Between 0-15% Health - Flee For Assist (No Repeat)'),
 (2272, 0, 0, 0, 0, 0, 100, 0, 0, 0, 3300, 6600, 0, 0, 11, 20819, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0,             'Dalaran Theurgist - In Combat - Cast Frostbolt'),
 (2272, 0, 1, 0, 0, 0, 100, 0, 4000, 5300, 4600, 9900, 0, 0, 11, 3652, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,         'Dalaran Theurgist - In Combat - Cast Summon Spirit of Old'),
 (2272, 0, 2, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,                       'Dalaran Theurgist - Between 0-15% Health - Flee For Assist (No Repeat)'),
 (2306, 0, 0, 0, 0, 0, 100, 0, 0, 0, 2000, 3000, 0, 0, 11, 20822, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0,             'Baron Vardus - In Combat - Cast Frostbolt'),
-(2306, 0, 1, 0, 106, 0, 100, 0, 5000, 17600, 12200, 39800, 0, 10, 11, 11831, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,  'Baron Vardus - In Combat - Cast Frost Nova'),
+(2306, 0, 1, 0, 106, 0, 100, 0, 0, 0, 12200, 39800, 0, 8, 11, 11831, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,          'Baron Vardus - Within 0-8 Range - Cast Frost Nova'),
 (2306, 0, 2, 0, 0, 0, 100, 0, 1000, 3000, 12500, 29800, 0, 0, 11, 6253, 0, 0, 0, 0, 0, 5, 5, 0, 0, 0, 0, 0, 0, 0,       'Baron Vardus - In Combat - Cast Backhand'),
 (2306, 0, 3, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,                       'Baron Vardus - Between 0-15% Health - Flee For Assist (No Repeat)'),
 (2415, 0, 0, 0, 0, 0, 100, 0, 0, 0, 3300, 4900, 0, 0, 11, 20823, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0,             'Warden Belamoore - In Combat - Cast Fireball'),
-(2415, 0, 1, 0, 106, 0, 100, 0, 10300, 10300, 14900, 37400, 0, 10, 11, 20828, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Warden Belamoore - Within 0-10 Range - Cast Cone of Cold'),
+(2415, 0, 1, 0, 106, 0, 100, 0, 0, 0, 14900, 37400, 0, 10, 11, 20828, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,         'Warden Belamoore - Within 0-10 Range - Cast Cone of Cold'),
 (2415, 0, 2, 0, 0, 0, 100, 0, 7000, 13000, 6000, 16000, 0, 0, 11, 13323, 1, 0, 0, 0, 0, 6, 30, 1, 0, 0, 0, 0, 0, 0,     'Warden Belamoore - Within 0-30 Range - Cast Polymorph'),
 (2415, 0, 3, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,                       'Warden Belamoore - Between 0-15% Health - Flee For Assist (No Repeat)'),
 --
@@ -66,13 +67,13 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
 (2417, 0, 3, 0, 0, 0, 100, 0, 10000, 19000, 10000, 23000, 0, 0, 11, 11990, 64, 0, 0, 0, 0, 5, 30, 0, 0, 0, 0, 0, 0, 0,  'Grel\'borg the Miser - Within 0-30 Range - Cast Rain of Fire'),
 (2420, 0, 0, 0, 1, 0, 100, 1, 1000, 1000, 0, 0, 0, 0, 11, 7366, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,               'Targ - Out of Combat - Cast Berserker Stance (No Repeat)'),
 (2420, 0, 1, 0, 4, 0, 10, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0,                          'Targ - On Aggro - Say Line 0 (No Repeat)'),
-(2420, 0, 2, 0, 9, 0, 100, 0, 4000, 16000, 6000, 19000, 0, 5, 11, 15496, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0,      'Targ - Within 0-5 Range - Cast Cleave'),
-(2420, 0, 3, 0, 106, 0, 100, 0, 3000, 16000, 11000, 24000, 0, 10, 11, 8147, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,   'Targ - Within 0-10 Range - Cast Thunderclap'),
+(2420, 0, 2, 0, 0, 0, 100, 0, 4000, 16000, 6000, 19000, 0, 0, 11, 15496, 0, 0, 0, 0, 0, 21, 5, 0, 0, 0, 0, 0, 0, 0,     'Targ - Within 0-5 Range - Cast Cleave'),
+(2420, 0, 3, 0, 106, 0, 100, 0, 0, 0, 11000, 24000, 0, 8, 11, 8147, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,           'Targ - Within 0-8 Range - Cast Thunderclap'),
 (2421, 0, 0, 0, 0, 0, 100, 0, 7000, 13000, 11000, 26000, 0, 0, 11, 8379, 0, 0, 0, 0, 0, 5, 5, 0, 0, 0, 0, 0, 0, 0,      'Muckrake - Within 0-5 Range - Cast Disarm'),
-(2421, 0, 1, 0, 105, 0, 100, 0, 6000, 15000, 13000, 16000, 0, 5, 11, 12555, 1, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0,   'Muckrake - Within 0-5 Range - Cast Pummel'),
+(2421, 0, 1, 0, 105, 0, 100, 0, 0, 0, 13000, 16000, 0, 5, 11, 12555, 1, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0,          'Muckrake - Target Casting - Cast Pummel'),
 (2422, 0, 0, 0, 4, 0, 10, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0,                          'Glommus - On Aggro - Say Line 0 (No Repeat)'),
 (2422, 0, 1, 0, 0, 0, 100, 0, 1000, 1000, 1000, 9000, 0, 0, 11, 9128, 32, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,        'Glommus - In Combat - Cast Battle Shout'),
-(2422, 0, 2, 0, 106, 0, 100, 0, 5000, 11000, 14000, 35000, 0, 10, 11, 13730, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,  'Glommus - Within 0-10 Range - Cast Demoralizing Shout'),
+(2422, 0, 2, 0, 106, 0, 100, 0, 0, 0, 14000, 35000, 0, 10, 11, 13730, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,         'Glommus - Within 0-10 Range - Cast Demoralizing Shout'),
 (2422, 0, 3, 0, 0, 0, 100, 0, 6000, 8000, 9000, 32000, 0, 0, 11, 11428, 0, 0, 0, 0, 0, 5, 5, 0, 0, 0, 0, 0, 0, 0,       'Glommus - Within 0-5 Range - Cast Knockdown'),
 (2423, 0, 0, 0, 0, 0, 100, 0, 9000, 9000, 13300, 38300, 0, 0, 11, 11974, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,      'Lord Aliden Perenolde - In Combat - Cast Power Word: Shield'),
 (2423, 0, 1, 0, 2, 0, 100, 1, 0, 50, 14000, 19000, 0, 0, 11, 8362, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,            'Lord Aliden Perenolde - Between 0-50% Health - Cast Renew'),
@@ -80,22 +81,45 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
 (2423, 0, 3, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,                       'Lord Aliden Perenolde - Between 0-15% Health - Flee For Assist (No Repeat)'),
 (2453, 0, 0, 0, 0, 0, 100, 0, 3000, 5000, 30000, 35000, 0, 0, 11, 6742, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,       'Lo Grosh - In Combat - Cast Bloodlust'),
 (2453, 0, 1, 0, 0, 0, 100, 0, 1000, 3000, 35000, 38000, 0, 0, 11, 2601, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,       'Lo Grosh - In Combat - Cast Fire Shield III'),
-(2453, 0, 2, 0, 0, 0, 100, 0, 5000, 8000, 18000, 22000, 0, 0, 11, 8814, 64, 0, 0, 0, 0, 5, 30, 0, 0, 0, 0, 0, 0, 0,     'Lo Grosh - In Combat - Cast Flame Spike');
+(2453, 0, 2, 0, 0, 0, 100, 0, 5000, 8000, 18000, 22000, 0, 0, 11, 8814, 64, 0, 0, 0, 0, 5, 30, 0, 0, 0, 0, 0, 0, 0,     'Lo Grosh - In Combat - Cast Flame Spike'),
+(4504, 0, 0, 0, 54, 0, 100, 0, 0, 0, 0, 0, 0, 0, 53, 0, 450400, 1, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0,                  'Frostmaw - On Just Summoned - Start Patrol');
 
 
--- Jailor Borhuin(2431) and Baron Vardus(2306) should have multiple spawn locations 
--- https://www.youtube.com/watch?v=3fLlozCjyD0 - https://www.youtube.com/watch?v=MgH-PCmxnUo - https://www.youtube.com/watch?v=ZLXbrYUfLtI - https://www.youtube.com/watch?v=Dk6V9prh2gk
+-- fix Frostmaw spawn location
+DELETE FROM `event_scripts` WHERE `id` = 727;
+INSERT INTO `event_scripts` (`id`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o`) VALUES 
+(727, 0, 10, 4504, 3000000, 0, 234.227, -239.227, 141.325, 2.84489);
 
+SET @ENTRY := 4504;
+DELETE FROM `waypoints` WHERE `entry` = @ENTRY * 100;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `point_comment`) VALUES
+(@ENTRY*100, 1,  221.10156, -254.34375, 145.13052, NULL, 0, 'Frostmaw'),
+(@ENTRY*100, 2,  221.40279, -262.92282, 145.25552, NULL, 0, 'Frostmaw'),
+(@ENTRY*100, 3,  229.7501, -267.23904, 145.87318,  NULL, 0, 'Frostmaw'),
+(@ENTRY*100, 4,  241.35802, -267.15924, 144.7831,  NULL, 0, 'Frostmaw'),
+(@ENTRY*100, 5,  247.68039, -266.39713, 144.98044, NULL, 0, 'Frostmaw'),
+(@ENTRY*100, 6,  261.16113, -267.38702, 144.8716,  NULL, 0, 'Frostmaw'),
+(@ENTRY*100, 7,  248.05843, -267.17468, 145.08376, NULL, 0, 'Frostmaw'),
+(@ENTRY*100, 8,  242.37035, -266.9359, 144.5908,   NULL, 0, 'Frostmaw'),
+(@ENTRY*100, 9,  237.8304, -267.07703, 145.80971,  NULL, 0, 'Frostmaw'),
+(@ENTRY*100, 10, 229.01921, -267.1084, 145.80151,  NULL, 0, 'Frostmaw'),
+(@ENTRY*100, 11, 222.44646, -260.98682, 145.13052, NULL, 0, 'Frostmaw'),
+(@ENTRY*100, 12, 222.2341, -253.12283, 144.81778,  NULL, 0, 'Frostmaw'),
+(@ENTRY*100, 13, 230.49452, -242.26663, 142.41824, NULL, 0, 'Frostmaw');
+
+
+-- Jailor Borhuin(2431) and Baron Vardus(2306) - multiple spawn locations 
 DELETE FROM `creature` WHERE `id1` IN (2306, 2431);
 INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, 
 `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`, `CreateObject`, `Comment`) VALUES 
-(16905, 2306, 0, 0, 0, 0, 0, 1, 1, 1, 1180.59, -555.904, 71.1468, 1.8822, 300, 0, 0, 1239, 3191, 0, 0, 0, 0, '', 0, 0, NULL),
-(695010, 2306, 0, 0, 0, 0, 0, 1, 1, 1, 693.333, -905.125, 157.78, 2.69564, 300, 0, 0, 1239, 3191, 0, 0, 0, 0, '', NULL, 0, NULL),
-(695011, 2306, 0, 0, 0, 0, 0, 1, 1, 1, 1107.99, -718.43, 71.5728, 1.84347, 300, 0, 0, 1239, 3191, 0, 0, 0, 0, '', NULL, 0, NULL),
-(695012, 2306, 0, 0, 0, 0, 0, 1, 1, 1, 1001.61, -790.672, 108.606, 2.31075, 300, 0, 0, 1239, 3191, 0, 0, 0, 0, '', NULL, 0, NULL),
-(17020, 2431, 0, 0, 0, 0, 0, 1, 1, 1, 689.462, -984.645, 165.695, 5.43263, 300, 0, 0, 1536, 0, 0, 0, 0, 0, '', 0, 0, NULL),
-(695014, 2431, 0, 0, 0, 0, 0, 1, 1, 1, 750.559, -971.896, 167.587, 1.60003, 300, 0, 0, 1537, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
-(695015, 2431, 0, 0, 0, 0, 0, 1, 1, 1, 679.818, -897.818, 171.806, 4.8398, 300, 0, 0, 1537, 0, 0, 0, 0, 0, '', NULL, 0, NULL);
+(16905,  2306, 0, 0, 0, 0, 0, 1, 1, 1, 1180.59, -555.904, 71.1468, 1.8822,  300, 0, 0, 1239, 3191, 0, 0, 0, 0, '', 0, 0, NULL),
+(695010, 2306, 0, 0, 0, 0, 0, 1, 1, 1, 693.333, -905.125, 157.78, 2.69564,  300, 0, 0, 1239, 3191, 0, 0, 0, 0, '', NULL, 0, NULL), -- https://www.youtube.com/watch?v=MgH-PCmxnUo
+(695011, 2306, 0, 0, 0, 0, 0, 1, 1, 1, 1107.99, -718.43, 71.5728, 1.84347,  300, 0, 0, 1239, 3191, 0, 0, 0, 0, '', NULL, 0, NULL), -- https://www.youtube.com/watch?v=ZLXbrYUfLtI
+(695012, 2306, 0, 0, 0, 0, 0, 1, 1, 1, 1001.61, -790.672, 108.606, 2.31075, 300, 0, 0, 1239, 3191, 0, 0, 0, 0, '', NULL, 0, NULL), -- https://www.youtube.com/watch?v=Dk6V9prh2gk
+--
+(17020,  2431, 0, 0, 0, 0, 0, 1, 1, 1, 689.462, -984.645, 165.695, 5.43263, 300, 0, 0, 1536, 0, 0, 0, 0, 0, '', 0, 0, NULL),
+(695014, 2431, 0, 0, 0, 0, 0, 1, 1, 1, 750.559, -971.896, 167.587, 1.60003, 300, 0, 0, 1537, 0, 0, 0, 0, 0, '', NULL, 0, NULL),    -- https://www.youtube.com/watch?v=3fLlozCjyD0
+(695015, 2431, 0, 0, 0, 0, 0, 1, 1, 1, 679.818, -897.818, 171.806, 4.8398,  300, 0, 0, 1537, 0, 0, 0, 0, 0, '', NULL, 0, NULL);
 
 DELETE FROM `pool_creature` WHERE `pool_entry` IN (601008, 601009);
 INSERT INTO `pool_creature` (`guid`, `pool_entry`, `chance`, `description`) VALUES