diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/FixChunkCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/FixChunkCommand.java
index d666ece29..4b9d730d7 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/FixChunkCommand.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/FixChunkCommand.java
@@ -1,6 +1,8 @@
 package com.dfsek.terra.bukkit.command.command;
 
 import com.dfsek.terra.bukkit.command.WorldCommand;
+import com.dfsek.terra.bukkit.generator.BukkitChunkGeneratorWrapper;
+import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -17,7 +19,7 @@ public class FixChunkCommand extends WorldCommand {
 
     @Override
     public boolean execute(@NotNull Player player, @NotNull Command command, @NotNull String s, @NotNull String[] strings, World world) {
-        //MasterChunkGenerator.fixChunk(player.getLocation().getChunk());
+        BukkitChunkGeneratorWrapper.fixChunk(BukkitAdapter.adapt(player.getLocation().getChunk()));
         return true;
     }
 
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/OreCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/OreCommand.java
deleted file mode 100644
index 145f5dc8e..000000000
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/OreCommand.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.dfsek.terra.bukkit.command.command;
-
-import com.dfsek.terra.bukkit.command.WorldCommand;
-import org.bukkit.World;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Collections;
-import java.util.List;
-
-public class OreCommand extends WorldCommand {
-    public OreCommand(com.dfsek.terra.bukkit.command.Command parent) {
-        super(parent);
-    }
-
-    @Override
-    public boolean execute(@NotNull Player sender, @NotNull Command command, @NotNull String label, @NotNull String[] args, World w) {
-        /*
-        Block bl = sender.getTargetBlockExact(25);
-        if(args.length > 0) {
-            OreConfig ore = TerraWorld.getWorld(w).getConfig().getOre(args[0]);
-            if(ore == null) {
-                LangUtil.send("command.ore.invalid-ore", sender, args[0]);
-                return true;
-            }
-            if(bl == null) {
-                LangUtil.send("command.ore.out-of-range", sender);
-                return true;
-            }
-            Vector source = new Vector(FastMath.floorMod(bl.getX(), 16), bl.getY(), FastMath.floorMod(bl.getZ(), 16));
-            ore.doVein(source, bl.getChunk(), new FastRandom());
-        } else {
-            LangUtil.send("command.ore.main-menu", sender);
-        }
-        */
-        return true;
-
-
-        // TODO: implementation
-    }
-
-    @Override
-    public String getName() {
-        return "ore";
-    }
-
-    @Override
-    public List<com.dfsek.terra.bukkit.command.Command> getSubCommands() {
-        return Collections.emptyList();
-    }
-
-    @Override
-    public int arguments() {
-        return 1;
-    }
-
-    @Override
-    public List<String> getTabCompletions(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) {
-        return Collections.emptyList();
-    }
-}
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/SaveDataCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/SaveDataCommand.java
index d996539ec..4cb09daba 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/SaveDataCommand.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/SaveDataCommand.java
@@ -3,6 +3,7 @@ package com.dfsek.terra.bukkit.command.command;
 import com.dfsek.terra.bukkit.BukkitCommandSender;
 import com.dfsek.terra.bukkit.command.Command;
 import com.dfsek.terra.bukkit.command.WorldCommand;
+import com.dfsek.terra.bukkit.generator.BukkitChunkGeneratorWrapper;
 import com.dfsek.terra.config.lang.LangUtil;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
@@ -39,7 +40,7 @@ public class SaveDataCommand extends WorldCommand {
 
     @Override
     public boolean execute(@NotNull Player sender, org.bukkit.command.@NotNull Command command, @NotNull String label, @NotNull String[] args, World w) {
-        //TerraChunkGenerator.saveAll();
+        BukkitChunkGeneratorWrapper.saveAll();
         LangUtil.send("debug.data-save", new BukkitCommandSender(sender), w.getName());
         return true;
     }
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/TerraCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/TerraCommand.java
index 7ceed79e6..ba3f16e96 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/TerraCommand.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/TerraCommand.java
@@ -19,7 +19,6 @@ import java.util.List;
 public class TerraCommand extends Command {
     private final List<Command> commands = Arrays.asList(new ReloadCommand(this),
             new BiomeCommand(this),
-            new OreCommand(this),
             new ProfileCommand(this),
             new SaveDataCommand(this),
             new StructureCommand(this),