diff --git a/Enderal - Forgotten Stories.esm b/Enderal - Forgotten Stories.esm
index 58493e88..f566161e 100644
Binary files a/Enderal - Forgotten Stories.esm and b/Enderal - Forgotten Stories.esm differ
diff --git a/Skyrim.esm b/Skyrim.esm
index bfe05014..2ffad629 100644
Binary files a/Skyrim.esm and b/Skyrim.esm differ
diff --git a/scripts/_00E_ArmorWeightPerkFixAlias.pex b/scripts/_00E_ArmorWeightPerkFixAlias.pex
deleted file mode 100644
index 57e12a41..00000000
Binary files a/scripts/_00E_ArmorWeightPerkFixAlias.pex and /dev/null differ
diff --git a/scripts/_00E_EngineBugfixAlias.pex b/scripts/_00E_EngineBugfixAlias.pex
new file mode 100644
index 00000000..4a9d6be0
Binary files /dev/null and b/scripts/_00E_EngineBugfixAlias.pex differ
diff --git a/scripts/_00E_FixStuckHelpMessagesAlias.pex b/scripts/_00E_FixStuckHelpMessagesAlias.pex
deleted file mode 100644
index dc594bf7..00000000
Binary files a/scripts/_00E_FixStuckHelpMessagesAlias.pex and /dev/null differ
diff --git a/scripts/_00e_mqp01_functions.pex b/scripts/_00e_mqp01_functions.pex
index c70c65c0..b5039e45 100644
Binary files a/scripts/_00e_mqp01_functions.pex and b/scripts/_00e_mqp01_functions.pex differ
diff --git a/scripts/_00e_playersetupscript.pex b/scripts/_00e_playersetupscript.pex
index f6a37fa3..c81c66f6 100644
Binary files a/scripts/_00e_playersetupscript.pex and b/scripts/_00e_playersetupscript.pex differ
diff --git a/source/scripts/_00E_ArmorWeightPerkFixAlias.psc b/source/scripts/_00E_EngineBugfixAlias.psc
similarity index 55%
rename from source/scripts/_00E_ArmorWeightPerkFixAlias.psc
rename to source/scripts/_00E_EngineBugfixAlias.psc
index e0cc0c92..3549fd09 100644
--- a/source/scripts/_00E_ArmorWeightPerkFixAlias.psc
+++ b/source/scripts/_00E_EngineBugfixAlias.psc
@@ -1,7 +1,19 @@
-Scriptname _00E_ArmorWeightPerkFixAlias extends ReferenceAlias Hidden 
+Scriptname _00E_EngineBugfixAlias extends ReferenceAlias Hidden 
+
+int function _GetScriptVersion() Global
+	return 1
+endFunction
+
+Event OnInit()
+	_ClearStuckHelpMessages()
+EndEvent
 
 Event OnPlayerLoadGame()
 
+	; If a help message is visible during game reload, it gets stuck on screen
+	; This workaround shows an empty message to forcefully clear the queue
+	_ClearStuckHelpMessages()
+
 	Actor PlayerREF = GetReference() as Actor
 
 	; Perks modifying armor weights need some push on each game load to work.
@@ -12,6 +24,11 @@ Event OnPlayerLoadGame()
 		_ResetPerk(PlayerREF, _00E_Class_Vagrant_P05_B_Lightweight)
 	EndIf
 
+	; Workaround for broken physics on loading saves, made on a mount
+	If PlayerREF.IsOnMount()
+		PlayerREF.Dismount()
+	EndIf
+	
 EndEvent
 
 Function _ResetPerk(Actor PlayerREF, Perk p)
@@ -21,5 +38,12 @@ Function _ResetPerk(Actor PlayerREF, Perk p)
 	EndIf
 EndFunction
 
+Event _ClearStuckHelpMessages()
+	Message.ResetHelpMessage("Clear")
+	_00E_EmptyMessage.ShowAsHelpMessage("Clear", 0.1, 1, 1)
+EndEvent
+
 Perk Property _00E_Class_Keeper_P05_C_Conditioning  Auto  
 Perk Property _00E_Class_Vagrant_P05_B_Lightweight  Auto  
+
+Message Property _00E_EmptyMessage Auto
diff --git a/source/scripts/_00E_FixStuckHelpMessagesAlias.psc b/source/scripts/_00E_FixStuckHelpMessagesAlias.psc
deleted file mode 100644
index 86cc6c76..00000000
--- a/source/scripts/_00E_FixStuckHelpMessagesAlias.psc
+++ /dev/null
@@ -1,14 +0,0 @@
-Scriptname _00E_FixStuckHelpMessagesAlias extends ReferenceAlias Hidden 
-
-; Clears stuck help messages, leaking between game loads
-	
-Event OnInit()
-	OnPlayerLoadGame()
-EndEvent
-
-Event OnPlayerLoadGame()
-	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_mqp01_functions.psc b/source/scripts/_00e_mqp01_functions.psc
index d3a869a0..79ad674c 100644
--- a/source/scripts/_00e_mqp01_functions.psc
+++ b/source/scripts/_00e_mqp01_functions.psc
@@ -258,8 +258,6 @@ Actor Property MQP01_FatherRef Auto
 Scene Property MQP01_SC1_FatherArrivesInKitchen Auto
 Scene Property MQP01_SC2_FatherAccusesThePlayer Auto
 
-Message Property _00E_MQP01_Thoughts01 Auto
-
 Sound Property _00E_MAGFXFireOilIgniteLow Auto
 Sound Property _00E_MQP01_InfantLaughing Auto
 Sound Property FXFireEmbers02LP Auto
diff --git a/source/scripts/_00e_playersetupscript.psc b/source/scripts/_00e_playersetupscript.psc
index 3e3f838f..cf355d07 100644
--- a/source/scripts/_00e_playersetupscript.psc
+++ b/source/scripts/_00e_playersetupscript.psc
@@ -1,4 +1,4 @@
-Scriptname _00E_PlayerSetUpScript extends ObjectReference  
+Scriptname _00E_PlayerSetUpScript extends Actor  
 {Initializes player's actor values}
 
 int function _GetScriptVersion() Global
@@ -11,8 +11,8 @@ endFunction
 
 Event OnInit()
 
-	PlayerREF.SetActorValue("speedMult", 95)
-	PlayerREF.SetActorValue("Healrate", 0)
+	SetActorValue("speedMult", 95)
+	SetActorValue("Healrate", 0)
 
 EndEvent
 
@@ -21,17 +21,6 @@ Event OnPlayerLoadGame()
 	; 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
 	; this is called before active magic effects of potions or spells are applied to the player which could also alter the value
-	PlayerREF.SetActorValue("Healrate", 0)
-
-	; Workaround for broken physics on loading saves, made on a mount
-	If PlayerREF.IsOnMount()
-		PlayerREF.Dismount()
-	EndIf
+	SetActorValue("Healrate", 0)
 
 EndEvent
-
-;=====================================================================================
-;              							 PROPERTIES                   					 
-;=====================================================================================
-
-Actor Property PlayerREF Auto