diff --git a/minecraft/net/minecraft/src/eui/boiler/TileEntityBoiler.java b/minecraft/net/minecraft/src/eui/boiler/TileEntityBoiler.java
index 310bf120c..7b85c57cc 100644
--- a/minecraft/net/minecraft/src/eui/boiler/TileEntityBoiler.java
+++ b/minecraft/net/minecraft/src/eui/boiler/TileEntityBoiler.java
@@ -553,7 +553,7 @@ public class TileEntityBoiler extends TileEntityMachine implements IInventory, I
 		public int onReceiveLiquid(int type, int vol, byte side) {
 			if(type == 1)
 			{
-			int rejectedElectricity = Math.max((this.waterStored + vol) - 14, 0);
+			int rejectedElectricity = Math.max((this.waterStored + vol) - this.getLiquidCapacity(1), 0);
 			 this.waterStored += vol - rejectedElectricity;
 			return rejectedElectricity;
 			}
@@ -591,9 +591,7 @@ public class TileEntityBoiler extends TileEntityMachine implements IInventory, I
 			return 0;
 		}
 		@Override
-		public int onProduceLiquid(int type, int maxVol, int side) {
-			if(count == 10 || count == 20)
-			{
+		public int onProduceLiquid(int type, int maxVol, int side) {			
 			if(type == 0)
 			{
 				if(steamStored > maxVol)
@@ -602,7 +600,6 @@ public class TileEntityBoiler extends TileEntityMachine implements IInventory, I
 					return maxVol;
 				}
 			}
-			}
 			return 0;
 		}
 
diff --git a/minecraft/net/minecraft/src/eui/pipes/ItemPipe.java b/minecraft/net/minecraft/src/eui/pipes/ItemPipe.java
index a2ff3ddab..87a1cbbc1 100644
--- a/minecraft/net/minecraft/src/eui/pipes/ItemPipe.java
+++ b/minecraft/net/minecraft/src/eui/pipes/ItemPipe.java
@@ -110,14 +110,14 @@ public class ItemPipe extends Item implements ITextureProvider
 	   int var3 = par1ItemStack.getItemDamage();
 	   switch(var3)
 	   {
-	   case 1: return "waterPipe";
 	   case 0: return "steamPipe";
-	   case 2: return "22";
-	   case 3: return "22";
-	   case 4: return "22";
-	   case 5: return "22";
+	   case 1: return "waterPipe";	   
+	   case 2: return "lavaPipe";
+	   case 3: return "oilPipe";
+	   case 4: return "fuelPipe";
+	   case 5: return "airPipe";
+	   default: return "Pipe";
 	   }
-        return this.getItemName();
     }
 	@Override
 	public String getTextureFile() {
diff --git a/minecraft/net/minecraft/src/eui/pipes/RenderPipe.java b/minecraft/net/minecraft/src/eui/pipes/RenderPipe.java
index 4799438f5..f918bb9a9 100644
--- a/minecraft/net/minecraft/src/eui/pipes/RenderPipe.java
+++ b/minecraft/net/minecraft/src/eui/pipes/RenderPipe.java
@@ -22,11 +22,11 @@ public class RenderPipe extends TileEntitySpecialRenderer
 		{
 		case 0: bindTextureByName("/eui/SteamPipe.png");break;
 		case 1: bindTextureByName("/eui/WaterPipe.png");break;
-		case 2: bindTextureByName("/eui/lavaPipe.png");break;
-		case 3: bindTextureByName("/eui/oilPipe.png");break;
-		case 4: bindTextureByName("/eui/fuelPipe.png");break;
-		case 5: bindTextureByName("/eui/airPipe.png");break;
-		default: break;
+		//case 2: bindTextureByName("/eui/lavaPipe.png");break;
+		//case 3: bindTextureByName("/eui/oilPipe.png");break;
+		//case 4: bindTextureByName("/eui/fuelPipe.png");break;
+		//case 5: bindTextureByName("/eui/airPipe.png");break;
+		default:bindTextureByName("/eui/DefaultPipe.png"); break;
 		}
         
 		GL11.glPushMatrix();
diff --git a/minecraft/net/minecraft/src/eui/pipes/TileEntityPipe.java b/minecraft/net/minecraft/src/eui/pipes/TileEntityPipe.java
index 26c253617..b0af97d29 100644
--- a/minecraft/net/minecraft/src/eui/pipes/TileEntityPipe.java
+++ b/minecraft/net/minecraft/src/eui/pipes/TileEntityPipe.java
@@ -113,7 +113,7 @@ public class TileEntityPipe extends TileEntity implements ILiquidConsumer
 				}
 	        }
 			
