diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineExcavator.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineExcavator.java
index c870d46fe..f03214c46 100644
--- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineExcavator.java
+++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineExcavator.java
@@ -278,6 +278,7 @@ public class TileEntityMachineExcavator extends TileEntityMachineBase implements
 					if(bedrockOre == null) {
 						breakBlocks(ring);
 						buildWall(ring + 1, ring == radius && this.enableWalling);
+						if(ring == radius) mineOuterOres(ring + 1);
 						tryCollect(radius);
 					} else {
 						collectBedrock(bedrockOre);
@@ -384,38 +385,47 @@ public class TileEntityMachineExcavator extends TileEntityMachineBase implements
 	}
 	
 	public void tryMineAtLocation(int x ,int y, int z) {
+
+		Block b = worldObj.getBlock(x, y, z);
 		
 		if(this.enableVeinMiner && this.getInstalledDrill().vein) {
 			
-			/* doing this isn't terribly accurate but just for figuring out if there's OD it works */
-			Item blockItem = Item.getItemFromBlock(worldObj.getBlock(x, y, z));
-			
-			if(blockItem != null) {
-				List<String> names = ItemStackUtil.getOreDictNames(new ItemStack(blockItem));
+			if(isOre(x, y, z, b)) {
+				minX = x;
+				minY = y;
+				minZ = z;
+				maxX = x;
+				maxY = y;
+				maxZ = z;
+				breakRecursively(x, y, z, 10);
+				recursionBrake.clear();
 				
-				for(String name : names) {
-					if(name.startsWith("ore")) {
-						minX = x;
-						minY = y;
-						minZ = z;
-						maxX = x;
-						maxY = y;
-						maxZ = z;
-						breakRecursively(x, y, z, 15);
-						recursionBrake.clear();
-						
-						/* move all excavated items to the last drillable position which is also within collection range */
-						List<EntityItem> items = worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(minX, minY, minZ, maxX + 1, maxY + 1, maxZ + 1));
-						for(EntityItem item : items) item.setPosition(x + 0.5, y + 0.5, z + 0.5);
-						
-						return;
-					}
+				/* move all excavated items to the last drillable position which is also within collection range */
+				List<EntityItem> items = worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(minX, minY, minZ, maxX + 1, maxY + 1, maxZ + 1));
+				for(EntityItem item : items) item.setPosition(x + 0.5, y + 0.5, z + 0.5);
+				
+				return;
+			}
+		}
+		breakSingleBlock(b, x, y, z);
+	}
+	
+	protected boolean isOre(int x ,int y, int z, Block b) {
+		
+		/* doing this isn't terribly accurate but just for figuring out if there's OD it works */
+		Item blockItem = Item.getItemFromBlock(b);
+		
+		if(blockItem != null) {
+			List<String> names = ItemStackUtil.getOreDictNames(new ItemStack(blockItem));
+			
+			for(String name : names) {
+				if(name.startsWith("ore")) {
+					return true;
 				}
 			}
 		}
-
-		Block b = worldObj.getBlock(x, y, z);
-		breakSingleBlock(b, x, y, z);
+		
+		return false;
 	}
 	
 	private HashSet<BlockPos> recursionBrake = new HashSet();
@@ -522,6 +532,23 @@ public class TileEntityMachineExcavator extends TileEntityMachineBase implements
 			}
 		}
 	}
+	protected void mineOuterOres(int ring) {
+		int y = getY();
+		
+		for(int x = xCoord - ring; x <= xCoord + ring; x++) {
+			for(int z = zCoord - ring; z <= zCoord + ring; z++) {
+				
+				if(ring == 1 || (x == xCoord - ring || x == xCoord + ring || z == zCoord - ring || z == zCoord + ring)) {
+					
+					Block b = worldObj.getBlock(x, y, z);
+					
+					if(!this.shouldIgnoreBlock(b, x, y, z) && this.isOre(x, y, z, b)) {
+						tryMineAtLocation(x, y, z);
+					}
+				}
+			}
+		}
+	}
 	
 	protected void tryEjectBuffer() {
 
@@ -685,7 +712,7 @@ public class TileEntityMachineExcavator extends TileEntityMachineBase implements
 	}
 	
 	public boolean shouldIgnoreBlock(Block block, int x, int y, int z) {
-		return block.isAir(worldObj, x, y, z) || block.getBlockHardness(worldObj, x, y, z) < 0 || block.getMaterial().isLiquid() || block == Blocks.bedrock;
+		return block.isAir(worldObj, x, y, z) || block.getMaterial() == ModBlocks.materialGas || block.getBlockHardness(worldObj, x, y, z) < 0 || block.getMaterial().isLiquid() || block == Blocks.bedrock;
 	}
 
 	@Override
diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java
index 23cfc21ad..2394ecea4 100644
--- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java
+++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java
@@ -273,6 +273,7 @@ public class TileEntityRBMKRod extends TileEntityRBMKSlottedBase implements IRBM
 	@Override
 	public void onMelt(int reduce) {
 
+		boolean moderated = this.isModerated();
 		int h = RBMKDials.getColumnHeight(worldObj);
 		reduce = MathHelper.clamp_int(reduce, 1, h);
 		
@@ -307,9 +308,7 @@ public class TileEntityRBMKRod extends TileEntityRBMKSlottedBase implements IRBM
 			this.standardMelt(reduce);
 		}
 		
-		spawnDebris(DebrisType.ELEMENT);
-		
-		if(this.isModerated()) {
+		if(moderated) {
 			
 			int count = 2 + worldObj.rand.nextInt(2);
 			
@@ -318,6 +317,8 @@ public class TileEntityRBMKRod extends TileEntityRBMKSlottedBase implements IRBM
 			}
 		}
 		
+		spawnDebris(DebrisType.ELEMENT);
+		
 		if(this.getBlockMetadata() == RBMKBase.DIR_NORMAL_LID.ordinal() + RBMKBase.offset)
 			spawnDebris(DebrisType.LID);
 	}
diff --git a/src/main/java/com/hbm/tileentity/network/RTTYSystem.java b/src/main/java/com/hbm/tileentity/network/RTTYSystem.java
index 5d0badde8..efd38aaf1 100644
--- a/src/main/java/com/hbm/tileentity/network/RTTYSystem.java
+++ b/src/main/java/com/hbm/tileentity/network/RTTYSystem.java
@@ -9,6 +9,7 @@ import com.hbm.util.NoteBuilder.Note;
 import com.hbm.util.NoteBuilder.Octave;
 import com.hbm.util.Tuple.Pair;
 
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.World;
 
 public class RTTYSystem {
@@ -45,8 +46,7 @@ public class RTTYSystem {
 		}
 		
 		HashMap<Pair<World, String>, RTTYChannel> toAdd = new HashMap();
-		for(Entry<Pair<World, String>, RTTYChannel> entry : broadcast.entrySet()) {
-			World world = entry.getKey().getKey();
+		for(World world : MinecraftServer.getServer().worldServers) {
 			RTTYChannel chan = new RTTYChannel();
 			chan.timeStamp = world.getTotalWorldTime();
 			chan.signal = getTestSender(chan.timeStamp);
@@ -69,6 +69,7 @@ public class RTTYSystem {
 		PRINT_BUFFER	//print message, literally, it makes a paper printout
 	}
 	
+	/* Song of Storms at 300 BPM */
 	public static Object getTestSender(long timeStamp) {
 
 		int tempo = 4;