diff --git a/gradle.properties b/gradle.properties
index 1e85a27..c5b9aed 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx2G
 	loader_version=0.9.1+build.205
 
 # Mod Properties
-	mod_version = 1.2.0
+	mod_version = 1.2.1
 	maven_group = eu.midnightdust.motschen
 	archives_base_name = rocks
 
diff --git a/src/main/java/eu/midnightdust/motschen/rocks/RocksMain.java b/src/main/java/eu/midnightdust/motschen/rocks/RocksMain.java
index 2193ab3..8e52520 100644
--- a/src/main/java/eu/midnightdust/motschen/rocks/RocksMain.java
+++ b/src/main/java/eu/midnightdust/motschen/rocks/RocksMain.java
@@ -7,6 +7,10 @@
 import eu.midnightdust.motschen.rocks.blockstates.StarfishVariation;
 import eu.midnightdust.motschen.rocks.blockstates.StickVariation;
 import eu.midnightdust.motschen.rocks.world.*;
+import eu.midnightdust.motschen.rocks.world.configured_feature.MiscFeatures;
+import eu.midnightdust.motschen.rocks.world.configured_feature.NetherFeatures;
+import eu.midnightdust.motschen.rocks.world.configured_feature.RockFeatures;
+import eu.midnightdust.motschen.rocks.world.configured_feature.StickFeatures;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder;
 import net.minecraft.block.Block;
@@ -122,6 +126,8 @@ public void onInitialize() {
         RockFeatures.init();
         StickFeatures.init();
         MiscFeatures.init();
+        NetherFeatures.init();
+
         FeatureInjector.init();
         BlockEntityInit.init();
     }
diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/blockentity/NetherGeyserBlockEntity.java b/src/main/java/eu/midnightdust/motschen/rocks/block/blockentity/NetherGeyserBlockEntity.java
index eaef522..cd98594 100644
--- a/src/main/java/eu/midnightdust/motschen/rocks/block/blockentity/NetherGeyserBlockEntity.java
+++ b/src/main/java/eu/midnightdust/motschen/rocks/block/blockentity/NetherGeyserBlockEntity.java
@@ -25,7 +25,7 @@ public void tick() {
         BlockState state = this.world.getBlockState(pos);
 
         if (player != null) {
-            world.setBlockState(pos, RocksMain.NetherGeyser.getDefaultState().with(NetherGeyser.ACTIVE, true));
+            world.setBlockState(pos, state.with(NetherGeyser.ACTIVE, true));
             player.damage(DamageSource.ON_FIRE,1);
             if (player2 != null) {
                 player2.damage(DamageSource.ON_FIRE,4);
@@ -37,7 +37,7 @@ public void tick() {
                 countdown = countdown - 1;
             }
             if (countdown == 0) {
-                world.setBlockState(pos, RocksMain.NetherGeyser.getDefaultState().with(NetherGeyser.ACTIVE, false));
+                world.setBlockState(pos, state.with(NetherGeyser.ACTIVE, false));
             }
         }
 
diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/blockentity/OverworldGeyserBlockEntity.java b/src/main/java/eu/midnightdust/motschen/rocks/block/blockentity/OverworldGeyserBlockEntity.java
index 6087b90..cff6d1c 100644
--- a/src/main/java/eu/midnightdust/motschen/rocks/block/blockentity/OverworldGeyserBlockEntity.java
+++ b/src/main/java/eu/midnightdust/motschen/rocks/block/blockentity/OverworldGeyserBlockEntity.java
@@ -12,7 +12,6 @@
 
 public class OverworldGeyserBlockEntity extends BlockEntity implements Tickable {
     private int countdown = 0;
-    private int pushUp = 0;
 
     public OverworldGeyserBlockEntity() {
         super(BlockEntityInit.OVERWORLD_GEYSER_BE);
@@ -33,7 +32,7 @@ public void tick() {
         if (player != null) {
             world.setBlockState(pos, state.with(OverworldGeyser.ACTIVE, true));
             if (player3 != null) {
-                player.addStatusEffect(new StatusEffectInstance(StatusEffects.LEVITATION, 2, 12, true, false, false));
+                player3.addStatusEffect(new StatusEffectInstance(StatusEffects.LEVITATION, 2, 12, true, false, false));
             }
             countdown = 1000;
         }
diff --git a/src/main/java/eu/midnightdust/motschen/rocks/world/FeatureInjector.java b/src/main/java/eu/midnightdust/motschen/rocks/world/FeatureInjector.java
index f522adc..35f1fd4 100644
--- a/src/main/java/eu/midnightdust/motschen/rocks/world/FeatureInjector.java
+++ b/src/main/java/eu/midnightdust/motschen/rocks/world/FeatureInjector.java
@@ -2,6 +2,10 @@
 
 import com.google.common.collect.Lists;
 import eu.midnightdust.motschen.rocks.mixin.GenerationSettingsAccessorMixin;
+import eu.midnightdust.motschen.rocks.world.configured_feature.MiscFeatures;
+import eu.midnightdust.motschen.rocks.world.configured_feature.NetherFeatures;
+import eu.midnightdust.motschen.rocks.world.configured_feature.RockFeatures;
+import eu.midnightdust.motschen.rocks.world.configured_feature.StickFeatures;
 import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback;
 import net.minecraft.util.registry.BuiltinRegistries;
 import net.minecraft.world.biome.Biome;
@@ -22,68 +26,68 @@ public static void init() {
     private static void addRockToBiome(Biome biome) {
         // Rocks
         if (biome.getCategory() != Biome.Category.NETHER && biome.getCategory() != Biome.Category.THEEND && biome.getCategory() != Biome.Category.BEACH && biome.getCategory() != Biome.Category.DESERT && biome.getCategory() != Biome.Category.MESA && biome.getCategory() != Biome.Category.ICY && biome.getCategory() != Biome.Category.OCEAN) {
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.ROCK_FEATURE);
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.GRANITE_ROCK_FEATURE);
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.DIORITE_ROCK_FEATURE);
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.ANDESITE_ROCK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.ROCK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.GRANITE_ROCK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.DIORITE_ROCK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.ANDESITE_ROCK_FEATURE);
         }
         if (biome.getCategory() == Biome.Category.BEACH || biome.getCategory() == Biome.Category.DESERT || biome.getCategory() == Biome.Category.MESA || biome.toString().contains("terrestria:lush_desert")) {
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.SAND_ROCK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.SAND_ROCK_FEATURE);
         }
         if (biome.getCategory() == Biome.Category.MESA || biome.getCategory() == Biome.Category.DESERT || biome.toString().contains("terrestria:lush_desert")) {
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.RED_SAND_ROCK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.RED_SAND_ROCK_FEATURE);
         }
         if (biome.getCategory() == Biome.Category.THEEND) {
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.END_STONE_ROCK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.END_STONE_ROCK_FEATURE);
         }
         // Sticks
         if (biome.toString().contains("minecraft:forest") || biome.toString().contains("minecraft:wooded_hills") ||
                 biome.toString().contains("minecraft:wooded_mountains") || biome.toString().contains("minecraft:plains") ||
                 biome.toString().contains("minecraft:flower_forest") || biome.toString().contains("minecraft:wooded_badlands_plateau") ||
                 biome.toString().contains("minecraft:modified_wooded_badlands_plateau") || biome.getCategory() == Biome.Category.SWAMP) {
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.OAK_STICK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.OAK_STICK_FEATURE);
         }
         if (biome.toString().contains("minecraft:forest") || biome.toString().contains("minecraft:birch_forest") ||
                 biome.toString().contains("minecraft:birch_forest_hills") || biome.toString().contains("minecraft:flower_forest")) {
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.BIRCH_STICK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.BIRCH_STICK_FEATURE);
         }
         if (biome.toString().contains("minecraft:wooded_mountains") || biome.getCategory() == Biome.Category.TAIGA) {
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.SPRUCE_STICK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.SPRUCE_STICK_FEATURE);
         }
         if (biome.getCategory() == Biome.Category.SAVANNA) {
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.ACACIA_STICK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.ACACIA_STICK_FEATURE);
         }
         if (biome.getCategory() == Biome.Category.JUNGLE) {
-            addFeature(biome, GenerationStep.Feature.UNDERGROUND_DECORATION, StickFeatures.JUNGLE_STICK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.UNDERGROUND_DECORATION, StickFeatures.JUNGLE_STICK_FEATURE);
         }
         if (biome.toString().contains("minecraft:dark_forest") || biome.toString().contains("minecraft:dark_forest_hills") ||
                 biome.toString().contains("minecraft:dark_forest_mountains")) {
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.DARK_OAK_STICK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.DARK_OAK_STICK_FEATURE);
         }
         // Misc
         if (biome.getCategory() == Biome.Category.BEACH && !biome.toString().contains("minecraft:snowy_beach")) {
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, MiscFeatures.SEASHELL_FEATURE);
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, MiscFeatures.STARFISH_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, MiscFeatures.SEASHELL_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, MiscFeatures.STARFISH_FEATURE);
         }
         if (biome.getCategory() == Biome.Category.OCEAN) {
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, MiscFeatures.UNDERWATER_STARFISH_FEATURE);
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, MiscFeatures.UNDERWATER_SEASHELL_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, MiscFeatures.UNDERWATER_STARFISH_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, MiscFeatures.UNDERWATER_SEASHELL_FEATURE);
         }
         if (biome.getCategory() == Biome.Category.NETHER) {
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, NetherFeatures.NETHERRACK_ROCK_FEATURE);
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, NetherFeatures.SOUL_SOIL_ROCK_FEATURE);
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, NetherFeatures.NETHER_GRAVEL_ROCK_FEATURE);
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, NetherFeatures.NETHER_GEYSER_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, NetherFeatures.NETHERRACK_ROCK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, NetherFeatures.SOUL_SOIL_ROCK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, NetherFeatures.NETHER_GRAVEL_ROCK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, NetherFeatures.NETHER_GEYSER_FEATURE);
         }
         if (biome.getCategory() != Biome.Category.NETHER) {
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.GRAVEL_ROCK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.GRAVEL_ROCK_FEATURE);
         }
         if (biome.getCategory() == Biome.Category.ICY) {
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, MiscFeatures.SNOWY_GEYSER_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, MiscFeatures.SNOWY_GEYSER_FEATURE);
         }
     }
 
