diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang
index 3b329b4cc..fb4a03d27 100644
--- a/assets/hbm/lang/de_DE.lang
+++ b/assets/hbm/lang/de_DE.lang
@@ -692,6 +692,8 @@ tile.cmb_brick_reinforced.name=Verstärkte CMB-Ziegel
 
 tile.gravel_obsidian.name=Gebrochener Obsidian
 
+tile.barbed_wire.name=Stacheldraht
+
 tile.seal_frame.name=Siloluke (Rahmen)
 tile.seal_controller.name=Silolukenöffner
 tile.seal_hatch.name=Siloluke (Deckel)
@@ -1091,7 +1093,7 @@ item.grenade_if_concussion.name=IF - Erschütterungsgranate
 item.grenade_if_brimstone.name=IF - Werfbare Brimstone-Mine
 item.grenade_if_mystery.name=IF - M.-Granate
 item.grenade_if_spark.name=IF - S.-Granate
-item.grenade_if_hopwire.name=IF - Schwarzes Loch Hopwire
+item.grenade_if_hopwire.name=IF - Vortex Hopwire
 item.grenade_if_null.name=IF - Null-Granate
 
 item.rod_uranium_fuel.name=Urankernbrennstoffzelle
diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang
index 1f0be5ea0..392925c41 100644
--- a/assets/hbm/lang/en_US.lang
+++ b/assets/hbm/lang/en_US.lang
@@ -692,6 +692,8 @@ tile.cmb_brick_reinforced.name=Reinforced CMB Bricks
 
 tile.gravel_obsidian.name=Crushed Obsidian
 
+tile.barbed_wire.name=Barbed Wire
+
 tile.seal_frame.name=Silo Hatch Frame
 tile.seal_controller.name=Silo Hatch Opener
 tile.seal_hatch.name=Silo Hatch
@@ -1091,7 +1093,7 @@ item.grenade_if_concussion.name=IF - Concussion Grenade
 item.grenade_if_brimstone.name=IF - Tossable Brimstone Mine
 item.grenade_if_mystery.name=IF - M.-Grenade
 item.grenade_if_spark.name=IF - S.-Grenade
-item.grenade_if_hopwire.name=IF - Black Hole Hopwire
+item.grenade_if_hopwire.name=IF - Vortex Hopwire
 item.grenade_if_null.name=IF - Null Grenade
 
 item.rod_uranium_fuel.name=Uranium Fuel Rod
diff --git a/assets/hbm/sounds.json b/assets/hbm/sounds.json
index 5ff8a2c2b..5b7412318 100644
--- a/assets/hbm/sounds.json
+++ b/assets/hbm/sounds.json
@@ -39,6 +39,9 @@
     "item.pinBreak": {"category": "player", "sounds": [{"name": "tool/pinBreak", "stream": false}]},
     "item.gasmaskScrew": {"category": "player", "sounds": [{"name": "tool/gasmaskScrew", "stream": false}]},
     "item.jetpackTank": {"category": "player", "sounds": [{"name": "tool/jetpackTank", "stream": false}]},
+    "item.unpack": {"category": "player", "sounds": ["tool/extract1", "tool/extract2"]},
+    "item.syringe": {"category": "player", "sounds": [{"name": "tool/stim", "stream": false}]},
+    "item.radaway": {"category": "player", "sounds": [{"name": "tool/radaway", "stream": false}]},
 
 	"music.recordLambdaCore": {"category": "record", "sounds": [{"name": "music/recordLambdaCore", "stream": true}]},
 	"music.recordSectorSweep": {"category": "record", "sounds": [{"name": "music/recordSectorSweep", "stream": true}]},
diff --git a/assets/hbm/sounds/tool/extract1.ogg b/assets/hbm/sounds/tool/extract1.ogg
new file mode 100644
index 000000000..b91acf1bd
Binary files /dev/null and b/assets/hbm/sounds/tool/extract1.ogg differ
diff --git a/assets/hbm/sounds/tool/extract2.ogg b/assets/hbm/sounds/tool/extract2.ogg
new file mode 100644
index 000000000..efcd35c37
Binary files /dev/null and b/assets/hbm/sounds/tool/extract2.ogg differ
diff --git a/assets/hbm/sounds/tool/radaway.ogg b/assets/hbm/sounds/tool/radaway.ogg
new file mode 100644
index 000000000..51e319948
Binary files /dev/null and b/assets/hbm/sounds/tool/radaway.ogg differ
diff --git a/assets/hbm/sounds/tool/stim.ogg b/assets/hbm/sounds/tool/stim.ogg
new file mode 100644
index 000000000..b5a53bcd1
Binary files /dev/null and b/assets/hbm/sounds/tool/stim.ogg differ
diff --git a/assets/hbm/textures/blocks/barbed_wire.png b/assets/hbm/textures/blocks/barbed_wire.png
new file mode 100644
index 000000000..062f46e2c
Binary files /dev/null and b/assets/hbm/textures/blocks/barbed_wire.png differ
diff --git a/assets/hbm/textures/blocks/machine_centrifuge.png b/assets/hbm/textures/blocks/machine_centrifuge.png
index 85118da5a..9bbd7b397 100644
Binary files a/assets/hbm/textures/blocks/machine_centrifuge.png and b/assets/hbm/textures/blocks/machine_centrifuge.png differ
diff --git a/assets/hbm/textures/items/centrifuge_element.png b/assets/hbm/textures/items/centrifuge_element.png
index 7a4a24dcc..b18865aab 100644
Binary files a/assets/hbm/textures/items/centrifuge_element.png and b/assets/hbm/textures/items/centrifuge_element.png differ
diff --git a/assets/hbm/textures/items/centrifuge_tower.png b/assets/hbm/textures/items/centrifuge_tower.png
index 0b4e95a3e..e9112f9ee 100644
Binary files a/assets/hbm/textures/items/centrifuge_tower.png and b/assets/hbm/textures/items/centrifuge_tower.png differ
diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java
index 3c2439c62..027cd4106 100644
--- a/com/hbm/blocks/ModBlocks.java
+++ b/com/hbm/blocks/ModBlocks.java
@@ -210,6 +210,8 @@ public class ModBlocks {
 
 	public static Block vault_door;
 	public static Block blast_door;
+	
+	public static Block barbed_wire;
 
 	public static Block marker_structure;
 
@@ -880,6 +882,8 @@ public class ModBlocks {
 		vault_door = new VaultDoor(Material.iron).setBlockName("vault_door").setHardness(10.0F).setResistance(10000.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":vault_door");
 		blast_door = new BlastDoor(Material.iron).setBlockName("blast_door").setHardness(10.0F).setResistance(10000.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":blast_door");
 		
+		barbed_wire = new BarbedWire(Material.iron).setBlockName("barbed_wire").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.weaponTab).setBlockTextureName(RefStrings.MODID + ":barbed_wire");
+		
 		marker_structure = new BlockMarker(Material.iron).setBlockName("marker_structure").setHardness(0.0F).setResistance(0.0F).setLightLevel(1.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":marker_structure");
 		
 		launch_pad = new LaunchPad(Material.iron).setBlockName("launch_pad").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":launch_pad");
