diff --git a/plugins/scripts/scripts/skybattle.sk b/plugins/scripts/scripts/skybattle.sk
index bb8ff1a..6a6afed 100644
--- a/plugins/scripts/scripts/skybattle.sk
+++ b/plugins/scripts/scripts/skybattle.sk
@@ -55,10 +55,10 @@ command /minigame_skybattle_start:
         clear {skybattle::gaming_players::*}
         loop 10 times:
             loop entries of team "IDList%loop-number%":
-                add loop-value to {skybattle::gaming_players::*}
-                add loop-value to {skybattle::IDList%loop-number-1%::players::*}
+                add loop-value-2 to {skybattle::gaming_players::*}
+                add loop-value-2 to {skybattle::IDList%loop-number-1%::players::*}
 
-                set {skybattle::players::%loop-value's uuid%::team} to "IDList%loop-number-1%"
+                set {skybattle::players::%loop-value-2's uuid%::team} to "IDList%loop-number-1%"
         broadcast "Načítám minihru Oblačný Souboj"
         send title "§2Oblačný Souboj" to all players
         set {skybattle::game_status} to "init"
@@ -95,7 +95,7 @@ command /minigame_skybattle_start:
                     clear {skybattle::IDList%loop-number%::alive_players::*}
                     set {skybattle::IDList%loop-number%::alive_number} to 4
                     loop entries of team "IDList%loop-number%":
-                        add loop-value to {skybattle::IDList%loop-number-1%::alive_players::*}
+                        add loop-value-2 to {skybattle::IDList%loop-number-1%::alive_players::*}
 
                 set {skybattle::current_arena} to {skybattle::current_arena} + 1
                 set {skybattle::teams_alive_num} to 10
@@ -111,6 +111,7 @@ command /minigame_skybattle_start:
                     set {skybattle::stop_players} to "True"
 
                 if {skybattle::current_arena} is 4:
+                    set {skybattle::game_status} to "end"
 
                 else: # starting loop - stuff like countdowns etc...
                     send title "§c§l%{skybattle::current_arena}%. KOLO" to all players
@@ -202,13 +203,13 @@ command /skybattle_setspectatorspawn <number>:
         if arg-1 is 1:
             set {skybattle::arena1::spectatorlocation} to player's location
             send "Spectator pro arenu 1 nastaven"
-        if arg-1 is 2:
+        else if arg-1 is 2:
             set {skybattle::arena2::spectatorlocation} to player's location
             send "Spectator pro arenu 2 nastaven"
-        if arg-1 is 3:
+        else if arg-1 is 3:
             set {skybattle::arena3::spectatorlocation} to player's location
             send "Spectator pro arenu 3 nastaven"
-        if arg-1 is not 1 and arg-1 is not 2 and arg-1 is not 3:
+        else:
             send "You need to specify arena 1-3"
 
 command /skybattle_setspawner <number> <number>:
@@ -220,16 +221,14 @@ command /skybattle_setspawner <number> <number>:
             if arg-1 is 1:
                 set {skybattle::arena1::spawn_location::%arg-2%} to player's location
                 send "Set spawn location %arg-1%" to player
-            if arg-1 is 2:
+            else if arg-1 is 2:
                 set {skybattle::arena2::spawn_location::%arg-2%} to player's location
                 send "Set spawn location %arg-1%" to player
-            if arg-1 is 3:
+            else if arg-1 is 3:
                 set {skybattle::arena3::spawn_location::%arg-2%} to player's location
                 send "Set spawn location %arg-2% for Sky Battle" to player
-            if arg-1 is not 1 and arg-1 is not 2 and arg-1 is not 3:
-                send "You must specify arena 1-3"
-            if arg-2 < 0:
-                send "You must specify a number from 1-10"
+            else:
+                send "You must specify a spawner from 1-10 and area from 1-3"
         if arg-2 > 10:
             send "You can only set 10 spawn positions"