diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41eca62..77993f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,8 @@
     - acid_spreads (Contagious Acid Spreads)
 - You can no longer jump over fence
 - Added Concrete which is really just a blank colored block :|
+- Added Tuff and Diorite both of which can spawn in caves
+- Added Diorite and Tuff Bricks
 
 ## [Oct 6th - Oct 12th 2024] Update: Texture Update
 
diff --git a/mods/ITEMS/pyutest_blocks/api.lua b/mods/ITEMS/pyutest_blocks/api.lua
index dd0d21a..179218b 100644
--- a/mods/ITEMS/pyutest_blocks/api.lua
+++ b/mods/ITEMS/pyutest_blocks/api.lua
@@ -28,7 +28,7 @@ PyuTest.make_node = function(name, desc, groups, tiles, extra_conf)
   minetest.register_node(name, conf)
 end
 
-PyuTest.node_boxes = {
+PyuTest.NODE_BOXES = {
   CARPET = {
     type = "fixed",
     fixed = { -0.5, -0.5, -0.5, 0.5, -0.45, 0.5 }
@@ -48,6 +48,12 @@ PyuTest.node_boxes = {
       { -0.5, 0,    0,    0.5, 0.5, 0.5 },
     },
   },
+  SLIGHTLY_SMALLER = {
+    type = "fixed",
+    fixed = {
+      {-0.5, -0.5, -0.5, 0.5, 0.45, 0.5},
+    }
+  }
 }
 PyuTest.building_blocks = {}
 
@@ -94,7 +100,7 @@ PyuTest.make_building_blocks = function(name, desc, tex, colortint, cgroups, ext
     drawtype = "nodebox",
     paramtype = "light",
     paramtype2 = "facedir",
-    node_box = PyuTest.node_boxes.CARPET,
+    node_box = PyuTest.NODE_BOXES.CARPET,
     sounds = PyuTest.make_node_sounds(),
     buildable_to = true
   }, econf))
@@ -106,7 +112,7 @@ PyuTest.make_building_blocks = function(name, desc, tex, colortint, cgroups, ext
     drawtype = "nodebox",
     paramtype = "light",
     paramtype2 = "facedir",
-    node_box = PyuTest.node_boxes.SLAB,
+    node_box = PyuTest.NODE_BOXES.SLAB,
     sounds = PyuTest.make_node_sounds(),
   }, econf))
 
@@ -116,7 +122,7 @@ PyuTest.make_building_blocks = function(name, desc, tex, colortint, cgroups, ext
     groups = groups,
     drawtype = "nodebox",
     paramtype = "light",
-    node_box = PyuTest.node_boxes.PILLAR,
+    node_box = PyuTest.NODE_BOXES.PILLAR,
     sounds = PyuTest.make_node_sounds()
   }, econf))
 
@@ -127,7 +133,7 @@ PyuTest.make_building_blocks = function(name, desc, tex, colortint, cgroups, ext
     drawtype = "nodebox",
     paramtype = "light",
     paramtype2 = "facedir",
-    node_box = PyuTest.node_boxes.STAIRS,
+    node_box = PyuTest.NODE_BOXES.STAIRS,
     sounds = PyuTest.make_node_sounds(),
   }, econf))
 
@@ -206,7 +212,7 @@ PyuTest.make_liquid = function(name, desc, groups, texture, speed, extra_conf)
       use_texture_alpha = "blend",
       paramtype = "light",
       drop = "",
-      drowning = 3,
+      drowning = 4,
       liquidtype = liquidtype,
       liquid_renewable = true,
       liquid_viscosity = speed or 1,
diff --git a/mods/ITEMS/pyutest_blocks/basic.lua b/mods/ITEMS/pyutest_blocks/basic.lua
index d6c27f9..dc3861d 100644
--- a/mods/ITEMS/pyutest_blocks/basic.lua
+++ b/mods/ITEMS/pyutest_blocks/basic.lua
@@ -74,6 +74,18 @@ PyuTest.make_building_blocks("pyutest_blocks:andesite", "Andesite", {"pyutest-an
   cracky = PyuTest.BLOCK_NORMAL,
 })
 
