diff --git a/FixStuckHelpMessages.esp b/FixStuckHelpMessages.esp
new file mode 100644
index 00000000..66bc3896
Binary files /dev/null and b/FixStuckHelpMessages.esp differ
diff --git a/IntegrityCheck.esp b/IntegrityCheck.esp
index 131a35a5..a1887517 100644
Binary files a/IntegrityCheck.esp and b/IntegrityCheck.esp differ
diff --git a/SyncKillMove.esp b/SyncKillMove.esp
index 641d0492..82f55b0a 100644
Binary files a/SyncKillMove.esp and b/SyncKillMove.esp differ
diff --git a/UpdateAutosaveInterval.esp b/UpdateAutosaveInterval.esp
index 6da062a1..2362eaaa 100644
Binary files a/UpdateAutosaveInterval.esp and b/UpdateAutosaveInterval.esp differ
diff --git a/WeightPerkQuest.esp b/WeightPerkQuest.esp
index 70a2e86c..203486c0 100644
Binary files a/WeightPerkQuest.esp and b/WeightPerkQuest.esp differ
diff --git a/scripts/ArmorWeightPerkFixAlias.pex b/scripts/ArmorWeightPerkFixAlias.pex
deleted file mode 100644
index 1ede99b2..00000000
Binary files a/scripts/ArmorWeightPerkFixAlias.pex and /dev/null differ
diff --git a/scripts/_00E_ArmorWeightPerkFixAlias.pex b/scripts/_00E_ArmorWeightPerkFixAlias.pex
new file mode 100644
index 00000000..57e12a41
Binary files /dev/null and b/scripts/_00E_ArmorWeightPerkFixAlias.pex differ
diff --git a/scripts/_00E_FixStuckHelpMessagesAlias.pex b/scripts/_00E_FixStuckHelpMessagesAlias.pex
new file mode 100644
index 00000000..93eb9776
Binary files /dev/null and b/scripts/_00E_FixStuckHelpMessagesAlias.pex differ
diff --git a/scripts/_00E_IntegrityCheckAlias.pex b/scripts/_00E_IntegrityCheckAlias.pex
index 436f20b6..e2f92cda 100644
Binary files a/scripts/_00E_IntegrityCheckAlias.pex and b/scripts/_00E_IntegrityCheckAlias.pex differ
diff --git a/scripts/_00e_playersetupscript.pex b/scripts/_00e_playersetupscript.pex
index 9a248530..f6a37fa3 100644
Binary files a/scripts/_00e_playersetupscript.pex and b/scripts/_00e_playersetupscript.pex differ
diff --git a/source/scripts/ArmorWeightPerkFixAlias.psc b/source/scripts/_00E_ArmorWeightPerkFixAlias.psc
similarity index 92%
rename from source/scripts/ArmorWeightPerkFixAlias.psc
rename to source/scripts/_00E_ArmorWeightPerkFixAlias.psc
index d7a0920a..e0cc0c92 100644
--- a/source/scripts/ArmorWeightPerkFixAlias.psc
+++ b/source/scripts/_00E_ArmorWeightPerkFixAlias.psc
@@ -1,4 +1,4 @@
-Scriptname ArmorWeightPerkFixAlias extends ReferenceAlias Hidden 
+Scriptname _00E_ArmorWeightPerkFixAlias extends ReferenceAlias Hidden 
 
 Event OnPlayerLoadGame()
 
diff --git a/source/scripts/_00E_FixStuckHelpMessagesAlias.psc b/source/scripts/_00E_FixStuckHelpMessagesAlias.psc
new file mode 100644
index 00000000..65dd0596
--- /dev/null
+++ b/source/scripts/_00E_FixStuckHelpMessagesAlias.psc
@@ -0,0 +1,11 @@
+Scriptname _00E_FixStuckHelpMessagesAlias extends ReferenceAlias Hidden 
+
+Event OnPlayerLoadGame()
+
+	; Clear stuck help messages, leaking between game loads
+	Message.ResetHelpMessage("Clear")
+	_00E_MQP01_Thoughts01.ShowAsHelpMessage("Clear", 0.1, 1, 1)
+
+EndEvent
+
+Message Property _00E_MQP01_Thoughts01  Auto  
diff --git a/source/scripts/_00E_IntegrityCheckAlias.psc b/source/scripts/_00E_IntegrityCheckAlias.psc
index 35c6e72f..3dc44376 100644
--- a/source/scripts/_00E_IntegrityCheckAlias.psc
+++ b/source/scripts/_00E_IntegrityCheckAlias.psc
@@ -1,37 +1,25 @@
 Scriptname _00E_IntegrityCheckAlias extends ReferenceAlias Hidden 
 
 Event OnInit()
