diff --git a/src/minecraft/assets/biomesoplenty/textures/blocks/wildcarrot.png b/src/minecraft/assets/biomesoplenty/textures/blocks/wildcarrot.png
new file mode 100644
index 000000000..d0c880b7c
Binary files /dev/null and b/src/minecraft/assets/biomesoplenty/textures/blocks/wildcarrot.png differ
diff --git a/src/minecraft/assets/biomesoplenty/textures/items/fruitsalad.png b/src/minecraft/assets/biomesoplenty/textures/items/fruitsalad.png
new file mode 100644
index 000000000..aa997e430
Binary files /dev/null and b/src/minecraft/assets/biomesoplenty/textures/items/fruitsalad.png differ
diff --git a/src/minecraft/assets/biomesoplenty/textures/items/shroomsalad.png b/src/minecraft/assets/biomesoplenty/textures/items/shroomsalad.png
new file mode 100644
index 000000000..10aa71e14
Binary files /dev/null and b/src/minecraft/assets/biomesoplenty/textures/items/shroomsalad.png differ
diff --git a/src/minecraft/assets/biomesoplenty/textures/items/veggiesalad.png b/src/minecraft/assets/biomesoplenty/textures/items/veggiesalad.png
new file mode 100644
index 000000000..9f4342d13
Binary files /dev/null and b/src/minecraft/assets/biomesoplenty/textures/items/veggiesalad.png differ
diff --git a/src/minecraft/assets/biomesoplenty/textures/items/wildcarrots.png b/src/minecraft/assets/biomesoplenty/textures/items/wildcarrots.png
new file mode 100644
index 000000000..6f4437103
Binary files /dev/null and b/src/minecraft/assets/biomesoplenty/textures/items/wildcarrots.png differ
diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenHighland.java b/src/minecraft/biomesoplenty/biomes/BiomeGenHighland.java
index bb1e5ae13..2dd54b144 100644
--- a/src/minecraft/biomesoplenty/biomes/BiomeGenHighland.java
+++ b/src/minecraft/biomesoplenty/biomes/BiomeGenHighland.java
@@ -19,7 +19,7 @@ public class BiomeGenHighland extends BiomeGenBase
 		customBiomeDecorator.highGrassPerChunk = 25;
 		customBiomeDecorator.grassPerChunk = 25;
 		customBiomeDecorator.potatoesPerChunk = -999;
-		customBiomeDecorator.generateBoulders = true;
+		customBiomeDecorator.generateBoulders = false;
 	}
 	
 	@Override
diff --git a/src/minecraft/biomesoplenty/world/layer/BiomeLayerSub.java b/src/minecraft/biomesoplenty/world/layer/BiomeLayerSub.java
index 62eada032..d5e5187e5 100644
--- a/src/minecraft/biomesoplenty/world/layer/BiomeLayerSub.java
+++ b/src/minecraft/biomesoplenty/world/layer/BiomeLayerSub.java
@@ -37,6 +37,9 @@ public class BiomeLayerSub extends BiomeLayer
                 if (k1 == Biomes.pasture.get().biomeID && nextInt(2) == 0) { l1 = Biomes.pastureMeadow.get().biomeID; }
                 if (k1 == Biomes.pasture.get().biomeID && nextInt(3) == 0) { l1 = Biomes.pastureThin.get().biomeID; }
                 if (k1 == Biomes.timber.get().biomeID && nextInt(3) == 0) { l1 = Biomes.timberThin.get().biomeID; }
+                if (k1 == BiomeGenBase.ocean.biomeID && nextInt(4) == 0) { l1 = Biomes.tropics.get().biomeID; }
+                if (k1 == BiomeGenBase.ocean.biomeID && nextInt(2) == 0) { l1 = Biomes.volcano.get().biomeID; }
+                if (k1 == BiomeGenBase.ocean.biomeID && nextInt(3) == 0) { l1 = Biomes.polar.get().biomeID; }
 
                 if (l1 == k1)
                 {