diff --git a/_module/are/encumbria.are.json b/_module/are/encumbria.are.json
index 9e190b61..cb4fb4e8 100644
--- a/_module/are/encumbria.are.json
+++ b/_module/are/encumbria.are.json
@@ -843,13 +843,17 @@
       }
     ]
   },
+  "TileBrdrDisabled": {
+    "type": "byte",
+    "value": 0
+  },
   "Tileset": {
     "type": "resref",
     "value": "tdm01"
   },
   "Version": {
     "type": "dword",
-    "value": 22
+    "value": 23
   },
   "Width": {
     "type": "int",
diff --git a/_module/are/townofascension.are.json b/_module/are/townofascension.are.json
index 2392710d..dafa8565 100644
--- a/_module/are/townofascension.are.json
+++ b/_module/are/townofascension.are.json
@@ -6357,7 +6357,7 @@
   },
   "Version": {
     "type": "dword",
-    "value": 509
+    "value": 510
   },
   "Width": {
     "type": "int",
diff --git a/_module/itp/creaturepalcus.itp.json b/_module/itp/creaturepalcus.itp.json
index 17308a9c..da54a759 100644
--- a/_module/itp/creaturepalcus.itp.json
+++ b/_module/itp/creaturepalcus.itp.json
@@ -1532,7 +1532,7 @@
                     "__struct_id": 0,
                     "CR": {
                       "type": "float",
-                      "value": 358.0
+                      "value": 175.0
                     },
                     "FACTION": {
                       "type": "cexostring",
diff --git a/_module/ncs/dragonstop2.ncs b/_module/ncs/dragonstop2.ncs
index 0a5e1b09..f638ebd7 100644
Binary files a/_module/ncs/dragonstop2.ncs and b/_module/ncs/dragonstop2.ncs differ
diff --git a/_module/ncs/forgeused.ncs b/_module/ncs/forgeused.ncs
index 0cd9679c..c2820c02 100644
Binary files a/_module/ncs/forgeused.ncs and b/_module/ncs/forgeused.ncs differ
diff --git a/_module/ncs/sf_wingwand.ncs b/_module/ncs/sf_wingwand.ncs
index bc76f6ea..a416ab9c 100644
Binary files a/_module/ncs/sf_wingwand.ncs and b/_module/ncs/sf_wingwand.ncs differ
diff --git a/_module/ncs/spawnb_cc_activ.ncs b/_module/ncs/spawnb_cc_activ.ncs
index b571555b..de4d1662 100644
Binary files a/_module/ncs/spawnb_cc_activ.ncs and b/_module/ncs/spawnb_cc_activ.ncs differ
diff --git a/_module/ncs/spawnb_cc_dactiv.ncs b/_module/ncs/spawnb_cc_dactiv.ncs
index 77e80d77..7e94385e 100644
Binary files a/_module/ncs/spawnb_cc_dactiv.ncs and b/_module/ncs/spawnb_cc_dactiv.ncs differ
diff --git a/_module/ncs/x2_def_endcombat.ncs b/_module/ncs/x2_def_endcombat.ncs
new file mode 100644
index 00000000..96829de3
Binary files /dev/null and b/_module/ncs/x2_def_endcombat.ncs differ
diff --git a/_module/nss/dragonstop2.nss b/_module/nss/dragonstop2.nss
index aa72530c..0535e84c 100644
--- a/_module/nss/dragonstop2.nss
+++ b/_module/nss/dragonstop2.nss
@@ -11,35 +11,31 @@
 //:: Created By: Preston Watamaniuk
 //:: Created On: Oct 16, 2001
 //:://////////////////////////////////////////////
-
 #include "NW_I0_GENERIC"
+
 void main()
 {
+	ExecuteScript("prc_npc_combat", OBJECT_SELF);
 
-RemoveEffect(OBJECT_SELF, EffectKnockdown());
-
-
-int stop = Random(20);
-if (stop <= 2){
-
- AssignCommand(OBJECT_SELF, ClearAllActions());
-AssignCommand(OBJECT_SELF, ActionCastSpellAtObject(SPELL_TIME_STOP, OBJECT_SELF, METAMAGIC_MAXIMIZE, TRUE, 40, PROJECTILE_PATH_TYPE_DEFAULT, TRUE));
-
-DelayCommand(1.0, AssignCommand(OBJECT_SELF, ActionAttack(GetNearestCreature(CREATURE_TYPE_REPUTATION,REPUTATION_TYPE_ENEMY, OBJECT_SELF, 1, CREATURE_TYPE_IS_ALIVE))));
-DelayCommand(3.0, AssignCommand(OBJECT_SELF, ActionAttack(GetNearestCreature(CREATURE_TYPE_REPUTATION,REPUTATION_TYPE_ENEMY,OBJECT_SELF, 1, CREATURE_TYPE_IS_ALIVE))));
-DelayCommand(6.0, AssignCommand(OBJECT_SELF, ActionAttack(GetNearestCreature(CREATURE_TYPE_REPUTATION,REPUTATION_TYPE_ENEMY, OBJECT_SELF, 1, CREATURE_TYPE_IS_ALIVE))));
-DelayCommand(9.0, AssignCommand(OBJECT_SELF, ActionAttack(GetNearestCreature(CREATURE_TYPE_REPUTATION,REPUTATION_TYPE_ENEMY, OBJECT_SELF, 1, CREATURE_TYPE_IS_ALIVE))));
-DelayCommand(12.0, AssignCommand(OBJECT_SELF, ActionAttack(GetNearestCreature(CREATURE_TYPE_REPUTATION,REPUTATION_TYPE_ENEMY, OBJECT_SELF, 1, CREATURE_TYPE_IS_ALIVE))));
-DelayCommand(15.0, AssignCommand(OBJECT_SELF, ActionAttack(GetNearestCreature(CREATURE_TYPE_REPUTATION,REPUTATION_TYPE_ENEMY, OBJECT_SELF, 1, CREATURE_TYPE_IS_ALIVE))));
-DelayCommand(18.0, AssignCommand(OBJECT_SELF, ActionAttack(GetNearestCreature(CREATURE_TYPE_REPUTATION,REPUTATION_TYPE_ENEMY, OBJECT_SELF, 1, CREATURE_TYPE_IS_ALIVE))));
-
-
-} else{
-DetermineCombatRound();
-
-  }
-
-}
+	RemoveEffect(OBJECT_SELF, EffectKnockdown());
 
 
+	int stop = Random(20);
+	if (stop <= 2)
+	{
+		AssignCommand(OBJECT_SELF, ClearAllActions());
+		AssignCommand(OBJECT_SELF, ActionCastSpellAtObject(SPELL_TIME_STOP, OBJECT_SELF, METAMAGIC_MAXIMIZE, TRUE, 40, PROJECTILE_PATH_TYPE_DEFAULT, TRUE));
 
+		DelayCommand(1.0, AssignCommand(OBJECT_SELF, ActionAttack(GetNearestCreature(CREATURE_TYPE_REPUTATION,REPUTATION_TYPE_ENEMY, OBJECT_SELF, 1, CREATURE_TYPE_IS_ALIVE))));
+		DelayCommand(3.0, AssignCommand(OBJECT_SELF, ActionAttack(GetNearestCreature(CREATURE_TYPE_REPUTATION,REPUTATION_TYPE_ENEMY, OBJECT_SELF, 1, CREATURE_TYPE_IS_ALIVE))));
+		DelayCommand(6.0, AssignCommand(OBJECT_SELF, ActionAttack(GetNearestCreature(CREATURE_TYPE_REPUTATION,REPUTATION_TYPE_ENEMY, OBJECT_SELF, 1, CREATURE_TYPE_IS_ALIVE))));
+		DelayCommand(9.0, AssignCommand(OBJECT_SELF, ActionAttack(GetNearestCreature(CREATURE_TYPE_REPUTATION,REPUTATION_TYPE_ENEMY, OBJECT_SELF, 1, CREATURE_TYPE_IS_ALIVE))));
+		DelayCommand(12.0, AssignCommand(OBJECT_SELF, ActionAttack(GetNearestCreature(CREATURE_TYPE_REPUTATION,REPUTATION_TYPE_ENEMY, OBJECT_SELF, 1, CREATURE_TYPE_IS_ALIVE))));
+		DelayCommand(15.0, AssignCommand(OBJECT_SELF, ActionAttack(GetNearestCreature(CREATURE_TYPE_REPUTATION,REPUTATION_TYPE_ENEMY, OBJECT_SELF, 1, CREATURE_TYPE_IS_ALIVE))));
+		DelayCommand(18.0, AssignCommand(OBJECT_SELF, ActionAttack(GetNearestCreature(CREATURE_TYPE_REPUTATION,REPUTATION_TYPE_ENEMY, OBJECT_SELF, 1, CREATURE_TYPE_IS_ALIVE))));
+	}
+	else
+	{
+		DetermineCombatRound();
+	}
+}
\ No newline at end of file
diff --git a/_module/nss/forgeused.nss b/_module/nss/forgeused.nss
index 7e611d53..7eff08c2 100644
--- a/_module/nss/forgeused.nss
+++ b/_module/nss/forgeused.nss
@@ -51,8 +51,8 @@ while (party != OBJECT_INVALID)
           DelayCommand(4.0, SendMessageToPC(oWarn, "The Immortal Crown Has Been Destroyed!!!!!!!!."));
           ApplyEffectAtLocation(DURATION_TYPE_TEMPORARY, EffectVisualEffect(VFX_FNF_TIME_STOP), lVis, 5.0);
           DelayCommand(5.0, SendMessageToPC(oWarn, "Suddenly, You feel The Life Energy Being Sucked From You!!!!!."));
-          ApplyEffectToObject(DURATION_TYPE_INSTANT, EffectDamage(5000, DAMAGE_TYPE_MAGICAL, DAMAGE_POWER_PLUS_FIVE), oWarn);
-          ApplyEffectAtLocation(DURATION_TYPE_TEMPORARY, EffectVisualEffect(VFX_FNF_IMPLOSION), lVis, 5.0);
+          ApplyEffectToObject(DURATION_TYPE_INSTANT, EffectDamage(5, DAMAGE_TYPE_MAGICAL, DAMAGE_POWER_PLUS_FIVE), oWarn);
+          ApplyEffectAtLocation(DURATION_TYPE_TEMPORARY, EffectVisualEffect(VFX_FNF_SCREEN_BUMP), lVis, 5.0);
           }
 
          oWarn = GetNextPC();