-	
-	; needs the IsInMenuMode() check to prevent stuck messages
-	While Utility.IsInMenuMode()
-		Utility.WaitMenuMode(0.1)
-	EndWhile
-
-	CheckForgottenStories()
-	
-	_00E_Func_CheckSKSE.Run()
-	_00E_Func_CheckEnderalDLL.Run()
-
+	RegisterForSingleUpdate(2.0) ; Give a few seconds for the game to warm up at the start
 EndEvent
 
 Event OnPlayerLoadGame()
-
-	CheckForgottenStories()
-
-	_00E_Func_CheckSKSE.Run()
-	_00E_Func_CheckEnderalDLL.Run()
-
+	RegisterForSingleUpdate(1.2)
 EndEvent
 
-function CheckForgottenStories()
-	; If Enderal - Forgotten Stories.esm is not loaded, kick the player back to main menu
+Event OnUpdate()
 
+	; If Enderal - Forgotten Stories.esm is not loaded, kick the player back to main menu
 	if _00E_FS_IsForgottenStoriesActivated.GetValue() as Int != 1
-		Utility.wait(2.0)
+		Utility.wait(0.1)
 		Game.QuitToMainMenu()
-		Debug.MessageBox("Enderal - Forgotten Stories.esm is not loaded! The game will not run properly. Open Data Files and enable it.")
-		return
+		Debug.MessageBox("Enderal - Forgotten Stories.esm is not loaded! The game will not run properly.")
 	EndIf
-endfunction
+
+	_00E_Func_CheckSKSE.Run()
+	_00E_Func_CheckEnderalDLL.Run()
+
+EndEvent
 
 GlobalVariable Property _00E_FS_IsForgottenStoriesActivated  Auto  
diff --git a/source/scripts/_00e_playersetupscript.psc b/source/scripts/_00e_playersetupscript.psc
index b98c4343..3e3f838f 100644
--- a/source/scripts/_00e_playersetupscript.psc
+++ b/source/scripts/_00e_playersetupscript.psc
@@ -1,5 +1,5 @@
 Scriptname _00E_PlayerSetUpScript extends ObjectReference  
-{Initializes all the necessary Quests, maintains the player, contains various OnPlayerLoadGame() failsafes. This script is important for proper updating, do not overwrite it.}
+{Initializes player's actor values}
 
 int function _GetScriptVersion() Global
 	return 1
@@ -10,28 +10,13 @@ endFunction
 ;=====================================================================================
 
 Event OnInit()
-	
-	If self != (PlayerREF as ObjectReference)
-		return
-	EndIf
-	
+
 	PlayerREF.SetActorValue("speedMult", 95)
 	PlayerREF.SetActorValue("Healrate", 0)
 
 EndEvent
 
 Event OnPlayerLoadGame()
-	If self == (PlayerREF as ObjectReference) ; A check just in case. Most likely this condition is always True
-		Maintenance()
-	EndIf
-EndEvent
-
-
-;=====================================================================================
-;              							 MAINTENANCE                   					 
-;=====================================================================================
-
-Function Maintenance()
 
 	; changes to the actor value healrate will not persist in consecutive saves
 	; every time a save gets loaded the healrate needs to be set to 0, otherwise it will go back again to default at 0.7
@@ -43,11 +28,7 @@ Function Maintenance()
 		PlayerREF.Dismount()
 	EndIf
 
-	; Clear stuck help messages, leaking between game loads
-	Message.ResetHelpMessage("Clear")
-	(Game.GetForm(0xAC80E) as Message).ShowAsHelpMessage("Clear", 0.1, 1, 1)
-
-EndFunction
+EndEvent
 
 ;=====================================================================================
 ;              							 PROPERTIES