diff --git a/src/main/java/com/volmit/iris/gen/layer/BiomeDataProvider.java b/src/main/java/com/volmit/iris/gen/layer/BiomeDataProvider.java
index 14b16f4e1..e2557bfc5 100644
--- a/src/main/java/com/volmit/iris/gen/layer/BiomeDataProvider.java
+++ b/src/main/java/com/volmit/iris/gen/layer/BiomeDataProvider.java
@@ -24,9 +24,7 @@ public class BiomeDataProvider
 
 	public BiomeResult generatePureData(double bx, double bz, int rawX, int rawZ, IrisRegion regionData)
 	{
-		getGenerator().setShuffle(12);
-		double zoom = (layer.getIris().getDimension().getBiomeZoom() * regionData.getBiomeZoom(getType())) * 3.15;
-		getGenerator().setCellScale(1D / zoom);
+		getGenerator().setShuffle(regionData.getBiomeShuffle());
 		return layer.generateBiomeData(bx, bz, regionData, getGenerator(), regionData.getBiomes(getType()), getType());
 	}
 
diff --git a/src/main/java/com/volmit/iris/gen/layer/GenLayerBiome.java b/src/main/java/com/volmit/iris/gen/layer/GenLayerBiome.java
index 7375dd344..55d874756 100644
--- a/src/main/java/com/volmit/iris/gen/layer/GenLayerBiome.java
+++ b/src/main/java/com/volmit/iris/gen/layer/GenLayerBiome.java
@@ -53,7 +53,7 @@ public class GenLayerBiome extends GenLayer
 			return null;
 		}
 
-		regionGenerator.setShuffle(8);
+		regionGenerator.setShuffle(11);
 		regionGenerator.setCellScale(0.33 / iris.getDimension().getRegionZoom());
 		double x = bx / iris.getDimension().getBiomeZoom();
 		double z = bz / iris.getDimension().getBiomeZoom();
@@ -133,8 +133,8 @@ public class GenLayerBiome extends GenLayer
 			return new BiomeResult(null, 0);
 		}
 
-		double x = bx / iris.getDimension().getBiomeZoom();
-		double z = bz / iris.getDimension().getBiomeZoom();
+		double x = bx / (iris.getDimension().getBiomeZoom() * regionData.getBiomeZoom(inferredType));
+		double z = bz / (iris.getDimension().getBiomeZoom() * regionData.getBiomeZoom(inferredType));
 		IrisBiome biome = cell.get(x, z, biomes);
 		biome.setInferredType(inferredType);
 
diff --git a/src/main/java/com/volmit/iris/gen/layer/GenLayerCave.java b/src/main/java/com/volmit/iris/gen/layer/GenLayerCave.java
index d28c563f7..f6ccb0e25 100644
--- a/src/main/java/com/volmit/iris/gen/layer/GenLayerCave.java
+++ b/src/main/java/com/volmit/iris/gen/layer/GenLayerCave.java
@@ -162,11 +162,10 @@ public class GenLayerCave extends GenLayer
 		Material e = data.getType(y + 3);
 		Material f = data.getType(y - 1);
 
-		if(can(a) && canAir(c) && canAir(f) && canWater(d) && canAir(d) && canWater(e))
+		if(can(a) && canAir(c) && canAir(f) && canWater(d) && canWater(e))
 		{
 			data.set(y, CAVE_AIR);
 			data.set(y + 1, CAVE_AIR);
-			data.set(y + 2, CAVE_AIR);
 			return true;
 		}
 
diff --git a/src/main/java/com/volmit/iris/object/IrisRegion.java b/src/main/java/com/volmit/iris/object/IrisRegion.java
index 3239decdf..02ddd6458 100644
--- a/src/main/java/com/volmit/iris/object/IrisRegion.java
+++ b/src/main/java/com/volmit/iris/object/IrisRegion.java
@@ -29,6 +29,10 @@ public class IrisRegion extends IrisRegistrant
 	@DontObfuscate
 	@Desc("The min shore height")
 	private double shoreHeightMin = 1.2;
+	@DontObfuscate
+
+	@Desc("The scrambling between biomes")
+	private double biomeShuffle = 11;
 
 	@DontObfuscate
 	@Desc("The the max shore height")