diff --git a/data/scripts/commands/ActivateCommand.lua b/data/scripts/commands/ActivateCommand.lua
index dffa22d1..71c84183 100644
--- a/data/scripts/commands/ActivateCommand.lua
+++ b/data/scripts/commands/ActivateCommand.lua
@@ -8,16 +8,15 @@ Switches between active and passive mode states
 
 --]]
 
-function onEventStarted(player, command, triggerName)	
+function onEventStarted(player, command, triggerName)		
 	
 	if (player:GetState() == 0) then
 		player:ChangeState(2);
-		sendSignal("playerActive");
 	elseif (player:GetState() == 2) then
 		player:ChangeState(0); 
-		sendSignal("playerPassive");
-	end
-		
+	end		
 	player:endEvent();
-
+	
+	sendSignal("playerActive");
+	
 end
\ No newline at end of file
diff --git a/data/scripts/commands/RequestQuestJournalCommand.lua b/data/scripts/commands/RequestQuestJournalCommand.lua
index 1cf9465e..bb979a15 100644
--- a/data/scripts/commands/RequestQuestJournalCommand.lua
+++ b/data/scripts/commands/RequestQuestJournalCommand.lua
@@ -6,8 +6,14 @@
 function onEventStarted(player, actor, trigger, questId, mapCode)
 
 	quest = player:GetQuest(questId);
+	
+	if (quest == nil) then	
+		player:EndEvent();
+		return;
+	end
+	
 	if (mapCode == nil) then	
-		player:SendRequestedInfo("requestedData", "qtdata", quest:GetQuestId(), 3);
+		player:SendRequestedInfo("requestedData", "qtdata", quest:GetQuestId(), quest:GetPhase());
 		player:EndEvent();
 	else
 		player:SendRequestedInfo("requestedData", "qtmap", quest:GetQuestId());
diff --git a/data/scripts/directors/Quest/QuestDirectorMan0g001.lua b/data/scripts/directors/Quest/QuestDirectorMan0g001.lua
index 6159e70e..d04d6c02 100644
--- a/data/scripts/directors/Quest/QuestDirectorMan0g001.lua
+++ b/data/scripts/directors/Quest/QuestDirectorMan0g001.lua
@@ -18,12 +18,12 @@ end
 
 function onEventStarted(player, actor, triggerName)	
 
-	quest = GetStaticActor("Man0g0");
+	quest = player:GetQuest("Man0g0");
 	callClientFunction(player, "delegateEvent", player, quest, "processTtrBtl001", nil, nil, nil);
 	callClientFunction(player, "delegateEvent", player, quest, "processEvent010_1", nil, nil, nil);
+	player:ChangeMusic(7);
 	callClientFunction(player, "delegateEvent", player, quest, "processEvent020_1", nil, nil, nil);	
-	GetWorldManager():DoZoneChange(player, 1);
-	player:EndEvent();
+	
 	--sendDataPacket: Success
 	--sendDataPacket: CloseWidget
 	--IF DoW:
@@ -40,8 +40,11 @@ function onEventStarted(player, actor, triggerName)
 	--IF DEAD
 	--sendDataPacket: Attention
 	
+	quest:NextPhase(10);	
 	player:EndEvent();
 	
+	GetWorldManager():DoZoneChange(player, 155, "PrivateAreaMasterPast", 1, 15, 175.38, -1.21, -1156.51, -2.1);
+	
 end
 
 function onUpdate()
diff --git a/data/scripts/directors/Quest/QuestDirectorMan0l001.lua b/data/scripts/directors/Quest/QuestDirectorMan0l001.lua
index 86776c57..07f2dad1 100644
--- a/data/scripts/directors/Quest/QuestDirectorMan0l001.lua
+++ b/data/scripts/directors/Quest/QuestDirectorMan0l001.lua
@@ -1,16 +1,9 @@
 require ("global")
+require ("tutorial")
 require ("quests/man/man0l0")
 
 --processTtrBtl001: Active Mode Tutorial
 --processTtrBtl002: Targetting Tutorial (After active mode done)
---processTtrBtl003: Auto Attack Done
---processTtrBtl004: Tutorial Complete
-
---[[
-12: TP
-13: WeaponSkills
-
-]]--
 
 function init()
 	return "/Director/Quest/QuestDirectorMan0l001";
@@ -19,46 +12,47 @@ end
 function onEventStarted(player, actor, triggerName)	
 
 	man0l0Quest = player:GetQuest("Man0l0");
-
+	startTutorialMode(player);
 	callClientFunction(player, "delegateEvent", player, man0l0Quest, "processTtrBtl001", nil, nil, nil);
 	player:EndEvent();
 	waitForSignal("playerActive");
