diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
old mode 100644
new mode 100755
index dc875445..b98da283
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -1542,33 +1542,38 @@ namespace TShockAPI
             for (int x = 0; x < Main.maxTilesX; x++)
             {
                 for (int y = 0; y < Main.maxTilesY; y++)
-                {
-                    switch (Main.tile[x, y].type)
-                    {
-                        case 117:
-                        case 25:
-                            Main.tile[x, y].type = 1;
-                            break;
-                        case 109:
-                        case 23:
-                            Main.tile[x, y].type = 2;
-                            break;
-                        case 32:
-                            Main.tile[x, y].type = 0;
-                            Main.tile[x, y].active = false;
-                            break;
-                        case 24:
-                            Main.tile[x, y].type = 3;
-                            break;
-                        case 112:
-                        case 116:
-                            Main.tile[x, y].type = 53;
-                            break;
-                        case 113:
-                            Main.tile[x, y].type = 38;
-                            break;
-                        default:
-                            continue;
+                {
+                    switch (Main.tile[x, y].type)
+                    {
+                        case 117:
+                        case 25:
+                            Main.tile[x, y].type = 1;
+                            break;
+                        case 109:
+                        case 23:
+                            Main.tile[x, y].type = 2;
+                            break;
+                        case 32:
+                        case 113:
+                        case 110:
+                            Main.tile[x, y].type = 0;
+                            Main.tile[x, y].active = false;
+                            break;
+                        case 24:
+                            Main.tile[x, y].type = 3;
+                            break;
+                        case 112:
+                        case 116:
+                            Main.tile[x, y].type = 53;
+                            break;
+                        case 118:
+                            Main.tile[x, y].type = 38;
+                            break;
+                        case 115:
+                            Main.tile[x, y].type = 52;
+                            break;
+                        default:
+                            continue;
                     }
                 }
             }
@@ -2204,7 +2209,8 @@ namespace TShockAPI
 
 		private static void Reload(CommandArgs args)
 		{
-			FileTools.SetupConfig();
+			FileTools.SetupConfig();
+            TShock.HandleCommandLinePostConfigLoad(Environment.GetCommandLineArgs());
 			TShock.Groups.LoadPermisions();
 			TShock.Regions.ReloadAllRegions();
 			args.Player.SendMessage(
diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
old mode 100644
new mode 100755
index d9de18fb..2c50bf97
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -355,7 +355,7 @@ namespace TShockAPI
 			}
 		}
 
-		private void HandleCommandLinePostConfigLoad(string[] parms)
+		public static void HandleCommandLinePostConfigLoad(string[] parms)
 		{
 			for (int i = 0; i < parms.Length; i++)
 			{
@@ -384,7 +384,12 @@ namespace TShockAPI
 					Config.RestApiPort = Convert.ToInt32(parms[++i]);
 					Console.WriteLine("Startup parameter overrode REST port.");
 
-				}
+				}
+                if ((parms[i].ToLower() == "-maxplayers")||(parms[i].ToLower() == "-players"))
+                {
+                    Config.MaxSlots = Convert.ToInt32(parms[++i]);
+                    Console.WriteLine("Startup parameter overrode maximum player slot configuration value.");
+                }
 			}
 		}