diff --git a/common/biomesoplenty/blocks/BlockHive.java b/common/biomesoplenty/blocks/BlockHive.java
index 83b5678c8..003243287 100644
--- a/common/biomesoplenty/blocks/BlockHive.java
+++ b/common/biomesoplenty/blocks/BlockHive.java
@@ -26,27 +26,6 @@ public class BlockHive extends Block
 		this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
 	}
 	
-	@Override
-	public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random)
-	{
-		if (par1World.getBlockMetadata(par2, par3, par4) == 1 || par1World.getBlockMetadata(par2, par3, par4) == 3)
-		{
-			if (par5Random.nextInt(10) == 0)
-			{
-				int spawnx = (par2 - 4) + par5Random.nextInt(8);
-				int spawny = (par3 - 4) + par5Random.nextInt(8);
-				int spawnz = (par4 - 4) + par5Random.nextInt(8);
-				
-				if (par1World.isAirBlock(spawnx, spawny, spawnz))
-				{
-					EntityWasp wasp = new EntityWasp(par1World);
-					wasp.setLocationAndAngles((double)spawnx, (double)spawny, (double)spawnz, 0.0F, 0.0F);
-					par1World.spawnEntityInWorld(wasp);
-				}
-			}
-		}
-	}
-	
     @Override
     public void breakBlock(World world, int x, int y, int z, int par5, int par6)
     {
@@ -98,7 +77,7 @@ public class BlockHive extends Block
 	@Override
 	public int getFlammability(IBlockAccess world, int x, int y, int z, int metadata, ForgeDirection face)
 	{
-		super.setBurnProperties(blockID, 2, 4);
+		super.setBurnProperties(blockID, 1, 30);
 		return blockFlammability[blockID];
 	}
 
diff --git a/common/biomesoplenty/fluids/BlockFluidHoney.java b/common/biomesoplenty/fluids/BlockFluidHoney.java
index c18c80740..c175baa02 100644
--- a/common/biomesoplenty/fluids/BlockFluidHoney.java
+++ b/common/biomesoplenty/fluids/BlockFluidHoney.java
@@ -5,17 +5,15 @@ import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.potion.Potion;
-import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.Icon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.fluids.BlockFluidClassic;
+import net.minecraftforge.fluids.BlockFluidFinite;
 import net.minecraftforge.fluids.Fluid;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class BlockFluidHoney extends BlockFluidClassic
+public class BlockFluidHoney extends BlockFluidFinite
 {
 	public static Icon honeyStillIcon;
 	public static Icon honeyFlowingIcon;
@@ -24,44 +22,7 @@ public class BlockFluidHoney extends BlockFluidClassic
 	{
 		super(id, fluid, material);
 
-		quantaPerBlock = 4;
-		this.setLightOpacity(3);
-
-		for (int i = 8; i < 11; i++)
-		{
-			displacementIds.put(i, false);
-		}
-	}
-
-	@Override
-	public boolean canDisplace(IBlockAccess world, int x, int y, int z) {
-
-		int bId = world.getBlockId(x, y, z);
-
-		if (bId == 0)
-			return true;
-		if (bId == blockID)
-			return false;
-		if (displacementIds.containsKey(bId))
-			return displacementIds.get(bId);
-		Material material = Block.blocksList[bId].blockMaterial;
-
-		if (material.blocksMovement() || material == Material.water || material == Material.lava || material == Material.portal)
-			return false;
-
-		return true;
-	}
-
-	@Override
-	public void onEntityCollidedWithBlock(World par1World, int x, int y, int z, Entity par5Entity)
-	{
-		int meta = par1World.getBlockMetadata(x, y, z);
-
-		if (par5Entity instanceof EntityLivingBase)
-		{
-			//((EntityLivingBase)par5Entity).addPotionEffect(new PotionEffect(Potion.poison.id, 100));
-			//((EntityLivingBase)par5Entity).addPotionEffect(new PotionEffect(Potion.hunger.id, 100));
-		}
+		this.setLightOpacity(1);
 	}
 
 	@Override