+PyuTest.make_building_blocks("pyutest_blocks:diorite", "Diorite", {"pyutest-diorite.png"}, nil, {
+  ground = 1,
+  stone = 1,
+  cracky = PyuTest.BLOCK_NORMAL,
+})
+
+PyuTest.make_building_blocks("pyutest_blocks:tuff", "Tuff", {"pyutest-tuff.png"}, nil, {
+  ground = 1,
+  stone = 1,
+  cracky = PyuTest.BLOCK_NORMAL,
+})
+
 PyuTest.make_building_blocks("pyutest_blocks:stone_bricks", "Stone Bricks", {
   "pyutest-bricks2.png"
 }, "#82807c", {
@@ -110,6 +122,25 @@ PyuTest.make_building_blocks("pyutest_blocks:andesite_bricks", "Andesite Bricks"
   is_ground_content = false
 })
 
+PyuTest.make_building_blocks("pyutest_blocks:diorite_bricks", "Diorite Bricks", {
+  "pyutest-bricks2.png"
+}, "#b4b3b1", {
+  bricks = 1,
+  cracky = PyuTest.BLOCK_NORMAL,
+}, {
+  is_ground_content = false,
+})
+
+PyuTest.make_building_blocks("pyutest_blocks:tuff_bricks", "Tuff Bricks", {
+  "pyutest-bricks2.png"
+}, "#e5b88c", {
+  bricks = 1,
+  cracky = PyuTest.BLOCK_NORMAL,
+}, {
+  is_ground_content = false,
+  paramtype2 = "color",
+})
+
 PyuTest.make_building_blocks("pyutest_blocks:sandstone", "Sandstone", { "pyutest-sandstone.png" }, nil, {
   ground = 1,
   acid_vulnerable = 1,
diff --git a/mods/ITEMS/pyutest_farming/api.lua b/mods/ITEMS/pyutest_farming/api.lua
index 2cda5cd..d29b137 100644
--- a/mods/ITEMS/pyutest_farming/api.lua
+++ b/mods/ITEMS/pyutest_farming/api.lua
@@ -3,7 +3,9 @@ PyuTest.make_node("pyutest_farming:farmland", "Farmland", {
   acid_vulnerable = 1,
   crumbly = PyuTest.BLOCK_FAST
 }, {"pyutest-farmland.png", "pyutest-dirt.png"}, {
-  drop = "pyutest_blocks:dirt_block"
+  drop = "pyutest_blocks:dirt_block",
+  drawtype = "nodebox",
+  node_box = PyuTest.NODE_BOXES.SLIGHTLY_SMALLER
 })
 
 PyuTest.make_item("pyutest_farming:hoe", "Hoe", {
diff --git a/mods/ITEMS/pyutest_grass/init.lua b/mods/ITEMS/pyutest_grass/init.lua
index 65b8fd0..3f69232 100644
--- a/mods/ITEMS/pyutest_grass/init.lua
+++ b/mods/ITEMS/pyutest_grass/init.lua
@@ -1,4 +1,4 @@
-PyuTest.make_grass = function (name, desc, groups, color, ttex, stex, dtex)
+PyuTest.make_grass = function (name, desc, groups, color, ttex, stex, dtex, econf)
   local _ttex = {name = ttex or "pyutest-grass-top.png", color = color}
   local _stex = {name = stex or "pyutest-grass-side.png", color = color}
   local _dtex = {_ttex, dtex or "pyutest-dirt.png"}
@@ -14,6 +14,8 @@ PyuTest.make_grass = function (name, desc, groups, color, ttex, stex, dtex)
   PyuTest.make_flower(name.."_plant", desc .. " Plant", "pyutest-grass-plant.png", nil, false, nil, {
     color = color
   })
+
+  minetest.override_item(name.."_block", econf or {})
 end
 
 PyuTest.make_grass("pyutest_grass:grass", "Grass", {
@@ -52,3 +54,13 @@ PyuTest.make_grass("pyutest_grass:snowy_grass", "Snowy Grass", {
   crumbly = PyuTest.BLOCK_FAST,
   acid_vulnerable = 1,
 }, "#f2f6fb")
+
+PyuTest.make_grass("pyutest_grass:dirt_path", "Dirt Path", {
+  crumbly = PyuTest.BLOCK_FAST,
+  acid_vulnerable = 1,
+}, "#d9a066", nil, nil, nil, {
+  drawtype = "nodebox",
+  node_box = PyuTest.NODE_BOXES.SLIGHTLY_SMALLER,
+  collision_box = PyuTest.NODE_BOXES.SLIGHTLY_SMALLER,
+  selection_box = PyuTest.NODE_BOXES.SLIGHTLY_SMALLER
+})
diff --git a/mods/MAPGEN/pyutest_mapgen/structures.lua b/mods/MAPGEN/pyutest_mapgen/structures.lua
index 5bebbd2..8b1f397 100644
--- a/mods/MAPGEN/pyutest_mapgen/structures.lua
+++ b/mods/MAPGEN/pyutest_mapgen/structures.lua
@@ -37,7 +37,7 @@ PyuTest.register_structure("ocean_ruins", "OceanRuins", {
   place_on = {"pyutest_blocks:gravel_block"},
   biomes = PyuTest.get_biomes_from_type(PyuTest.BIOME_TYPES.OCEAN),
   y_max = PyuTest.OVERWORLD_DEEP_OCEAN_MAX + 4,
-  y_min = PyuTest.DEAP_OCEAN_MIN,
+  y_min = PyuTest.OVERWORLD_DEEP_OCEAN_MIN,
   spawn_by = {"pyutest_blocks:water_source"},
   num_spawn_by = 2
 })
diff --git a/mods/MAPGEN/pyutest_ores/init.lua b/mods/MAPGEN/pyutest_ores/init.lua
index abc4336..00b12fd 100644
--- a/mods/MAPGEN/pyutest_ores/init.lua
+++ b/mods/MAPGEN/pyutest_ores/init.lua
@@ -33,6 +33,30 @@ minetest.register_ore({
   noise_params = PyuTest.SPECIALSTONE_NOISE_PARAMS
 })
 
+minetest.register_ore({
+  ore_type = "blob",
+  ore = "pyutest_blocks:diorite_block",
+  wherein = "pyutest_blocks:stone_block",
+  clust_scarcity = 9 * 9 * 9,
+  clust_num_ores = 35,
+  clust_size = 5,
+  y_max = PyuTest.OVERWORLD_SURFACE_BOTTOM - 1,
+  y_min = PyuTest.OVERWORLD_BOTTOM,
+  noise_params = PyuTest.SPECIALSTONE_NOISE_PARAMS
+})
+
+minetest.register_ore({
+  ore_type = "blob",
+  ore = "pyutest_blocks:tuff_block",
+  wherein = "pyutest_blocks:stone_block",
+  clust_scarcity = 9 * 9 * 9,
+  clust_num_ores = 35,
+  clust_size = 5,
+  y_max = PyuTest.OVERWORLD_SURFACE_BOTTOM - 1,
+  y_min = PyuTest.OVERWORLD_BOTTOM,
+  noise_params = PyuTest.SPECIALSTONE_NOISE_PARAMS
+})
+
 minetest.register_ore({
   ore_type = "blob",
   ore = "pyutest_blocks:clay_block",
@@ -41,7 +65,7 @@ minetest.register_ore({
   clust_num_ores = 35,
   clust_size = 5,
   y_max = PyuTest.OVERWORLD_SURFACE_BOTTOM - 1,
-  y_min = PyuTest.DEAP_OCEAN_MIN,
+  y_min = PyuTest.OVERWORLD_DEEP_OCEAN_MIN,
   noise_params = PyuTest.SPECIALSTONE_NOISE_PARAMS
 })
 
@@ -49,8 +73,22 @@ PyuTest.ORE_STONES = {
   "pyutest_blocks:stone_block",
   "pyutest_blocks:granite_block",
   "pyutest_blocks:andesite_block",
+  "pyutest_blocks:diorite_block",
+  "pyutest_blocks:tuff_block"
 }
 
+minetest.register_ore({
+  ore_type = "blob",
+  ore = "pyutest_blocks:dirt_block",
+  wherein = "pyutest_blocks:stone_block",
+  clust_scarcity = 7 * 7 * 7,
+  clust_num_ores = 35,
+  clust_size = 5,
+  y_max = PyuTest.OVERWORLD_SURFACE_BOTTOM - 1,
+  y_min = PyuTest.OVERWORLD_BOTTOM,
+  noise_params = PyuTest.SPECIALSTONE_NOISE_PARAMS
+})
+
 PyuTest.registered_ores = {}
 
 PyuTest.make_ore_and_item = function(id, desc, item_id_suffix, item_description_suffix, options)
diff --git a/textures/pyutest-diorite.png b/textures/pyutest-diorite.png
new file mode 100644
index 0000000..66e39a6
Binary files /dev/null and b/textures/pyutest-diorite.png differ
diff --git a/textures/pyutest-tuff.png b/textures/pyutest-tuff.png
new file mode 100644
index 0000000..f849ba4
Binary files /dev/null and b/textures/pyutest-tuff.png differ