diff --git a/Plugin NPC/plugin.properties b/Plugin NPC/src/main/resources/plugin.properties
similarity index 100%
rename from Plugin NPC/plugin.properties
rename to Plugin NPC/src/main/resources/plugin.properties
diff --git a/Server/src/main/java/net/simon987/server/webserver/KeypressHandler.java b/Server/src/main/java/net/simon987/server/webserver/KeypressHandler.java
index 89d247a..4b99783 100644
--- a/Server/src/main/java/net/simon987/server/webserver/KeypressHandler.java
+++ b/Server/src/main/java/net/simon987/server/webserver/KeypressHandler.java
@@ -3,6 +3,8 @@ package net.simon987.server.webserver;
 import net.simon987.server.logging.LogManager;
 import org.json.simple.JSONObject;
 
+import java.util.ArrayList;
+
 
 public class KeypressHandler implements MessageHandler {
 
@@ -16,7 +18,11 @@ public class KeypressHandler implements MessageHandler {
 
                 int key = (int) (long) json.get("k");
 
-                user.getUser().getControlledUnit().getKeyboardBuffer().add(key);
+                ArrayList<Integer> buffer = user.getUser().getControlledUnit().getKeyboardBuffer();
+
+                if (buffer.size() < 16) {
+                    buffer.add(key);
+                }
             }
         }
     }
diff --git a/Server/src/main/java/net/simon987/server/webserver/SocketServer.java b/Server/src/main/java/net/simon987/server/webserver/SocketServer.java
index 89dcb9e..3a1c713 100644
--- a/Server/src/main/java/net/simon987/server/webserver/SocketServer.java
+++ b/Server/src/main/java/net/simon987/server/webserver/SocketServer.java
@@ -57,8 +57,7 @@ public class SocketServer extends WebSocketServer {
             }
         }
 
-        setConnectionLostTimeout(30);
-
+        setConnectionLostTimeout(120);
 
         database = new SocketServerDatabase(config);