diff --git a/build.gradle b/build.gradle
index 8a319feb2..4ef2058ef 100644
--- a/build.gradle
+++ b/build.gradle
@@ -192,6 +192,12 @@ subprojects { p ->
         implementation("org.apache.logging.log4j:log4j-api:${rootProject.log4j_version}")
         implementation("org.apache.logging.log4j:log4j-core:${rootProject.log4j_version}")
 
+        // JOML
+        if (project.hasProperty("embed_joml") && embed_joml == "true")
+            forgeShadowMe("org.joml:joml:${rootProject.joml_version}")
+        else
+            implementation("org.joml:joml:${rootProject.joml_version}")
+
         // JUnit tests
         implementation("org.junit.jupiter:junit-jupiter:5.8.2")
         implementation("org.junit.jupiter:junit-jupiter-engine:5.8.2")
@@ -287,7 +293,8 @@ subprojects { p ->
 //        relocate "org.sqlite", "${librariesLocation}.sqlite"
         
         // JOML
-        relocate "org.joml", "${librariesLocation}.joml"
+        if (project.hasProperty("embed_joml") && embed_joml == "true")
+            relocate "org.joml", "${librariesLocation}.joml"
 
         // NightConfig (includes Toml & Json)
         relocate "com.electronwill.nightconfig", "${librariesLocation}.electronwill.nightconfig"
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java
index 843817892..9cbdd9816 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java
@@ -65,7 +65,7 @@ public class BiomeWrapper implements IBiomeWrapper
     #endif
 	
 	public static final String EMPTY_STRING = "EMPTY";
-	public static final BiomeWrapper EMPTY_WRAPPER = new BiomeWrapper(null, null);
+	public static final BiomeWrapper EMPTY_WRAPPER = new BiomeWrapper();
 	
 	/** keep track of broken biomes so we don't log every time */
 	private static final HashSet<String> brokenResourceLocationStrings = new HashSet<>();
@@ -115,7 +115,6 @@ public class BiomeWrapper implements IBiomeWrapper
 			return newWrapper;
 		}
 	}
