diff --git a/MobArena.jar b/MobArena.jar
index 96e3ffd..6eebe73 100644
Binary files a/MobArena.jar and b/MobArena.jar differ
diff --git a/src/com/garbagemule/MobArena/Arena.java b/src/com/garbagemule/MobArena/Arena.java
index 67058a6..d1b615c 100644
--- a/src/com/garbagemule/MobArena/Arena.java
+++ b/src/com/garbagemule/MobArena/Arena.java
@@ -59,7 +59,7 @@ public class Arena
     protected List<ItemStack> entryFee;
     
     // Arena sets/maps
-    protected Set<Player>         arenaPlayers, lobbyPlayers, readyPlayers, specPlayers, waitPlayers, hasPaid, rewardedPlayers, notifyPlayers, randoms;
+    protected Set<Player>         arenaPlayers, lobbyPlayers, readyPlayers, specPlayers, hasPaid, rewardedPlayers, notifyPlayers, randoms;
     protected Set<LivingEntity>   monsters;
     protected Set<Block>          blocks;
     protected Set<Wolf>           pets;
@@ -103,7 +103,6 @@ public class Arena
         notifyPlayers   = new HashSet<Player>();
         readyPlayers    = new HashSet<Player>();
         specPlayers     = new HashSet<Player>();
-        waitPlayers     = new HashSet<Player>();
         rewardedPlayers = new HashSet<Player>();
         hasPaid         = new HashSet<Player>();
         monsters        = new HashSet<LivingEntity>();
diff --git a/src/com/garbagemule/MobArena/MACommands.java b/src/com/garbagemule/MobArena/MACommands.java
index 57a2d35..8163264 100644
--- a/src/com/garbagemule/MobArena/MACommands.java
+++ b/src/com/garbagemule/MobArena/MACommands.java
@@ -152,7 +152,7 @@ public class MACommands implements CommandExecutor
                 error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_ARENA_NOT_ENABLED));
             else if (!arena.setup || arena.edit)
                 error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_ARENA_NOT_SETUP));
-            else if (arena.running && arena.waitPlayers.add(p))
+            else if (arena.running && arena.notifyPlayers.add(p))
                 error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_ARENA_IS_RUNNING));
             else if (arena.arenaPlayers.contains(p))
                 error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_ALREADY_PLAYING));
diff --git a/src/com/garbagemule/MobArena/MAListener.java b/src/com/garbagemule/MobArena/MAListener.java
index 72b8e15..4dc3370 100644
--- a/src/com/garbagemule/MobArena/MAListener.java
+++ b/src/com/garbagemule/MobArena/MAListener.java
@@ -80,7 +80,6 @@ public class MAListener implements ArenaListener
             return;
         
         Block b = event.getBlock();
-        //if (running && livePlayers.contains(event.getPlayer()))
         if (arena.running && arena.arenaPlayers.contains(event.getPlayer()))
         {
             arena.blocks.add(b);
@@ -227,7 +226,6 @@ public class MAListener implements ArenaListener
             }
             
             if (event.getReason() == TargetReason.CLOSEST_PLAYER)
-                //if (!livePlayers.contains(event.getTarget()))
                 if (!arena.arenaPlayers.contains(event.getTarget()))
                     event.setCancelled(true);
             return;
@@ -238,7 +236,6 @@ public class MAListener implements ArenaListener
 	{
         if (!arena.running) return;
         
-        //if (!(event.getEntity() instanceof Player) || !livePlayers.contains((Player)event.getEntity()))
         if (!(event.getEntity() instanceof Player) || !arena.arenaPlayers.contains((Player)event.getEntity()))
             return;
         
@@ -252,7 +249,6 @@ public class MAListener implements ArenaListener
         {
             Player p = (Player) event.getEntity();
             
-            //if (!livePlayers.contains(p))
             if (!arena.arenaPlayers.contains(p))
                 return;
             
@@ -310,7 +306,6 @@ public class MAListener implements ArenaListener
         // Damagee & Damager - Player - cancel if pvp disabled
         if (damagee instanceof Player && damager instanceof Player)
         {
-            //if (livePlayers.contains(damagee) && !pvp)
             if (arena.arenaPlayers.contains(damagee) && !arena.pvp)
                 event.setCancelled(true);
             
@@ -329,7 +324,6 @@ public class MAListener implements ArenaListener
         // Creeper detonations
         if (arena.inRegion(damagee.getLocation()))
         {
-            //if (!detDamage || !(damagee instanceof Player) || !livePlayers.contains((Player) damagee))
             if (!arena.detDamage || !(damagee instanceof Player) || !arena.arenaPlayers.contains((Player) damagee))
                 return;
             
@@ -345,7 +339,6 @@ public class MAListener implements ArenaListener
         if (arena.running && arena.shareInArena) return;
         
         Player p = event.getPlayer();
-        //if (!livePlayers.contains(p))
         if (!arena.arenaPlayers.contains(p) && !arena.lobbyPlayers.contains(p))
             return;
         
diff --git a/src/com/garbagemule/MobArena/MAUtils.java b/src/com/garbagemule/MobArena/MAUtils.java
index bac5d45..73b9000 100644
--- a/src/com/garbagemule/MobArena/MAUtils.java
+++ b/src/com/garbagemule/MobArena/MAUtils.java
@@ -901,7 +901,7 @@ public class MAUtils
      * Sends a message to all players in and around the arena.
      */
     public static void tellAll(Arena arena, String msg) { tellAll(arena, msg, false); }
-    public static void tellAll(Arena arena, String msg, boolean waitPlayers)
+    public static void tellAll(Arena arena, String msg, boolean notifyPlayers)
     {
         Set<Player> tmp = new HashSet<Player>();
         tmp.addAll(arena.arenaPlayers);
@@ -909,7 +909,7 @@ public class MAUtils
         tmp.addAll(arena.readyPlayers);
         tmp.addAll(arena.notifyPlayers);
         tmp.addAll(arena.specPlayers);
-        if (waitPlayers) tmp.addAll(arena.waitPlayers);
+        if (notifyPlayers) tmp.addAll(arena.notifyPlayers);
         for (Player p : tmp)
             tellPlayer(p, msg);
     }