-    public static void addFeature(Biome biome, GenerationStep.Feature step, ConfiguredFeature<?, ?> feature) {
+    public static void addRockFeature(Biome biome, GenerationStep.Feature step, ConfiguredFeature<?, ?> feature) {
         GenerationSettingsAccessorMixin generationSettingsAccessor  = (GenerationSettingsAccessorMixin) biome.getGenerationSettings();
         int stepIndex = step.ordinal();
         List<List<Supplier<ConfiguredFeature<?, ?>>>> featuresByStep = new ArrayList<>( generationSettingsAccessor.getFeatures());
diff --git a/src/main/java/eu/midnightdust/motschen/rocks/world/FeatureRegistry.java b/src/main/java/eu/midnightdust/motschen/rocks/world/FeatureRegistry.java
index dbd9d13..a88021b 100644
--- a/src/main/java/eu/midnightdust/motschen/rocks/world/FeatureRegistry.java
+++ b/src/main/java/eu/midnightdust/motschen/rocks/world/FeatureRegistry.java
@@ -3,6 +3,8 @@
 import eu.midnightdust.motschen.rocks.RocksMain;
 import eu.midnightdust.motschen.rocks.blockstates.SeashellVariation;
 import eu.midnightdust.motschen.rocks.blockstates.StarfishVariation;
+import eu.midnightdust.motschen.rocks.world.feature.SnowFeature;
+import eu.midnightdust.motschen.rocks.world.feature.UnderwaterFeature;
 import net.minecraft.state.property.Properties;
 import net.minecraft.util.registry.Registry;
 import net.minecraft.world.gen.ProbabilityConfig;
diff --git a/src/main/java/eu/midnightdust/motschen/rocks/world/MiscFeatures.java b/src/main/java/eu/midnightdust/motschen/rocks/world/configured_feature/MiscFeatures.java
similarity index 96%
rename from src/main/java/eu/midnightdust/motschen/rocks/world/MiscFeatures.java
rename to src/main/java/eu/midnightdust/motschen/rocks/world/configured_feature/MiscFeatures.java
index 08c88fd..bf39494 100644
--- a/src/main/java/eu/midnightdust/motschen/rocks/world/MiscFeatures.java
+++ b/src/main/java/eu/midnightdust/motschen/rocks/world/configured_feature/MiscFeatures.java
@@ -1,9 +1,10 @@
-package eu.midnightdust.motschen.rocks.world;
+package eu.midnightdust.motschen.rocks.world.configured_feature;
 
 import com.google.common.collect.ImmutableSet;
 import eu.midnightdust.motschen.rocks.RocksMain;
 import eu.midnightdust.motschen.rocks.blockstates.SeashellVariation;
 import eu.midnightdust.motschen.rocks.blockstates.StarfishVariation;
+import eu.midnightdust.motschen.rocks.world.FeatureRegistry;
 import net.minecraft.block.Blocks;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.BuiltinRegistries;
diff --git a/src/main/java/eu/midnightdust/motschen/rocks/world/NetherFeatures.java b/src/main/java/eu/midnightdust/motschen/rocks/world/configured_feature/NetherFeatures.java
similarity index 98%
rename from src/main/java/eu/midnightdust/motschen/rocks/world/NetherFeatures.java
rename to src/main/java/eu/midnightdust/motschen/rocks/world/configured_feature/NetherFeatures.java
index 9f76e09..a21d665 100644
--- a/src/main/java/eu/midnightdust/motschen/rocks/world/NetherFeatures.java
+++ b/src/main/java/eu/midnightdust/motschen/rocks/world/configured_feature/NetherFeatures.java
@@ -1,4 +1,4 @@
-package eu.midnightdust.motschen.rocks.world;
+package eu.midnightdust.motschen.rocks.world.configured_feature;
 
 import com.google.common.collect.ImmutableSet;
 import eu.midnightdust.motschen.rocks.RocksMain;
diff --git a/src/main/java/eu/midnightdust/motschen/rocks/world/RockFeatures.java b/src/main/java/eu/midnightdust/motschen/rocks/world/configured_feature/RockFeatures.java
similarity index 99%
rename from src/main/java/eu/midnightdust/motschen/rocks/world/RockFeatures.java
rename to src/main/java/eu/midnightdust/motschen/rocks/world/configured_feature/RockFeatures.java
index 56b64de..50dd27e 100644
--- a/src/main/java/eu/midnightdust/motschen/rocks/world/RockFeatures.java
+++ b/src/main/java/eu/midnightdust/motschen/rocks/world/configured_feature/RockFeatures.java
@@ -1,4 +1,4 @@
-package eu.midnightdust.motschen.rocks.world;
+package eu.midnightdust.motschen.rocks.world.configured_feature;
 
 import com.google.common.collect.ImmutableSet;
 import eu.midnightdust.motschen.rocks.RocksMain;
diff --git a/src/main/java/eu/midnightdust/motschen/rocks/world/StickFeatures.java b/src/main/java/eu/midnightdust/motschen/rocks/world/configured_feature/StickFeatures.java
similarity index 98%
rename from src/main/java/eu/midnightdust/motschen/rocks/world/StickFeatures.java
rename to src/main/java/eu/midnightdust/motschen/rocks/world/configured_feature/StickFeatures.java
index 68e6776..a4651bb 100644
--- a/src/main/java/eu/midnightdust/motschen/rocks/world/StickFeatures.java
+++ b/src/main/java/eu/midnightdust/motschen/rocks/world/configured_feature/StickFeatures.java
@@ -1,4 +1,4 @@
-package eu.midnightdust.motschen.rocks.world;
+package eu.midnightdust.motschen.rocks.world.configured_feature;
 
 import com.google.common.collect.ImmutableSet;
 import eu.midnightdust.motschen.rocks.RocksMain;
diff --git a/src/main/java/eu/midnightdust/motschen/rocks/world/SnowFeature.java b/src/main/java/eu/midnightdust/motschen/rocks/world/feature/SnowFeature.java
similarity index 97%
rename from src/main/java/eu/midnightdust/motschen/rocks/world/SnowFeature.java
rename to src/main/java/eu/midnightdust/motschen/rocks/world/feature/SnowFeature.java
index 40792c2..1ecc1c9 100644
--- a/src/main/java/eu/midnightdust/motschen/rocks/world/SnowFeature.java
+++ b/src/main/java/eu/midnightdust/motschen/rocks/world/feature/SnowFeature.java
@@ -1,4 +1,4 @@
-package eu.midnightdust.motschen.rocks.world;
+package eu.midnightdust.motschen.rocks.world.feature;
 
 import com.mojang.serialization.Codec;
 import net.minecraft.block.BlockState;
diff --git a/src/main/java/eu/midnightdust/motschen/rocks/world/UnderwaterFeature.java b/src/main/java/eu/midnightdust/motschen/rocks/world/feature/UnderwaterFeature.java
similarity index 97%
rename from src/main/java/eu/midnightdust/motschen/rocks/world/UnderwaterFeature.java
rename to src/main/java/eu/midnightdust/motschen/rocks/world/feature/UnderwaterFeature.java
index 4dff3d7..cd107b6 100644
--- a/src/main/java/eu/midnightdust/motschen/rocks/world/UnderwaterFeature.java
+++ b/src/main/java/eu/midnightdust/motschen/rocks/world/feature/UnderwaterFeature.java
@@ -1,4 +1,4 @@
-package eu.midnightdust.motschen.rocks.world;
+package eu.midnightdust.motschen.rocks.world.feature;
 
 import com.mojang.serialization.Codec;
 import net.minecraft.block.BlockState;