-	
 	private BiomeWrapper(#if MC_VER < MC_1_18_2 Biome #else Holder<Biome> #endif biome, ILevelWrapper levelWrapper)
 	{
 		this.biome = biome;
@@ -123,6 +122,13 @@ public class BiomeWrapper implements IBiomeWrapper
 		LOGGER.trace("Created BiomeWrapper ["+this.serialString+"] for ["+biome+"]");
 	}
 	
+	/** should only be used to create {@link BiomeWrapper#EMPTY_WRAPPER} */
+	private BiomeWrapper()
+	{
+		this.biome = null;
+		this.serialString = EMPTY_STRING;
+	}
+	
 	
 	
 	//=========//
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java
index 3e3fbd24e..e44a30e0a 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java
@@ -489,6 +489,10 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		{
 			return IrisBlockMaterial.LEAVES;
 		}
+		else if (this.blockState.is(Blocks.LAVA))
+		{
+			return IrisBlockMaterial.LAVA;
+		}
 		else if (this.isLiquid() || this.blockState.is(Blocks.WATER))
 		{
 			return IrisBlockMaterial.WATER;
@@ -524,10 +528,6 @@ public class BlockStateWrapper implements IBlockStateWrapper
 			)
 		{
 			return IrisBlockMaterial.DIRT;
-		} 
-		else if (this.blockState.is(Blocks.LAVA)) 
-		{
-			return IrisBlockMaterial.LAVA;
 		}
 		#if MC_VER >= MC_1_17_1
 		else if (this.blockState.getSoundType() == SoundType.DEEPSLATE
diff --git a/coreSubProjects b/coreSubProjects
index 556550fea..cd20fb1e3 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit 556550fea802c5e7ad526204a40916ba9b698ad0
+Subproject commit cd20fb1e345f0661af0b9e9b3bb242c04ba8cf18
diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java
index 931113d95..d9216458d 100644
--- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java
+++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java
@@ -32,6 +32,8 @@ import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.pos.DhBlockPos;
+import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
@@ -123,17 +125,20 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 			// if we have access to the server, use the chunk save event instead 
 			if (MC.clientConnectedToDedicatedServer())
 			{
-				// Since fabric doesn't have a client-side break-block API event, this is the next best thing
-				ChunkAccess chunk = level.getChunk(blockPos);
-				if (chunk != null)
+				if (SharedApi.isChunkAtBlockPosAlreadyUpdating(blockPos.getX(), blockPos.getZ()))
 				{
-					LOGGER.trace("attack block at blockPos: " + blockPos);
-					
-					IClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper((ClientLevel) level);
-					SharedApi.INSTANCE.chunkBlockChangedEvent(
-							new ChunkWrapper(chunk, level, wrappedLevel),
-							wrappedLevel
-					);
+					// Since fabric doesn't have a client-side break-block API event, this is the next best thing
+					ChunkAccess chunk = level.getChunk(blockPos);
+					if (chunk != null)
+					{
+						LOGGER.trace("attack block at blockPos: " + blockPos);
+						
+						IClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper((ClientLevel) level);
+						SharedApi.INSTANCE.chunkBlockChangedEvent(
+								new ChunkWrapper(chunk, level, wrappedLevel),
+								wrappedLevel
+						);
+					}	
 				}
 			}
 			
@@ -147,20 +152,23 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 			// if we have access to the server, use the chunk save event instead 
 			if (MC.clientConnectedToDedicatedServer())
 			{
-				// Since fabric doesn't have a client-side place-block API event, this is the next best thing
-				if (hitResult.getType() == HitResult.Type.BLOCK
-						&& !hitResult.isInside())
+				if (SharedApi.isChunkAtBlockPosAlreadyUpdating(hitResult.getBlockPos().getX(), hitResult.getBlockPos().getZ()))
 				{
-					ChunkAccess chunk = level.getChunk(hitResult.getBlockPos());
-					if (chunk != null)
+					// Since fabric doesn't have a client-side place-block API event, this is the next best thing
+					if (hitResult.getType() == HitResult.Type.BLOCK
+							&& !hitResult.isInside())
 					{
-						LOGGER.trace("use block at blockPos: " + hitResult.getBlockPos());
-						
-						IClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper((ClientLevel) level);
-						SharedApi.INSTANCE.chunkBlockChangedEvent(
-								new ChunkWrapper(chunk, level, wrappedLevel),
-								wrappedLevel
-						);
+						ChunkAccess chunk = level.getChunk(hitResult.getBlockPos());
+						if (chunk != null)
+						{
+							LOGGER.trace("use block at blockPos: " + hitResult.getBlockPos());
+							
+							IClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper((ClientLevel) level);
+							SharedApi.INSTANCE.chunkBlockChangedEvent(
+									new ChunkWrapper(chunk, level, wrappedLevel),
+									wrappedLevel
+							);
+						}
 					}
 				}
 			}
diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java
index 469f7b134..9b1b03c49 100644
--- a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java
+++ b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java
@@ -173,6 +173,11 @@ public class ForgeClientProxy implements AbstractModInitializer.IEventProxy
 	@SubscribeEvent
 	public void rightClickBlockEvent(PlayerInteractEvent.RightClickBlock event)
 	{
+		if (SharedApi.isChunkAtBlockPosAlreadyUpdating(event.getPos().getX(), event.getPos().getZ()))
+		{
+			return;
+		}
+		
 		LOGGER.trace("interact or block place event at blockPos: " + event.getPos());
 		
 		#if MC_VER < MC_1_19_2
@@ -187,6 +192,11 @@ public class ForgeClientProxy implements AbstractModInitializer.IEventProxy
 	@SubscribeEvent
 	public void leftClickBlockEvent(PlayerInteractEvent.LeftClickBlock event)
 	{
+		if (SharedApi.isChunkAtBlockPosAlreadyUpdating(event.getPos().getX(), event.getPos().getZ()))
+		{
+			return;
+		}
+		
 		LOGGER.trace("break or block attack at blockPos: " + event.getPos());
 		
 		#if MC_VER < MC_1_19_2
diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeClientProxy.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeClientProxy.java
index d46be455c..69da1d5e1 100644
--- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeClientProxy.java
+++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeClientProxy.java
@@ -146,6 +146,11 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 	@SubscribeEvent
 	public void rightClickBlockEvent(PlayerInteractEvent.RightClickBlock event)
 	{
+		if (SharedApi.isChunkAtBlockPosAlreadyUpdating(event.getPos().getX(), event.getPos().getZ()))
+		{
+			return;
+		}
+		
 		LOGGER.trace("interact or block place event at blockPos: " + event.getPos());
 		
 		LevelAccessor level = event.getLevel();
@@ -156,6 +161,11 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 	@SubscribeEvent
 	public void leftClickBlockEvent(PlayerInteractEvent.LeftClickBlock event)
 	{
+		if (SharedApi.isChunkAtBlockPosAlreadyUpdating(event.getPos().getX(), event.getPos().getZ()))
+		{
+			return;
+		}
+		
 		LOGGER.trace("break or block attack at blockPos: " + event.getPos());
 		
 		LevelAccessor level = event.getLevel();
diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/modAccessor/ModChecker.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/modAccessor/ModChecker.java
index 775869e49..6494d6edf 100644
--- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/modAccessor/ModChecker.java
+++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/modAccessor/ModChecker.java
@@ -22,14 +22,22 @@ package com.seibel.distanthorizons.neoforge.wrappers.modAccessor;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker;
 import net.neoforged.fml.ModList;
 
+import java.io.File;
+
 public class ModChecker implements IModChecker
 {
 	public static final ModChecker INSTANCE = new ModChecker();
 	
 	@Override
-	public boolean isModLoaded(String modid)
+	public boolean isModLoaded(String modid) 
 	{
-		return ModList.get().isLoaded(modid);
+		return ModList.get().isLoaded(modid); 
+	}
+	
+	@Override
+	public File modLocation(String modid) 
+	{
+		return ModList.get().getModFileById(modid).getFile().getFilePath().toFile(); 
 	}
 	
 }
diff --git a/versionProperties/1.16.5.properties b/versionProperties/1.16.5.properties
index dc8d54645..dae7f1dc0 100644
--- a/versionProperties/1.16.5.properties
+++ b/versionProperties/1.16.5.properties
@@ -5,6 +5,7 @@ parchment_version=1.16.5:2022.03.06
 compatible_minecraft_versions=["1.16.4", "1.16.5"]
 accessWidenerVersion=1_16
 builds_for=fabric,forge
+embed_joml=true
 
 # Fabric loader
 fabric_loader_version=0.14.24
diff --git a/versionProperties/1.17.1.properties b/versionProperties/1.17.1.properties
index 44be229a8..4b5b8dfc9 100644
--- a/versionProperties/1.17.1.properties
+++ b/versionProperties/1.17.1.properties
@@ -5,6 +5,7 @@ parchment_version=1.17.1:2021.12.12
 compatible_minecraft_versions=["1.17", "1.17.1"]
 accessWidenerVersion=1_17
 builds_for=fabric,forge
+embed_joml=true
 
 # Fabric loader
 fabric_loader_version=0.14.24
diff --git a/versionProperties/1.18.2.properties b/versionProperties/1.18.2.properties
index e987c439f..e168e4f1b 100644
--- a/versionProperties/1.18.2.properties
+++ b/versionProperties/1.18.2.properties
@@ -5,6 +5,7 @@ parchment_version=1.18.2:2022.11.06
 compatible_minecraft_versions=["1.18.2"]
 accessWidenerVersion=1_18
 builds_for=fabric,forge
+embed_joml=true
 
 # Fabric loader
 fabric_loader_version=0.14.24
diff --git a/versionProperties/1.19.2.properties b/versionProperties/1.19.2.properties
index c4fe3195f..34e38b150 100644
--- a/versionProperties/1.19.2.properties
+++ b/versionProperties/1.19.2.properties
@@ -5,6 +5,7 @@ parchment_version=1.19.2:2022.11.27
 compatible_minecraft_versions=["1.19.2"]
 accessWidenerVersion=1_19_2
 builds_for=fabric,forge
+embed_joml=true
 
 # Fabric loader
 fabric_loader_version=0.14.24