@@ -1125,6 +1129,9 @@ public class ModBlocks {
 		GameRegistry.registerBlock(cmb_brick, cmb_brick.getUnlocalizedName());
 		GameRegistry.registerBlock(cmb_brick_reinforced, cmb_brick_reinforced.getUnlocalizedName());
 		
+		//Other defensive stuff
+		GameRegistry.registerBlock(barbed_wire, barbed_wire.getUnlocalizedName());
+		
 		//Decoration Blocks
 		GameRegistry.registerBlock(block_meteor, block_meteor.getUnlocalizedName());
 		GameRegistry.registerBlock(block_meteor_cobble, block_meteor_cobble.getUnlocalizedName());
diff --git a/com/hbm/blocks/generic/BarbedWire.java b/com/hbm/blocks/generic/BarbedWire.java
new file mode 100644
index 000000000..36907f956
--- /dev/null
+++ b/com/hbm/blocks/generic/BarbedWire.java
@@ -0,0 +1,44 @@
+package com.hbm.blocks.generic;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.DamageSource;
+import net.minecraft.world.World;
+
+public class BarbedWire extends Block {
+
+    public BarbedWire(Material mat)
+    {
+        super(mat);
+    }
+    
+    public void onEntityCollidedWithBlock(World p_149670_1_, int p_149670_2_, int p_149670_3_, int p_149670_4_, Entity p_149670_5_)
+    {
+        p_149670_5_.setInWeb();
+        p_149670_5_.attackEntityFrom(DamageSource.cactus, 2.0F);
+    }
+
+    public boolean isOpaqueCube()
+    {
+        return false;
+    }
+
+    public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_)
+    {
+        return null;
+    }
+
+    public int getRenderType()
+    {
+        return 1;
+    }
+
+    public boolean renderAsNormalBlock()
+    {
+        return false;
+    }
+
+}
diff --git a/com/hbm/inventory/MachineRecipes.java b/com/hbm/inventory/MachineRecipes.java
index a86db45e2..7ac145828 100644
--- a/com/hbm/inventory/MachineRecipes.java
+++ b/com/hbm/inventory/MachineRecipes.java
@@ -2654,13 +2654,12 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.hull_big_steel, 4));
 			break;
 		case MINER:
-			list.add(new ItemStack(ModBlocks.steel_scaffold, 12));
+			list.add(new ItemStack(ModBlocks.steel_scaffold, 6));
 			list.add(new ItemStack(ModItems.ingot_steel, 4));
-			list.add(new ItemStack(ModItems.plate_titanium, 6));
 			list.add(new ItemStack(ModItems.wire_red_copper, 4));
-			list.add(new ItemStack(ModItems.circuit_copper, 2));
+			list.add(new ItemStack(ModItems.circuit_copper, 1));
 			list.add(new ItemStack(ModItems.motor, 1));
-			list.add(new ItemStack(ModItems.ingot_dura_steel, 6));
+			list.add(new ItemStack(ModItems.ingot_dura_steel, 2));
 			list.add(new ItemStack(ModItems.bolt_dura_steel, 2));
 			list.add(new ItemStack(ModItems.drill_titanium, 1));
 			break;
diff --git a/com/hbm/items/special/ItemStarterKit.java b/com/hbm/items/special/ItemStarterKit.java
index 0715f5a7f..09f02aa58 100644
--- a/com/hbm/items/special/ItemStarterKit.java
+++ b/com/hbm/items/special/ItemStarterKit.java
@@ -46,7 +46,7 @@ public class ItemStarterKit extends Item {
 	@Override
 	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
 		
-		stack.damageItem(5, player);
+		//stack.damageItem(5, player);
 		
 		if(this == ModItems.nuke_starter_kit)
 		{
@@ -567,7 +567,9 @@ public class ItemStarterKit extends Item {
 				player.addChatMessage(new ChatComponentText("You rip the letter in half; nothing happens."));
 			}
 		}
-		
+
+		world.playSoundAtEntity(player, "hbm:item.unpack", 1.0F, 1.0F);
+		stack.stackSize--;
 		return stack;
 		
 	}
