diff --git a/MobArena.jar b/MobArena.jar
index 81fad63..b1b6bfd 100644
Binary files a/MobArena.jar and b/MobArena.jar differ
diff --git a/bin/plugin.yml b/bin/plugin.yml
index 5f2329c..dd2ba60 100644
--- a/bin/plugin.yml
+++ b/bin/plugin.yml
@@ -1,6 +1,6 @@
 name: MobArena
 main: com.garbagemule.MobArena.MobArena
-version: 0.88
+version: 0.88.1
 commands:
   mobarena:
     description: Base command for MobArena
diff --git a/src/com/garbagemule/MobArena/MAMonsterListener.java b/src/com/garbagemule/MobArena/MAMonsterListener.java
index 5c77614..9869501 100644
--- a/src/com/garbagemule/MobArena/MAMonsterListener.java
+++ b/src/com/garbagemule/MobArena/MAMonsterListener.java
@@ -75,9 +75,12 @@ public class MAMonsterListener extends EntityListener
             return;
         
         if (event.getReason() == TargetReason.FORGOT_TARGET)
-            event.setCancelled(true);
+            event.setTarget(MASpawnThread.getClosestPlayer(event.getEntity()));
             
         if (event.getReason() == TargetReason.TARGET_DIED)
             event.setTarget(MASpawnThread.getClosestPlayer(event.getEntity()));
+            
+        if (event.getReason() == TargetReason.CLOSEST_PLAYER)
+            event.setTarget(MASpawnThread.getClosestPlayer(event.getEntity()));
     }
 }
\ No newline at end of file
diff --git a/src/com/garbagemule/MobArena/MAUtils.java b/src/com/garbagemule/MobArena/MAUtils.java
index 9329d78..e1bdb2f 100644
--- a/src/com/garbagemule/MobArena/MAUtils.java
+++ b/src/com/garbagemule/MobArena/MAUtils.java
@@ -316,13 +316,27 @@ public class MAUtils
         int wave;
         String rewards;
         
-        /* Check if the keys exist in the config-file, if not,
-         * simply return the empty map. */
+        /* Check if the keys exist in the config-file, if not, set some. */
+        if (c.getKeys("rewards.waves." + type) == null)
+        {
+            if (type.equals("every"))
+            {
+                c.setProperty("rewards.waves.every.3", "feather, bone, stick");
+                c.setProperty("rewards.waves.every.5", "dirt:4, gravel:4, stone:4");
+                c.setProperty("rewards.waves.every.10", "iron_ingot:10, gold_ingot:8");
+            }
+            else if (type.equals("after"))
+            {
+                c.setProperty("rewards.waves.after.7", "minecart, storage_minecart, powered_minecart");
+                c.setProperty("rewards.waves.after.13", "iron_sword, iron_pickaxe, iron_spade");
+                c.setProperty("rewards.waves.after.16", "diamon_sword");
+            }
+            
+            c.save();
+        }
         List<String> waves = c.getKeys("rewards.waves." + type);
-        if (waves == null)
-            return result;
         
-        // Else, put all the rewards in the map.
+        // Put all the rewards in the map.
         for (String n : waves)
         {
             if (!n.matches("[0-9]+"))