-			averageElectricity = averageElectricity/connectedConductors;
+			averageElectricity = Math.max(averageElectricity/connectedConductors,0);
 			if(connectedUnits > 0)
 			{
 				for(byte i = 0; i < 6; i++)
diff --git a/minecraft/net/minecraft/src/mod_BasicPipes.java b/minecraft/net/minecraft/src/mod_BasicPipes.java
index 101e90d4f..d21f830f1 100644
--- a/minecraft/net/minecraft/src/mod_BasicPipes.java
+++ b/minecraft/net/minecraft/src/mod_BasicPipes.java
@@ -16,6 +16,7 @@ public class mod_BasicPipes extends NetworkMod {
 	public static Block pipe = new net.minecraft.src.eui.pipes.BlockPipe(pipeID).setBlockName("pipe");
 	public static Item parts = new net.minecraft.src.eui.pipes.ItemParts(partID);
 	public static Item itemPipes = new net.minecraft.src.eui.pipes.ItemPipe(ppipeID);
+	public static Item gauge = new net.minecraft.src.eui.pipes.ItemGuage(ppipeID+1);
 	@Override
 	public String getVersion() {
 		// TODO change version on each update ;/
@@ -38,15 +39,15 @@ public class mod_BasicPipes extends NetworkMod {
    	    ModLoader.registerBlock(pipe);
 		ModLoader.registerTileEntity(net.minecraft.src.eui.pipes.TileEntityPipe.class, "pipe", new RenderPipe());
    	    //Names
-
-		ModLoader.addName((new ItemStack(itemPipes, 1, 0)), "Steam");
-		ModLoader.addName((new ItemStack(itemPipes, 1, 1)), "Water");
-		ModLoader.addName((new ItemStack(itemPipes, 1, 2)), "Lava");
-		ModLoader.addName((new ItemStack(itemPipes, 1, 3)), "Oil");
-		ModLoader.addName((new ItemStack(itemPipes, 1, 4)), "Fuel");
-		ModLoader.addName((new ItemStack(itemPipes, 1, 5)), "Air");
+		ModLoader.addName((new ItemStack(gauge, 1, 0)), "guage");
+		ModLoader.addName((new ItemStack(itemPipes, 1, 0)), "SteamPipe");
+		ModLoader.addName((new ItemStack(itemPipes, 1, 1)), "WaterPipe");
+		ModLoader.addName((new ItemStack(itemPipes, 1, 2)), "LavaPipe");
+		ModLoader.addName((new ItemStack(itemPipes, 1, 3)), "OilPipe");
+		ModLoader.addName((new ItemStack(itemPipes, 1, 4)), "FuelPipe");
+		ModLoader.addName((new ItemStack(itemPipes, 1, 5)), "AirPipe");
 		ModLoader.addName((new ItemStack(parts, 1, 0)), "BronzeTube");
-		ModLoader.addName((new ItemStack(parts, 1, 1)), "ObbyTube");
+		ModLoader.addName((new ItemStack(parts, 1, 1)), "IronTube");
 		ModLoader.addName((new ItemStack(parts, 1, 2)), "LeatherSeal");
 		ModLoader.addName((new ItemStack(parts, 1, 3)), "ObsidianTube");
 		ModLoader.addName((new ItemStack(parts, 1, 4)), "SlimeSeal");