diff --git a/com/hbm/items/special/ItemSyringe.java b/com/hbm/items/special/ItemSyringe.java
index 09da1442c..5728a334e 100644
--- a/com/hbm/items/special/ItemSyringe.java
+++ b/com/hbm/items/special/ItemSyringe.java
@@ -36,6 +36,7 @@ public class ItemSyringe extends Item {
             	player.clearActivePotions();
             
             	stack.stackSize--;
+            	world.playSoundAtEntity(player, "hbm:item.syringe", 1.0F, 1.0F);
 
             	if (stack.stackSize <= 0)
             	{
@@ -65,6 +66,7 @@ public class ItemSyringe extends Item {
                 player.addPotionEffect(new PotionEffect(Potion.confusion.id, 5 * 20, 4));
                 
                 stack.stackSize--;
+            	world.playSoundAtEntity(player, "hbm:item.syringe", 1.0F, 1.0F);
 
                 if (stack.stackSize <= 0)
                 {
@@ -88,6 +90,7 @@ public class ItemSyringe extends Item {
             		player.attackEntityFrom(ModDamageSource.euthanizedSelf2, 30);
                 
                 stack.stackSize--;
+            	world.playSoundAtEntity(player, "hbm:item.syringe", 1.0F, 1.0F);
 
                 if (stack.stackSize <= 0)
                 {
@@ -108,6 +111,7 @@ public class ItemSyringe extends Item {
             	player.heal(5);
             
             	stack.stackSize--;
+            	world.playSoundAtEntity(player, "hbm:item.syringe", 1.0F, 1.0F);
 
             	if (stack.stackSize <= 0)
             	{
@@ -128,6 +132,7 @@ public class ItemSyringe extends Item {
             	player.addPotionEffect(new PotionEffect(Potion.resistance.id, 4 * 60 * 20, 2));
             	
             	stack.stackSize--;
+            	world.playSoundAtEntity(player, "hbm:item.syringe", 1.0F, 1.0F);
 
             	if (stack.stackSize <= 0)
             	{
@@ -149,6 +154,7 @@ public class ItemSyringe extends Item {
             	player.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 2 * 60 * 20, 0));
             	
             	stack.stackSize--;
+            	world.playSoundAtEntity(player, "hbm:item.syringe", 1.0F, 1.0F);
 
             	if (stack.stackSize <= 0)
             	{
@@ -170,6 +176,7 @@ public class ItemSyringe extends Item {
             	player.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 10 * 20, 0));
             
             	stack.stackSize--;
+            	world.playSoundAtEntity(player, "hbm:item.syringe", 1.0F, 1.0F);
 
             	if (stack.stackSize <= 0)
             	{
@@ -210,6 +217,7 @@ public class ItemSyringe extends Item {
         		player.removePotionEffect(HbmPotion.radiation.id);
             
             	stack.stackSize--;
+            	world.playSoundAtEntity(player, "hbm:item.radaway", 1.0F, 1.0F);
             }
 		}
 		
@@ -221,6 +229,7 @@ public class ItemSyringe extends Item {
                 player.addPotionEffect(new PotionEffect(Potion.confusion.id, 5 * 20, 0));
             
             	stack.stackSize--;
+            	world.playSoundAtEntity(player, "hbm:item.syringe", 1.0F, 1.0F);
             }
 
         	if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.syringe_metal_empty)))
@@ -319,6 +328,7 @@ public class ItemSyringe extends Item {
             	entity.clearActivePotions();
             
             	stack.stackSize--;
+            	world.playSoundAtEntity(entity, "hbm:item.syringe", 1.0F, 1.0F);
 
             	if(entityPlayer instanceof EntityPlayer)
             	{
@@ -347,6 +357,7 @@ public class ItemSyringe extends Item {
             	entity.addPotionEffect(new PotionEffect(Potion.confusion.id, 5 * 20, 4));
                 
                 stack.stackSize--;
+            	world.playSoundAtEntity(entity, "hbm:item.syringe", 1.0F, 1.0F);
 
             	if(entityPlayer instanceof EntityPlayer)
             	{
@@ -366,6 +377,7 @@ public class ItemSyringe extends Item {
             	entity.attackEntityFrom(ModDamageSource.euthanized(entityPlayer, entityPlayer), 30);
                 
                 stack.stackSize--;
+            	world.playSoundAtEntity(entity, "hbm:item.syringe", 1.0F, 1.0F);
 
             	if(entityPlayer instanceof EntityPlayer)
             	{
@@ -385,6 +397,7 @@ public class ItemSyringe extends Item {
             	entity.heal(5);
             
             	stack.stackSize--;
+            	world.playSoundAtEntity(entity, "hbm:item.syringe", 1.0F, 1.0F);
 
             	if(entityPlayer instanceof EntityPlayer)
             	{
@@ -404,6 +417,7 @@ public class ItemSyringe extends Item {
             	entity.addPotionEffect(new PotionEffect(Potion.resistance.id, 4 * 60 * 20, 2));
             	
             	stack.stackSize--;
+            	world.playSoundAtEntity(entity, "hbm:item.syringe", 1.0F, 1.0F);
 
             	if(entityPlayer instanceof EntityPlayer)
             	{
@@ -424,6 +438,7 @@ public class ItemSyringe extends Item {
             	entity.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 2 * 60 * 20, 0));
             	
             	stack.stackSize--;
+            	world.playSoundAtEntity(entity, "hbm:item.syringe", 1.0F, 1.0F);
 
             	if(entityPlayer instanceof EntityPlayer)
             	{
@@ -444,6 +459,7 @@ public class ItemSyringe extends Item {
             	entity.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 10 * 20, 0));
             
             	stack.stackSize--;
+            	world.playSoundAtEntity(entity, "hbm:item.syringe", 1.0F, 1.0F);
 
             	if(entityPlayer instanceof EntityPlayer)
             	{
@@ -464,6 +480,7 @@ public class ItemSyringe extends Item {
             	entity.addPotionEffect(new PotionEffect(Potion.confusion.id, 5 * 20, 0));
             
             	stack.stackSize--;
+            	world.playSoundAtEntity(entity, "hbm:item.syringe", 1.0F, 1.0F);
 
             	if(entityPlayer instanceof EntityPlayer)
             	{
diff --git a/com/hbm/items/weapon/ItemGrenade.java b/com/hbm/items/weapon/ItemGrenade.java
index fffad2733..cbb0d8dfb 100644
--- a/com/hbm/items/weapon/ItemGrenade.java
+++ b/com/hbm/items/weapon/ItemGrenade.java
@@ -278,7 +278,8 @@ public class ItemGrenade extends Item {
 		}
 		if (this == ModItems.grenade_if_spark) {
 			list.add("");
-			list.add(EnumChatFormatting.ITALIC + "\"31-31-31-31-31-31-31-31-31-31-31-31-31\"");
+			//list.add(EnumChatFormatting.ITALIC + "\"31-31-31-31-31-31-31-31-31-31-31-31-31\"");
+			list.add(EnumChatFormatting.ITALIC + "\"We can't rewind, we've gone too far.\"");
 		}
 		if (this == ModItems.grenade_if_hopwire) {
 			list.add("");
diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java
index bd5f5c5bc..8c31c55a3 100644
--- a/com/hbm/main/CraftingManager.java
+++ b/com/hbm/main/CraftingManager.java
@@ -682,6 +682,8 @@ public class CraftingManager {
 		GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.reinforced_light), 1), new Object[] { "FFF", "FBF", "FFF", 'F', Blocks.iron_bars, 'B', Blocks.glowstone });
 		GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.reinforced_lamp_off), 1), new Object[] { "FFF", "FBF", "FFF", 'F', Blocks.iron_bars, 'B', Blocks.redstone_lamp });
 		GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.reinforced_sand), 8), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', Blocks.sandstone });
+		
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.barbed_wire, 16), new Object[] { "AIA", "I I", "AIA", 'A', ModItems.wire_aluminium, 'I', "ingotIron" }));
 
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.tape_recorder), 4), new Object[] { "TST", "SSS", 'T', "ingotTungsten", 'S', "ingotSteel" }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.steel_poles), 16), new Object[] { "S S", "SSS", "S S", 'S', "ingotSteel" }));
@@ -821,6 +823,20 @@ public class CraftingManager {
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.grenade_breach, 1), new Object[] { "G", "G", "P", 'G', ModItems.grenade_smart, 'P', "plateSaturnite" }));
 		GameRegistry.addRecipe(new ItemStack(ModItems.grenade_burst, 1), new Object[] { "GGG", "GCG", "GGG", 'G', ModItems.grenade_breach, 'C', ModItems.grenade_generic });
 
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.grenade_if_generic, 1), new Object[] { " C ", "PTP", " P ", 'C', ModItems.coil_tungsten, 'P', "plateSteel", 'T', Blocks.tnt }));
+		GameRegistry.addRecipe(new ItemStack(ModItems.grenade_if_he, 1), new Object[] { "A", "G", "A", 'G', ModItems.grenade_if_generic, 'A', Items.gunpowder });
+		GameRegistry.addRecipe(new ItemStack(ModItems.grenade_if_bouncy, 1), new Object[] { "G", "A", 'G', ModItems.grenade_if_generic, 'A', ModItems.plate_polymer });
+		GameRegistry.addRecipe(new ItemStack(ModItems.grenade_if_sticky, 1), new Object[] { "G", "A", 'G', ModItems.grenade_if_generic, 'A', Items.slime_ball });
+		GameRegistry.addRecipe(new ItemStack(ModItems.grenade_if_impact, 1), new Object[] { "G", "A", 'G', ModItems.grenade_if_generic, 'A', Items.redstone });
+		GameRegistry.addRecipe(new ItemStack(ModItems.grenade_if_concussion, 1), new Object[] { "G", "A", 'G', ModItems.grenade_if_generic, 'A', Items.glowstone_dust });
+		GameRegistry.addRecipe(new ItemStack(ModItems.grenade_if_toxic, 1), new Object[] { "G", "A", 'G', ModItems.grenade_if_generic, 'A', ModItems.powder_poison });
+		GameRegistry.addRecipe(new ItemStack(ModItems.grenade_if_incendiary, 1), new Object[] { "G", "A", 'G', ModItems.grenade_if_generic, 'A', ModItems.powder_fire });
+		GameRegistry.addRecipe(new ItemStack(ModItems.grenade_if_brimstone, 1), new Object[] { "R", "G", "A", 'G', ModItems.grenade_if_generic, 'R', Items.redstone, 'A', ModItems.sulfur });
+		GameRegistry.addRecipe(new ItemStack(ModItems.grenade_if_mystery, 1), new Object[] { "A", "G", "A", 'G', ModItems.grenade_if_generic, 'A', ModItems.powder_magic });
+		GameRegistry.addRecipe(new ItemStack(ModItems.grenade_if_spark, 1), new Object[] { " A ", "AGA", " A ", 'G', ModItems.grenade_if_generic, 'A', ModItems.powder_spark_mix });
+		GameRegistry.addRecipe(new ItemStack(ModItems.grenade_if_hopwire, 1), new Object[] { " A ", "AGA", " A ", 'G', ModItems.grenade_if_generic, 'A', ModItems.powder_power });
+		GameRegistry.addRecipe(new ItemStack(ModItems.grenade_if_null, 1), new Object[] { "BAB", "AGA", "BAB", 'G', ModItems.grenade_if_generic, 'A', Blocks.obsidian, 'B', ModItems.ingot_saturnite });
+
 		GameRegistry.addRecipe(new ItemStack(ModItems.bomb_waffle, 1), new Object[] { "WEW", "MPM", "WEW", 'W', Items.wheat, 'E', Items.egg, 'M', Items.milk_bucket, 'P', ModItems.man_core });
 		GameRegistry.addRecipe(new ItemStack(ModItems.schnitzel_vegan, 3), new Object[] { "RWR", "WPW", "RWR", 'W', ModItems.nuclear_waste, 'R', Items.reeds, 'P', Items.pumpkin_seeds });
 		GameRegistry.addRecipe(new ItemStack(ModItems.cotton_candy, 2), new Object[] { " S ", "SPS", " H ", 'P', ModItems.nugget_pu239, 'S', Items.sugar, 'H', Items.stick });
