diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping
index 94e4a8d0d1..a0c8bd09ca 100644
--- a/mappings/net/minecraft/block/Block.mapping
+++ b/mappings/net/minecraft/block/Block.mapping
@@ -1,5 +1,6 @@
 CLASS net/minecraft/class_2248 net/minecraft/block/Block
-	COMMENT Represents a block that can be placed in a world.
+	COMMENT A block is a voxel in a {@linkplain World world}.
+	COMMENT This class and its subclasses define all logics for those voxels.
 	COMMENT
 	COMMENT <p>There is exactly one instance for every type of block. Every stone
 	COMMENT block for example in a world shares the same block instance. Each block
@@ -13,7 +14,11 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
 	COMMENT <p>The translation key for the block name is determined by {@link
 	COMMENT #getTranslationKey}.
 	COMMENT
-	COMMENT @see <a href="https://minecraft.fandom.com/wiki/Model">Model - Official Minecraft Wiki</a>
+	COMMENT <p>In the world, the actual voxels are not stored as blocks, but as
+	COMMENT {@linkplain BlockState block states}. The possible states of the block
+	COMMENT is defined by {@link appendProperties}.
+	COMMENT
+	COMMENT @see BlockState
 	FIELD field_10638 LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD field_10642 translationKey Ljava/lang/String;
 	FIELD field_10646 defaultState Lnet/minecraft/class_2680;
diff --git a/mappings/net/minecraft/state/StateManager.mapping b/mappings/net/minecraft/state/StateManager.mapping
index f818e4b07b..d7401571e1 100644
--- a/mappings/net/minecraft/state/StateManager.mapping
+++ b/mappings/net/minecraft/state/StateManager.mapping
@@ -4,6 +4,8 @@ CLASS net/minecraft/class_2689 net/minecraft/state/StateManager
 	FIELD field_12316 properties Lcom/google/common/collect/ImmutableSortedMap;
 	FIELD field_12317 owner Ljava/lang/Object;
 	METHOD <init> (Ljava/util/function/Function;Ljava/lang/Object;Lnet/minecraft/class_2689$class_2691;Ljava/util/Map;)V
+		ARG 1 defaultStateGetter
+		ARG 2 owner
 		ARG 3 factory
 		ARG 4 propertiesMap
 	METHOD method_11659 getProperties ()Ljava/util/Collection;
@@ -12,6 +14,11 @@ CLASS net/minecraft/class_2689 net/minecraft/state/StateManager
 	METHOD method_11663 getProperty (Ljava/lang/String;)Lnet/minecraft/class_2769;
 		ARG 1 name
 	METHOD method_11664 getDefaultState ()Lnet/minecraft/class_2688;
+	METHOD method_30040 addFieldToMapCodec (Lcom/mojang/serialization/MapCodec;Ljava/util/function/Supplier;Ljava/lang/String;Lnet/minecraft/class_2769;)Lcom/mojang/serialization/MapCodec;
+		ARG 0 mapCodec
+		ARG 1 defaultStateGetter
+		ARG 2 key
+		ARG 3 property
 	CLASS class_2690 Builder
 		FIELD field_12318 owner Ljava/lang/Object;
 		FIELD field_12319 namedProperties Ljava/util/Map;
@@ -20,7 +27,7 @@ CLASS net/minecraft/class_2689 net/minecraft/state/StateManager
 		METHOD method_11667 add ([Lnet/minecraft/class_2769;)Lnet/minecraft/class_2689$class_2690;
 			ARG 1 properties
 		METHOD method_11668 build (Ljava/util/function/Function;Lnet/minecraft/class_2689$class_2691;)Lnet/minecraft/class_2689;
-			ARG 1 ownerToStateFunction
+			ARG 1 defaultStateGetter
 			ARG 2 factory
 		METHOD method_11669 validate (Lnet/minecraft/class_2769;)V
 			ARG 1 property
diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping
index be2298d9d1..c206026e77 100644
--- a/mappings/net/minecraft/world/World.mapping
+++ b/mappings/net/minecraft/world/World.mapping
@@ -80,8 +80,11 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
 	METHOD method_27982 isDebugWorld ()Z
 		COMMENT Checks if this world is a debug world.
 		COMMENT
-		COMMENT <p>Debug worlds are not modifiable and are typically meant for development and debug use only.
-		COMMENT See <a href="https://minecraft.gamepedia.com/Debug_mode">the minecraft wiki</a> as well.
+		COMMENT <p>Debug worlds are not modifiable. They have a barrier layer at y=60,
+		COMMENT and lists all possible block states in game at y=70, helpful for finding
+		COMMENT block rendering and model errors.
+		COMMENT
+		COMMENT @see net.minecraft.world.gen.chunk.DebugChunkGenerator
 	METHOD method_27983 getRegistryKey ()Lnet/minecraft/class_5321;
 	METHOD method_31419 asString ()Ljava/lang/String;
 	METHOD method_31592 getEntityLookup ()Lnet/minecraft/class_5577;