diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index c411c2da42d..481907b30d0 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -4244,7 +4244,7 @@ void Player::RemoveSpellCategoryCooldown(uint32 cat, bool update /* = false */)
 
 void Player::RemoveArenaSpellCooldowns(bool removeActivePetCooldowns)
 {
-    // remove cooldowns on spells that have <= 10 min CD
+    // remove cooldowns on spells that have < 10 min CD
 
     SpellCooldowns::iterator itr, next;
     for (itr = m_spellCooldowns.begin(); itr != m_spellCooldowns.end(); itr = next)
@@ -4252,10 +4252,10 @@ void Player::RemoveArenaSpellCooldowns(bool removeActivePetCooldowns)
         next = itr;
         ++next;
         SpellInfo const* entry = sSpellMgr->GetSpellInfo(itr->first);
-        // check if spellentry is present and if the cooldown is less or equal to 10 min
+        // check if spellentry is present and if the cooldown is less than 10 min
         if (entry &&
-            entry->RecoveryTime <= 10 * MINUTE * IN_MILLISECONDS &&
-            entry->CategoryRecoveryTime <= 10 * MINUTE * IN_MILLISECONDS)
+            entry->RecoveryTime < 10 * MINUTE * IN_MILLISECONDS &&
+            entry->CategoryRecoveryTime < 10 * MINUTE * IN_MILLISECONDS)
         {
             // remove & notify
             RemoveSpellCooldown(itr->first, true);
@@ -22693,6 +22693,34 @@ void Player::SendCooldownEvent(SpellInfo const* spellInfo, uint32 itemId /*= 0*/
     data << uint32(spellInfo->Id);
     data << uint64(GetGUID());
     SendDirectMessage(&data);
+
+    uint32 cat = spellInfo->GetCategory();
+    if (cat && spellInfo->CategoryRecoveryTime)
+    {
+        SpellCategoryStore::const_iterator ct = sSpellsByCategoryStore.find(cat);
+        if (ct != sSpellsByCategoryStore.end())
+        {
+            SpellCategorySet const& catSet = ct->second;
+            for (SpellCooldowns::const_iterator i = m_spellCooldowns.begin(); i != m_spellCooldowns.end(); ++i)
+            {
+                if (i->first == spellInfo->Id) // skip main spell, already handled above
+                    continue;
+
+                SpellInfo const* spellInfo2 = sSpellMgr->GetSpellInfo(i->first);
+                if (!spellInfo2 || !spellInfo2->IsCooldownStartedOnEvent())
+                    continue;
+
+                if (catSet.find(i->first) != catSet.end())
+                {
+                    // Send activate cooldown timer (possible 0) at client side
+                    WorldPacket data(SMSG_COOLDOWN_EVENT, 4 + 8);
+                    data << uint32(i->first);
+                    data << uint64(GetGUID());
+                    SendDirectMessage(&data);
+                }
+            }
+        }
+    }
 }
 
 void Player::UpdatePotionCooldown(Spell* spell)
diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp
index 4fe6c5e49cd..eff70406956 100644
--- a/src/server/game/Scripting/ScriptLoader.cpp
+++ b/src/server/game/Scripting/ScriptLoader.cpp
@@ -368,7 +368,6 @@ void AddSC_dustwallow_marsh();
 void AddSC_felwood();
 void AddSC_feralas();
 void AddSC_moonglade();
-void AddSC_mulgore();
 void AddSC_orgrimmar();
 void AddSC_silithus();
 void AddSC_stonetalon_mountains();
@@ -1089,7 +1088,6 @@ void AddKalimdorScripts()
     AddSC_felwood();
     AddSC_feralas();
     AddSC_moonglade();
-    AddSC_mulgore();
     AddSC_orgrimmar();
     AddSC_silithus();
     AddSC_stonetalon_mountains();
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
index 5cb050965b4..eeb8bd944de 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
@@ -175,7 +175,7 @@ public:
             anchor->GetContactPoint(me, anchorX, anchorY, z, 1.0f);
 
             playerGUID = target->GetGUID();
-            Talk(SAY_EVENT_START);
+            Talk(SAY_EVENT_START, target);
         }
 
         void UpdateAI(uint32 diff) override
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
index 01ac3920082..1a98c081570 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
@@ -689,54 +689,57 @@ class boss_alyson_antille : public CreatureScript
         }
 };
 