diff --git a/_module/nss/moad_spawn.nss b/_module/nss/moad_spawn.nss
index bfca3817..4ec8ecde 100644
--- a/_module/nss/moad_spawn.nss
+++ b/_module/nss/moad_spawn.nss
@@ -38,9 +38,6 @@ const int EVENT_USER_DEFINED_POSTSPAWN = 1511;
 const string NWNX_DISCORD_URL = "/api/webhooks/709533785091342397/8Rsb8-or0Ticc5xDNxLP2tldtx_vPR4Zqu41rs_KzNq5stylkMECcEAIdEDDVXteaQmO/slack";
 
 
-
-
-
 void main()
 {
     string sTag;
diff --git a/_module/nss/onplayerdeath.nss b/_module/nss/onplayerdeath.nss
index 2aee3ea8..8daba32f 100644
--- a/_module/nss/onplayerdeath.nss
+++ b/_module/nss/onplayerdeath.nss
@@ -188,6 +188,7 @@ void Respawn(object oPlayer)
 void main()
 {
      ExecuteScript("prc_ondeath", OBJECT_SELF);
+	 
     //Declare Major Variables...
     object oPlayer = GetLastPlayerDied();
     object oPC = GetLastPlayerDied();
diff --git a/_module/nss/onplayerequipted.nss b/_module/nss/onplayerequipted.nss
index 799246ae..a6cb83d6 100644
--- a/_module/nss/onplayerequipted.nss
+++ b/_module/nss/onplayerequipted.nss
@@ -15,8 +15,9 @@ Likewise players cannot equipt items tagnamed "arena" outside of the arena.
 //Main Script
 void main()
 {
-ExecuteScript("prc_equip", OBJECT_SELF);
-    //Declare Major Variables
+	ExecuteScript("prc_equip", OBJECT_SELF);
+
+//:: Declare Major Variables
     object oItem = GetPCItemLastEquipped();
     object oPC   = GetPCItemLastEquippedBy();
     int nSlot;
diff --git a/_module/nss/prc_pwondeath.nss b/_module/nss/prc_pwondeath.nss
index 55bf94e8..e60ed0dc 100644
--- a/_module/nss/prc_pwondeath.nss
+++ b/_module/nss/prc_pwondeath.nss
@@ -12,6 +12,8 @@
 
 void RndDropGold(object oSelf, object oKiller);
 
+void RndDropGear(object oSelf, object oKiller);
+
 void RndDropGold(object oSelf, object oKiller)
 {
 //:: Declare major variables	
diff --git a/_module/utc/motherofalldrags.utc.json b/_module/utc/motherofalldrags.utc.json
index 0a38ea0c..a9ca67bb 100644
--- a/_module/utc/motherofalldrags.utc.json
+++ b/_module/utc/motherofalldrags.utc.json
@@ -2,7 +2,7 @@
   "__data_type": "UTC ",
   "Appearance_Type": {
     "type": "word",
-    "value": 45
+    "value": 583
   },
   "BodyBag": {
     "type": "byte",
@@ -14,7 +14,7 @@
   },
   "ChallengeRating": {
     "type": "float",
-    "value": 358.0
+    "value": 175.0
   },
   "ClassList": {
     "type": "list",
@@ -937,7 +937,7 @@
   },
   "PortraitId": {
     "type": "word",
-    "value": 194
+    "value": 191
   },
   "Race": {
     "type": "byte",
@@ -969,7 +969,7 @@
   },
   "ScriptEndRound": {
     "type": "resref",
-    "value": "x2_def_endcombat"
+    "value": "dragonstop2"
   },
   "ScriptHeartbeat": {
     "type": "resref",
@@ -1341,7 +1341,7 @@
   },
   "Subrace": {
     "type": "cexostring",
-    "value": ""
+    "value": "Dragon"
   },
   "Tag": {
     "type": "cexostring",
@@ -1349,7 +1349,7 @@
   },
   "Tail_New": {
     "type": "dword",
-    "value": 0
+    "value": 332
   },
   "TemplateList": {
     "type": "list",
@@ -1361,7 +1361,7 @@
   },
   "WalkRate": {
     "type": "int",
-    "value": 8
+    "value": 7
   },
   "willbonus": {
     "type": "short",
diff --git a/_release/Path of Ascension [PRC8-CEP3].7z b/_release/Path of Ascension [PRC8-CEP3].7z
index 5fd4a83b..a70c023c 100644
Binary files a/_release/Path of Ascension [PRC8-CEP3].7z and b/_release/Path of Ascension [PRC8-CEP3].7z differ