diff --git a/_module/ncs/assplode.ncs b/_module/ncs/assplode.ncs
index ecc788c4..12f13fec 100644
Binary files a/_module/ncs/assplode.ncs and b/_module/ncs/assplode.ncs differ
diff --git a/_module/ncs/daosianfocus.ncs b/_module/ncs/daosianfocus.ncs
index 0bd86d9a..9cca3d44 100644
Binary files a/_module/ncs/daosianfocus.ncs and b/_module/ncs/daosianfocus.ncs differ
diff --git a/_module/ncs/explode.ncs b/_module/ncs/explode.ncs
index 66c538c7..931f6b91 100644
Binary files a/_module/ncs/explode.ncs and b/_module/ncs/explode.ncs differ
diff --git a/_module/ncs/explode2.ncs b/_module/ncs/explode2.ncs
index 0a5ea21e..9122b348 100644
Binary files a/_module/ncs/explode2.ncs and b/_module/ncs/explode2.ncs differ
diff --git a/_module/ncs/gelhn_hanselfast.ncs b/_module/ncs/gelhn_hanselfast.ncs
index 29ca1323..3707a2d4 100644
Binary files a/_module/ncs/gelhn_hanselfast.ncs and b/_module/ncs/gelhn_hanselfast.ncs differ
diff --git a/_module/ncs/heija_armourer.ncs b/_module/ncs/heija_armourer.ncs
index c8bdabbb..10fe66c4 100644
Binary files a/_module/ncs/heija_armourer.ncs and b/_module/ncs/heija_armourer.ncs differ
diff --git a/_module/ncs/heija_wepshop.ncs b/_module/ncs/heija_wepshop.ncs
index 9831f4ca..77573db5 100644
Binary files a/_module/ncs/heija_wepshop.ncs and b/_module/ncs/heija_wepshop.ncs differ
diff --git a/_module/ncs/kgard_2_kwater.ncs b/_module/ncs/kgard_2_kwater.ncs
index 391bf60a..ac506230 100644
Binary files a/_module/ncs/kgard_2_kwater.ncs and b/_module/ncs/kgard_2_kwater.ncs differ
diff --git a/_module/ncs/kulkingspawn.ncs b/_module/ncs/kulkingspawn.ncs
index 656bf0f2..06ce81ed 100644
Binary files a/_module/ncs/kulkingspawn.ncs and b/_module/ncs/kulkingspawn.ncs differ
diff --git a/_module/ncs/leo_shadowjump.ncs b/_module/ncs/leo_shadowjump.ncs
index 7b3c6a8f..2d718305 100644
Binary files a/_module/ncs/leo_shadowjump.ncs and b/_module/ncs/leo_shadowjump.ncs differ
diff --git a/_module/ncs/ls_atropos.ncs b/_module/ncs/ls_atropos.ncs
index 95e02906..b0cc1bf5 100644
Binary files a/_module/ncs/ls_atropos.ncs and b/_module/ncs/ls_atropos.ncs differ
diff --git a/_module/ncs/ls_clotho.ncs b/_module/ncs/ls_clotho.ncs
index 5c2873df..4b34d917 100644
Binary files a/_module/ncs/ls_clotho.ncs and b/_module/ncs/ls_clotho.ncs differ
diff --git a/_module/ncs/ls_lachesis.ncs b/_module/ncs/ls_lachesis.ncs
index 01650247..16baf158 100644
Binary files a/_module/ncs/ls_lachesis.ncs and b/_module/ncs/ls_lachesis.ncs differ
diff --git a/_module/ncs/madspark.ncs b/_module/ncs/madspark.ncs
index 264d399f..3b920af8 100644
Binary files a/_module/ncs/madspark.ncs and b/_module/ncs/madspark.ncs differ
diff --git a/_module/ncs/on_attack.ncs b/_module/ncs/on_attack.ncs
index ab10af0e..1728f834 100644
Binary files a/_module/ncs/on_attack.ncs and b/_module/ncs/on_attack.ncs differ
diff --git a/_module/ncs/paerunmagicshop.ncs b/_module/ncs/paerunmagicshop.ncs
index 87e3133b..02fb5a97 100644
Binary files a/_module/ncs/paerunmagicshop.ncs and b/_module/ncs/paerunmagicshop.ncs differ
diff --git a/_module/ncs/rall_open_chest.ncs b/_module/ncs/rall_open_chest.ncs
index 4d95dae6..fd6d804a 100644
Binary files a/_module/ncs/rall_open_chest.ncs and b/_module/ncs/rall_open_chest.ncs differ
diff --git a/_module/ncs/sail_inchyre_h1.ncs b/_module/ncs/sail_inchyre_h1.ncs
index f788738a..9acf9687 100644
Binary files a/_module/ncs/sail_inchyre_h1.ncs and b/_module/ncs/sail_inchyre_h1.ncs differ
diff --git a/_module/ncs/sedate.ncs b/_module/ncs/sedate.ncs
index 22c8be5f..aed3cf68 100644
Binary files a/_module/ncs/sedate.ncs and b/_module/ncs/sedate.ncs differ
diff --git a/_module/ncs/shop_hatvendor.ncs b/_module/ncs/shop_hatvendor.ncs
index a9fb22d9..55304fe3 100644
Binary files a/_module/ncs/shop_hatvendor.ncs and b/_module/ncs/shop_hatvendor.ncs differ
diff --git a/_module/ncs/shop_magic_hur.ncs b/_module/ncs/shop_magic_hur.ncs
index ff1b8ba5..d7b4ef16 100644
Binary files a/_module/ncs/shop_magic_hur.ncs and b/_module/ncs/shop_magic_hur.ncs differ
diff --git a/_module/ncs/shop_smithng.ncs b/_module/ncs/shop_smithng.ncs
index 05ea9203..e5b76d88 100644
Binary files a/_module/ncs/shop_smithng.ncs and b/_module/ncs/shop_smithng.ncs differ
diff --git a/_module/ncs/theabyss.ncs b/_module/ncs/theabyss.ncs
index 2f38fab0..e2b6c540 100644
Binary files a/_module/ncs/theabyss.ncs and b/_module/ncs/theabyss.ncs differ
diff --git a/_module/ncs/underworldstaff.ncs b/_module/ncs/underworldstaff.ncs
index 6c6b5496..41046b5a 100644
Binary files a/_module/ncs/underworldstaff.ncs and b/_module/ncs/underworldstaff.ncs differ
diff --git a/_module/ncs/vapors.ncs b/_module/ncs/vapors.ncs
index ff501774..ca4b3f33 100644
Binary files a/_module/ncs/vapors.ncs and b/_module/ncs/vapors.ncs differ
diff --git a/_module/ncs/woa_mod_onnui.ncs b/_module/ncs/woa_mod_onnui.ncs
index 84edd928..2375c91a 100644
Binary files a/_module/ncs/woa_mod_onnui.ncs and b/_module/ncs/woa_mod_onnui.ncs differ
diff --git a/_module/ncs/x2_pc_craft.ncs b/_module/ncs/x2_pc_craft.ncs
index 71eb95fc..e7699ddf 100644
Binary files a/_module/ncs/x2_pc_craft.ncs and b/_module/ncs/x2_pc_craft.ncs differ
diff --git a/_module/nss/on_attack.nss b/_module/nss/on_attack.nss
index 65552e97..d06d5947 100644
--- a/_module/nss/on_attack.nss
+++ b/_module/nss/on_attack.nss
@@ -23,6 +23,11 @@ void main ()
 	  {
 		  SendMessageToPC(data.oTarget, "Devastating Critical Hit: 10x damage!");
 	  }
