diff --git a/src/main/java/com/dfsek/terra/config/TerraConfig.java b/src/main/java/com/dfsek/terra/config/TerraConfig.java
index a09894d21..c90eb4c9c 100644
--- a/src/main/java/com/dfsek/terra/config/TerraConfig.java
+++ b/src/main/java/com/dfsek/terra/config/TerraConfig.java
@@ -66,7 +66,7 @@ public class TerraConfig extends YamlConfiguration {
 
         palettes = ConfigLoader.load(main, new File(file, "palettes").toPath(), this, PaletteConfig.class);
 
-        carvers = ConfigLoader.load(main, new File(file, "carvers").toPath(), this, CarverConfig.class);
+        carvers = ConfigLoader.load(main, new File(file, "carving").toPath(), this, CarverConfig.class);
 
         flora = ConfigLoader.load(main, new File(file, "flora").toPath(), this, FloraConfig.class);
 
diff --git a/src/main/java/com/dfsek/terra/config/base/ConfigUtil.java b/src/main/java/com/dfsek/terra/config/base/ConfigUtil.java
index 69ba1577e..2426dcdbd 100644
--- a/src/main/java/com/dfsek/terra/config/base/ConfigUtil.java
+++ b/src/main/java/com/dfsek/terra/config/base/ConfigUtil.java
@@ -46,12 +46,8 @@ public final class ConfigUtil {
 
         TerraConfig.loadAll(main);
         TerraWorld.invalidate();
-        TerraWorld.invalidate();
     }
 
-    public static <E extends Enum<E>> List<E> getElements(List<String> st, Class<E> clazz) {
-        return st.stream().map((s) -> E.valueOf(clazz, s)).collect(Collectors.toList());
-    }
     public static Set<Material> toBlockData(List<String> list, String phase, String id) throws InvalidConfigurationException {
         Set<Material> bl = new HashSet<>();
         for(String s : list) {
diff --git a/src/main/java/com/dfsek/terra/config/genconfig/BiomeConfig.java b/src/main/java/com/dfsek/terra/config/genconfig/BiomeConfig.java
index 3c33c0bf5..46b4b3996 100644
--- a/src/main/java/com/dfsek/terra/config/genconfig/BiomeConfig.java
+++ b/src/main/java/com/dfsek/terra/config/genconfig/BiomeConfig.java
@@ -136,6 +136,7 @@ public class BiomeConfig extends TerraConfigObject {
                 for(Map.Entry<?, ?> entry : e.entrySet()) {
                     try {
                         CarverConfig c = getConfig().getCarver((String) entry.getKey());
+                        if(c == null) throw new NotFoundException("Carver", (String) entry.getKey(), getID());
                         Debug.info("Got carver " + c + ". Adding with weight " + entry.getValue());
                         carvers.put(c, (Integer) entry.getValue());
                     } catch(ClassCastException ex) {
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index a7dc7b9af..52cf172ce 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -1 +1,4 @@
-debug: false
\ No newline at end of file
+debug: false
+data-save: PT6M
+master-disable:
+  caves: false
\ No newline at end of file