@@ -1161,6 +1177,7 @@ public class CraftingManager {
 		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_nitan_mix, 6), new Object[] { "dustStrontium", "dustCobalt", "dustBromine", "dustTennessine", "dustNiobium", "dustCerium" }));
 		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_spark_mix, 5), new Object[] { "dustDesh", "dustEuphemium", ModItems.powder_meteorite, ModItems.powder_power, ModItems.powder_nitan_mix }));
 		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_meteorite, 5), new Object[] { "dustIron", "dustCopper", "dustLithium", "dustTungsten", "dustUranium" }));
+		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_thermite, 4), new Object[] { "dustIron", "dustIron", "dustIron", "dustAluminum" }));
 		
 		GameRegistry.addRecipe(new ItemStack(ModItems.canister_petroil, 9), new Object[] { "RRR", "RLR", "RRR", 'R', ModItems.canister_reoil, 'L', ModItems.canister_canola });
 		
diff --git a/com/hbm/packet/TEDrillPacket.java b/com/hbm/packet/TEDrillPacket.java
index 94ae3918e..f157550f0 100644
--- a/com/hbm/packet/TEDrillPacket.java
+++ b/com/hbm/packet/TEDrillPacket.java
@@ -15,18 +15,20 @@ public class TEDrillPacket implements IMessage {
 	int y;
 	int z;
 	float spin;
+	float torque;
 
 	public TEDrillPacket()
 	{
 		
 	}
 
-	public TEDrillPacket(int x, int y, int z, float spin)
+	public TEDrillPacket(int x, int y, int z, float spin, float torque)
 	{
 		this.x = x;
 		this.y = y;
 		this.z = z;
 		this.spin = spin;
+		this.torque = torque;
 	}
 
 	@Override
@@ -35,6 +37,7 @@ public class TEDrillPacket implements IMessage {
 		y = buf.readInt();
 		z = buf.readInt();
 		spin = buf.readFloat();
+		torque = buf.readFloat();
 	}
 
 	@Override
@@ -43,6 +46,7 @@ public class TEDrillPacket implements IMessage {
 		buf.writeInt(y);
 		buf.writeInt(z);
 		buf.writeFloat(spin);
+		buf.writeFloat(torque);
 	}
 
 	public static class Handler implements IMessageHandler<TEDrillPacket, IMessage> {
@@ -55,6 +59,7 @@ public class TEDrillPacket implements IMessage {
 					
 				TileEntityMachineMiningDrill gen = (TileEntityMachineMiningDrill) te;
 				gen.rotation = m.spin;
+				gen.torque = m.torque;
 			}
 			return null;
 		}
diff --git a/com/hbm/tileentity/machine/TileEntityMachineMiningDrill.java b/com/hbm/tileentity/machine/TileEntityMachineMiningDrill.java
index c2c2f5643..45afedf1c 100644
--- a/com/hbm/tileentity/machine/TileEntityMachineMiningDrill.java
+++ b/com/hbm/tileentity/machine/TileEntityMachineMiningDrill.java
@@ -464,7 +464,7 @@ public class TileEntityMachineMiningDrill extends TileEntity implements ISidedIn
 			if(rotation >= 360)
 				rotation -= 360;
 
-			PacketDispatcher.wrapper.sendToAll(new TEDrillPacket(xCoord, yCoord, zCoord, rotation));
+			PacketDispatcher.wrapper.sendToAll(new TEDrillPacket(xCoord, yCoord, zCoord, rotation, torque));
 			PacketDispatcher.wrapper.sendToAll(new LoopedSoundPacket(xCoord, yCoord, zCoord));
 			PacketDispatcher.wrapper.sendToAll(new AuxElectricityPacket(xCoord, yCoord, zCoord, power));
 		}