+	  if (GetIsPC(OBJECT_SELF)) 
+	  {
+		  SendMessageToPC(OBJECT_SELF, "Devastating Critical Hit: 10x damage!");
+		  FloatingTextStringOnCreature("Devastating Critical Hit!", data.oTarget);
+	  }	  
 	  
       data.iAttackResult = 10; // 10 : dev crit
 
@@ -44,10 +49,14 @@ void main ()
         data.iNegative +
         data.iPositive;
 		
-      if (nTotalDamage >= GetCurrentHitPoints(data.oTarget)) 
-	  {
-		  SetLocalInt(OBJECT_SELF, "devcrit", 0);
-	  }
+		NWNX_Damage_SetAttackEventData(data);
+		
+	if (!GetIsObjectValid(data.oTarget)) return;
+
+	if (nTotalDamage >= GetCurrentHitPoints(data.oTarget)) 
+	{
+	  SetLocalInt(OBJECT_SELF, "devcrit", 0);
+	}
 	  
     //}
 /*     else
diff --git a/_module/nss/woa_mod_onnui.nss b/_module/nss/woa_mod_onnui.nss
index 4386ffb3..a04ba2ec 100644
--- a/_module/nss/woa_mod_onnui.nss
+++ b/_module/nss/woa_mod_onnui.nss
@@ -16,26 +16,9 @@
 
 void main()
 {
-    NUI();
+    //NUI();
 	
-    object oPlayer		= NuiGetEventPlayer();
-    int nToken			= NuiGetEventWindow();
-    string sWindowId 	= NuiGetWindowId(oPlayer, nToken);
+	ExecuteScript("prc_onplayernui");
 	
 	ExecuteScript("mod_nui");
-
-    // Open the Power Attack NUI
-    if(sWindowId == NUI_PRC_POWER_ATTACK_WINDOW)
-    {
-        ExecuteScript("prc_nui_pa_event");
-    }
-
-    // Open the Spellbook NUI
-    if(sWindowId == PRC_SPELLBOOK_NUI_WINDOW_ID
-        || sWindowId == NUI_SPELL_DESCRIPTION_WINDOW_ID)
-    {
-        ExecuteScript("prc_nui_sb_event");
-    }
-
-    return;
 }
\ No newline at end of file