diff --git a/common/src/main/java/common/block/Block.java b/common/src/main/java/common/block/Block.java
index 883ce754..bc326ff3 100755
--- a/common/src/main/java/common/block/Block.java
+++ b/common/src/main/java/common/block/Block.java
@@ -1096,6 +1096,8 @@ public class Block {
 
 	@Clientside
 	public void getTooltips(ItemStack stack, EntityNPC player, List<String> tooltip) {
+		if(this.light != 0)
+			tooltip.add(Color.BLUE + "Licht" + Color.DARK_GRAY + ": " + Color.NEON + String.format("%06x", this.light));
 	}
 
 	@Clientside
diff --git a/common/src/main/java/common/block/artificial/BlockMetalBlock.java b/common/src/main/java/common/block/artificial/BlockMetalBlock.java
index e941ac56..33544409 100644
--- a/common/src/main/java/common/block/artificial/BlockMetalBlock.java
+++ b/common/src/main/java/common/block/artificial/BlockMetalBlock.java
@@ -35,6 +35,7 @@ public class BlockMetalBlock extends Block {
 	
 	public void getTooltips(ItemStack stack, EntityNPC playerIn, List<String> tooltip)
     {
+		super.getTooltips(stack, playerIn, tooltip);
 		tooltip.add(this.metal.formatSymbol());
 		if(this.metal.radioactivity > 0.0f) {
 			tooltip.add(this.metal.formatRadioactivity());
diff --git a/common/src/main/java/common/block/natural/BlockCompressable.java b/common/src/main/java/common/block/natural/BlockCompressable.java
index 02d54f66..7fdb64d5 100644
--- a/common/src/main/java/common/block/natural/BlockCompressable.java
+++ b/common/src/main/java/common/block/natural/BlockCompressable.java
@@ -38,6 +38,7 @@ public class BlockCompressable extends Block {
 
 	@Clientside
 	public void getTooltips(ItemStack stack, EntityNPC player, List<String> tooltip) {
+		super.getTooltips(stack, player, tooltip);
 		if(this.compLevel > 0)
 			tooltip.add(Color.YELLOW + "" + this.compLevel + "-Fach komprimiert");
 	}
diff --git a/common/src/main/java/common/block/natural/BlockMetalOre.java b/common/src/main/java/common/block/natural/BlockMetalOre.java
index 45d94067..6161a684 100644
--- a/common/src/main/java/common/block/natural/BlockMetalOre.java
+++ b/common/src/main/java/common/block/natural/BlockMetalOre.java
@@ -29,6 +29,7 @@ public class BlockMetalOre extends BlockOre {
 	
 	public void getTooltips(ItemStack stack, EntityNPC playerIn, List<String> tooltip)
     {
+		super.getTooltips(stack, playerIn, tooltip);
 		tooltip.add(this.metal.formatSymbol());
 		if(this.metal.radioactivity > 0.0f) {
 			tooltip.add(this.metal.formatRadioactivity());
diff --git a/common/src/main/java/common/block/tech/BlockChest.java b/common/src/main/java/common/block/tech/BlockChest.java
index 356bbdbd..3a832a34 100755
--- a/common/src/main/java/common/block/tech/BlockChest.java
+++ b/common/src/main/java/common/block/tech/BlockChest.java
@@ -260,6 +260,7 @@ public class BlockChest extends Block implements ITileEntityProvider, Rotatable
 
 	@Clientside
 	public void getTooltips(ItemStack stack, EntityNPC player, List<String> tooltip) {
+		super.getTooltips(stack, player, tooltip);
 		tooltip.add(Color.DARK_GREEN + "Kapazität" + Color.DARK_GRAY + ": " + Color.GREEN + (this.width * this.height));
 	}
 
diff --git a/common/src/main/java/common/block/tech/BlockFurnace.java b/common/src/main/java/common/block/tech/BlockFurnace.java
index 83a74aea..c9841928 100755
--- a/common/src/main/java/common/block/tech/BlockFurnace.java
+++ b/common/src/main/java/common/block/tech/BlockFurnace.java
@@ -159,6 +159,7 @@ public class BlockFurnace extends BlockMachine {
 
 	@Clientside
 	public void getTooltips(ItemStack stack, EntityNPC player, List<String> tooltip) {
+		super.getTooltips(stack, player, tooltip);
 		tooltip.add(Color.DARK_GREEN + "Schmelzzeit: " + Color.GREEN + (this.burnTime / 20) + " s");
 		tooltip.add(Color.CYAN + "Effizienz: " + Color.NEON + this.fuelEfficiency + " %");
 	}
diff --git a/common/src/main/java/common/init/BlockRegistry.java b/common/src/main/java/common/init/BlockRegistry.java
index ef5f542c..8345e4d6 100755
--- a/common/src/main/java/common/init/BlockRegistry.java
+++ b/common/src/main/java/common/init/BlockRegistry.java
@@ -186,7 +186,7 @@ public abstract class BlockRegistry {
         registerFluid("acid", "Säure", LiquidType.HOT, 0, 5, 0.0f, 1, 1);
         registerFluid("slime", "Schleim", LiquidType.COLD, 0, 50, 0.0f, 8, 4);
         registerFluid("goo", "Klebrige Masse", LiquidType.COLD, 0, 60, 0.0f, 10, 5);
-        registerFluid("nukage", "Radioaktive Masse", LiquidType.COLD, 10, 10, 4.0f, 2, 2);
+        registerFluid("nukage", "Radioaktive Masse", LiquidType.COLD, 0x00ff00, 10, 4.0f, 2, 2);
         registerFluid("blood", "Blut", LiquidType.COLD, 0, 10, 0.0f, 2, 1);
 		registerFluid("spring_water", "Klares Wasser", LiquidType.COLD, 0, 5, 0.0f, 1, 1);
 		registerFluid("swamp_water", "Sumpfwasser", LiquidType.COLD, 0, 5, 0.0f, TextureAnimation.SWAMP_WATER_STILL, TextureAnimation.SWAMP_WATER_FLOW);
diff --git a/common/src/main/java/common/item/material/ItemBucket.java b/common/src/main/java/common/item/material/ItemBucket.java
index 985459c6..831195ce 100755
--- a/common/src/main/java/common/item/material/ItemBucket.java
+++ b/common/src/main/java/common/item/material/ItemBucket.java
@@ -27,6 +27,7 @@ import common.tileentity.TileEntity;
 import common.tileentity.DeviceDispenser;
 import common.util.BlockPos;
 import common.util.Clientside;
+import common.util.Color;
 import common.util.Facing;
 import common.util.HitPosition;
 import common.util.ParticleType;
@@ -116,10 +117,10 @@ public class ItemBucket extends Item
     {
     	if(liquid != null) {
     		this.setUnstackable();
-    		this.setDisplay((recursive ? "Flutender" : "") + "Eimer mit " + liquid.getDisplay(), liquid.getDescription());
+    		this.setDisplay((recursive ? "Flutender " : "") + "Eimer mit " + liquid.getDisplay(), liquid.getDescription());
     	}
     	else {
-    		this.setDisplay((recursive ? "Unendlicher" : "") + "Eimer");
+    		this.setDisplay((recursive ? "Unendlicher " : "") + "Eimer");
     	}
         this.liquid = liquid;
         this.recursive = recursive;
@@ -142,6 +143,11 @@ public class ItemBucket extends Item
 			map.put(Attribute.RADIATION, -5.0f);
 	}
 
+	public void addInformation(ItemStack stack, EntityNPC playerIn, List<String> tooltip) {
+		if(this.liquid != null)
+			this.liquid.getTooltips(stack, playerIn, tooltip);
+	}
+
     /**
      * Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer
      */
diff --git a/common/src/main/java/common/item/tool/ItemFire.java b/common/src/main/java/common/item/tool/ItemFire.java
index 58ab749c..8c512424 100755
--- a/common/src/main/java/common/item/tool/ItemFire.java
+++ b/common/src/main/java/common/item/tool/ItemFire.java
@@ -1,5 +1,7 @@
 package common.item.tool;
 
+import java.util.List;
+
 import common.block.natural.BlockFire;
 import common.block.tech.BlockTNT;
 import common.entity.npc.EntityNPC;
@@ -28,6 +30,10 @@ public class ItemFire extends Item
         this.setMagnetic();
     }
 
+	public void addInformation(ItemStack stack, EntityNPC playerIn, List<String> tooltip) {
+		this.fireBlock.getTooltips(stack, playerIn, tooltip);
+	}
+
     /**
      * Called when a Block is right-clicked with this Item
      */