diff --git a/Enderal - Forgotten Stories.esm b/Enderal - Forgotten Stories.esm
index f566161e..a2a1e730 100644
Binary files a/Enderal - Forgotten Stories.esm and b/Enderal - Forgotten Stories.esm differ
diff --git a/Skyrim.esm b/Skyrim.esm
index 2ffad629..d6325987 100644
Binary files a/Skyrim.esm and b/Skyrim.esm differ
diff --git a/scripts/_00e_ephandler.pex b/scripts/_00e_ephandler.pex
index d4c92aa5..253fd4d3 100644
Binary files a/scripts/_00e_ephandler.pex and b/scripts/_00e_ephandler.pex differ
diff --git a/scripts/_00e_epondeath.pex b/scripts/_00e_epondeath.pex
index e26dcd10..9f0148a8 100644
Binary files a/scripts/_00e_epondeath.pex and b/scripts/_00e_epondeath.pex differ
diff --git a/scripts/_00e_epupdatefunctions.pex b/scripts/_00e_epupdatefunctions.pex
index 3fa2ba77..3a66b2e1 100644
Binary files a/scripts/_00e_epupdatefunctions.pex and b/scripts/_00e_epupdatefunctions.pex differ
diff --git a/scripts/_00e_fs_nqr05_perversionsc.pex b/scripts/_00e_fs_nqr05_perversionsc.pex
index b4308176..5e0b7e04 100644
Binary files a/scripts/_00e_fs_nqr05_perversionsc.pex and b/scripts/_00e_fs_nqr05_perversionsc.pex differ
diff --git a/scripts/_00e_oorbayadeathscript.pex b/scripts/_00e_oorbayadeathscript.pex
index 55118e9c..f11429a9 100644
Binary files a/scripts/_00e_oorbayadeathscript.pex and b/scripts/_00e_oorbayadeathscript.pex differ
diff --git a/source/scripts/_00e_ephandler.psc b/source/scripts/_00e_ephandler.psc
index 65e27321..251ffd7c 100644
--- a/source/scripts/_00e_ephandler.psc
+++ b/source/scripts/_00e_ephandler.psc
@@ -2,6 +2,6 @@ Scriptname _00E_EPHandler
 
 Function GiveEP(int ToGive) Global
 
-	((Game.GetForm(0x14) as Actor) as _00E_EPUpdateFunctions).receiveEP(ToGive)
+	(Game.GetForm(0x14) as _00E_EPUpdateFunctions).receiveEP(ToGive)
 
 EndFunction
diff --git a/source/scripts/_00e_epondeath.psc b/source/scripts/_00e_epondeath.psc
index 49c0f10c..8403c292 100644
--- a/source/scripts/_00e_epondeath.psc
+++ b/source/scripts/_00e_epondeath.psc
@@ -13,9 +13,7 @@ Event OnDeath(Actor akKiller)
 			PlayerREF = Game.GetPlayer()
 		EndIf
 		
-		If (PlayerREF as _00E_EPUpdateFunctions).receiveEP(RewardExp)
-			; Player receives EXP
-		EndIf
+		_00E_EPHandler.GiveEP(RewardExp)
 
 	EndIf
 
diff --git a/source/scripts/_00e_epupdatefunctions.psc b/source/scripts/_00e_epupdatefunctions.psc
index ab40d924..2d78008d 100644
--- a/source/scripts/_00e_epupdatefunctions.psc
+++ b/source/scripts/_00e_epupdatefunctions.psc
@@ -1,7 +1,7 @@
 Scriptname _00E_EPUpdateFunctions extends Actor
 
-
 import Math
+
 int MapMarkersDiscoveredCounter = 0
 int LocksPickedCounter = 0
 int ItemsPickpocketedCounter = 0
@@ -32,7 +32,6 @@ Event OnPlayerLoadGame()
 			GoToState("RealPlayer")
 		EndIf
 		UpdateLevelUpSystem() ; Failsafe and version update
-		UnregisterForUpdate()
 		RegisterForSingleUpdate(3.5)
 	EndIf
 EndEvent
@@ -198,16 +197,6 @@ State RealPlayer
 		RegisterForSingleUpdate(3.5) ; seems like a decent value
 	EndEvent
 
-
-	Event OnDeath(Actor akKiller)
-
-		if Player.IsInCombat()
-			_00E_Player_sIdiot.Show()
-			receiveEP(1000)
-		EndIf
-		
-	EndEvent
-
 EndState
 
 Event OnDeath(Actor akKiller)
@@ -333,7 +322,6 @@ Message Property _00E_Player_sArcaneFever_Worsen Auto
 Message Property _00E_Player_sArcaneFever_Death Auto
 Message Property _00E_Player_sArcaneFever_Critical Auto
 Message Property _00E_Player_sArcaneFever_Cure Auto
-Message Property _00E_Player_sIdiot Auto
 Message Property _00E_sEPNeeded Auto
 Message Property _00E_Levelup Auto
 Message Property _00E_Tutorial_EPSystem Auto
diff --git a/source/scripts/_00e_fs_nqr05_perversionsc.psc b/source/scripts/_00e_fs_nqr05_perversionsc.psc
index e80ab444..4b87ee26 100644
--- a/source/scripts/_00e_fs_nqr05_perversionsc.psc
+++ b/source/scripts/_00e_fs_nqr05_perversionsc.psc
@@ -42,9 +42,7 @@ Function PlayDeathFX()
 	myActorBase.SetEssential(True)
 
 	If RewardExp > 0
-		If (Game.GetPlayer() as _00E_EPUpdateFunctions).receiveEP(RewardExp)
-			; Player receives EXP
-		EndIf
+		_00E_EPHandler.GiveEP(RewardExp)
 	EndIf
 EndFunction
 
diff --git a/source/scripts/_00e_oorbayadeathscript.psc b/source/scripts/_00e_oorbayadeathscript.psc
index e6309405..e52be62a 100644
--- a/source/scripts/_00e_oorbayadeathscript.psc
+++ b/source/scripts/_00e_oorbayadeathscript.psc
@@ -77,9 +77,7 @@ Function PlayDeathFX()
 
 	If doReceiveEP
 		Utility.Wait(0.5)
-		If (PlayerREF as _00E_EPUpdateFunctions).receiveEP(__Config_RewardExp)
-			; Player receives EXP
-		EndIf
+		_00E_EPHandler.GiveEP(__Config_RewardExp)
 	EndIf
 
 	If __Config_DeleteActor