diff --git a/src/main/java/com/volmit/iris/nms/v16_2/NMSChunkGenerator_16_2.java b/src/main/java/com/volmit/iris/nms/v16_2/NMSChunkGenerator_16_2.java
index 09d3089d4..ca42033fe 100644
--- a/src/main/java/com/volmit/iris/nms/v16_2/NMSChunkGenerator_16_2.java
+++ b/src/main/java/com/volmit/iris/nms/v16_2/NMSChunkGenerator_16_2.java
@@ -215,13 +215,13 @@ public final class NMSChunkGenerator_16_2 extends ChunkGenerator {
             @Override
             public void setBiome(int x, int y, int z, Biome bio)
             {
-                protochunk.getBiomeIndex().setBiome(x, y, z, CraftBlock.biomeToBiomeBase(ws.get().r().b(IRegistry.ay), bio));
+                protochunk.getBiomeIndex().setBiome(x, y, z, (BiomeBase) INMS.get().getBiomeBase(ws.get().r().b(IRegistry.ay), bio));
             }
 
             @Override
             public void setBiome(int x, int z, Biome bio)
             {
-                protochunk.getBiomeIndex().setBiome(x, 0, z, CraftBlock.biomeToBiomeBase(ws.get().r().b(IRegistry.ay), bio));
+                protochunk.getBiomeIndex().setBiome(x, 0, z, (BiomeBase) INMS.get().getBiomeBase(ws.get().r().b(IRegistry.ay), bio));
             }
 
             @Override
diff --git a/src/main/java/com/volmit/iris/nms/v16_2/NMSWorldChunkManager16_2.java b/src/main/java/com/volmit/iris/nms/v16_2/NMSWorldChunkManager16_2.java
index 76a2ac430..7d5421ef9 100644
--- a/src/main/java/com/volmit/iris/nms/v16_2/NMSWorldChunkManager16_2.java
+++ b/src/main/java/com/volmit/iris/nms/v16_2/NMSWorldChunkManager16_2.java
@@ -3,9 +3,10 @@ package com.volmit.iris.nms.v16_2;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.Lifecycle;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.volmit.iris.nms.INMS;
 import com.volmit.iris.scaffold.engine.EngineCompositeGenerator;
 import net.minecraft.server.v1_16_R2.*;
-import org.bukkit.craftbukkit.v1_16_R2.util.CraftNamespacedKey;
+import org.bukkit.block.Biome;
 
 public class NMSWorldChunkManager16_2 extends WorldChunkManager {
     public static final Codec<NMSWorldChunkManager16_2> e = RecordCodecBuilder.create((var0) -> {
@@ -45,12 +46,12 @@ public class NMSWorldChunkManager16_2 extends WorldChunkManager {
     public BiomeBase getBiome(int var0, int var1, int var2) {
         try
         {
-            return k.get(CraftNamespacedKey.toMinecraft(compound.getComposite().getDefaultEngine().getSurfaceBiome(var0, var2).getVanillaDerivative().getKey()));
+            return (BiomeBase) INMS.get().getBiomeBase(k, compound.getComposite().getDefaultEngine().getSurfaceBiome(var0, var2).getVanillaDerivative());
         }
 
         catch(Throwable e)
         {
-            return k.get(Biomes.THE_VOID.a());
+            return (BiomeBase) INMS.get().getBiomeBase(k, Biome.THE_VOID);
         }
     }
 }
diff --git a/src/main/java/com/volmit/iris/nms/v16_3/NMSChunkGenerator16_3.java b/src/main/java/com/volmit/iris/nms/v16_3/NMSChunkGenerator16_3.java
index 67f5a525c..a944b6bcf 100644
--- a/src/main/java/com/volmit/iris/nms/v16_3/NMSChunkGenerator16_3.java
+++ b/src/main/java/com/volmit/iris/nms/v16_3/NMSChunkGenerator16_3.java
@@ -215,13 +215,13 @@ public final class NMSChunkGenerator16_3 extends ChunkGenerator {
             @Override
             public void setBiome(int x, int y, int z, Biome bio)
             {
-                protochunk.getBiomeIndex().setBiome(x, y, z, CraftBlock.biomeToBiomeBase(ws.get().r().b(IRegistry.ay), bio));
+                protochunk.getBiomeIndex().setBiome(x, y, z, (BiomeBase) INMS.get().getBiomeBase(ws.get().r().b(IRegistry.ay), bio));
             }
 
             @Override
             public void setBiome(int x, int z, Biome bio)
             {
-                protochunk.getBiomeIndex().setBiome(x, 0, z, CraftBlock.biomeToBiomeBase(ws.get().r().b(IRegistry.ay), bio));
+                protochunk.getBiomeIndex().setBiome(x, 0, z, (BiomeBase) INMS.get().getBiomeBase(ws.get().r().b(IRegistry.ay), bio));
             }
 
             @Override
diff --git a/src/main/java/com/volmit/iris/nms/v16_3/NMSWorldChunkManager16_3.java b/src/main/java/com/volmit/iris/nms/v16_3/NMSWorldChunkManager16_3.java
index 721380fa3..8c7ee71d1 100644
--- a/src/main/java/com/volmit/iris/nms/v16_3/NMSWorldChunkManager16_3.java
+++ b/src/main/java/com/volmit/iris/nms/v16_3/NMSWorldChunkManager16_3.java
@@ -3,9 +3,10 @@ package com.volmit.iris.nms.v16_3;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.Lifecycle;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.volmit.iris.nms.INMS;
 import com.volmit.iris.scaffold.engine.EngineCompositeGenerator;
 import net.minecraft.server.v1_16_R3.*;
-import org.bukkit.craftbukkit.v1_16_R3.util.CraftNamespacedKey;
+import org.bukkit.block.Biome;
 
 public class NMSWorldChunkManager16_3 extends WorldChunkManager {
     public static final Codec<NMSWorldChunkManager16_3> e = RecordCodecBuilder.create((var0) -> {
@@ -45,12 +46,12 @@ public class NMSWorldChunkManager16_3 extends WorldChunkManager {
     public BiomeBase getBiome(int var0, int var1, int var2) {
         try
         {
-            return k.get(CraftNamespacedKey.toMinecraft(compound.getComposite().getDefaultEngine().getSurfaceBiome(var0, var2).getVanillaDerivative().getKey()));
+            return (BiomeBase) INMS.get().getBiomeBase(k, compound.getComposite().getDefaultEngine().getSurfaceBiome(var0, var2).getVanillaDerivative());
         }
 
         catch(Throwable e)
         {
-            return k.get(Biomes.THE_VOID.a());
+            return (BiomeBase) INMS.get().getBiomeBase(k, Biome.THE_VOID);
         }
     }
 }
diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java
index a451414fc..6bf4e53f4 100644
--- a/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java
+++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java
@@ -52,7 +52,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
         this.production = production;
         this.dimensionHint = hint;
         initialized = new AtomicBoolean(false);
-        art = J.ar(this::tick, 20);
+        art = J.ar(this::tick, 100);
         populators = new KList<BlockPopulator>().qadd(new BlockPopulator() {
             @Override
             public void populate(@NotNull World world, @NotNull Random random, @NotNull Chunk chunk) {
@@ -106,7 +106,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
 
         try
         {
-            hotloader.check();
+            J.a(() -> hotloader.check());
             getComposite().clean();
         }