diff --git a/common/biomesoplenty/biomes/BiomeGenScrubland.java b/common/biomesoplenty/biomes/BiomeGenScrubland.java
index 2c4e9ed4f..acb7decf7 100644
--- a/common/biomesoplenty/biomes/BiomeGenScrubland.java
+++ b/common/biomesoplenty/biomes/BiomeGenScrubland.java
@@ -56,7 +56,7 @@ public class BiomeGenScrubland extends BiomeGenBase
 	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-		return par1Random.nextInt(3) == 0 ? new WorldGenShrub(0, 0) : new WorldGenScrubland(false);
+		return par1Random.nextInt(3) == 0 ? new WorldGenShrub(3, 0) : new WorldGenScrubland(false);
 	}
 
 	/**
diff --git a/common/biomesoplenty/biomes/BiomeGenTropicalRainforest.java b/common/biomesoplenty/biomes/BiomeGenTropicalRainforest.java
index 980bd72bb..11a2df6eb 100644
--- a/common/biomesoplenty/biomes/BiomeGenTropicalRainforest.java
+++ b/common/biomesoplenty/biomes/BiomeGenTropicalRainforest.java
@@ -8,12 +8,12 @@ import net.minecraft.entity.passive.EntityOcelot;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.biome.SpawnListEntry;
+import net.minecraft.world.gen.feature.WorldGenTrees;
 import net.minecraft.world.gen.feature.WorldGenerator;
 import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
 import biomesoplenty.entities.EntityJungleSpider;
 import biomesoplenty.worldgen.tree.WorldGenRainforest1;
-import biomesoplenty.worldgen.tree.WorldGenRainforest2;
 
 public class BiomeGenTropicalRainforest extends BiomeGenBase
 {
@@ -71,7 +71,7 @@ public class BiomeGenTropicalRainforest extends BiomeGenBase
 	@Override
 	public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	{
-		return par1Random.nextInt(5) == 0 ? new WorldGenRainforest2() : new WorldGenRainforest1(false);
+		return par1Random.nextInt(5) == 0 ? new WorldGenTrees(false, 4 + par1Random.nextInt(7), 3, 3, true) : new WorldGenRainforest1(false);
 	}
 
 	/**
diff --git a/common/biomesoplenty/worldgen/WorldGenBrush1.java b/common/biomesoplenty/worldgen/WorldGenBrush1.java
index c78791a7a..cfca4a0b6 100644
--- a/common/biomesoplenty/worldgen/WorldGenBrush1.java
+++ b/common/biomesoplenty/worldgen/WorldGenBrush1.java
@@ -32,13 +32,13 @@ public class WorldGenBrush1 extends WorldGenerator
 			}
 
 			var1.setBlock(var3, var4, var5, Block.dirt.blockID);
-			var1.setBlock(var3, var4 + 1, var5, Block.wood.blockID);
-			var1.setBlock(var3, var4 + 2, var5, Block.wood.blockID);
-			var1.setBlock(var3, var4 + 3, var5, Block.wood.blockID);
-			var1.setBlock(var3, var4 + 4, var5, Block.wood.blockID);
-			var1.setBlock(var3, var4 + 5, var5, Block.wood.blockID);
-			var1.setBlock(var3, var4 + 6, var5, Block.wood.blockID);
-			var1.setBlock(var3, var4 + 7, var5, Block.wood.blockID);
+			var1.setBlock(var3, var4 + 1, var5, Block.wood.blockID, 3, 2);
+			var1.setBlock(var3, var4 + 2, var5, Block.wood.blockID, 3, 2);
+			var1.setBlock(var3, var4 + 3, var5, Block.wood.blockID, 3, 2);
+			var1.setBlock(var3, var4 + 4, var5, Block.wood.blockID, 3, 2);
+			var1.setBlock(var3, var4 + 5, var5, Block.wood.blockID, 3, 2);
+			var1.setBlock(var3, var4 + 6, var5, Block.wood.blockID, 3, 2);
+			var1.setBlock(var3, var4 + 7, var5, Block.wood.blockID, 3, 2);
 			var1.setBlock(var3 + 1, var4 + 7, var5, Block.leaves.blockID);
 			var1.setBlock(var3 - 1, var4 + 7, var5, Block.leaves.blockID);
 			var1.setBlock(var3, var4 + 7, var5 + 1, Block.leaves.blockID);
diff --git a/common/biomesoplenty/worldgen/WorldGenBrush2.java b/common/biomesoplenty/worldgen/WorldGenBrush2.java
index b8c986ea6..969855fe9 100644
--- a/common/biomesoplenty/worldgen/WorldGenBrush2.java
+++ b/common/biomesoplenty/worldgen/WorldGenBrush2.java
@@ -32,10 +32,10 @@ public class WorldGenBrush2 extends WorldGenerator
 			}
 
 			var1.setBlock(var3, var4, var5, Block.dirt.blockID);
-			var1.setBlock(var3, var4 + 1, var5, Block.wood.blockID);
-			var1.setBlock(var3, var4 + 2, var5, Block.wood.blockID);
-			var1.setBlock(var3, var4 + 3, var5, Block.wood.blockID);
-			var1.setBlock(var3, var4 + 4, var5, Block.wood.blockID);
+			var1.setBlock(var3, var4 + 1, var5, Block.wood.blockID, 3, 2);
+			var1.setBlock(var3, var4 + 2, var5, Block.wood.blockID, 3, 2);
+			var1.setBlock(var3, var4 + 3, var5, Block.wood.blockID, 3, 2);
+			var1.setBlock(var3, var4 + 4, var5, Block.wood.blockID, 3, 2);
 			var1.setBlock(var3 + 1, var4 + 4, var5, Block.leaves.blockID);
 			var1.setBlock(var3 - 1, var4 + 4, var5, Block.leaves.blockID);
 			var1.setBlock(var3, var4 + 4, var5 + 1, Block.leaves.blockID);
diff --git a/common/biomesoplenty/worldgen/WorldGenScrubland.java b/common/biomesoplenty/worldgen/WorldGenScrubland.java
index 8d1f78a47..008467823 100644
--- a/common/biomesoplenty/worldgen/WorldGenScrubland.java
+++ b/common/biomesoplenty/worldgen/WorldGenScrubland.java
@@ -22,7 +22,7 @@ public class WorldGenScrubland extends WorldGenerator
 
 	public WorldGenScrubland(boolean par1)
 	{
-		this(par1, 2, 0, 2, false);
+		this(par1, 2, 3, 2, false);
 	}
 
 	public WorldGenScrubland(boolean par1, int par2, int par3, int par4, boolean par5)