-struct boss_gazakrothAI : public boss_hexlord_addAI
+class boss_gazakroth : public CreatureScript
 {
-    boss_gazakrothAI(Creature* creature) : boss_hexlord_addAI(creature)
-    {
-        Initialize();
-    }
+    public:
 
-    void Initialize()
-    {
-        firebolt_timer = 2000;
-    }
-
-    uint32 firebolt_timer;
-
-    void Reset() override
-    {
-        Initialize();
-        boss_hexlord_addAI::Reset();
-    }
-
-    void AttackStart(Unit* who) override
-    {
-        if (!who)
-            return;
-
-        if (who->isTargetableForAttack())
+        boss_gazakroth() : CreatureScript("boss_gazakroth") { }
+        
+        struct boss_gazakrothAI : public boss_hexlord_addAI
         {
-            if (me->Attack(who, false))
+            boss_gazakrothAI(Creature* creature) : boss_hexlord_addAI(creature)
             {
-                me->GetMotionMaster()->MoveChase(who, 20);
-                me->AddThreat(who, 0.0f);
+                Initialize();
             }
-        }
-    }
 
-    void UpdateAI(uint32 diff) override
-    {
-        if (!UpdateVictim())
-            return;
+            void Initialize()
+            {
+                firebolt_timer = 2 * IN_MILLISECONDS;
+            }
+            
+            void Reset() override
+            {
+                Initialize();
+                boss_hexlord_addAI::Reset();
+            }
 
-        if (firebolt_timer <= diff)
+            void AttackStart(Unit* who) override
+            {
+                AttackStartCaster(who, 20.0f);
+            }
+
+            void UpdateAI(uint32 diff) override
+            {
+                if (!UpdateVictim())
+                    return;
+
+                if (firebolt_timer <= diff)
+                {
+                    DoCastVictim(SPELL_FIREBOLT, false);
+                    firebolt_timer = 0.7 * IN_MILLISECONDS;
+                } else firebolt_timer -= diff;
+
+                boss_hexlord_addAI::UpdateAI(diff);
+            }
+
+        private:
+            uint32 firebolt_timer;
+        };
+
+        CreatureAI* GetAI(Creature* creature) const override
         {
-            DoCastVictim(SPELL_FIREBOLT, false);
-            firebolt_timer = 700;
-        } else firebolt_timer -= diff;
-
-        boss_hexlord_addAI::UpdateAI(diff);
-    }
+            return GetInstanceAI<boss_gazakrothAI>(creature);
+        }
 };
 
 class boss_lord_raadan : public CreatureScript
