diff --git a/Enderal - Forgotten Stories.esm b/Enderal - Forgotten Stories.esm
index 8ddf7614..58493e88 100644
Binary files a/Enderal - Forgotten Stories.esm and b/Enderal - Forgotten Stories.esm differ
diff --git a/Skyrim.esm b/Skyrim.esm
index e9fed5bc..bfe05014 100644
Binary files a/Skyrim.esm and b/Skyrim.esm differ
diff --git a/scripts/_00e_mq00_racetesttriggbox.pex b/scripts/_00e_mq00_racetesttriggbox.pex
deleted file mode 100644
index af688628..00000000
Binary files a/scripts/_00e_mq00_racetesttriggbox.pex and /dev/null differ
diff --git a/scripts/_00e_mq00_trigbox00script.pex b/scripts/_00e_mq00_trigbox00script.pex
deleted file mode 100644
index 956f1999..00000000
Binary files a/scripts/_00e_mq00_trigbox00script.pex and /dev/null differ
diff --git a/scripts/_00e_mq00_trigbox01script.pex b/scripts/_00e_mq00_trigbox01script.pex
deleted file mode 100644
index b8fc6e26..00000000
Binary files a/scripts/_00e_mq00_trigbox01script.pex and /dev/null differ
diff --git a/scripts/_00e_mqp01_functions.pex b/scripts/_00e_mqp01_functions.pex
index 108aab99..c70c65c0 100644
Binary files a/scripts/_00e_mqp01_functions.pex and b/scripts/_00e_mqp01_functions.pex differ
diff --git a/scripts/_00e_mqp02_functions.pex b/scripts/_00e_mqp02_functions.pex
index e8697e5a..e6e73ad6 100644
Binary files a/scripts/_00e_mqp02_functions.pex and b/scripts/_00e_mqp02_functions.pex differ
diff --git a/scripts/_00e_mqp03_functions.pex b/scripts/_00e_mqp03_functions.pex
index 2495ad6a..7dc4f007 100644
Binary files a/scripts/_00e_mqp03_functions.pex and b/scripts/_00e_mqp03_functions.pex differ
diff --git a/scripts/_00e_startdoorscript.pex b/scripts/_00e_startdoorscript.pex
deleted file mode 100644
index 0d39a9a8..00000000
Binary files a/scripts/_00e_startdoorscript.pex and /dev/null differ
diff --git a/source/scripts/EnderalSteam.psc b/source/scripts/EnderalSteam.psc
index 8c0b35ed..d29a55e8 100644
--- a/source/scripts/EnderalSteam.psc
+++ b/source/scripts/EnderalSteam.psc
@@ -1,3 +1,4 @@
 Scriptname EnderalSteam Hidden
 
+; Do not call this function directly, use Steam.pex
 bool Function CallUnlockAchievement(string name) global native
diff --git a/source/scripts/_00e_mq00_racetesttriggbox.psc b/source/scripts/_00e_mq00_racetesttriggbox.psc
deleted file mode 100644
index a2dbdadb..00000000
--- a/source/scripts/_00e_mq00_racetesttriggbox.psc
+++ /dev/null
@@ -1,12 +0,0 @@
-Scriptname _00E_MQ00_RaceTestTriggBox extends ObjectReference  
-
-
-int DoOnce
-
-
-Event OnTriggerEnter(ObjectReference akActionRef)
-	if DoOnce == 0
-		Game.ShowRaceMenu()
-		DoOnce = 1
-	endif
-EndEvent
\ No newline at end of file
diff --git a/source/scripts/_00e_mq00_trigbox00script.psc b/source/scripts/_00e_mq00_trigbox00script.psc
deleted file mode 100644
index 4f51aee9..00000000
--- a/source/scripts/_00e_mq00_trigbox00script.psc
+++ /dev/null
@@ -1,31 +0,0 @@
-Scriptname _00E_MQ00_TrigBox00Script extends ObjectReference  
-
-
-int DoOnce
-
-Quest Property _00E_MQ00 auto
-Race Property NordRaceChild auto
-
-Event OnTriggerEnter(ObjectReference akActionRef)
-
-	if ( DoOnce == 0 )
-		if(akActionRef == Game.GetPlayer())
-
-			Game.FadeOutGame(false, true, 2.0, 1.0)					; Fade in after the mainmenu
-			;Game.SetInChargen(false, true, false)						; Save, Rest, HUD ? Disabled
-			Game.EnablePlayerControls()								; Enable Player Controls
-			;Game.ShowTitleSequenceMenu()
-
-			Game.GetPlayer().SetScale(0.98)							; Scale the player
-			Game.GetPlayer().SetRace(NordRaceChild) 					; Set player race to child
-
-			Debug.MessageBox("Yippee, jetzt bin ich Jorle Rostlöffel!")
-			_00E_MQ00.SetCurrentStageID(0)									; Starts _00E_MQ00 Quest
-
-			DoOnce = -1
-
-		endif
-	endif
-
-EndEvent
-
diff --git a/source/scripts/_00e_mq00_trigbox01script.psc b/source/scripts/_00e_mq00_trigbox01script.psc
deleted file mode 100644
index 36cbc86a..00000000
--- a/source/scripts/_00e_mq00_trigbox01script.psc
+++ /dev/null
@@ -1,31 +0,0 @@
-Scriptname _00E_MQ00_TrigBox01Script extends ObjectReference  
-
-int DoOnce
-
-Event OnTriggerEnter(ObjectReference akActionRef)
-
-	if ( DoOnce == 0 )
-		if(akActionRef == Game.GetPlayer())
-
-			Game.SetInChargen(false, false, false)
-			;Game.ShowRaceMenu()
-
-			DoOnce = -1
-
-		endif
-	endif
-
-
-	if ( DoOnce == -1)
-
-	utility.Wait(4)	
-
-	Game.RequestAutoSave()
-	Game.RequestSave()
-	DoOnce = -2
-
-	endif
-
-
-EndEvent
-
diff --git a/source/scripts/_00e_mqp01_functions.psc b/source/scripts/_00e_mqp01_functions.psc
index e51ab44e..d3a869a0 100644
--- a/source/scripts/_00e_mqp01_functions.psc
+++ b/source/scripts/_00e_mqp01_functions.psc
@@ -8,6 +8,7 @@ Import Utility
 
 Function SetUpScene()
 
