diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5711bdd..30f9b89 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -23,24 +23,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="998d5e92-ac1f-4423-8aef-5f389ab213de" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/arena/CreateCommand.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/arena/EnableAndDisableCommand.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/arena/GenerateCommand.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/arena/InfoCommand.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/arena/RemoveCommand.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/arena/SetACommand.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/arena/SetBCommand.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/arena/SetBuildMaxCommand.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/arena/SetDeadZoneCommand.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/arena/SetIconCommand.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/arena/SetMaxCommand.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/arena/SetMinCommand.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/arena/SetTeamAMaxCommand.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/arena/SetTeamAMinCommand.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/arena/SetTeamBMaxCommand.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/arena/SetTeamBMinCommand.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/arena/ArenaCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/arena/ArenaCommand.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/BedWars.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/BedWars.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/listeners/game/GameStartListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/listeners/game/GameStartListener.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -77,17 +63,17 @@
     <property name="settings.editor.selected.configurable" value="MTConfigurable" />
   </component>
   <component name="RecentsManager">
-    <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="rip.tilly.bedwars.commands.arena" />
-      <recent name="rip.tilly.bedwars.mongo" />
-      <recent name="rip.tilly.bedwars.utils" />
-    </key>
     <key name="CopyFile.RECENT_KEYS">
       <recent name="C:\Users\logan\Documents\GitHub\BedWars\src\main\java\rip\tilly\bedwars\commands\arena" />
       <recent name="C:\Users\logan\Documents\GitHub\BedWars\src\main\java" />
       <recent name="C:\Users\logan\Documents\GitHub\BedWars\src\main\java\rip\tilly\bedwars\commands" />
       <recent name="C:\Users\Luca\Documents\GitHub\BedWars\src\main\java\rip\tilly\bedwars" />
     </key>
+    <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="rip.tilly.bedwars.commands.arena" />
+      <recent name="rip.tilly.bedwars.mongo" />
+      <recent name="rip.tilly.bedwars.utils" />
+    </key>
   </component>
   <component name="RunManager">
     <configuration name="BedWars build" type="MavenRunConfiguration" factoryName="Maven">
@@ -103,6 +89,7 @@
             <option name="outputLevel" value="INFO" />
             <option name="pluginUpdatePolicy" value="DEFAULT" />
             <option name="printErrorStackTraces" value="false" />
+            <option name="showDialogWithAdvancedSettings" value="false" />
             <option name="threads" />
             <option name="usePluginRegistry" value="false" />
             <option name="userSettingsFile" value="" />
@@ -171,34 +158,4 @@
     </option>
     <option name="oldMeFiltersMigrated" value="true" />
   </component>
-  <component name="WindowStateProjectService">
-    <state x="574" y="115" key="#com.intellij.ide.util.MemberChooser" timestamp="1637507010776">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="574" y="115" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824/1920.0.800.560@0.0.1536.824" timestamp="1637507010776" />
-    <state x="499" y="159" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1637505947686">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="499" y="159" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1536.824/1920.0.800.560@0.0.1536.824" timestamp="1637505947686" />
-    <state width="1493" height="204" key="GridCell.Tab.0.bottom" timestamp="1637589735031">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state width="1493" height="204" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.800.560@0.0.1536.824" timestamp="1637589735031" />
-    <state width="1493" height="204" key="GridCell.Tab.0.center" timestamp="1637589735031">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state width="1493" height="204" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.800.560@0.0.1536.824" timestamp="1637589735031" />
-    <state width="1493" height="204" key="GridCell.Tab.0.left" timestamp="1637589735031">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state width="1493" height="204" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.800.560@0.0.1536.824" timestamp="1637589735031" />
-    <state width="1493" height="204" key="GridCell.Tab.0.right" timestamp="1637589735031">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state width="1493" height="204" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.800.560@0.0.1536.824" timestamp="1637589735031" />
-    <state x="425" y="187" key="run.anything.popup" timestamp="1637587441862">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="425" y="187" key="run.anything.popup/0.0.1536.824/1920.0.800.560@0.0.1536.824" timestamp="1637587441862" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/rip/tilly/bedwars/BedWars.java b/src/main/java/rip/tilly/bedwars/BedWars.java
index 1b48bf8..5f52723 100644
--- a/src/main/java/rip/tilly/bedwars/BedWars.java
+++ b/src/main/java/rip/tilly/bedwars/BedWars.java
@@ -8,6 +8,7 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
+import rip.tilly.bedwars.game.Game;
 import rip.tilly.bedwars.listeners.game.*;
 import rip.tilly.bedwars.listeners.*;
 import rip.tilly.bedwars.managers.CommandManager;
@@ -30,6 +31,8 @@ import rip.tilly.bedwars.utils.config.file.Config;
 
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
 
 /**
  * Created by Lucanius & Trixkz
@@ -94,6 +97,11 @@ public final class BedWars extends JavaPlugin {
     public void onDisable() {
         instance = null;
 
+        for (Map.Entry<UUID, Game> entry : this.gameManager.getGames().entrySet()) {
+            Game game = entry.getValue();
+            this.chunkClearingManager.resetArena(game.getCopiedArena());
+        }
+
         for (World world : Bukkit.getWorlds()) {
             for (Entity entity : world.getEntities()) {
                 if (entity.getType() == EntityType.DROPPED_ITEM) {
diff --git a/src/main/java/rip/tilly/bedwars/listeners/game/GameStartListener.java b/src/main/java/rip/tilly/bedwars/listeners/game/GameStartListener.java
index 7a098a5..3c2869f 100644
--- a/src/main/java/rip/tilly/bedwars/listeners/game/GameStartListener.java
+++ b/src/main/java/rip/tilly/bedwars/listeners/game/GameStartListener.java
@@ -9,6 +9,7 @@ import rip.tilly.bedwars.events.GameStartEvent;
 import rip.tilly.bedwars.game.Game;
 import rip.tilly.bedwars.game.GameType;
 import rip.tilly.bedwars.playerdata.PlayerData;
+import rip.tilly.bedwars.playerdata.PlayerState;
 import rip.tilly.bedwars.runnables.GameRunnable;
 import rip.tilly.bedwars.utils.CC;
 import rip.tilly.bedwars.utils.CustomLocation;
@@ -47,6 +48,8 @@ public class GameStartListener implements Listener {
             playerData.setTeamId(team.getId());
             playerData.setPlayerTeam(team.getPlayerTeam());
 
+            playerData.setPlayerState(PlayerState.PLAYING);
+
             CustomLocation locationA = game.getCopiedArena().getA();
             CustomLocation locationB = game.getCopiedArena().getB();