diff --git a/Faction_Shared/BlisteringZombie2.lua b/Faction_Shared/BlisteringZombie2.lua
index fa06f05..a049487 100644
--- a/Faction_Shared/BlisteringZombie2.lua
+++ b/Faction_Shared/BlisteringZombie2.lua
@@ -10,7 +10,7 @@ creature:RegisterEvent(BlisteringZombie.Ability1, 8000, 0)
 end
 
 function BlisteringZombie.Ability1(event, delay, calls, creature)
-creature:CastSpell(creature:GetVictim(), 55604, true)
+creature:CastSpell(creature:GetVictim(), 64153, true)
 end
 
 function BlisteringZombie.OnLeaveCombat(event, creature)
diff --git a/Faction_Shared/DingMask.lua b/Faction_Shared/DingMask.lua
index 1ae3e93..26a4b04 100644
--- a/Faction_Shared/DingMask.lua
+++ b/Faction_Shared/DingMask.lua
@@ -12,19 +12,17 @@ local npcIds1 = {
 10414,
 10407,
 400010,
-400011,
 400015,
 400016,
 300018,
 16383,
 16394,
-16423,
-16422,
 400036,
 400049,
 400048,
 16437,
-16438
+16438,
+400112
 }
 
 -- Rez Visual
@@ -58,7 +56,11 @@ local npcIds3 = {
 400073,
 400072,
 400102,
-400103
+400103,
+16422,
+16423,
+400011,
+400057
 }
 
 -- Function to be executed when an NPC from group 1 is spawned
diff --git a/Faction_Shared/Emote.lua b/Faction_Shared/Emote.lua
index dd01542..8569f16 100644
--- a/Faction_Shared/Emote.lua
+++ b/Faction_Shared/Emote.lua
@@ -1,5 +1,5 @@
 local GAME_EVENT_ID = 17 
-local npcIds = {777, 790, 415, 956, 3356, 341, 793, 343, 342, 812, 1671, 10037, 859, 382, 1070, 931, 932, 903, 935, 68, 12480, 12481, 3479, 3483, 3477, 3486, 3478, 3431, 3481, 3482, 3464, 3489, 3432, 3480}
+local npcIds = {777, 790, 415, 956, 3356, 341, 793, 343, 342, 812, 1671, 10037, 859, 382, 1070, 931, 932, 903, 935, 68, 8991, 12480, 12481, 3479, 3483, 3477, 3486, 3478, 3431, 3481, 3482, 3464, 3489, 3432, 3480}
 local secondNpcIds = {3088}
 local thirdNpcIds = {3501, 3615} 
 local EMOTE_ID = 333 -- 1h ready
diff --git a/Faction_Shared/RandomScourgeAttack.lua b/Faction_Shared/RandomScourgeAttack.lua
index dcc7c30..d44fce1 100644
--- a/Faction_Shared/RandomScourgeAttack.lua
+++ b/Faction_Shared/RandomScourgeAttack.lua
@@ -1,12 +1,17 @@
+local ENABLED = true -- set to false to disable
+
 local GAME_EVENT_ID = 17 -- Set the game event ID
 local MAX_NPC_SPAWN = 3 -- Set the maximum number of NPCs to spawn simultaneously. Extremely high numbers will hurt performance
 local ATTACK_CHANCE = 15 -- Set the likelihood of an attack here, in percent
 local DAZE_SPELL_ID = 100201 -- Set the spell ID for daze
+local MINIMUM_LEVEL = 15 -- Set min level to be active
+local EXCLUDED_MAP_ID = 530 
 
 local creatureEntries = {
     16423,
     16422,
-    400011
+    400011,
+    400057
 } -- Add NPC entries above (CHANGE THESE OR IT WON'T WORK! I'M USING CUSTOM IDs)
 
 local npcdialogue = {
@@ -28,6 +33,12 @@ local function IsGameEventActive(eventId)
 end
 
 local function SpawnAttacker(event, player)
+    if not ENABLED then 
+        return
+    end
+    if player:GetLevel() < MINIMUM_LEVEL or player:GetMapId() == EXCLUDED_MAP_ID then
+        return
+    end
     if IsGameEventActive(GAME_EVENT_ID) then
         local chance = math.random(100)
 
@@ -39,10 +50,10 @@ local function SpawnAttacker(event, player)
             local npcCount = math.random(1, MAX_NPC_SPAWN)
 
             -- Check if the player is mounted and not flying
-            if player:IsMounted() and not player:IsFlying() then
+            if player:IsMounted() and not player:IsFlying() then 
                 player:Dismount()
-				player:CastSpell(player, DAZE_SPELL_ID, true)
-				player:SendBroadcastMessage("You have been knocked off your mount!")
+                player:CastSpell(player, DAZE_SPELL_ID, true)
+                player:SendBroadcastMessage("You have been knocked off your mount!")
             end
 
             for i = 1, npcCount do
diff --git a/Faction_Shared/SkeletalWarrior.lua b/Faction_Shared/SkeletalWarrior.lua
index 75a11ae..27ae95d 100644
--- a/Faction_Shared/SkeletalWarrior.lua
+++ b/Faction_Shared/SkeletalWarrior.lua
@@ -1,7 +1,10 @@
 local SkeletalWarrior = {}
 
+
+
 function SkeletalWarrior.OnSpawn(event, creature)
 creature:SetMaxHealth(7720)
+creature:SetEquipmentSlots(10570, 0, 0)
 creature:CastSpell(creature:GetVictim(), 17683, true)
 end