diff --git a/CClash/CClashServer.cs b/CClash/CClashServer.cs
index ba854c5..037f4a6 100644
--- a/CClash/CClashServer.cs
+++ b/CClash/CClashServer.cs
@@ -192,7 +192,6 @@ public void Listen(string cachedir)
                         NewServerThread(cachedir);
                     }
                 }
-                cache.SetupStats();
                 if (DateTime.Now.Subtract(lastRequest).TotalMinutes > QuitAfterIdleMinutes)
                 {
                     quitnow = true;
@@ -203,7 +202,7 @@ public void Listen(string cachedir)
                 t.Join(2000);
             }
 
-
+            cache.SetupStats();
             Logging.Emit("server quitting");
             mtx.ReleaseMutex();
             
@@ -228,7 +227,6 @@ public CClashResponse ProcessRequest(CClashRequest req)
                 case Command.GetStats:
                     rv.exitcode = 0;
                     cache.SetupStats(); // commits stats to disk
-                    
                     rv.stdout = StatOutputs.GetStatsString(req.compiler, cache);
                     break;
 
@@ -241,16 +239,11 @@ public CClashResponse ProcessRequest(CClashRequest req)
                     rv.supported = true;
                     rv.stderr = stderr.ToString();
                     rv.stdout = stdout.ToString();
-                    if (Environment.CurrentDirectory != mydocs)
-                    {
-                        //rv.exitcode = -1;
-                        //rv.supported = false;
-                        //rv.stderr = string.Format("cclash server error: server cwd has changed from {0} to {1}!!", mydocs, Environment.CurrentDirectory);
-                        //rv.stdout = string.Empty;
-                    }
+
                     break;
 
                 case Command.Quit:
+                    cache.SetupStats();
                     Stop();
                     break;
             }
diff --git a/Installer/Installer/Express/DVD-5/DiskImages/DISK1/Setup.ini b/Installer/Installer/Express/DVD-5/DiskImages/DISK1/Setup.ini
index ed043b4..9c3ed71 100644
Binary files a/Installer/Installer/Express/DVD-5/DiskImages/DISK1/Setup.ini and b/Installer/Installer/Express/DVD-5/DiskImages/DISK1/Setup.ini differ
diff --git a/cclash.v11.suo b/cclash.v11.suo
index 2eb8812..eeffef3 100644
Binary files a/cclash.v11.suo and b/cclash.v11.suo differ