@@ -1062,7 +1065,7 @@ void AddSC_boss_hex_lord_malacrass()
 {
     new boss_hexlord_malacrass();
     new boss_thurg();
-    // new boss_gazakroth();
+    new boss_gazakroth();
     new boss_lord_raadan();
     new boss_darkheart();
     new boss_slither();
diff --git a/src/server/scripts/Kalimdor/CMakeLists.txt b/src/server/scripts/Kalimdor/CMakeLists.txt
index d5e445230bd..8c3f3216e91 100644
--- a/src/server/scripts/Kalimdor/CMakeLists.txt
+++ b/src/server/scripts/Kalimdor/CMakeLists.txt
@@ -92,7 +92,6 @@ set(scripts_STAT_SRCS
   Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
   Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
   Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
-  Kalimdor/zone_mulgore.cpp
   Kalimdor/zone_bloodmyst_isle.cpp
   Kalimdor/zone_thunder_bluff.cpp
   Kalimdor/zone_azshara.cpp
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
index 97c4372f0e6..0b829c2c6dd 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
@@ -27,7 +27,7 @@ enum Yells
     SAY_SLAY            = 1,
     SAY_DEATH           = 2,
     SAY_SOUL_STORM      = 3,
-    SAY_CORRUPT_SOUL    = 4,
+    SAY_CORRUPT_SOUL    = 4
 };
 
 enum Spells
@@ -39,9 +39,9 @@ enum Spells
     SPELL_TELEPORT              = 68988,
     SPELL_FEAR                  = 68950,
     SPELL_SOULSTORM             = 68872,
-    SPELL_SOULSTORM_CHANNEL     = 69008,    // pre-fight
-    SPELL_SOULSTORM_VISUAL      = 68870,    // pre-cast soulstorm
-    SPELL_PURPLE_BANISH_VISUAL  = 68862     // Used by Soul Fragment (Aura)
+    SPELL_SOULSTORM_CHANNEL     = 69008, // Pre-fight
+    SPELL_SOULSTORM_VISUAL      = 68870, // Pre-cast Soulstorm
+    SPELL_PURPLE_BANISH_VISUAL  = 68862  // Used by Soul Fragment (Aura)
 };
 
 enum Events
@@ -50,7 +50,7 @@ enum Events
     EVENT_SHADOW_BOLT   = 2,
     EVENT_CORRUPT_SOUL  = 3,
     EVENT_SOULSTORM     = 4,
-    EVENT_FEAR          = 5,
+    EVENT_FEAR          = 5
 };
 
 enum CombatPhases
@@ -59,6 +59,11 @@ enum CombatPhases
     PHASE_2 = 2
 };
 
+enum Misc
+{
+    DATA_SOUL_POWER = 1
+};
+
 class boss_bronjahm : public CreatureScript
 {
     public:
@@ -73,33 +78,30 @@ class boss_bronjahm : public CreatureScript
 
             void Reset() override
             {
-                events.Reset();
+                _Reset();
                 events.SetPhase(PHASE_1);
                 events.ScheduleEvent(EVENT_SHADOW_BOLT, 2000);
                 events.ScheduleEvent(EVENT_MAGIC_BANE, urand(8000, 20000));
                 events.ScheduleEvent(EVENT_CORRUPT_SOUL, urand(25000, 35000), 0, PHASE_1);
-
-                instance->SetBossState(DATA_BRONJAHM, NOT_STARTED);
             }
 
-           void JustReachedHome() override
-           {
-               DoCast(me, SPELL_SOULSTORM_CHANNEL, true);
-           }
+            void JustReachedHome() override
+            {
+                _JustReachedHome();
+                DoCast(me, SPELL_SOULSTORM_CHANNEL, true);
+            }
 
             void EnterCombat(Unit* /*who*/) override
             {
+                _EnterCombat();
                 Talk(SAY_AGGRO);
                 me->RemoveAurasDueToSpell(SPELL_SOULSTORM_CHANNEL);
-
-                instance->SetBossState(DATA_BRONJAHM, IN_PROGRESS);
             }
 
             void JustDied(Unit* /*killer*/) override
             {
+                _JustDied();
                 Talk(SAY_DEATH);
-
-                instance->SetBossState(DATA_BRONJAHM, DONE);
             }
 
             void KilledUnit(Unit* who) override
@@ -128,6 +130,23 @@ class boss_bronjahm : public CreatureScript
                 summon->CastSpell(summon, SPELL_PURPLE_BANISH_VISUAL, true);
             }
 
