diff --git a/Admin/Server.cs b/Admin/Server.cs
index 2b52ecaf..d2a6cdd0 100644
--- a/Admin/Server.cs
+++ b/Admin/Server.cs
@@ -328,7 +328,7 @@ namespace IW4MAdmin
 
                 try
                 {
-                    ClientNum = await PollPlayersAsync();
+                    await PollPlayersAsync();
 
                     if (ConnectionErrors > 0)
                     {
@@ -375,7 +375,9 @@ namespace IW4MAdmin
                     start = DateTime.Now;
                 }
 
-                //logFile = new IFile();
+                if (LogFile == null)
+                    return;
+
                 if (l_size != LogFile.Length())
                 {
                     // this should be the longest running task
diff --git a/Admin/lib/SharedLibrary.dll b/Admin/lib/SharedLibrary.dll
index 98ed18af..7ca9ddb8 100644
Binary files a/Admin/lib/SharedLibrary.dll and b/Admin/lib/SharedLibrary.dll differ
diff --git a/Admin/webfront/main.html b/Admin/webfront/main.html
index 10b86989..6eb83337 100644
--- a/Admin/webfront/main.html
+++ b/Admin/webfront/main.html
@@ -1,6 +1,13 @@
 <script>
     function getPlayerHistoryChart(playerHistory, i) {
         ///////////////////////////////////////
+
+        // thanks to cnavas js :(
+        playerHistory.forEach(function(item, i) {
+            playerHistory[i].x = new Date(playerHistory[i].x);
+  
+        });        
+
         return new CanvasJS.Chart(`graph-player-history-${i}`, {
             backgroundColor: "#191919",
             height: 100,
@@ -8,7 +15,7 @@
 
             toolTip: {
                 contentFormatter: function (e) {
-                    var date = new Date(e.entries[0].dataPoint.x * 1000);
+                    var date = new Date(e.entries[0].dataPoint.x);
                     return date.toLocaleTimeString('en-US', { timeZone: 'America/New_York', hour12: true }) + " - " + e.entries[0].dataPoint.y + " players";
                 }
             },
diff --git a/Plugins/SimpleStats/Plugin.cs b/Plugins/SimpleStats/Plugin.cs
index e4159dd5..e766bc7c 100644
--- a/Plugins/SimpleStats/Plugin.cs
+++ b/Plugins/SimpleStats/Plugin.cs
@@ -154,7 +154,7 @@ namespace StatsPlugin
 
         public static List<StatTracking> statLists;
 
-        public struct StatTracking
+        public class StatTracking
         {
             public StatsDB playerStats;
             public DateTime[] lastKill, connectionTime;
@@ -222,8 +222,11 @@ namespace StatsPlugin
                 if (ManagerInstance == null)
                 {
                     ManagerInstance = S.Manager;
-                    WebService.PageList.Add(new StatsPage());
-                    WebService.PageList.Add(new KillStatsJSON());
+                    lock (WebService.PageList)
+                    {
+                        WebService.PageList.Add(new StatsPage());
+                        WebService.PageList.Add(new KillStatsJSON());
+                    }
                 }
 
                 statLists.Add(new StatTracking(S.GetPort()));
@@ -292,7 +295,8 @@ namespace StatsPlugin
                 if (E.Origin == E.Target || E.Origin == null)
                     return;
 
-                string[] killInfo = E.Data.Split(';');
+                string[] killInfo = (E.Data != null) ? E.Data.Split(';') : new string[0];
+
                 if (killInfo.Length >= 9 && killInfo[0].Contains("ScriptKill"))
                 {
                     var killEvent = new KillInfo(E.Origin.DatabaseID, E.Target.DatabaseID, S.CurrentMap.Name, killInfo[7], killInfo[8], killInfo[5], killInfo[6], killInfo[3], killInfo[4])
@@ -305,7 +309,7 @@ namespace StatsPlugin
                         ServerStats[S.GetPort()].GetKillQueue().Dequeue();
                     ServerStats[S.GetPort()].GetKillQueue().Enqueue(killEvent);
                     //S.Logger.WriteInfo($"{E.Origin.Name} killed {E.Target.Name} with a {killEvent.Weapon} from a distance of {Vector3.Distance(killEvent.KillOrigin, killEvent.DeathOrigin)} with {killEvent.Damage} damage, at {killEvent.HitLoc}");
-                    var cs= statLists.Find(x => x.Port == S.GetPort());
+                    var cs = statLists.Find(x => x.Port == S.GetPort());
                     cs.playerStats.AddKill(killEvent);
                     return;
                 }
@@ -415,6 +419,8 @@ namespace StatsPlugin
         {
             StatTracking selectedPlayers = statLists.Find(x => x.Port == serverPort);
 
+            if (selectedPlayers == null)
+                return;
             selectedPlayers.Kills[cID] = 0;
             selectedPlayers.connectionTime[cID] = DateTime.Now;
             selectedPlayers.inactiveMinutes[cID] = 0;
@@ -640,7 +646,7 @@ namespace StatsPlugin
         }
     }
 
-    public struct PlayerStats
+    public class PlayerStats
     {
         public PlayerStats(int K, int D, double DR, double S, double sc, int P)
         {
diff --git a/README.md b/README.md
index 679cf820..94dd12d2 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ _______
 
 ### Setup
 IW4MAdmin requires minimal configuration to run. There is only one prerequisite.  
-2. [.NET Framework 4.5](https://www.microsoft.com/en-us/download/details.aspx?id=30653) *or better*  
+1. [.NET Framework 4.5](https://www.microsoft.com/en-us/download/details.aspx?id=30653) *or newer*  
 
 Extract `IW4MAdmin.zip`  
 Run `IW4MAdmin.exe`
diff --git a/SharedLibrary/Helpers/PlayerHistory.cs b/SharedLibrary/Helpers/PlayerHistory.cs
index a631efdf..a69cf4ca 100644
--- a/SharedLibrary/Helpers/PlayerHistory.cs
+++ b/SharedLibrary/Helpers/PlayerHistory.cs
@@ -7,7 +7,7 @@ namespace SharedLibrary.Helpers
         public PlayerHistory(int cNum)
         {
             DateTime t = DateTime.UtcNow;
-            When = new DateTime(t.Year, t.Month, t.Day, t.Hour, 5 * (int)Math.Round(t.Minute / 5.0), 0);
+            When = new DateTime(t.Year, t.Month, t.Day, t.Hour, Math.Min(59, 15 * (int)Math.Round(t.Minute / 15.0)), 0);
             PlayerCount = cNum;
         }
 
@@ -25,11 +25,11 @@ namespace SharedLibrary.Helpers
         /// <summary>
         /// Used by CanvasJS as a point on the x axis
         /// </summary>
-        public double x
+        public string x
         {
             get
             {
-                return (When - DateTime.MinValue).TotalSeconds;
+                return When.ToString("yyyy-MM-ddTHH:mm:ssZ");
             }
         }
 
diff --git a/SharedLibrary/Server.cs b/SharedLibrary/Server.cs
index 68fd9ab7..583d9dcf 100644
--- a/SharedLibrary/Server.cs
+++ b/SharedLibrary/Server.cs
@@ -31,7 +31,6 @@ namespace SharedLibrary
             Port = config.Port;
             Manager = mgr;
             Logger = Manager.GetLogger();
-            ClientNum = 0;
             Config = config;
 
             Players = new List<Player>(new Player[18]);
@@ -117,7 +116,7 @@ namespace SharedLibrary
         {
             return null;
         }
-        
+
         /// <summary>
         /// Legacy method for the alias command
         /// </summary>
@@ -164,7 +163,7 @@ namespace SharedLibrary
         {
 #if DEBUG
             //if (!Target.lastEvent.Remote)
-             //  return;
+            //  return;
 #endif
             string tellCommand = (GameName == Game.IW4) ? "tellraw" : "tell";
 
@@ -270,7 +269,7 @@ namespace SharedLibrary
                         Maps.Add(map);
                     }
                 }
-            }     
+            }
             else
                 Logger.WriteInfo("Maps configuration appears to be empty - skipping...");
         }
@@ -300,7 +299,7 @@ namespace SharedLibrary
                 MessageTime = 60;
             else
                 MessageTime = mTime;
-            
+
             foreach (String l in lines)
             {
                 if (lines[0] != l && l.Length > 1)
@@ -310,7 +309,7 @@ namespace SharedLibrary
             messageCFG.Close();
 
             //if (Program.Version != Program.latestVersion && Program.latestVersion != 0)
-              // messages.Add("^5IW4M Admin ^7is outdated. Please ^5update ^7to version " + Program.latestVersion);
+            // messages.Add("^5IW4M Admin ^7is outdated. Please ^5update ^7to version " + Program.latestVersion);
         }
 
         /// <summary>
@@ -349,7 +348,7 @@ namespace SharedLibrary
         public ServerConfiguration Config { get; private set; }
         public List<Map> Maps { get; protected set; }
         public List<string> Rules { get; protected set; }
-        public List<Report> Reports { get; set;  }
+        public List<Report> Reports { get; set; }
         public List<Chat> ChatHistory { get; protected set; }
         public Queue<Helpers.PlayerHistory> PlayerHistory { get; private set; }
         public Game GameName { get; protected set; }
@@ -359,7 +358,13 @@ namespace SharedLibrary
         public string Website { get; protected set; }
         public string Gametype { get; protected set; }
         public Map CurrentMap { get; protected set; }
-        public int ClientNum { get; protected set; }
+        public int ClientNum
+        {
+            get
+            {
+                return Players.Where(p => p != null).Count();
+            }
+        }
         public int MaxClients { get; protected set; }
         public List<Player> Players { get; protected set; }
         public string Password { get; private set; }