diff --git a/CSMPFunctions.lua b/CSMPFunctions.lua
index f6fcb72..2a8bff0 100644
--- a/CSMPFunctions.lua
+++ b/CSMPFunctions.lua
@@ -700,7 +700,6 @@ function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,He
 				end
 			end
 
-			delay(0, function()
 				-- wait for the objects to load. we don't want to be TOO quick
 				waitForChild(Player.PlayerGui,"UserSettingsShield")
 				waitForChild(Player.PlayerGui.UserSettingsShield,"Settings")
@@ -721,10 +720,7 @@ function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,He
 						end
 					end
 				end)
-			end)
-		elseif (rbxlegacyversion == 11) then
-			game.CoreGui.RobloxGui.ControlFrame.BottomRightControl:Remove()
-		end
+			end
 		if (rbxlegacyversion > 8) then
 			Player.CanLoadCharacterAppearance = false
 		end
@@ -841,8 +837,6 @@ function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,
 				instance.ChildAdded:wait()
 			end
 		end
-
-		delay(0, function()
 			-- wait for the objects to load. we don't want to be TOO quick
 			waitForChild(plr.PlayerGui,"UserSettingsShield")
 			waitForChild(plr.PlayerGui.UserSettingsShield,"Settings")
@@ -863,10 +857,7 @@ function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,
 					end
 				end
 			end)
-		end)
-	elseif (rbxlegacyversion == 11) then
-		game.CoreGui.RobloxGui.ControlFrame.BottomRightControl:Remove()
-	end
+		end
 	pcall(function() plr:SetUnder13(false) end)
 	if (rbxlegacyversion >= 8) then
 		if (IconType == "BC") then
diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs
index 28ca892..f5c7f5e 100644
--- a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs
+++ b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs
@@ -109,7 +109,7 @@ namespace RBXLegacyLauncher
 		void Button2Click(object sender, EventArgs e)
 		{
 			Process pmap = new Process();
-			pmap.StartInfo.FileName = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\bin\\java.exe";
+			pmap.StartInfo.FileName = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\jreportable\\bin\\java.exe";
 			pmap.StartInfo.Arguments = "-jar upnp.jar -externalPort" + GlobalVars.ServerPort + " -internalPort" + GlobalVars.ServerPort + "-ip \"\localhost\" -protocol udp";
 			pmap.StartInfo.UseShellExecute = false;
 			pmap.StartInfo.CreateNoWindow = true;
@@ -878,7 +878,7 @@ namespace RBXLegacyLauncher
 			if (command.Equals("rbxlegacy server"))
 			{
 				Process pmap = new Process();
-				pmap.StartInfo.FileName = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\bin\\java.exe";
+				pmap.StartInfo.FileName = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\jreportable\\bin\\java.exe";
 				pmap.StartInfo.Arguments = "-jar upnp.jar -externalPort" + GlobalVars.ServerPort + " -internalPort" + GlobalVars.ServerPort + "-ip \"\localhost\" -protocol udp";
 				pmap.StartInfo.UseShellExecute = false;
 				pmap.StartInfo.CreateNoWindow = true;
@@ -888,7 +888,7 @@ namespace RBXLegacyLauncher
 			else if (command.Equals("rbxlegacy server no3d"))
 			{
 				Process pmap = new Process();
-				pmap.StartInfo.FileName = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\bin\\java.exe";
+				pmap.StartInfo.FileName = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\jreportable\\bin\\java.exe";
 				pmap.StartInfo.Arguments = "-jar upnp.jar -externalPort" + GlobalVars.ServerPort + " -internalPort" + GlobalVars.ServerPort + "-ip \"\localhost\" -protocol udp";
 				pmap.StartInfo.UseShellExecute = false;
 				pmap.StartInfo.CreateNoWindow = true;
@@ -898,7 +898,7 @@ namespace RBXLegacyLauncher
 			else if (command.Equals("rbxlegacy no3d"))
 			{
 				Process pmap = new Process();
-				pmap.StartInfo.FileName = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\bin\\java.exe";
+				pmap.StartInfo.FileName = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\jreportable\\bin\\java.exe";
 				pmap.StartInfo.Arguments = "-jar upnp.jar -externalPort" + GlobalVars.ServerPort + " -internalPort" + GlobalVars.ServerPort + "-ip \"\localhost\" -protocol udp";
 				pmap.StartInfo.UseShellExecute = false;
 				pmap.StartInfo.CreateNoWindow = true;