@@ -528,7 +528,7 @@ public class TileEntityMachineMiningDrill extends TileEntity implements ISidedIn
 	//"ok"
 	public boolean isOreo(int x, int y, int z) {
 		
-		Block b = worldObj.getBlock(x, y, z);
+		/*Block b = worldObj.getBlock(x, y, z);
 		int meta = worldObj.getBlockMetadata(x, y, z);
 		
 		if(b == Blocks.air || b == Blocks.grass || b == Blocks.dirt || 
@@ -545,14 +545,17 @@ public class TileEntityMachineMiningDrill extends TileEntity implements ISidedIn
 			
 			if(s.length() > 3 && s.substring(0, 3).equals("ore"))
 				return true;
-		}
+		}*/
 		
-		return false;
+		Block b = worldObj.getBlock(x, y, z);
+		float hardness = b.getBlockHardness(worldObj, x, y, z);
+		
+		return hardness < 70 && hardness >= 0;
 	}
 	
 	public boolean isMinableOreo(int x, int y, int z) {
 		
-		Block b = worldObj.getBlock(x, y, z);
+		/*Block b = worldObj.getBlock(x, y, z);
 		int meta = worldObj.getBlockMetadata(x, y, z);
 		
 		if(b == Blocks.grass || b == Blocks.dirt || 
@@ -571,7 +574,12 @@ public class TileEntityMachineMiningDrill extends TileEntity implements ISidedIn
 				return true;
 		}
 		
-		return false;
+		return false;*/
+		
+		Block b = worldObj.getBlock(x, y, z);
+		float hardness = b.getBlockHardness(worldObj, x, y, z);
+		
+		return hardness < 70 && hardness >= 0;
 	}
 	
 	/**
diff --git a/com/hbm/world/DesertAtom002.java b/com/hbm/world/DesertAtom002.java
index 715023eaa..80136dc36 100644
--- a/com/hbm/world/DesertAtom002.java
+++ b/com/hbm/world/DesertAtom002.java
@@ -2353,57 +2353,57 @@ public class DesertAtom002
 		world.setBlock(x + 15, y + 2, z + 33, Blocks.iron_bars, 0, 3);
 		world.setBlock(x + 16, y + 2, z + 33, Block5, 0, 3);
 		world.setBlock(x + 0, y + 3, z + 0, Block5, 0, 3);
-		world.setBlock(x + 1, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 2, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 3, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 4, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 5, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 6, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 7, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 8, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 9, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 10, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 11, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 12, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 13, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 14, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 15, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 16, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 17, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 18, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 19, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 20, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 21, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 22, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 23, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 24, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 25, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 26, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 27, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 28, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 29, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 30, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 31, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 32, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 33, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 34, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 35, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 36, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 37, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 38, y + 3, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 39, y + 3, z + 0, Blocks.web, 0, 3);
+		world.setBlock(x + 1, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 2, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 3, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 4, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 5, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 6, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 7, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 8, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 9, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 10, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 11, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 12, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 13, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 14, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 15, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 16, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 17, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 18, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 19, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 20, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 21, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 22, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 23, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 24, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 25, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 26, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 27, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 28, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 29, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 30, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 31, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 32, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 33, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 34, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 35, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 36, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 37, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 38, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 39, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 40, y + 3, z + 0, Block5, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 1, Blocks.web, 0, 3);
-		world.setBlock(x + 40, y + 3, z + 1, Blocks.web, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 2, Blocks.web, 0, 3);
-		world.setBlock(x + 40, y + 3, z + 2, Blocks.web, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 3, Blocks.web, 0, 3);
-		world.setBlock(x + 40, y + 3, z + 3, Blocks.web, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 4, Blocks.web, 0, 3);
-		world.setBlock(x + 40, y + 3, z + 4, Blocks.web, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 5, Blocks.web, 0, 3);
-		world.setBlock(x + 40, y + 3, z + 5, Blocks.web, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 6, Blocks.web, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 1, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 40, y + 3, z + 1, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 2, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 40, y + 3, z + 2, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 3, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 40, y + 3, z + 3, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 4, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 40, y + 3, z + 4, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 5, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 40, y + 3, z + 5, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 6, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 16, y + 3, z + 6, Block1, 0, 3);
 		world.setBlock(x + 17, y + 3, z + 6, Block1, 0, 3);
 		world.setBlock(x + 18, y + 3, z + 6, Block1, 0, 3);
@@ -2427,7 +2427,7 @@ public class DesertAtom002
 		world.setBlock(x + 36, y + 3, z + 6, Block1, 0, 3);
 		world.setBlock(x + 37, y + 3, z + 6, Block1, 0, 3);
 		world.setBlock(x + 40, y + 3, z + 6, Block5, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 7, Blocks.web, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 7, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 7, y + 3, z + 7, Block8, 2, 3);
 		world.setBlock(x + 9, y + 3, z + 7, Block8, 2, 3);
 		world.setBlock(x + 16, y + 3, z + 7, Block1, 0, 3);
@@ -2453,7 +2453,7 @@ public class DesertAtom002
 		world.setBlock(x + 36, y + 3, z + 7, Block6, 0, 3);
 		world.setBlock(x + 37, y + 3, z + 7, Block1, 0, 3);
 		world.setBlock(x + 40, y + 3, z + 7, Block5, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 8, Blocks.web, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 8, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 6, y + 3, z + 8, Block5, 0, 3);
 		world.setBlock(x + 7, y + 3, z + 8, Block5, 0, 3);
 		world.setBlock(x + 8, y + 3, z + 8, Block5, 0, 3);
@@ -2482,7 +2482,7 @@ public class DesertAtom002
 		world.setBlock(x + 36, y + 3, z + 8, Block6, 0, 3);
 		world.setBlock(x + 37, y + 3, z + 8, Block1, 0, 3);
 		world.setBlock(x + 40, y + 3, z + 8, Block5, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 9, Blocks.web, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 9, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 5, y + 3, z + 9, Block5, 0, 3);
 		world.setBlock(x + 6, y + 3, z + 9, Block5, 0, 3);
 		world.setBlock(x + 7, y + 3, z + 9, Block5, 0, 3);
@@ -2513,7 +2513,7 @@ public class DesertAtom002
 		world.setBlock(x + 36, y + 3, z + 9, Block6, 0, 3);
 		world.setBlock(x + 37, y + 3, z + 9, Block1, 0, 3);
 		world.setBlock(x + 40, y + 3, z + 9, Block5, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 10, Blocks.web, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 10, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 4, y + 3, z + 10, Block5, 0, 3);
 		world.setBlock(x + 5, y + 3, z + 10, Block5, 0, 3);
 		world.setBlock(x + 6, y + 3, z + 10, Block5, 0, 3);
@@ -2544,7 +2544,7 @@ public class DesertAtom002
 		world.setBlock(x + 36, y + 3, z + 10, Block6, 0, 3);
 		world.setBlock(x + 37, y + 3, z + 10, Block1, 0, 3);
 		world.setBlock(x + 40, y + 3, z + 10, Block5, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 11, Blocks.web, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 11, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 4, y + 3, z + 11, Block5, 0, 3);
 		world.setBlock(x + 5, y + 3, z + 11, Block5, 0, 3);
 		world.setBlock(x + 6, y + 3, z + 11, Blocks.water, 0, 3);
@@ -2575,7 +2575,7 @@ public class DesertAtom002
 		world.setBlock(x + 36, y + 3, z + 11, Block6, 0, 3);
 		world.setBlock(x + 37, y + 3, z + 11, Block1, 0, 3);
 		world.setBlock(x + 40, y + 3, z + 11, Block5, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 12, Blocks.web, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 12, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 4, y + 3, z + 12, Block5, 0, 3);
 		world.setBlock(x + 5, y + 3, z + 12, Block5, 0, 3);
 		world.setBlock(x + 6, y + 3, z + 12, Block5, 0, 3);
diff --git a/com/hbm/world/DesertAtom003.java b/com/hbm/world/DesertAtom003.java
index 2516195d3..305fc6057 100644
--- a/com/hbm/world/DesertAtom003.java
+++ b/com/hbm/world/DesertAtom003.java
@@ -69,8 +69,8 @@ public class DesertAtom003
 		world.setBlock(x + 35, y + 3, z + 12, Block6, 0, 3);
 		world.setBlock(x + 36, y + 3, z + 12, Block18, 0, 3);
 		world.setBlock(x + 37, y + 3, z + 12, Block1, 0, 3);
-		world.setBlock(x + 40, y + 3, z + 12, Blocks.web, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 13, Blocks.web, 0, 3);
+		world.setBlock(x + 40, y + 3, z + 12, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 13, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 4, y + 3, z + 13, Block5, 0, 3);
 		world.setBlock(x + 5, y + 3, z + 13, Block5, 0, 3);
 		world.setBlock(x + 6, y + 3, z + 13, Blocks.water, 0, 3);
@@ -100,8 +100,8 @@ public class DesertAtom003
 		world.setBlock(x + 35, y + 3, z + 13, Block18, 0, 3);
 		world.setBlock(x + 36, y + 3, z + 13, Block18, 0, 3);
 		world.setBlock(x + 37, y + 3, z + 13, Block1, 0, 3);
-		world.setBlock(x + 40, y + 3, z + 13, Blocks.web, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 14, Blocks.web, 0, 3);
+		world.setBlock(x + 40, y + 3, z + 13, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 14, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 4, y + 3, z + 14, Block5, 0, 3);
 		world.setBlock(x + 5, y + 3, z + 14, Block5, 0, 3);
 		world.setBlock(x + 6, y + 3, z + 14, Block5, 0, 3);
@@ -132,8 +132,8 @@ public class DesertAtom003
 		world.setBlock(x + 35, y + 3, z + 14, Block18, 0, 3);
 		world.setBlock(x + 36, y + 3, z + 14, Block18, 0, 3);
 		world.setBlock(x + 37, y + 3, z + 14, Block1, 0, 3);
-		world.setBlock(x + 40, y + 3, z + 14, Blocks.web, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 15, Blocks.web, 0, 3);
+		world.setBlock(x + 40, y + 3, z + 14, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 15, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 5, y + 3, z + 15, Block5, 0, 3);
 		world.setBlock(x + 6, y + 3, z + 15, Block5, 0, 3);
 		world.setBlock(x + 7, y + 3, z + 15, Block5, 0, 3);
@@ -162,8 +162,8 @@ public class DesertAtom003
 		world.setBlock(x + 34, y + 3, z + 15, Block18, 0, 3);
 		world.setBlock(x + 35, y + 3, z + 15, Block18, 0, 3);
 		world.setBlock(x + 37, y + 3, z + 15, Block1, 0, 3);
-		world.setBlock(x + 40, y + 3, z + 15, Blocks.web, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 16, Blocks.web, 0, 3);
+		world.setBlock(x + 40, y + 3, z + 15, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 16, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 6, y + 3, z + 16, Block5, 0, 3);
 		world.setBlock(x + 7, y + 3, z + 16, Block5, 0, 3);
 		world.setBlock(x + 8, y + 3, z + 16, Block5, 0, 3);
@@ -189,8 +189,8 @@ public class DesertAtom003
 		world.setBlock(x + 33, y + 3, z + 16, Block18, 0, 3);
 		world.setBlock(x + 34, y + 3, z + 16, Blocks.vine, 4, 3);
 		world.setBlock(x + 37, y + 3, z + 16, Block1, 0, 3);
-		world.setBlock(x + 40, y + 3, z + 16, Blocks.web, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 17, Blocks.web, 0, 3);
+		world.setBlock(x + 40, y + 3, z + 16, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 17, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 16, y + 3, z + 17, Block1, 0, 3);
 		world.setBlock(x + 17, y + 3, z + 17, Block6, 0, 3);
 		world.setBlock(x + 18, y + 3, z + 17, Block6, 0, 3);
@@ -211,8 +211,8 @@ public class DesertAtom003
 		world.setBlock(x + 33, y + 3, z + 17, Block18, 0, 3);
 		world.setBlock(x + 34, y + 3, z + 17, Block18, 0, 3);
 		world.setBlock(x + 35, y + 3, z + 17, Blocks.vine, 2, 3);
-		world.setBlock(x + 40, y + 3, z + 17, Blocks.web, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 18, Blocks.web, 0, 3);
+		world.setBlock(x + 40, y + 3, z + 17, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 18, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 16, y + 3, z + 18, Block1, 0, 3);
 		world.setBlock(x + 17, y + 3, z + 18, Block1, 0, 3);
 		world.setBlock(x + 18, y + 3, z + 18, Block1, 0, 3);
@@ -234,107 +234,107 @@ public class DesertAtom003
 		world.setBlock(x + 34, y + 3, z + 18, Block1, 0, 3);
 		world.setBlock(x + 35, y + 3, z + 18, Blocks.gravel, 0, 3);
 		world.setBlock(x + 36, y + 3, z + 18, Blocks.gravel, 0, 3);
-		world.setBlock(x + 40, y + 3, z + 18, Blocks.web, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 19, Blocks.web, 0, 3);
-		world.setBlock(x + 40, y + 3, z + 19, Blocks.web, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 20, Blocks.web, 0, 3);
+		world.setBlock(x + 40, y + 3, z + 18, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 19, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 40, y + 3, z + 19, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 20, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 6, y + 3, z + 20, Block15, 0, 3);
 		world.setBlock(x + 7, y + 3, z + 20, Block15, 0, 3);
 		world.setBlock(x + 8, y + 3, z + 20, Block15, 0, 3);
 		world.setBlock(x + 9, y + 3, z + 20, Block15, 0, 3);
 		world.setBlock(x + 10, y + 3, z + 20, Block15, 0, 3);
-		world.setBlock(x + 40, y + 3, z + 20, Blocks.web, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 21, Blocks.web, 0, 3);
+		world.setBlock(x + 40, y + 3, z + 20, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 21, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 4, y + 3, z + 21, Block15, 0, 3);
 		world.setBlock(x + 5, y + 3, z + 21, Block15, 0, 3);
 		world.setBlock(x + 11, y + 3, z + 21, Block15, 0, 3);
 		world.setBlock(x + 12, y + 3, z + 21, Block15, 0, 3);
-		world.setBlock(x + 40, y + 3, z + 21, Blocks.web, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 22, Blocks.web, 0, 3);
+		world.setBlock(x + 40, y + 3, z + 21, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 22, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 4, y + 3, z + 22, Block15, 0, 3);
 		world.setBlock(x + 12, y + 3, z + 22, Block15, 0, 3);
-		world.setBlock(x + 40, y + 3, z + 22, Blocks.web, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 23, Blocks.web, 0, 3);
+		world.setBlock(x + 40, y + 3, z + 22, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 23, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 3, y + 3, z + 23, Block15, 0, 3);
 		world.setBlock(x + 13, y + 3, z + 23, Block15, 0, 3);
-		world.setBlock(x + 40, y + 3, z + 23, Blocks.web, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 24, Blocks.web, 0, 3);
+		world.setBlock(x + 40, y + 3, z + 23, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 24, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 3, y + 3, z + 24, Block15, 0, 3);
 		world.setBlock(x + 13, y + 3, z + 24, Block15, 0, 3);
-		world.setBlock(x + 40, y + 3, z + 24, Blocks.web, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 25, Blocks.web, 0, 3);
+		world.setBlock(x + 40, y + 3, z + 24, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 25, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 3, y + 3, z + 25, Block15, 0, 3);
 		world.setBlock(x + 13, y + 3, z + 25, Block15, 0, 3);
-		world.setBlock(x + 40, y + 3, z + 25, Blocks.web, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 26, Blocks.web, 0, 3);
+		world.setBlock(x + 40, y + 3, z + 25, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 26, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 3, y + 3, z + 26, Block15, 0, 3);
 		world.setBlock(x + 13, y + 3, z + 26, Block15, 0, 3);
-		world.setBlock(x + 40, y + 3, z + 26, Blocks.web, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 27, Blocks.web, 0, 3);
+		world.setBlock(x + 40, y + 3, z + 26, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 27, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 3, y + 3, z + 27, Block15, 0, 3);
 		world.setBlock(x + 13, y + 3, z + 27, Block15, 0, 3);
-		world.setBlock(x + 40, y + 3, z + 27, Blocks.web, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 28, Blocks.web, 0, 3);
+		world.setBlock(x + 40, y + 3, z + 27, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 28, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 4, y + 3, z + 28, Block15, 0, 3);
 		world.setBlock(x + 12, y + 3, z + 28, Block15, 0, 3);
-		world.setBlock(x + 40, y + 3, z + 28, Blocks.web, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 29, Blocks.web, 0, 3);
+		world.setBlock(x + 40, y + 3, z + 28, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 29, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 4, y + 3, z + 29, Block15, 0, 3);
 		world.setBlock(x + 5, y + 3, z + 29, Block15, 0, 3);
 		world.setBlock(x + 11, y + 3, z + 29, Block15, 0, 3);
 		world.setBlock(x + 12, y + 3, z + 29, Block15, 0, 3);
-		world.setBlock(x + 40, y + 3, z + 29, Blocks.web, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 30, Blocks.web, 0, 3);
+		world.setBlock(x + 40, y + 3, z + 29, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 30, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 6, y + 3, z + 30, Block15, 0, 3);
 		world.setBlock(x + 7, y + 3, z + 30, Block15, 0, 3);
 		world.setBlock(x + 8, y + 3, z + 30, Block15, 0, 3);
 		world.setBlock(x + 9, y + 3, z + 30, Block15, 0, 3);
 		world.setBlock(x + 10, y + 3, z + 30, Block15, 0, 3);
-		world.setBlock(x + 40, y + 3, z + 30, Blocks.web, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 31, Blocks.web, 0, 3);
+		world.setBlock(x + 40, y + 3, z + 30, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 16, y + 3, z + 31, Block5, 0, 3);
-		world.setBlock(x + 17, y + 3, z + 31, Blocks.web, 0, 3);
-		world.setBlock(x + 18, y + 3, z + 31, Blocks.web, 0, 3);
-		world.setBlock(x + 19, y + 3, z + 31, Blocks.web, 0, 3);
-		world.setBlock(x + 20, y + 3, z + 31, Blocks.web, 0, 3);
-		world.setBlock(x + 21, y + 3, z + 31, Blocks.web, 0, 3);
-		world.setBlock(x + 22, y + 3, z + 31, Blocks.web, 0, 3);
-		world.setBlock(x + 23, y + 3, z + 31, Blocks.web, 0, 3);
-		world.setBlock(x + 24, y + 3, z + 31, Blocks.web, 0, 3);
-		world.setBlock(x + 25, y + 3, z + 31, Blocks.web, 0, 3);
-		world.setBlock(x + 26, y + 3, z + 31, Blocks.web, 0, 3);
-		world.setBlock(x + 27, y + 3, z + 31, Blocks.web, 0, 3);
-		world.setBlock(x + 28, y + 3, z + 31, Blocks.web, 0, 3);
-		world.setBlock(x + 29, y + 3, z + 31, Blocks.web, 0, 3);
-		world.setBlock(x + 30, y + 3, z + 31, Blocks.web, 0, 3);
-		world.setBlock(x + 31, y + 3, z + 31, Blocks.web, 0, 3);
-		world.setBlock(x + 32, y + 3, z + 31, Blocks.web, 0, 3);
-		world.setBlock(x + 33, y + 3, z + 31, Blocks.web, 0, 3);
-		world.setBlock(x + 34, y + 3, z + 31, Blocks.web, 0, 3);
-		world.setBlock(x + 35, y + 3, z + 31, Blocks.web, 0, 3);
-		world.setBlock(x + 36, y + 3, z + 31, Blocks.web, 0, 3);
-		world.setBlock(x + 37, y + 3, z + 31, Blocks.web, 0, 3);
-		world.setBlock(x + 38, y + 3, z + 31, Blocks.web, 0, 3);
-		world.setBlock(x + 39, y + 3, z + 31, Blocks.web, 0, 3);
+		world.setBlock(x + 17, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 18, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 19, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 20, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 21, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 22, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 23, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 24, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 25, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 26, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 27, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 28, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 29, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 30, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 31, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 32, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 33, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 34, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 35, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 36, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 37, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 38, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 39, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 40, y + 3, z + 31, Block5, 0, 3);
-		world.setBlock(x + 0, y + 3, z + 32, Blocks.web, 0, 3);
-		world.setBlock(x + 16, y + 3, z + 32, Blocks.web, 0, 3);
+		world.setBlock(x + 0, y + 3, z + 32, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 16, y + 3, z + 32, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 0, y + 3, z + 33, Block5, 0, 3);
-		world.setBlock(x + 1, y + 3, z + 33, Blocks.web, 0, 3);
-		world.setBlock(x + 2, y + 3, z + 33, Blocks.web, 0, 3);
-		world.setBlock(x + 3, y + 3, z + 33, Blocks.web, 0, 3);
-		world.setBlock(x + 4, y + 3, z + 33, Blocks.web, 0, 3);
-		world.setBlock(x + 5, y + 3, z + 33, Blocks.web, 0, 3);
-		world.setBlock(x + 6, y + 3, z + 33, Blocks.web, 0, 3);
-		world.setBlock(x + 7, y + 3, z + 33, Blocks.web, 0, 3);
-		world.setBlock(x + 8, y + 3, z + 33, Blocks.web, 0, 3);
-		world.setBlock(x + 9, y + 3, z + 33, Blocks.web, 0, 3);
-		world.setBlock(x + 10, y + 3, z + 33, Blocks.web, 0, 3);
-		world.setBlock(x + 11, y + 3, z + 33, Blocks.web, 0, 3);
-		world.setBlock(x + 12, y + 3, z + 33, Blocks.web, 0, 3);
-		world.setBlock(x + 13, y + 3, z + 33, Blocks.web, 0, 3);
-		world.setBlock(x + 14, y + 3, z + 33, Blocks.web, 0, 3);
-		world.setBlock(x + 15, y + 3, z + 33, Blocks.web, 0, 3);
+		world.setBlock(x + 1, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 2, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 3, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 4, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 5, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 6, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 7, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 8, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 9, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 10, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 11, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 12, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 13, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 14, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 15, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 16, y + 3, z + 33, Block5, 0, 3);
 		world.setBlock(x + 16, y + 4, z + 6, Block1, 0, 3);
 		world.setBlock(x + 17, y + 4, z + 6, Block1, 0, 3);
diff --git a/com/hbm/world/Relay.java b/com/hbm/world/Relay.java
index b9d00fa58..952a57911 100644
--- a/com/hbm/world/Relay.java
+++ b/com/hbm/world/Relay.java
@@ -784,56 +784,56 @@ public class Relay extends WorldGenerator
 		world.setBlock(x + 9, y + 1, z + 15, Blocks.iron_bars, 0, 3);
 		world.setBlock(x + 10, y + 1, z + 15, Block3, 0, 3);
 		world.setBlock(x + 2, y + 2, z + 0, Block3, 0, 3);
-		world.setBlock(x + 3, y + 2, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 4, y + 2, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 5, y + 2, z + 0, Blocks.web, 0, 3);
+		world.setBlock(x + 3, y + 2, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 4, y + 2, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 5, y + 2, z + 0, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 6, y + 2, z + 0, Blocks.anvil, 3, 3);
-		world.setBlock(x + 7, y + 2, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 8, y + 2, z + 0, Blocks.web, 0, 3);
-		world.setBlock(x + 9, y + 2, z + 0, Blocks.web, 0, 3);
+		world.setBlock(x + 7, y + 2, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 8, y + 2, z + 0, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 9, y + 2, z + 0, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 10, y + 2, z + 0, Block3, 0, 3);
-		world.setBlock(x + 2, y + 2, z + 1, Blocks.web, 0, 3);
-		world.setBlock(x + 10, y + 2, z + 1, Blocks.web, 0, 3);
-		world.setBlock(x + 2, y + 2, z + 2, Blocks.web, 0, 3);
+		world.setBlock(x + 2, y + 2, z + 1, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 10, y + 2, z + 1, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 2, y + 2, z + 2, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 5, y + 2, z + 2, Block4, 3, 3);
 		world.setBlock(x + 6, y + 2, z + 2, Block2, 0, 3);
 		world.setBlock(x + 7, y + 2, z + 2, Block4, 3, 3);
-		world.setBlock(x + 10, y + 2, z + 2, Blocks.web, 0, 3);
-		world.setBlock(x + 2, y + 2, z + 3, Blocks.web, 0, 3);
+		world.setBlock(x + 10, y + 2, z + 2, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 2, y + 2, z + 3, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 4, y + 2, z + 3, Block4, 5, 3);
 		world.setBlock(x + 5, y + 2, z + 3, Block2, 0, 3);
 		world.setBlock(x + 6, y + 2, z + 3, Block2, 0, 3);
 		world.setBlock(x + 7, y + 2, z + 3, Block2, 0, 3);
 		world.setBlock(x + 8, y + 2, z + 3, Block4, 4, 3);
-		world.setBlock(x + 10, y + 2, z + 3, Blocks.web, 0, 3);
-		world.setBlock(x + 2, y + 2, z + 4, Blocks.web, 0, 3);
+		world.setBlock(x + 10, y + 2, z + 3, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 2, y + 2, z + 4, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 4, y + 2, z + 4, Block2, 0, 3);
 		world.setBlock(x + 5, y + 2, z + 4, Block2, 0, 3);
 		world.setBlock(x + 6, y + 2, z + 4, ModBlocks.red_wire_coated, 0, 3);
 		world.setBlock(x + 7, y + 2, z + 4, Block2, 0, 3);
 		world.setBlock(x + 8, y + 2, z + 4, Block2, 0, 3);
-		world.setBlock(x + 10, y + 2, z + 4, Blocks.web, 0, 3);
-		world.setBlock(x + 2, y + 2, z + 5, Blocks.web, 0, 3);
+		world.setBlock(x + 10, y + 2, z + 4, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 2, y + 2, z + 5, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 4, y + 2, z + 5, Block4, 5, 3);
 		world.setBlock(x + 5, y + 2, z + 5, Block2, 0, 3);
 		world.setBlock(x + 6, y + 2, z + 5, Block2, 0, 3);
 		world.setBlock(x + 7, y + 2, z + 5, Block2, 0, 3);
 		world.setBlock(x + 8, y + 2, z + 5, Block4, 4, 3);
-		world.setBlock(x + 10, y + 2, z + 5, Blocks.web, 0, 3);
-		world.setBlock(x + 2, y + 2, z + 6, Blocks.web, 0, 3);
+		world.setBlock(x + 10, y + 2, z + 5, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 2, y + 2, z + 6, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 5, y + 2, z + 6, Block4, 2, 3);
 		world.setBlock(x + 6, y + 2, z + 6, Block2, 0, 3);
 		world.setBlock(x + 7, y + 2, z + 6, Block4, 2, 3);
-		world.setBlock(x + 10, y + 2, z + 6, Blocks.web, 0, 3);
+		world.setBlock(x + 10, y + 2, z + 6, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 0, y + 2, z + 7, Block3, 0, 3);
-		world.setBlock(x + 1, y + 2, z + 7, Blocks.web, 0, 3);
+		world.setBlock(x + 1, y + 2, z + 7, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 2, y + 2, z + 7, Block3, 0, 3);
 		world.setBlock(x + 3, y + 2, z + 7, Blocks.iron_bars, 0, 3);
 		world.setBlock(x + 6, y + 2, z + 7, Block2, 0, 3);
 		world.setBlock(x + 7, y + 2, z + 7, Block2, 0, 3);
 		world.setBlock(x + 8, y + 2, z + 7, Block2, 0, 3);
 		world.setBlock(x + 10, y + 2, z + 7, Blocks.anvil, 0, 3);
-		world.setBlock(x + 0, y + 2, z + 8, Blocks.web, 0, 3);
+		world.setBlock(x + 0, y + 2, z + 8, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 3, y + 2, z + 8, Blocks.iron_bars, 0, 3);
 		world.setBlock(x + 4, y + 2, z + 8, Blocks.iron_bars, 0, 3);
 		world.setBlock(x + 5, y + 2, z + 8, Blocks.iron_bars, 0, 3);
@@ -841,52 +841,52 @@ public class Relay extends WorldGenerator
 		world.setBlock(x + 7, y + 2, z + 8, Block2, 0, 3);
 		world.setBlock(x + 8, y + 2, z + 8, Block2, 0, 3);
 		world.setBlock(x + 10, y + 2, z + 8, Blocks.anvil, 0, 3);
-		world.setBlock(x + 0, y + 2, z + 9, Blocks.web, 0, 3);
+		world.setBlock(x + 0, y + 2, z + 9, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 4, y + 2, z + 9, Blocks.brick_block, 0, 3);
 		world.setBlock(x + 5, y + 2, z + 9, Blocks.brick_block, 0, 3);
 		world.setBlock(x + 6, y + 2, z + 9, Blocks.brick_block, 0, 3);
 		world.setBlock(x + 7, y + 2, z + 9, Blocks.brick_block, 0, 3);
 		world.setBlock(x + 8, y + 2, z + 9, Blocks.brick_block, 0, 3);
-		world.setBlock(x + 10, y + 2, z + 9, Blocks.web, 0, 3);
+		world.setBlock(x + 10, y + 2, z + 9, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 0, y + 2, z + 10, Block3, 0, 3);
 		world.setBlock(x + 4, y + 2, z + 10, Blocks.brick_block, 0, 3);
 		world.setBlock(x + 5, y + 2, z + 10, Blocks.brick_block, 0, 3);
 		world.setBlock(x + 6, y + 2, z + 10, Blocks.brick_block, 0, 3);
 		world.setBlock(x + 7, y + 2, z + 10, Blocks.brick_block, 0, 3);
 		world.setBlock(x + 8, y + 2, z + 10, Blocks.brick_block, 0, 3);
-		world.setBlock(x + 10, y + 2, z + 10, Blocks.web, 0, 3);
+		world.setBlock(x + 10, y + 2, z + 10, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 4, y + 2, z + 11, Blocks.brick_block, 0, 3);
 		world.setBlock(x + 5, y + 2, z + 11, Blocks.brick_block, 0, 3);
 		world.setBlock(x + 6, y + 2, z + 11, Blocks.brick_block, 0, 3);
 		world.setBlock(x + 7, y + 2, z + 11, Blocks.brick_block, 0, 3);
 		world.setBlock(x + 8, y + 2, z + 11, Blocks.brick_block, 0, 3);
-		world.setBlock(x + 10, y + 2, z + 11, Blocks.web, 0, 3);
+		world.setBlock(x + 10, y + 2, z + 11, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 0, y + 2, z + 12, Block3, 0, 3);
 		world.setBlock(x + 4, y + 2, z + 12, Blocks.brick_block, 0, 3);
 		world.setBlock(x + 5, y + 2, z + 12, Blocks.brick_block, 0, 3);
 		world.setBlock(x + 6, y + 2, z + 12, Blocks.brick_block, 0, 3);
 		world.setBlock(x + 7, y + 2, z + 12, Blocks.brick_block, 0, 3);
 		world.setBlock(x + 8, y + 2, z + 12, Blocks.brick_block, 0, 3);
-		world.setBlock(x + 10, y + 2, z + 12, Blocks.web, 0, 3);
-		world.setBlock(x + 0, y + 2, z + 13, Blocks.web, 0, 3);
+		world.setBlock(x + 10, y + 2, z + 12, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 0, y + 2, z + 13, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 4, y + 2, z + 13, Blocks.brick_block, 0, 3);
 		world.setBlock(x + 5, y + 2, z + 13, Blocks.brick_block, 0, 3);
 		world.setBlock(x + 6, y + 2, z + 13, Blocks.brick_block, 0, 3);
 		world.setBlock(x + 7, y + 2, z + 13, Blocks.brick_block, 0, 3);
 		world.setBlock(x + 8, y + 2, z + 13, Blocks.brick_block, 0, 3);
-		world.setBlock(x + 10, y + 2, z + 13, Blocks.web, 0, 3);
-		world.setBlock(x + 0, y + 2, z + 14, Blocks.web, 0, 3);
-		world.setBlock(x + 10, y + 2, z + 14, Blocks.web, 0, 3);
+		world.setBlock(x + 10, y + 2, z + 13, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 0, y + 2, z + 14, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 10, y + 2, z + 14, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 0, y + 2, z + 15, Block3, 0, 3);
-		world.setBlock(x + 1, y + 2, z + 15, Blocks.web, 0, 3);
-		world.setBlock(x + 2, y + 2, z + 15, Blocks.web, 0, 3);
-		world.setBlock(x + 3, y + 2, z + 15, Blocks.web, 0, 3);
-		world.setBlock(x + 4, y + 2, z + 15, Blocks.web, 0, 3);
+		world.setBlock(x + 1, y + 2, z + 15, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 2, y + 2, z + 15, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 3, y + 2, z + 15, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 4, y + 2, z + 15, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 5, y + 2, z + 15, Blocks.anvil, 1, 3);
-		world.setBlock(x + 6, y + 2, z + 15, Blocks.web, 0, 3);
-		world.setBlock(x + 7, y + 2, z + 15, Blocks.web, 0, 3);
-		world.setBlock(x + 8, y + 2, z + 15, Blocks.web, 0, 3);
-		world.setBlock(x + 9, y + 2, z + 15, Blocks.web, 0, 3);
+		world.setBlock(x + 6, y + 2, z + 15, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 7, y + 2, z + 15, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 8, y + 2, z + 15, ModBlocks.barbed_wire, 0, 3);
+		world.setBlock(x + 9, y + 2, z + 15, ModBlocks.barbed_wire, 0, 3);
 		world.setBlock(x + 10, y + 2, z + 15, Block3, 0, 3);
 		world.setBlock(x + 5, y + 3, z + 2, Block4, 3, 3);
 		world.setBlock(x + 6, y + 3, z + 2, Block2, 0, 3);