diff --git a/Minecraft.Client/Common/App_enums.h b/Minecraft.Client/Common/App_enums.h
index 56043ce3..72f3bfbf 100644
--- a/Minecraft.Client/Common/App_enums.h
+++ b/Minecraft.Client/Common/App_enums.h
@@ -875,7 +875,8 @@ enum EControllerActions
 	MINECRAFT_ACTION_SPAWN_CREEPER,
 	MINECRAFT_ACTION_CHANGE_SKIN,
 	MINECRAFT_ACTION_FLY_TOGGLE,
-	MINECRAFT_ACTION_RENDER_DEBUG
+	MINECRAFT_ACTION_RENDER_DEBUG,
+	MINECRAFT_ACTION_RENDER_DEBUG_SCREEN
 };
 
 enum eMCLang
diff --git a/Minecraft.Client/Common/Buildsteps/Windows64-postbuild.ps1 b/Minecraft.Client/Common/Buildsteps/Windows64-postbuild.ps1
index 3a744a40..a44057b2 100644
--- a/Minecraft.Client/Common/Buildsteps/Windows64-postbuild.ps1
+++ b/Minecraft.Client/Common/Buildsteps/Windows64-postbuild.ps1
@@ -22,8 +22,7 @@ $folderCopies = @(
     @{ Source = "music";                Dest = "music" },
     @{ Source = "Common\res";      		Dest = "Common\res" },
     @{ Source = "Common\Media";    		Dest = "Common\Media" },
-    @{ Source = "DurangoMedia";    		Dest = "Windows64Media" },
-    @{ Source = "Windows64Media";  		Dest = "Windows64Media" },
+    @{ Source = "Windows64Media\DLC";  	Dest = "Windows64Media\DLC" },
 	@{ Source = "Windows64Media\Sound";	Dest = "Windows64Media\Sound" },
 	#@{ Source = "PSVita\Tutorial"; 	Dest = "Windows64Media\Tutorial" }, # str1k3r - doesnt even work bru
 	@{ Source = "Windows64\Miles\lib\redist64"; Dest = "Windows64\redist64" }
diff --git a/Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp b/Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp
index fc81ef22..8a4da2bb 100644
--- a/Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp
+++ b/Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp
@@ -25,6 +25,8 @@ UIComponent_PressStartToPlay::UIComponent_PressStartToPlay(int iPad, void *initD
 	m_labelPressStart.init( (UIString) [] { return replaceAll(app.GetString(IDS_PRESS_X_TO_JOIN), L"{*CONTROLLER_VK_A*}", app.GetVKReplacement(VK_PAD_A) ); });
 #elif defined _XBOX_ONE
 	m_labelPressStart.init( (UIString) [] { return replaceAll(app.GetString(IDS_PRESS_START_TO_JOIN), L"{*CONTROLLER_VK_START*}", app.GetVKReplacement(VK_PAD_START) ); });
+#elif defined _WINDOWS64
+	m_labelPressStart.init( (UIString) [] { return replaceAll(app.GetString(IDS_PRESS_START_TO_JOIN), L"{*CONTROLLER_VK_START*}", app.GetVKReplacement(VK_PAD_START) ); });
 #else
 	m_labelPressStart.init(IDS_PRESS_START_TO_JOIN);
 #endif
diff --git a/Minecraft.Client/Extrax64Stubs.cpp b/Minecraft.Client/Extrax64Stubs.cpp
index 7fff9b09..30840321 100644
--- a/Minecraft.Client/Extrax64Stubs.cpp
+++ b/Minecraft.Client/Extrax64Stubs.cpp
@@ -34,12 +34,10 @@
 #include <perf.h>
 #endif
 
-#if !defined(__PS3__) && !defined(__ORBIS__) && !defined(__PSVITA__)
 #ifdef _WINDOWS64
-//C4JStorage StorageManager;
+C4JStorage StorageManager;
 C_4JProfile ProfileManager;
 #endif
-#endif // __PS3__
 CSentientManager SentientManager;
 CXuiStringTable StringTable;
 
diff --git a/Minecraft.Client/StringTable.cpp b/Minecraft.Client/StringTable.cpp
index a64c07b2..81985116 100644
--- a/Minecraft.Client/StringTable.cpp
+++ b/Minecraft.Client/StringTable.cpp
@@ -119,9 +119,6 @@ void StringTable::ProcessStringTableData(void)
 	else
 	{
 		app.DebugPrintf("Failed to get language\n");
-#ifdef _DEBUG
-		__debugbreak();
-#endif
 
 		isStatic = false;
 	}
diff --git a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
index 861b22ad..c1b0ed97 100644
--- a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
+++ b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
@@ -93,6 +93,13 @@ static Windows64LaunchArgs ParseLaunchArgs()
 		{
 			args.fullscreen = true;
 		}
+		else if (_wcsicmp(argv[i], L"-resolution") == 0)
+		{
+			if (i + 1 < argc && argv[i + 1][0] >= L'1' && argv[i + 1][0] <= L'6')
+			{
+				args.resolution = argv[++i][0] - L'0';
+			}
+		}
 	}
 
 	LocalFree(argv);
@@ -951,12 +958,11 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 
 	app.InitGameSettings();
 
-#if 0
-	//bool bDisplayPauseMenu=false;
-
 	// set the default gamma level
 	float fVal=50.0f*327.68f;
 	RenderManager.UpdateGamma((unsigned short)fVal);
+#if 0
+	//bool bDisplayPauseMenu=false;
 
 	// load any skins
 	//app.AddSkinsToMemoryTextureFiles();
@@ -994,14 +1000,8 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	// Set the default sound levels
 	pMinecraft->options->set(Options::Option::MUSIC,1.0f);
 	pMinecraft->options->set(Options::Option::SOUND,1.0f);
-
-	app.NavigateToScene(XUSER_INDEX_ANY,eUIScene_Intro,&initData);
 #endif
 
-	// Set the default sound levels
-	pMinecraft->options->set(Options::Option::MUSIC,1.0f);
-	pMinecraft->options->set(Options::Option::SOUND,1.0f);
-
 	//app.TemporaryCreateGameStart();
 
 	//Sleep(10000);
@@ -1061,9 +1061,9 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 			InputManager.Tick();
 		}
 		PIXEndNamedEvent();
-		PIXBeginNamedEvent(0,"Profile manager tick");
-		//		ProfileManager.Tick();
-		PIXEndNamedEvent();
+		/*PIXBeginNamedEvent(0,"Profile manager tick");
+		ProfileManager.Tick();
+		PIXEndNamedEvent();*/
 		PIXBeginNamedEvent(0,"Storage manager tick");
 		StorageManager.Tick();
 		PIXEndNamedEvent();
@@ -1071,23 +1071,11 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 		RenderManager.Tick();
 		PIXEndNamedEvent();
 
-		// Tick the social networking manager.
-		PIXBeginNamedEvent(0,"Social network manager tick");
-		//		CSocialManager::Instance()->Tick();
-		PIXEndNamedEvent();
-
-		// Tick sentient.
-		PIXBeginNamedEvent(0,"Sentient tick");
-		MemSect(37);
-		//		SentientManager.Tick();
-		MemSect(0);
-		PIXEndNamedEvent();
-
 		PIXBeginNamedEvent(0,"Network manager do work #1");
 		//		g_NetworkManager.DoWork();
 		PIXEndNamedEvent();
 
-		//		LeaderboardManager::Instance()->Tick();
+		// LeaderboardManager::Instance()->Tick();
 		// Render game graphics.
 		if(app.GetGameStarted())
 		{