Index: binary-improvements/7dtd-server-fixes/src/CustomCommands/ShowInventory.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/CustomCommands/ShowInventory.cs	(revision 144)
+++ binary-improvements/7dtd-server-fixes/src/CustomCommands/ShowInventory.cs	(revision 145)
@@ -29,5 +29,5 @@
 				}
 
-				string steamid = PersistentContainer.Instance.Players.GetSteamID(_params[0], true);
+				string steamid = PersistentContainer.Instance.Players.GetSteamID (_params [0], true);
 				if (steamid == null) {
 					m_Console.SendResult ("Playername or entity/steamid id not found or no inventory saved (first saved after a player has been online for 30s).");
@@ -35,22 +35,17 @@
 				}
 
-				Log.Out ( "SteamID: " + steamid);
-
-				Player p = PersistentContainer.Instance.Players[steamid];
-
-				Log.Out ("Player");
-
+				Player p = PersistentContainer.Instance.Players [steamid];
 				PersistentData.Inventory inv = p.Inventory;
-
-				Log.Out ("Inv");
 
 				m_Console.SendResult ("Belt of player:");
 				for (int i = 0; i < inv.belt.Count; i++) {
-					m_Console.SendResult (string.Format ("    Slot {0}: {1:000} * {2}", i, inv.belt[i].count, inv.belt[i].itemName));
+					if (inv.belt [i] != null)
+						m_Console.SendResult (string.Format ("    Slot {0}: {1:000} * {2}", i, inv.belt [i].count, inv.belt [i].itemName));
 				}
 				m_Console.SendResult (string.Empty);
 				m_Console.SendResult ("Bagpack of player:");
 				for (int i = 0; i < inv.bag.Count; i++) {
-					m_Console.SendResult (string.Format ("    Slot {0}: {1:000} * {2}", i, inv.bag[i].count, inv.bag[i].itemName));
+					if (inv.bag [i] != null)
+						m_Console.SendResult (string.Format ("    Slot {0}: {1:000} * {2}", i, inv.bag [i].count, inv.bag [i].itemName));
 				}
 				m_Console.SendResult (string.Empty);
Index: binary-improvements/7dtd-server-fixes/src/PersistentData/InvItem.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/PersistentData/InvItem.cs	(revision 144)
+++ binary-improvements/7dtd-server-fixes/src/PersistentData/InvItem.cs	(revision 145)
@@ -12,4 +12,6 @@
 		public InvItem (string itemName, int count)
 		{
+			this.itemName = itemName;
+			this.count = count;
 		}
 	}
Index: binary-improvements/7dtd-server-fixes/src/PersistentData/Inventory.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/PersistentData/Inventory.cs	(revision 144)
+++ binary-improvements/7dtd-server-fixes/src/PersistentData/Inventory.cs	(revision 145)
@@ -23,5 +23,4 @@
 			ProcessInv (bag, pdf.bag);
 			ProcessInv (belt, pdf.inventory);
-			Log.Out ("Now: belt: " + belt.Count + " - bag: " + bag.Count);
 		}
 
Index: binary-improvements/7dtd-server-fixes/src/PersistentData/Player.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/PersistentData/Player.cs	(revision 144)
+++ binary-improvements/7dtd-server-fixes/src/PersistentData/Player.cs	(revision 145)
@@ -24,15 +24,12 @@
 		public int EntityID {
 			get { return entityId; }
-			set { entityId = value; }
 		}
 
 		public string Name {
 			get { return name; }
-			set { name = value; }
 		}
 
 		public string IP {
 			get { return ip; }
-			set { ip = value; }
 		}
 
Index: binary-improvements/7dtd-server-fixes/src/PersistentData/Players.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/PersistentData/Players.cs	(revision 144)
+++ binary-improvements/7dtd-server-fixes/src/PersistentData/Players.cs	(revision 145)
@@ -47,14 +47,14 @@
 						}
 					}
+				}
 
-					_nameOrId = _nameOrId.ToLower ();
-					foreach (KeyValuePair<string, Player> kvp in players) {
-						string name = kvp.Value.Name.ToLower ();
-						if (_ignoreColorCodes) {
-							name = Regex.Replace (name, "\\[[0-9a-fA-F]{6}\\]", "");
-						}
-						if (kvp.Value.IsOnline && kvp.Value.Name.Equals (name)) {
-							return kvp.Key;
-						}
+				_nameOrId = _nameOrId.ToLower ();
+				foreach (KeyValuePair<string, Player> kvp in players) {
+					string name = kvp.Value.Name.ToLower ();
+					if (_ignoreColorCodes) {
+						name = Regex.Replace (name, "\\[[0-9a-fA-F]{6}\\]", "");
+					}
+					if (kvp.Value.IsOnline && name.Equals (_nameOrId)) {
+						return kvp.Key;
 					}
 				}
Index: binary-improvements/7dtd-server-fixes/src/StateManager.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/StateManager.cs	(revision 144)
+++ binary-improvements/7dtd-server-fixes/src/StateManager.cs	(revision 145)
@@ -18,4 +18,5 @@
 		{
 			try {
+				Log.Out ("Server shutting down!");
 				PersistentData.PersistentContainer.Instance.Save ();
 			} catch (Exception e) {