diff --git a/Classic/scripts/CTFGame.cs b/Classic/scripts/CTFGame.cs
index ccba498..a4715e8 100755
--- a/Classic/scripts/CTFGame.cs
+++ b/Classic/scripts/CTFGame.cs
@@ -466,7 +466,7 @@ function CTFGame::playerTouchEnemyFlag(%game, %player, %flag)
       if (%startStalemate)
          %game.stalemateSchedule = %game.schedule(%game.stalemateTimeMS, beginStalemate);
 
-      if($Host::ClassicEvoStats && !$Host::TournamentMode)
+      if($Host::ClassicEvoStats)
       {
          $stats::grabs[%client]++;
          if($stats::grabs[%client] > $stats::grabs_counter)
@@ -480,7 +480,7 @@ function CTFGame::playerTouchEnemyFlag(%game, %player, %flag)
          %game.totalFlagHeldTime[%flag] = getSimTime();
    }
 
-   if($Host::ClassicEvoStats && !%player.flagStatsWait && !$Host::TournamentMode)
+   if($Host::ClassicEvoStats && !%player.flagStatsWait)
    {
 	  // get the grab speed
 	  %grabspeed = mFloor(VectorLen(setWord(%player.getVelocity(), 2, 0)) * 3.6);
diff --git a/Classic/scripts/SCtFGame.cs b/Classic/scripts/SCtFGame.cs
index b4b940a..159425e 100755
--- a/Classic/scripts/SCtFGame.cs
+++ b/Classic/scripts/SCtFGame.cs
@@ -693,7 +693,7 @@ function SCtFGame::playerTouchEnemyFlag(%game, %player, %flag)
       if (%startStalemate)
          %game.stalemateSchedule = %game.schedule(%game.stalemateTimeMS, beginStalemate);
 	 
-	  if($Host::ClassicEvoStats && !$Host::TournamentMode)
+	  if($Host::ClassicEvoStats)
       {
          $stats::grabs[%client]++;
          if($stats::grabs[%client] > $stats::grabs_counter)
@@ -707,7 +707,7 @@ function SCtFGame::playerTouchEnemyFlag(%game, %player, %flag)
          %game.totalFlagHeldTime[%flag] = getSimTime();
    }
    
-   if($Host::ClassicEvoStats && !%player.flagStatsWait && !$Host::TournamentMode)
+   if($Host::ClassicEvoStats && !%player.flagStatsWait)
    {
 	  // get the grab speed
 	  %grabspeed = mFloor(VectorLen(setWord(%player.getVelocity(), 2, 0)) * 3.6);
diff --git a/Classic/scripts/autoexec/EvoStats.cs b/Classic/scripts/autoexec/EvoStats.cs
index 8492653..f32a632 100755
--- a/Classic/scripts/autoexec/EvoStats.cs
+++ b/Classic/scripts/autoexec/EvoStats.cs
@@ -30,7 +30,7 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am
 {
    Parent::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC);
    // call the function
-   if(!$Host::TournamentMode && $Host::ClassicEvoStats)
+   if($Host::ClassicEvoStats)
       handleDamageStat(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC);
 }
 
@@ -38,7 +38,7 @@ function DefaultGame::onClientKilled(%game, %clVictim, %clKiller, %damageType, %
 {
    Parent::onClientKilled(%game, %clVictim, %clKiller, %damageType, %implement, %damageLocation);
    // call the function
-   if(!$Host::TournamentMode && $Host::ClassicEvoStats)
+   if($Host::ClassicEvoStats)
       handleKillStat(%game, %clVictim, %clKiller, %damageType, %implement, %damageLocation);
 }
 
@@ -47,7 +47,7 @@ function ProjectileData::onCollision(%data, %projectile, %targetObject, %modifie
    if(isObject(%targetObject)) // Console spam fix.
    {
       // call the function
-      if(!$Host::TournamentMode && $Host::ClassicEvoStats)
+      if($Host::ClassicEvoStats)
          handleMAStat(%data, %projectile, %targetObject, %modifier, %position, %normal);
    }
    Parent::onCollision( %data, %projectile, %targetObject, %modifier, %position, %normal );
diff --git a/Classic/scripts/defaultGame.cs b/Classic/scripts/defaultGame.cs
index c728f41..7db98d1 100755
--- a/Classic/scripts/defaultGame.cs
+++ b/Classic/scripts/defaultGame.cs
@@ -772,7 +772,7 @@ function DefaultGame::sendDebriefing( %game, %client )
       }
    }
 
-   if($Host::ClassicEvoStats)
+   if($Host::ClassicEvoStats && ($CurrentMissionType $= "CTF" || $CurrentMissionType $= "SCtF"))
       sendEvoDebriefing(%client);
 }
 
@@ -1751,7 +1751,7 @@ function DefaultGame::clientMissionDropReady(%game, %client)
          //displayObserverHud( %client, 0 );
          // Eolk - flag stats stuff
          //updateObserverFlyHud(%client);
-         if($Host::ClassicEvoStats && $CurrentMissionType $= "CTF")
+         if($Host::ClassicEvoStats && ($CurrentMissionType $= "CTF" || $CurrentMissionType $= "SCtF"))
             schedule(10000, %client, updateObserverFlyHud, %client);
       }
 
@@ -1774,7 +1774,7 @@ function DefaultGame::clientMissionDropReady(%game, %client)
          }
       }
 
-      if( $Host::ClassicEvoStats && ($CurrentMissionType $= "CTF" || $CurrentMissionType $= "SCtF") )
+      if( $Host::ClassicEvoStats && ($CurrentMissionType $= "CTF" || $CurrentMissionType $= "SCtF"))
       {
          %nickTeam1 = ($flagstats::heldTeam1 ? $flagstats::nickTeam1 : "N/A");
          %realTeam1 = ($flagstats::heldTeam1 ? $flagstats::realTeam1 : "N/A");
@@ -1833,7 +1833,7 @@ function DefaultGame::clientMissionDropReady(%game, %client)
          if(isEventPending(%client.okschedule))
             cancel(%client.okschedule);
 
-		 %time = $Host::KickObserverTimeout;
+         %time = $Host::KickObserverTimeout;
          //%time = ($Host::KickObserverTimeout) + ($Host::KickObserverTimeout/2);
          //%minutes = %time / 60;
          //messageClient(%client, 'MsgNoObservers', '\c2You have %1 minutes to join the game or you will be kicked.', %minutes);