-	kickEventContinue(player, actor, "noticeEvent", "noticeEvent");
+	wait(1); --If this isn't here, the scripts bugs out. TODO: Find a better alternative.
+	kickEventContinue(player, actor, "noticeEvent", "noticeEvent");	
 	callClientFunction(player, "delegateEvent", player, man0l0Quest, "processTtrBtl002", nil, nil, nil);
 	player:EndEvent();
-	
-	
 	wait(4);
-	player:SendRequestedInfo(5); --Close TutorialWidget
-	player:SendRequestedInfo(2, nil, nil, 9055, 9055, 9055); --Open TutorialSuccessWidget for attacking enemy
-	wait(4);
-	player:SendRequestedInfo(4, nil, nil, nil, 12); --Open TP TutorialWidget
-	wait(4); --Should be wait for TP signal
-	player:SendRequestedInfo(5); --Close TutorialWidget
-	player:SendRequestedInfo(4, nil, nil, nil, 13); --Open WS TutorialWidget
+	closeTutorialWidget(player);
+	showTutorialSuccessWidget(player, 9055); --Open TutorialSuccessWidget for attacking enemy
+	wait(3);
+	openTutorialWidget(player, CONTROLLER_KEYBOARD, TUTORIAL_TP);
+	wait(5);
+	closeTutorialWidget(player);
+	openTutorialWidget(player, CONTROLLER_KEYBOARD, TUTORIAL_WEAPONSKILLS);
 	wait(4); --Should be wait for weaponskillUsed signal
-	player:SendRequestedInfo(5); --Close TutorialWidget
-	player:SendRequestedInfo(2, nil, nil, 9065, 9065, 9065); --Open TutorialSuccessWidget for weapon skill
-	wait(4); --Should be wait for mobkill
-	callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent000_2", nil, nil, nil);		
+	closeTutorialWidget(player);
+	showTutorialSuccessWidget(player, 9065); --Open TutorialSuccessWidget for weapon skill
+	
+	wait(6); --Should be wait for mobkill
+	worldMaster = GetWorldMaster();
+	player:SendRequestedInfo("attention", worldMaster, "", 51073, 1);
+	wait(7);
 	player:ChangeMusic(7);
+	player:ChangeState(0); 
+	kickEventContinue(player, actor, "noticeEvent", "noticeEvent");
 	callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent000_3", nil, nil, nil);	
 	
-	--sendDataPacket: Success
-	--sendDataPacket: CloseWidget
-	--IF DoW:
-		--sendDataPacket: OpenWidget (TP)
-		--IF TP REACHED:
-		--sendDataPacket: CloseWidget
-		--sendDataPacket: OpenWidget (WS)
-		--IF WS USED:
-		--sendDataPacket: Success
-		--sendDataPacket: CloseWidget
-	--ELSE MAGIC:
-		--sendDataPacket: OpenWidget (DEFEAT ENEMY)
-			
-	--IF DEAD
-	--sendDataPacket: Attention
+	--[[
+	IF DoW:
+		OpenWidget (TP)
+		IF TP REACHED:
+			CloseWidget
+			OpenWidget (WS)
+		IF WS USED:
+			Success
+			CloseWidget
+	ELSE MAGIC:
+		OpenWidget (DEFEAT ENEMY)			
+	]]
 	
 	man0l0Quest:NextPhase(10);	
 	player:EndEvent();
diff --git a/data/scripts/player.lua b/data/scripts/player.lua
index 03924d9d..929068f1 100644
--- a/data/scripts/player.lua
+++ b/data/scripts/player.lua
@@ -21,7 +21,7 @@ function onBeginLogin(player)
 		--director = player:GetZone():CreateDirector("OpeningDirector");
 		--player:AddDirector(director);
 		--player:SetLoginDirector(director);		
-		--player:KickEvent(director, "noticeEvent", "noticeEvent");
+		--player:KickEvent(director, "noticeEvent", true);
 		
 		player.positionX = 0.016;
 		player.positionY = 10.35;
diff --git a/data/scripts/tutorial.lua b/data/scripts/tutorial.lua
index 0d146ef9..c16372f9 100644
--- a/data/scripts/tutorial.lua
+++ b/data/scripts/tutorial.lua
@@ -36,8 +36,9 @@ end
 
 function openTutorialWidget(player, controllerType, widgetId)
 	--Default to keyboard if somethings fucky
-	if (controllerType ~= CONTROLLER_GAMEPAD)
+	if (controllerType ~= CONTROLLER_GAMEPAD) then
 		controllerType = CONTROLLER_KEYBOARD;
+	end
 	player:SendRequestedInfo(4, nil, nil, controllerType, widgetId);
 end