+            uint32 GetData(uint32 type) const override
+            {
+                if (type == DATA_SOUL_POWER)
+                {
+                    uint32 count = 0;
+                    for (ObjectGuid const& guid : summons)
+                    {
+                        if (Creature* summon = ObjectAccessor::GetCreature(*me, guid))
+                            if (summon->GetEntry() == NPC_CORRUPTED_SOUL_FRAGMENT && summon->IsAlive())
+                                ++count;
+                    }
+                    return count;
+                }
+
+                return 0;
+            }
+
             void UpdateAI(uint32 diff) override
             {
                 if (!UpdateVictim())
@@ -143,13 +162,21 @@ class boss_bronjahm : public CreatureScript
                     switch (eventId)
                     {
                         case EVENT_MAGIC_BANE:
-                            DoCastVictim(SPELL_MAGIC_S_BANE);
+                            DoCastAOE(SPELL_MAGIC_S_BANE);
                             events.ScheduleEvent(EVENT_MAGIC_BANE, urand(8000, 20000));
                             break;
                         case EVENT_SHADOW_BOLT:
-                            if (!me->IsWithinMeleeRange(me->GetVictim()))
+                            if (events.IsInPhase(PHASE_2))
+                            {
                                 DoCastVictim(SPELL_SHADOW_BOLT);
-                            events.ScheduleEvent(EVENT_SHADOW_BOLT, 2000);
+                                events.ScheduleEvent(EVENT_SHADOW_BOLT, urand(1, 2) * IN_MILLISECONDS);
+                            }
+                            else
+                            {
+                                if (!me->IsWithinMeleeRange(me->GetVictim()))
+                                    DoCastVictim(SPELL_SHADOW_BOLT);
+                                events.ScheduleEvent(EVENT_SHADOW_BOLT, 2 * IN_MILLISECONDS);
+                            }
                             break;
                         case EVENT_CORRUPT_SOUL:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true))
@@ -165,8 +192,7 @@ class boss_bronjahm : public CreatureScript
                             me->CastSpell(me, SPELL_SOULSTORM, false);
                             break;
                         case EVENT_FEAR:
-                            if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true))
-                                me->CastCustomSpell(SPELL_FEAR, SPELLVALUE_MAX_TARGETS, 1, target, false);
+                            me->CastCustomSpell(SPELL_FEAR, SPELLVALUE_MAX_TARGETS, 1, nullptr, false);
                             events.ScheduleEvent(EVENT_FEAR, urand(8000, 12000), 0, PHASE_2);
                             break;
                         default:
@@ -174,7 +200,8 @@ class boss_bronjahm : public CreatureScript
                     }
                 }
 
-                DoMeleeAttackIfReady();
+                if (!events.IsInPhase(PHASE_2))
+                    DoMeleeAttackIfReady();
             }
         };
 
@@ -201,17 +228,11 @@ class npc_corrupted_soul_fragment : public CreatureScript
                 if (type != CHASE_MOTION_TYPE)
                     return;
 
-                if (TempSummon* summ = me->ToTempSummon())
-                {
-                    ObjectGuid BronjahmGUID(instance->GetGuidData(DATA_BRONJAHM));
-                    if (BronjahmGUID.GetCounter() != id)
-                        return;
+                if (instance->GetGuidData(DATA_BRONJAHM).GetCounter() != id)
+                    return;
 
-                    if (Creature* bronjahm = ObjectAccessor::GetCreature(*me, BronjahmGUID))
-                        me->CastSpell(bronjahm, SPELL_CONSUME_SOUL, true);
-
-                    summ->UnSummon();
-                }
+                me->CastSpell((Unit*)nullptr, SPELL_CONSUME_SOUL, true);
+                me->DespawnOrUnsummon();
             }
 
         private:
@@ -220,7 +241,7 @@ class npc_corrupted_soul_fragment : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return GetInstanceAI<npc_corrupted_soul_fragmentAI>(creature);
+            return GetInstanceAI<npc_corrupted_soul_fragmentAI>(creature, FoSScriptName);
         }
 };
 
@@ -238,12 +259,10 @@ class spell_bronjahm_magic_bane : public SpellScriptLoader
                 if (GetHitUnit()->getPowerType() != POWER_MANA)
                     return;
 
-                const int32 maxDamage = GetCaster()->GetMap()->GetSpawnMode() == 1 ? 15000 : 10000;
-                int32 newDamage = GetHitDamage();
-                newDamage += GetHitUnit()->GetMaxPower(POWER_MANA)/2;
-                newDamage = std::min<int32>(maxDamage, newDamage);
+                int32 const maxDamage = GetCaster()->GetMap()->IsHeroic() ? 15000 : 10000;
+                int32 newDamage = GetHitDamage() + (GetHitUnit()->GetMaxPower(POWER_MANA) / 2);
 
