diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index 4cb34216..933c01f2 100644
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -165,6 +165,7 @@ namespace TShockAPI
             add(null, AuthToken, "auth");
             add(null, ThirdPerson, "me");
             add(null, PartyChat, "p");
+            add(null, Motd, "motd");
             add(null, Rules, "rules");
             add(Permissions.logs, DisplayLogs, "displaylogs");
             ChatCommands.Add(new Command(PasswordUser, "password") { DoLog = false });
@@ -2154,6 +2155,11 @@ namespace TShockAPI
                 args.Player.SendMessage("You are not in a party!", 255, 240, 20);
             }
         }
+        
+        private static void Motd(CommandArgs args)
+        {
+            Tools.ShowFileToUser(args.Player, "motd.txt");
+        }
 
         private static void Rules(CommandArgs args)
         {
diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index d17247e8..62d0fcb1 100644
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -349,6 +349,13 @@ namespace TShockAPI
                     args.Player.SendTileSquare(x, y);
                     return true;
                 }
+                if (type == 1 && tiletype == 21 && Tools.MaxChests())
+                {
+                    args.Player.SendMessage("Reached world's max chest limit, unable to place more!", Color.Red);
+                    Log.Info("Reached world's chest limit, unable to place more.");
+                    args.Player.SendTileSquare(x, y);
+                    return true;
+                }
             }
             if (!args.Player.Group.HasPermission(Permissions.editspawn) && !TShock.Regions.CanBuild(x, y, args.Player) && TShock.Regions.InArea(x, y))
             {
diff --git a/UnitTests/RegionManagerTest.cs b/UnitTests/RegionManagerTest.cs
index fc3ab948..8fd1ea08 100644
--- a/UnitTests/RegionManagerTest.cs
+++ b/UnitTests/RegionManagerTest.cs
@@ -92,8 +92,6 @@ namespace UnitTests
             /**
              * For now, this test is useless.  Need to implement user groups so we can alter Canbuild permission.
              */
-            TSPlayer t = new TSPlayer(0);
-            Assert.IsFalse( manager.CanBuild( 100,100,t) );
         }
 
         [TestMethod]