+	Game.SetInChargen(true, true, false)
 	Game.FadeOutGame(false, true, 0.5, 0.5)
 	FadeToBlackHoldIMOD.Apply()
 	PlayerREF.SetScale(0.85)
@@ -19,16 +20,13 @@ Function SetUpScene()
 	FadeToBlackHoldIMOD.Remove()
 	MQP01_DreamDoorREF.BlockActivation(True)
 	Wait(5.0)
-	Game.EnablePlayerControls()
 	
 	if EnderalFunctions.GetNewGameCount() > 1
+		Game.EnablePlayerControls()
 		Game.QuitToMainMenu()
 		Debug.MessageBox("Due to an engine bug, new game should not be started after quitting to the main menu. Please, restart Enderal first.")
-		return
 	endif
 	
-	Game.DisablePlayerControls(false, true, true, false, true, false, false)
-
 EndFunction
 
 Function UnlockDoor()
diff --git a/source/scripts/_00e_mqp02_functions.psc b/source/scripts/_00e_mqp02_functions.psc
index 7abd8c0a..0af54c89 100644
--- a/source/scripts/_00e_mqp02_functions.psc
+++ b/source/scripts/_00e_mqp02_functions.psc
@@ -420,6 +420,7 @@ State Chargen
 			Game.EnablePlayerControls()
 			PlayerREF.PlayIdle(IdleForceDefaultState)
 			Debug.SendAnimationEvent(PlayerREF, "IdleForceDefaultState")
+			Game.SetInCharGen(false, true, false)
 		Else
 			RegisterForSingleUpdate(1)
 		EndIf
diff --git a/source/scripts/_00e_mqp03_functions.psc b/source/scripts/_00e_mqp03_functions.psc
index b4c780d8..1b5653e8 100644
--- a/source/scripts/_00e_mqp03_functions.psc
+++ b/source/scripts/_00e_mqp03_functions.psc
@@ -11,7 +11,7 @@ Import Game
 Event OnUpdate()
 
 	If (Self.GetCurrentStageID() < 20) && _00E_DisableMenuTutorials.GetValueInt() == 0
-		If UsingGamepad()
+		If Game.UsingGamepad()
 			Message.ResetHelpMessage("Empty")
 			_00E_MQP03_Tutorial_LeaveMenuHintConsole.ShowAsHelpMessage("Empty", 5, 1, 1)
 		Else
diff --git a/source/scripts/_00e_startdoorscript.psc b/source/scripts/_00e_startdoorscript.psc
deleted file mode 100644
index 94198ea3..00000000
--- a/source/scripts/_00e_startdoorscript.psc
+++ /dev/null
@@ -1,16 +0,0 @@
-Scriptname _00E_StartDoorScript extends ObjectReference  
-int count
-
-Event OnActivate(ObjectReference akActionRef)
-	
-	if count == 0
-       	;Game.ShowRaceMenu()
-		Game.GetPlayer().SetActorValue("health", 50)
-		Game.GetPlayer().SetActorValue("Magicka", 50)
-		Game.GetPlayer().SetActorValue("Stamina", 50)
-		Game.GetPlayer().RemoveAllItems(abRemoveQuestItems = true)
-	endif
-
-	count = 1
-
- endEvent
\ No newline at end of file