diff --git a/MobArena.jar b/MobArena.jar
index 7bcd069..ba9f033 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 210b8e5..2c87350 100644
--- a/src/com/garbagemule/MobArena/Arena.java
+++ b/src/com/garbagemule/MobArena/Arena.java
@@ -170,8 +170,8 @@ public class Arena
         }
         
         // Start the spawnThread.
-        spawnThread = new MASpawnThread(plugin, this);
-        spawnTaskId = Bukkit.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, spawnThread, waveDelay, waveInterval);
+        spawnThread  = new MASpawnThread(plugin, this);
+        spawnTaskId  = Bukkit.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, spawnThread, waveDelay, (!waveClear) ? waveInterval : 60);
         
         readyPlayers.clear();
         MAUtils.tellAll(this, MAMessages.get(Msg.ARENA_START));
@@ -1219,14 +1219,8 @@ public class Arena
                     // Make sure to remove any dead/removed entities first.
                     List<Entity> tmp = new LinkedList<Entity>(monsters);
                     for (Entity e : tmp)
-                    {
-                        out(e.getClass().getSimpleName());
                         if (e.isDead())
-                        {
-                            out("Removing monster");
                             monsters.remove(e);
-                        }
-                    }
                     
                     // Compare the current size with the previous size.
                     if (monsters.size() < spawnThread.previousSize || spawnThread.previousSize == 0)
@@ -1267,9 +1261,4 @@ public class Arena
     {
         return ((enabled && setup) ? ChatColor.GREEN : ChatColor.GRAY) + configName();
     }
-    
-    private void out(String s)
-    {
-        System.out.println(s);
-    }
 }
diff --git a/src/com/garbagemule/MobArena/MAUtils.java b/src/com/garbagemule/MobArena/MAUtils.java
index a268c82..563c5a2 100644
--- a/src/com/garbagemule/MobArena/MAUtils.java
+++ b/src/com/garbagemule/MobArena/MAUtils.java
@@ -336,7 +336,7 @@ public class MAUtils
         
         try
         {
-            if (backupFile.exists())
+            if (backupFile.exists() && !restoreInventory(p))
                 return false;
 
             backupFile.createNewFile();