-                SetHitDamage(newDamage);
+                SetHitDamage(std::min<int32>(maxDamage, newDamage));
             }
 
             void Register() override
@@ -261,7 +280,7 @@ class spell_bronjahm_magic_bane : public SpellScriptLoader
 class spell_bronjahm_consume_soul : public SpellScriptLoader
 {
     public:
-        spell_bronjahm_consume_soul() :  SpellScriptLoader("spell_bronjahm_consume_soul") { }
+        spell_bronjahm_consume_soul() : SpellScriptLoader("spell_bronjahm_consume_soul") { }
 
         class spell_bronjahm_consume_soul_SpellScript : public SpellScript
         {
@@ -285,38 +304,22 @@ class spell_bronjahm_consume_soul : public SpellScriptLoader
         }
 };
 
-class spell_bronjahm_soulstorm_channel : public SpellScriptLoader
+static uint32 const SoulstormVisualSpells[] =
 {
-    public:
-        spell_bronjahm_soulstorm_channel() : SpellScriptLoader("spell_bronjahm_soulstorm_channel") { }
-
-        class spell_bronjahm_soulstorm_channel_AuraScript : public AuraScript
-        {
-            PrepareAuraScript(spell_bronjahm_soulstorm_channel_AuraScript);
-
-            void HandlePeriodicTick(AuraEffect const* /*aurEff*/)
-            {
-                PreventDefaultAction();
-                for (uint32 i = 68904; i <= 68907; ++i)
-                    GetTarget()->CastSpell(GetTarget(), i, true);
-            }
-
-            void Register() override
-            {
-                OnEffectPeriodic += AuraEffectPeriodicFn(spell_bronjahm_soulstorm_channel_AuraScript::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
-            }
-        };
-
-        AuraScript* GetAuraScript() const override
-        {
-            return new spell_bronjahm_soulstorm_channel_AuraScript();
-        }
+    68904,
+    68886,
+    68905,
+    68896,
+    68906,
+    68897,
+    68907,
+    68898
 };
 
 class spell_bronjahm_soulstorm_visual : public SpellScriptLoader
 {
     public:
-        spell_bronjahm_soulstorm_visual() : SpellScriptLoader("spell_bronjahm_soulstorm_visual") { }
+        spell_bronjahm_soulstorm_visual(char const* scriptName) : SpellScriptLoader(scriptName) { }
 
         class spell_bronjahm_soulstorm_visual_AuraScript : public AuraScript
         {
@@ -325,11 +328,7 @@ class spell_bronjahm_soulstorm_visual : public SpellScriptLoader
             void HandlePeriodicTick(AuraEffect const* aurEff)
             {
                 PreventDefaultAction();
-                if (aurEff->GetTickNumber()%5)
-                    return;
-                GetTarget()->CastSpell(GetTarget(), 68886, true);
-                for (uint32 i = 68896; i <= 68898; ++i)
-                    GetTarget()->CastSpell(GetTarget(), i, true);
+                GetTarget()->CastSpell(GetTarget(), SoulstormVisualSpells[aurEff->GetTickNumber() % 8], true);
             }
 
             void Register() override
@@ -344,21 +343,6 @@ class spell_bronjahm_soulstorm_visual : public SpellScriptLoader
         }
 };
 
-class DistanceCheck
-{
-    public:
-        explicit DistanceCheck(Unit* _caster) : caster(_caster) { }
-
-        bool operator() (WorldObject* unit) const
-        {
-            if (caster->GetExactDist2d(unit) <= 10.0f)
-                return true;
-            return false;
-        }
-
-        Unit* caster;
-};
-
 class spell_bronjahm_soulstorm_targeting : public SpellScriptLoader
 {
     public:
@@ -368,25 +352,19 @@ class spell_bronjahm_soulstorm_targeting : public SpellScriptLoader
         {
             PrepareSpellScript(spell_bronjahm_soulstorm_targeting_SpellScript);
 
-            void FilterTargetsInitial(std::list<WorldObject*>& targets)
+            void FilterTargets(std::list<WorldObject*>& targets)
             {
-                targets.remove_if(DistanceCheck(GetCaster()));
-                sharedTargets = targets;
-            }
-
-            // use the same target for first and second effect
-            void FilterTargetsSubsequent(std::list<WorldObject*>& targets)
-            {
-                targets = sharedTargets;
+                Unit* caster = GetCaster();
+                targets.remove_if([caster](WorldObject* target)
+                {
+                    return caster->GetExactDist2d(target) <= 10.0f;
+                });
             }
 
             void Register() override
             {
-                OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_bronjahm_soulstorm_targeting_SpellScript::FilterTargetsInitial, EFFECT_1, TARGET_UNIT_DEST_AREA_ENEMY);
-                OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_bronjahm_soulstorm_targeting_SpellScript::FilterTargetsSubsequent, EFFECT_2, TARGET_UNIT_DEST_AREA_ENEMY);
+                OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_bronjahm_soulstorm_targeting_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_DEST_AREA_ENEMY);
             }
