diff --git a/src/main/java/com/volmit/iris/engine/IrisEngine.java b/src/main/java/com/volmit/iris/engine/IrisEngine.java
index c9717a05c..c5c1411ba 100644
--- a/src/main/java/com/volmit/iris/engine/IrisEngine.java
+++ b/src/main/java/com/volmit/iris/engine/IrisEngine.java
@@ -97,8 +97,8 @@ public class IrisEngine extends BlockPopulator implements Engine {
     public IrisEngine(EngineTarget target, EngineCompound compound, int index) {
         Iris.info("Initializing Engine: " + target.getWorld().name() + "/" + target.getDimension().getLoadKey() + " (" + target.getHeight() + " height)");
         metrics = new EngineMetrics(32);
-        getEngineData();
         this.target = target;
+        getEngineData();
         this.framework = new IrisEngineFramework(this);
         worldManager = new IrisWorldManager(this);
         this.compound = compound;
@@ -264,12 +264,6 @@ public class IrisEngine extends BlockPopulator implements Engine {
         return getData().getBiomeLoader().load(getDimension().getFocus());
     }
 
-    @Override
-    public void hotloading() {
-        getEngineData().getStatistics().hotloaded();
-        close();
-    }
-
     @ChunkCoordinates
     @Override
     public void populate(@NotNull World world, @NotNull Random random, @NotNull Chunk c) {
@@ -296,6 +290,7 @@ public class IrisEngine extends BlockPopulator implements Engine {
 
     @Override
     public void hotload() {
+        getEngineData().getStatistics().hotloaded();
         cacheId = RNG.r.nextInt();
     }
 }
diff --git a/src/main/java/com/volmit/iris/engine/data/loader/ResourceLoader.java b/src/main/java/com/volmit/iris/engine/data/loader/ResourceLoader.java
index b1b27f43c..3a064daa1 100644
--- a/src/main/java/com/volmit/iris/engine/data/loader/ResourceLoader.java
+++ b/src/main/java/com/volmit/iris/engine/data/loader/ResourceLoader.java
@@ -116,7 +116,6 @@ public class ResourceLoader<T extends IrisRegistrant> {
             return possibleKeys;
         }
 
-        Iris.info("Building " + resourceTypeName + " Registry Lists");
         KSet<String> m = new KSet<>();
 
         for (File i : getFolders()) {
diff --git a/src/main/java/com/volmit/iris/engine/framework/Engine.java b/src/main/java/com/volmit/iris/engine/framework/Engine.java
index be1738d8a..cf8ac3a06 100644
--- a/src/main/java/com/volmit/iris/engine/framework/Engine.java
+++ b/src/main/java/com/volmit/iris/engine/framework/Engine.java
@@ -99,6 +99,7 @@ public interface Engine extends DataProvider, Fallible, GeneratorAccess, LootPro
 
     default void save() {
         getParallax().saveAll();
+        getWorldManager().onSave();
         saveEngineData();
     }
 
@@ -406,7 +407,5 @@ public interface Engine extends DataProvider, Fallible, GeneratorAccess, LootPro
 
     IrisBiome getFocus();
 
-    void hotloading();
-
     IrisEngineData getEngineData();
 }
diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java
index d80742272..a35942b8a 100644
--- a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java
+++ b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java
@@ -40,7 +40,7 @@ public abstract class EngineAssignedWorldManager extends EngineAssignedComponent
     @EventHandler
     public void on(WorldSaveEvent e) {
         if (e.getWorld().equals(getTarget().getWorld().realWorld())) {
-            onSave();
+            getEngine().save();
         }
     }