diff --git a/mirricraft-kitpvp.sk b/mirricraft-kitpvp.sk
index 34f4de8..dd54f11 100644
--- a/mirricraft-kitpvp.sk
+++ b/mirricraft-kitpvp.sk
@@ -14,19 +14,19 @@ command /kitpvp [<string>] [<string>]:
 
                 if {kitpvp.%player%.map} is set:
                     if {kitpvp.%player%.map} is "winter":
-                        format slot 11 of player with compass named "&fKartta" with lore "Talvi" to close then run [execute player command "/kitpvp setmap"]
+                        format slot 12 of player with compass named "&fKartta" with lore "Talvi" to close then run [execute player command "/kitpvp setmap"]
                     if {kitpvp.%player%.map} is "nether":
-                        format slot 11 of player with compass named "&fKartta" with lore "Horna" to close then run [execute player command "/kitpvp setmap"]
+                        format slot 12 of player with compass named "&fKartta" with lore "Horna" to close then run [execute player command "/kitpvp setmap"]
                     if {kitpvp.%player%.map} is "farm":
-                        format slot 11 of player with compass named "&fKartta" with lore "Farmi" to close then run [execute player command "/kitpvp setmap"]
+                        format slot 12 of player with compass named "&fKartta" with lore "Farmi" to close then run [execute player command "/kitpvp setmap"]
                 else:
-                    format slot 11 of player with compass named "&fKartta" to close then run [execute player command "/kitpvp setmap"]
+                    format slot 12 of player with compass named "&fKartta" to close then run [execute player command "/kitpvp setmap"]
 
                 if {kitpvp.%player%.kit} is set:
                     if {kitpvp.%player%.kit} is "soldier":
-                        format slot 13 of player with iron chestplate named "&fKitit" with lore "Sotilas" to close then run [execute player command "/kitpvp setkit"]
+                        format slot 14 of player with iron chestplate named "&fKitit" with lore "Sotilas" to close then run [execute player command "/kitpvp setkit"]
                 else:
-                    format slot 13 of player with iron chestplate named "&fKitit" to close then run [execute player command "/kitpvp setkit"]
+                    format slot 14 of player with iron chestplate named "&fKitit" to close then run [execute player command "/kitpvp setkit"]
 
                 if {kitpvp.%player%.map} and {kitpvp.%player%.kit} is set:
                     format slot 35 of player with nether star named "&fAloita" to close then run [execute player command "/kitpvp start"]
@@ -76,6 +76,22 @@ command /kitpvp [<string>] [<string>]:
                             stop
                         stop
                 else if arg-1 is "start":
+                    if {kitpvp.%player%.kit} is set:
+                        if {kitpvp.%player%.kit} is "soldier":
+                            
+                        else:
+                            make player execute command "/kitpvp"
+
+                    if {kitpvp.%player%.map} is set:
+                        if {kitpvp.%player%.map} is "winter":
+                            
+                        if {kitpvp.%player%.map} is "nether":
+                            
+                        if {kitpvp.%player%.map} is "farm":
+                            
+                        else:
+                            make player execute command "/kitpvp"
+
                     stop
                 else:
                     stop
@@ -98,6 +114,7 @@ on respawn:
 on quit:
     if player's world is "minigames":
         remove all items from player
+        clear {kitpvp.%player%}
     stop
 
 on leftclick: