diff --git a/Classic/scripts/autoexec/MissionTypeOptions.cs b/Classic/scripts/autoexec/MissionTypeOptions.cs
index ac9d427..cd76a10 100644
--- a/Classic/scripts/autoexec/MissionTypeOptions.cs
+++ b/Classic/scripts/autoexec/MissionTypeOptions.cs
@@ -1,10 +1,11 @@
-// To manage options in certain missiontypes
-
-// Variables
+// Mission Type Options Script
 //
+// To manage options in certain missiontypes
+//
+// PUG Password
 // Turns Password on and off in Tournament mode
-// Used to be auto but isnt anymore. 
 // Enabled in the admin menu.
+// If you want a password automatically when switched to tournament mode
 // $Host::PUGautoPassword = 1;
 // The PUG password you want
 // $Host::PUGPassword = "pickup";
@@ -18,14 +19,11 @@ function loadMissionStage2()
 	if( $CurrentMissionType !$= "LakRabbit" ) 
 	{
 		if( $Host::TournamentMode && $Host::PUGautoPassword )
-			
 			$Host::Password = $Host::PUGPassword;
-	
 		else if( !$Host::TournamentMode )
-		{
 			$Host::Password = "";
-		}
 		
+		//Set server mode to SPEED
 		$Host::HiVisibility = "0";
 	}
 	else if( $CurrentMissionType $= "LakRabbit" ) 
@@ -33,14 +31,9 @@ function loadMissionStage2()
 		$Host::Password = "";
 		$Host::TournamentMode = 0;
 		
+		//Set server mode to DISTANCE
 		$Host::HiVisibility = "1";
 	}
-		
-	//Activate NetTourneyClient package if enabled. zCheckVar.cs
-	if($Host::EnableNetTourneyClient && !isActivePackage(checkver)) //Added
-		activatePackage(checkver);
-		
-	//echo ("PUGpassCheck");
    
     parent::loadMissionStage2();
 }
diff --git a/Classic/scripts/autoexec/zCheckVer.cs b/Classic/scripts/autoexec/zCheckVer.cs
index f608893..1baf797 100644
--- a/Classic/scripts/autoexec/zCheckVer.cs
+++ b/Classic/scripts/autoexec/zCheckVer.cs
@@ -21,8 +21,10 @@
 
 
 // Added some things so it can be toggled in game. -ChocoTaco
+// Toggle Tourney Net Client
+// $Host::EnableNetTourneyClient = 1; 
 
-//Original
+// Original
 function checkVer_showBanner(%client)
 {
 	// customize me
@@ -88,12 +90,28 @@ package checkver
 	}	
 };
 
-// Moved to MissionTypeOptions.cs
-//
-//if($Host::EnableNetTourneyClient && !isActivePackage(checkver)) //Added
-//	activatePackage(checkver);
 
-//Throw a offenders to observer when enabled
+package StartCheckVer
+{
+
+function loadMissionStage2()
+{		
+	//Activate NetTourneyClient package if enabled.
+	if($Host::EnableNetTourneyClient && !isActivePackage(checkver)) //Added
+		activatePackage(checkver);
+   
+    parent::loadMissionStage2();
+}
+
+};
+
+// Prevent package from being activated if it is already
+if (!isActivePackage(StartCheckVer))
+    activatePackage(StartCheckVer);
+
+
+
+// Throw offenders to observer when enabled
 function CheckVerObserver(%client)
 {
 	if($Host::EnableNetTourneyClient && !$Host::TournamentMode)
@@ -112,7 +130,7 @@ function CheckVerObserver(%client)
 	}
 }
 
-//List Names of players without NTC
+// List Names of players without NTC
 function CheckVerList(%client)
 {
 	for(%i = 0; %i < ClientGroup.getCount(); %i++)