-
-            std::list<WorldObject*> sharedTargets;
         };
 
         SpellScript* GetSpellScript() const override
@@ -395,13 +373,25 @@ class spell_bronjahm_soulstorm_targeting : public SpellScriptLoader
         }
 };
 
+class achievement_bronjahm_soul_power : public AchievementCriteriaScript
+{
+    public:
+        achievement_bronjahm_soul_power() : AchievementCriteriaScript("achievement_bronjahm_soul_power") { }
+
+        bool OnCheck(Player* /*source*/, Unit* target) override
+        {
+            return target && target->GetAI()->GetData(DATA_SOUL_POWER) >= 4;
+        }
+};
+
 void AddSC_boss_bronjahm()
 {
     new boss_bronjahm();
     new npc_corrupted_soul_fragment();
     new spell_bronjahm_magic_bane();
     new spell_bronjahm_consume_soul();
-    new spell_bronjahm_soulstorm_channel();
-    new spell_bronjahm_soulstorm_visual();
+    new spell_bronjahm_soulstorm_visual("spell_bronjahm_soulstorm_channel");
+    new spell_bronjahm_soulstorm_visual("spell_bronjahm_soulstorm_visual");
     new spell_bronjahm_soulstorm_targeting();
+    new achievement_bronjahm_soul_power();
 }
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
index 2f1d4943019..d5f00757039 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
@@ -128,7 +128,7 @@ class boss_devourer_of_souls : public CreatureScript
 
         struct boss_devourer_of_soulsAI : public BossAI
         {
-            boss_devourer_of_soulsAI(Creature* creature) : BossAI(creature, DATA_DEVOURER_EVENT)
+            boss_devourer_of_soulsAI(Creature* creature) : BossAI(creature, DATA_DEVOURER_OF_SOULS)
             {
                 Initialize();
                 beamAngle = 0.f;
@@ -143,20 +143,17 @@ class boss_devourer_of_souls : public CreatureScript
 
             void Reset() override
             {
+                _Reset();
                 me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE);
                 me->SetDisplayId(DISPLAY_ANGER);
                 me->SetReactState(REACT_AGGRESSIVE);
 
-                events.Reset();
-                summons.DespawnAll();
-
                 Initialize();
-
-                instance->SetData(DATA_DEVOURER_EVENT, NOT_STARTED);
             }
 
             void EnterCombat(Unit* /*who*/) override
             {
+                _EnterCombat();
                 Talk(SAY_FACE_AGGRO);
 
                 if (!me->FindNearestCreature(NPC_CRUCIBLE_OF_SOULS, 60)) // Prevent double spawn
@@ -166,8 +163,6 @@ class boss_devourer_of_souls : public CreatureScript
                 events.ScheduleEvent(EVENT_WELL_OF_SOULS, 30000);
                 events.ScheduleEvent(EVENT_UNLEASHED_SOULS, 20000);
                 events.ScheduleEvent(EVENT_WAILING_SOULS, urand(60000, 70000));
-
-                instance->SetData(DATA_DEVOURER_EVENT, IN_PROGRESS);
             }
 
             void KilledUnit(Unit* victim) override
@@ -175,7 +170,7 @@ class boss_devourer_of_souls : public CreatureScript
                 if (victim->GetTypeId() != TYPEID_PLAYER)
                     return;
 
-                int32 textId = 0;
+                uint8 textId = 0;
                 switch (me->GetDisplayId())
                 {
                     case DISPLAY_ANGER:
@@ -197,14 +192,12 @@ class boss_devourer_of_souls : public CreatureScript
 
             void JustDied(Unit* /*killer*/) override
             {
-                summons.DespawnAll();
+                _JustDied();
 
                 Position spawnPoint = {5618.139f, 2451.873f, 705.854f, 0};
 
                 Talk(SAY_FACE_DEATH);
 
-                instance->SetData(DATA_DEVOURER_EVENT, DONE);
-
                 int32 entryIndex;
                 if (instance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE)
                     entryIndex = 0;
@@ -402,11 +395,6 @@ class spell_devourer_of_souls_mirrored_soul_proc : public SpellScriptLoader
                 return true;
             }
 
-            bool Load() override
-            {
-                return true;
-            }
-
             bool CheckProc(ProcEventInfo& /*eventInfo*/)
             {
                 return GetCaster() && GetCaster()->IsAlive();
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
index 054e5d5a7bd..ddbc117e7fd 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
@@ -15,38 +15,44 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef DEF_FORGE_OF_SOULS_H
-#define DEF_FORGE_OF_SOULS_H
+#ifndef FORGE_OF_SOULS_H_
+#define FORGE_OF_SOULS_H_
 
 #define FoSScriptName "instance_forge_of_souls"
 #define DataHeader    "FOS"
 
+uint32 const EncounterCount = 2;
+
 enum Data
 {
-    DATA_BRONJAHM           = 0,
-    DATA_DEVOURER           = 1,
-    DATA_DEVOURER_EVENT     = 2,
-    DATA_TEAM_IN_INSTANCE   = 3,
+    // Encounter states and GUIDs
+    DATA_BRONJAHM                   = 0,
+    DATA_DEVOURER_OF_SOULS          = 1,
+
+    // Additional Data
+    DATA_TEAM_IN_INSTANCE           = 2
 };
 
 enum Creatures
 {
-    CREATURE_BRONJAHM                             = 36497,
-    CREATURE_DEVOURER                             = 36502,
+    NPC_BRONJAHM                    = 36497,
+    NPC_DEVOURER                    = 36502,
+    NPC_CORRUPTED_SOUL_FRAGMENT     = 36535,
 
-    NPC_SYLVANAS_PART1                            = 37596,
-    NPC_SYLVANAS_PART2                            = 38161,
-    NPC_JAINA_PART1                               = 37597,
-    NPC_JAINA_PART2                               = 38160,
-    NPC_KALIRA                                    = 37583,
-    NPC_ELANDRA                                   = 37774,
-    NPC_LORALEN                                   = 37779,
-    NPC_KORELN                                    = 37582,
-    NPC_CHAMPION_1_HORDE                          = 37584,
-    NPC_CHAMPION_2_HORDE                          = 37587,
-    NPC_CHAMPION_3_HORDE                          = 37588,
-    NPC_CHAMPION_1_ALLIANCE                       = 37496,
-    NPC_CHAMPION_2_ALLIANCE                       = 37497,
-    NPC_CRUCIBLE_OF_SOULS                         = 37094,
+    NPC_SYLVANAS_PART1              = 37596,
+    NPC_SYLVANAS_PART2              = 38161,
+    NPC_JAINA_PART1                 = 37597,
+    NPC_JAINA_PART2                 = 38160,
+    NPC_KALIRA                      = 37583,
+    NPC_ELANDRA                     = 37774,
+    NPC_LORALEN                     = 37779,
+    NPC_KORELN                      = 37582,
+    NPC_CHAMPION_1_HORDE            = 37584,
+    NPC_CHAMPION_2_HORDE            = 37587,
+    NPC_CHAMPION_3_HORDE            = 37588,
+    NPC_CHAMPION_1_ALLIANCE         = 37496,
+    NPC_CHAMPION_2_ALLIANCE         = 37497,
+    NPC_CRUCIBLE_OF_SOULS           = 37094
 };
-#endif
+
+#endif // FORGE_OF_SOULS_H_
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
index 8b586ea7fc2..db7628ebada 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
@@ -20,13 +20,6 @@
 #include "forge_of_souls.h"
 #include "Player.h"
 
-#define MAX_ENCOUNTER 2
-
-/* Forge of Souls encounters:
-0- Bronjahm, The Godfather of Souls
-1- The Devourer of Souls
-*/
-
 class instance_forge_of_souls : public InstanceMapScript
 {
     public:
@@ -37,7 +30,7 @@ class instance_forge_of_souls : public InstanceMapScript
             instance_forge_of_souls_InstanceScript(Map* map) : InstanceScript(map)
             {
                 SetHeaders(DataHeader);
-                SetBossNumber(MAX_ENCOUNTER);
+                SetBossNumber(EncounterCount);
 
                 teamInInstance = 0;
             }
@@ -60,10 +53,10 @@ class instance_forge_of_souls : public InstanceMapScript
 
                 switch (creature->GetEntry())
                 {
-                    case CREATURE_BRONJAHM:
+                    case NPC_BRONJAHM:
                         bronjahm = creature->GetGUID();
                         break;
-                    case CREATURE_DEVOURER:
+                    case NPC_DEVOURER:
                         devourerOfSouls = creature->GetGUID();
                         break;
                     case NPC_SYLVANAS_PART1:
@@ -100,7 +93,7 @@ class instance_forge_of_souls : public InstanceMapScript
                 {
                     case DATA_BRONJAHM:
                         return bronjahm;
-                    case DATA_DEVOURER:
+                    case DATA_DEVOURER_OF_SOULS:
                         return devourerOfSouls;
                     default:
                         break;
diff --git a/src/server/shared/Database/Transaction.cpp b/src/server/shared/Database/Transaction.cpp
index b83b787a106..9f36d198bde 100644
--- a/src/server/shared/Database/Transaction.cpp
+++ b/src/server/shared/Database/Transaction.cpp
@@ -19,6 +19,8 @@
 #include "Transaction.h"
 #include <mysqld_error.h>
 
+std::mutex TransactionTask::_deadlockLock;
+
 //- Append a raw ad-hoc query to the transaction
 void Transaction::Append(const char* sql)
 {
@@ -81,6 +83,8 @@ bool TransactionTask::Execute()
 
     if (errorCode == ER_LOCK_DEADLOCK)
     {
+        // Make sure only 1 async thread retries a transaction so they don't keep dead-locking each other
+        std::lock_guard<std::mutex> lock(_deadlockLock);
         uint8 loopBreaker = 5;  // Handle MySQL Errno 1213 without extending deadlock to the core itself
         for (uint8 i = 0; i < loopBreaker; ++i)
             if (!m_conn->ExecuteTransaction(m_trans))
diff --git a/src/server/shared/Database/Transaction.h b/src/server/shared/Database/Transaction.h
index cf6aa98b386..83d59006ddc 100644
--- a/src/server/shared/Database/Transaction.h
+++ b/src/server/shared/Database/Transaction.h
@@ -66,6 +66,7 @@ class TransactionTask : public SQLOperation
         bool Execute() override;
 
         SQLTransaction m_trans;
+        static std::mutex _deadlockLock;
 };
 
 #endif