diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar
index 19a3cf4..52006d4 100644
Binary files a/TwosideKeeper.jar and b/TwosideKeeper.jar differ
diff --git a/src/plugin.yml b/src/plugin.yml
index 1c3b6fc..fb47cb5 100644
--- a/src/plugin.yml
+++ b/src/plugin.yml
@@ -1,6 +1,6 @@
 name: TwosideKeeper
 main: sig.plugin.TwosideKeeper.TwosideKeeper
-version: 3.8.0
+version: 3.8.0r1
 commands:
    money:
       description: Tells the player the amount of money they are holding.
diff --git a/src/sig/plugin/TwosideKeeper/EliteMonster.java b/src/sig/plugin/TwosideKeeper/EliteMonster.java
index bb8b1c3..9d63bab 100644
--- a/src/sig/plugin/TwosideKeeper/EliteMonster.java
+++ b/src/sig/plugin/TwosideKeeper/EliteMonster.java
@@ -63,6 +63,7 @@ public class EliteMonster {
 	boolean enraged=false;
 	boolean storingenergy=false;
 	Location target_leap_loc = null;
+	Location myspawn = null;
 	HashMap<Block,Material> storedblocks = new HashMap<Block,Material>();
 	
 	List<Player> targetlist = new ArrayList<Player>();
@@ -72,6 +73,7 @@ public class EliteMonster {
 		this.m=m;
 		m.getAttribute(Attribute.GENERIC_MOVEMENT_SPEED).setBaseValue(DEFAULT_MOVE_SPD);
 		this.hp_before_burstcheck=m.getHealth();
+		this.myspawn=m.getLocation();
 	}
 	
 	public void runTick() {
@@ -80,6 +82,7 @@ public class EliteMonster {
 		rebuff();
 		regenerateHealth();
 		moveFasterToTarget();
+		resetToSpawn();
 		if (m.isValid() && targetlist.size()>0) {
 			weakenTeam();
 			retargetInAir();
@@ -88,6 +91,12 @@ public class EliteMonster {
 		}
 	}
 
+	private void resetToSpawn() {
+		if (targetlist.size()==0 && m.getLocation().distanceSquared(myspawn)>81) {
+			m.teleport(myspawn);
+		}
+	}
+
 	private void dontDrown() {
 		m.setRemainingAir(m.getMaximumAir());
 	}
@@ -179,6 +188,7 @@ public class EliteMonster {
 					m.setTarget(ChooseRandomTarget());
 				} else {
 					m.setTarget(null);
+					resetToSpawn();
 				}
 			}
 			if (!storingenergy) {
@@ -205,6 +215,7 @@ public class EliteMonster {
 				m.setVelocity((m.getLocation().getDirection()).add(new Vector(0,0.2*(l.getLocation().getY()-m.getLocation().getY()),0)));
 			}
 		} else {
+			targetlist.remove(l);
 			m.setTarget(null);
 		}
 	}
@@ -342,7 +353,7 @@ public class EliteMonster {
 		for (int x=-radius;x<radius+1;x++) {
 			for (int z=-radius;z<radius+1;z++) {
 				Block b = target.getLocation().add(x,-0.9,z).getBlock();
-				if (b.getType()!=Material.AIR && aPlugin.API.isDestroyable(b)) {
+				if (b.getType()!=Material.AIR && aPlugin.API.isDestroyable(b) && GenericFunctions.isSoftBlock(b)) {
 					storedblocks.put(b, b.getType());
 					b.setType(Material.STAINED_GLASS);
 					b.setData((byte)4);
diff --git a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java
index d4e1836..dbebd7b 100644
--- a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java
+++ b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java
@@ -2688,7 +2688,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
 	    		}
 	    	}
 	    	newDeathMsg=p.getName()+" "+newDeathMsg;
-	    	ev.setDeathMessage(newDeathMsg);
+	    	ev.setDeathMessage(newDeathMsg); 
 	    	log("Death Message: "+ev.getDeathMessage(),5);
 	    	if (p!=null) {
 	    		p.sendMessage(ChatColor.GRAY+"Due to death, you lost "+DEATHPENALTY+"% of your holding money. ");
@@ -2708,7 +2708,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
     	}
     	for (int i=0;i<elitemonsters.size();i++) {
     		EliteMonster em = elitemonsters.get(i);
-    		em.getMonster().setTarget(null);
+    		em.targetlist.remove(p);
     	}
     }
     
@@ -3784,6 +3784,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
     	log(ev.getDamage()+"",5);
 		
 		if (ev.getCause()==DamageCause.FIRE || ev.getCause()==DamageCause.FIRE_TICK ||
+				ev.getCause()==DamageCause.LAVA || ev.getCause()==DamageCause.SUFFOCATION ||
 				ev.getCause()==DamageCause.WITHER || ev.getCause()==DamageCause.POISON
 				 || ev.getCause()==DamageCause.THORNS) {
 			if (ev.getEntity() instanceof LivingEntity) {