diff --git a/src/main/java/com/cse3310/App.java b/src/main/java/com/cse3310/App.java
index fd21377..232b677 100644
--- a/src/main/java/com/cse3310/App.java
+++ b/src/main/java/com/cse3310/App.java
@@ -3,10 +3,7 @@
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
-import java.nio.ByteBuffer;
 import java.util.Collections;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -411,8 +408,10 @@ public void forceDisconnect(int GameId) {
             }
         }
 
-        for (User u : disconnectUsers) {
-            ActiveUsers.remove(ActiveUsers.indexOf(u));
+        if (disconnectUsers.isEmpty() != true) {
+            for (User u : disconnectUsers) {
+                ActiveUsers.remove(ActiveUsers.indexOf(u));
+            }
         }
     }
 
@@ -530,6 +529,5 @@ public static void main(String[] args) {
         } catch (NullPointerException e) { // Checks for environment variable
             e.printStackTrace();
         }
-
     }
 }
diff --git a/src/main/java/com/cse3310/Game.java b/src/main/java/com/cse3310/Game.java
index 6c10422..f104c56 100644
--- a/src/main/java/com/cse3310/Game.java
+++ b/src/main/java/com/cse3310/Game.java
@@ -2,8 +2,6 @@
 
 import java.util.ArrayList;
 import java.util.Random;
-import java.util.Collections;
-import java.time.Clock;
 
 public class Game {
 
diff --git a/target/classes/com/cse3310/App$LetterTimer.class b/target/classes/com/cse3310/App$LetterTimer.class
index f712375..57ad105 100644
Binary files a/target/classes/com/cse3310/App$LetterTimer.class and b/target/classes/com/cse3310/App$LetterTimer.class differ
diff --git a/target/classes/com/cse3310/App.class b/target/classes/com/cse3310/App.class
index 8db69fc..8fb1bce 100644
Binary files a/target/classes/com/cse3310/App.class and b/target/classes/com/cse3310/App.class differ
diff --git a/target/classes/com/cse3310/Game.class b/target/classes/com/cse3310/Game.class
index 11bb1a6..8b49e5c 100644
Binary files a/target/classes/com/cse3310/Game.class and b/target/classes/com/cse3310/Game.class differ
diff --git a/target/cse3310-wordsearch.jar b/target/cse3310-wordsearch.jar
index b6a60c8..51eab02 100644
Binary files a/target/cse3310-wordsearch.jar and b/target/cse3310-wordsearch.jar differ
diff --git a/target/surefire-reports/TEST-com.cse3310.AppTest.xml b/target/surefire-reports/TEST-com.cse3310.AppTest.xml
index f473f6f..840c54f 100644
--- a/target/surefire-reports/TEST-com.cse3310.AppTest.xml
+++ b/target/surefire-reports/TEST-com.cse3310.AppTest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" name="com.cse3310.AppTest" time="0.503" tests="5" errors="0" skipped="0" failures="0">
+<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" name="com.cse3310.AppTest" time="0.505" tests="5" errors="0" skipped="0" failures="0">
   <properties>
     <property name="awt.toolkit" value="sun.awt.X11.XToolkit"/>
     <property name="exec.mainClass" value="com.cse3310.App"/>
@@ -15,7 +15,7 @@
     <property name="os.name" value="Linux"/>
     <property name="sun.java.launcher" value="SUN_STANDARD"/>
     <property name="sun.boot.library.path" value="/usr/lib/jvm/java-11-openjdk-amd64/lib"/>
-    <property name="sun.java.command" value="/mnt/c/Users/verid/OneDrive/Documents/School/Classes/CSE 3310 Software Engineering/cse3310_sp24_group_26/target/surefire/surefirebooter1265698555585075939.jar /mnt/c/Users/verid/OneDrive/Documents/School/Classes/CSE 3310 Software Engineering/cse3310_sp24_group_26/target/surefire 2024-04-30T17-05-53_897-jvmRun1 surefire12147627652851137436tmp surefire_011632373026406175695tmp"/>
+    <property name="sun.java.command" value="/mnt/c/Users/verid/OneDrive/Documents/School/Classes/CSE 3310 Software Engineering/cse3310_sp24_group_26/target/surefire/surefirebooter4882662595909840937.jar /mnt/c/Users/verid/OneDrive/Documents/School/Classes/CSE 3310 Software Engineering/cse3310_sp24_group_26/target/surefire 2024-04-30T17-11-27_012-jvmRun1 surefire8804950575522584090tmp surefire_017833531690563026993tmp"/>
     <property name="jdk.debug" value="release"/>
     <property name="surefire.test.class.path" value="/mnt/c/Users/verid/OneDrive/Documents/School/Classes/CSE 3310 Software Engineering/cse3310_sp24_group_26/target/test-classes:/mnt/c/Users/verid/OneDrive/Documents/School/Classes/CSE 3310 Software Engineering/cse3310_sp24_group_26/target/classes:/home/veridion/.m2/repository/junit/junit/4.13.1/junit-4.13.1.jar:/home/veridion/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:/home/veridion/.m2/repository/com/google/code/gson/gson/2.9.1/gson-2.9.1.jar:/home/veridion/.m2/repository/net/freeutils/jlhttp/2.6/jlhttp-2.6.jar:/home/veridion/.m2/repository/org/java-websocket/Java-WebSocket/1.5.4/Java-WebSocket-1.5.4.jar:/home/veridion/.m2/repository/org/slf4j/slf4j-api/2.0.0-alpha0/slf4j-api-2.0.0-alpha0.jar:"/>
     <property name="sun.cpu.endian" value="little"/>
@@ -31,7 +31,7 @@
     <property name="java.specification.name" value="Java Platform API Specification"/>
     <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
     <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
-    <property name="surefire.real.class.path" value="/mnt/c/Users/verid/OneDrive/Documents/School/Classes/CSE 3310 Software Engineering/cse3310_sp24_group_26/target/surefire/surefirebooter1265698555585075939.jar"/>
+    <property name="surefire.real.class.path" value="/mnt/c/Users/verid/OneDrive/Documents/School/Classes/CSE 3310 Software Engineering/cse3310_sp24_group_26/target/surefire/surefirebooter4882662595909840937.jar"/>
     <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
     <property name="java.runtime.version" value="11.0.21+9-post-Ubuntu-0ubuntu122.04"/>
     <property name="user.name" value="veridion"/>
@@ -57,9 +57,9 @@
     <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
     <property name="java.class.version" value="55.0"/>
   </properties>
-  <testcase name="testGenerateGrid" classname="com.cse3310.AppTest" time="0.293"/>
+  <testcase name="testGenerateGrid" classname="com.cse3310.AppTest" time="0.283"/>
   <testcase name="testApp" classname="com.cse3310.AppTest" time="0"/>
   <testcase name="testGame" classname="com.cse3310.AppTest" time="0"/>
-  <testcase name="testGetCompletedButtons" classname="com.cse3310.AppTest" time="0.09"/>
-  <testcase name="testEndIdCase" classname="com.cse3310.AppTest" time="0.084"/>
+  <testcase name="testGetCompletedButtons" classname="com.cse3310.AppTest" time="0.091"/>
+  <testcase name="testEndIdCase" classname="com.cse3310.AppTest" time="0.096"/>
 </testsuite>
\ No newline at end of file
diff --git a/target/surefire-reports/TEST-com.cse3310.UserTest.xml b/target/surefire-reports/TEST-com.cse3310.UserTest.xml
index adc4694..663524a 100644
--- a/target/surefire-reports/TEST-com.cse3310.UserTest.xml
+++ b/target/surefire-reports/TEST-com.cse3310.UserTest.xml
@@ -15,7 +15,7 @@
     <property name="os.name" value="Linux"/>
     <property name="sun.java.launcher" value="SUN_STANDARD"/>
     <property name="sun.boot.library.path" value="/usr/lib/jvm/java-11-openjdk-amd64/lib"/>
-    <property name="sun.java.command" value="/mnt/c/Users/verid/OneDrive/Documents/School/Classes/CSE 3310 Software Engineering/cse3310_sp24_group_26/target/surefire/surefirebooter1265698555585075939.jar /mnt/c/Users/verid/OneDrive/Documents/School/Classes/CSE 3310 Software Engineering/cse3310_sp24_group_26/target/surefire 2024-04-30T17-05-53_897-jvmRun1 surefire12147627652851137436tmp surefire_011632373026406175695tmp"/>
+    <property name="sun.java.command" value="/mnt/c/Users/verid/OneDrive/Documents/School/Classes/CSE 3310 Software Engineering/cse3310_sp24_group_26/target/surefire/surefirebooter4882662595909840937.jar /mnt/c/Users/verid/OneDrive/Documents/School/Classes/CSE 3310 Software Engineering/cse3310_sp24_group_26/target/surefire 2024-04-30T17-11-27_012-jvmRun1 surefire8804950575522584090tmp surefire_017833531690563026993tmp"/>
     <property name="jdk.debug" value="release"/>
     <property name="surefire.test.class.path" value="/mnt/c/Users/verid/OneDrive/Documents/School/Classes/CSE 3310 Software Engineering/cse3310_sp24_group_26/target/test-classes:/mnt/c/Users/verid/OneDrive/Documents/School/Classes/CSE 3310 Software Engineering/cse3310_sp24_group_26/target/classes:/home/veridion/.m2/repository/junit/junit/4.13.1/junit-4.13.1.jar:/home/veridion/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:/home/veridion/.m2/repository/com/google/code/gson/gson/2.9.1/gson-2.9.1.jar:/home/veridion/.m2/repository/net/freeutils/jlhttp/2.6/jlhttp-2.6.jar:/home/veridion/.m2/repository/org/java-websocket/Java-WebSocket/1.5.4/Java-WebSocket-1.5.4.jar:/home/veridion/.m2/repository/org/slf4j/slf4j-api/2.0.0-alpha0/slf4j-api-2.0.0-alpha0.jar:"/>
     <property name="sun.cpu.endian" value="little"/>
@@ -31,7 +31,7 @@
     <property name="java.specification.name" value="Java Platform API Specification"/>
     <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
     <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
-    <property name="surefire.real.class.path" value="/mnt/c/Users/verid/OneDrive/Documents/School/Classes/CSE 3310 Software Engineering/cse3310_sp24_group_26/target/surefire/surefirebooter1265698555585075939.jar"/>
+    <property name="surefire.real.class.path" value="/mnt/c/Users/verid/OneDrive/Documents/School/Classes/CSE 3310 Software Engineering/cse3310_sp24_group_26/target/surefire/surefirebooter4882662595909840937.jar"/>
     <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
     <property name="java.runtime.version" value="11.0.21+9-post-Ubuntu-0ubuntu122.04"/>
     <property name="user.name" value="veridion"/>
diff --git a/target/surefire-reports/com.cse3310.AppTest.txt b/target/surefire-reports/com.cse3310.AppTest.txt
index f4bef0a..0e13a8a 100644
--- a/target/surefire-reports/com.cse3310.AppTest.txt
+++ b/target/surefire-reports/com.cse3310.AppTest.txt
@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: com.cse3310.AppTest
 -------------------------------------------------------------------------------
-Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.503 s - in com.cse3310.AppTest
+Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.505 s - in com.cse3310.AppTest