diff --git a/df_achievements/farming.lua b/df_achievements/farming.lua
index 43cf1e7..b0d8455 100644
--- a/df_achievements/farming.lua
+++ b/df_achievements/farming.lua
@@ -87,7 +87,7 @@ for seed_item, def in pairs(plant_node_achievements) do
 end
 
 awards.register_achievement("dfcaverns_plant_all_upper_trees", {
-	title = S("Plant All Fungal Trees"),
+	title = S("Fungal Arborist"),
 	description = S("Plant one of every kind of 'tree' found in the caverns above the Sunless Sea."),
 	icon = "dfcaverns_awards_backgroundx32.png^"
 		.."(dfcaverns_awards_cavern_towercapx32.png^dfcaverns_awards_cavern_fungiwoodx32.png^dfcaverns_awards_cavern_goblincapx32.png)^[transformFX"
@@ -101,7 +101,7 @@ awards.register_achievement("dfcaverns_plant_all_upper_trees", {
 })
 
 awards.register_achievement("dfcaverns_plant_all_primordial", {
-	title = S("Plant All Primordial Trees"),
+	title = S("Primordial Arborist"),
 	description = S("Plant one of every kind of 'tree' from the Primordial caverns."),
 	icon = "dfcaverns_awards_backgroundx32.png^"
 		.."(dfcaverns_awards_cavern_primordial_mushx32.png^dfcaverns_awards_cavern_junglex32.png)^[transformFX"
@@ -116,7 +116,7 @@ awards.register_achievement("dfcaverns_plant_all_primordial", {
 })
 
 awards.register_achievement("dfcaverns_plant_all_underground_trees", {
-	title = S("Plant All Underground Trees"),
+	title = S("Underground Arborist"),
 	description = S("Plant one of every kind of 'tree' found in the caverns beneath the surface."),
 	icon = "dfcaverns_awards_backgroundx32.png^"
 		.."(dfcaverns_awards_cavern_towercapx32.png^dfcaverns_awards_cavern_fungiwoodx32.png^dfcaverns_awards_cavern_goblincapx32.png)^[transformFX"
@@ -131,7 +131,7 @@ awards.register_achievement("dfcaverns_plant_all_underground_trees", {
 })
 
 awards.register_achievement("dfcaverns_plant_all_farmables", {
-	title = S("Plant All Farmable Underground Plants"),
+	title = S("Underground Farmer"),
 	description = S("Plant one of every kind of small farmable plant found in the caverns beneath the surface."),
 	icon = "dfcaverns_awards_backgroundx32.png"
 		.."^[combine:32x32:0,0="..soil_texture
diff --git a/df_achievements/locale/template.txt b/df_achievements/locale/template.txt
index 601a184..83ac323 100644
--- a/df_achievements/locale/template.txt
+++ b/df_achievements/locale/template.txt
@@ -45,11 +45,8 @@ Plug a crack that mine gas is seeping out of to make the caves just a little bit
 
 ### farming.lua ###
 
+Fungal Arborist=
 Plant @1=
-Plant All Farmable Underground Plants=
-Plant All Fungal Trees=
-Plant All Primordial Trees=
-Plant All Underground Trees=
 Plant Black Cap=
 Plant Bloodthorn=
 Plant Cave Wheat=
@@ -80,6 +77,9 @@ Plant one of every kind of 'tree' from the Primordial caverns.=
 
 Plant one of every kind of small farmable plant found in the caverns beneath the surface.=
 
+Primordial Arborist=
+Underground Arborist=
+Underground Farmer=
 
 ### food.lua ###
 
diff --git a/df_dependencies/fireflies.lua b/df_dependencies/fireflies.lua
index ecf5f87..38ec608 100644
--- a/df_dependencies/fireflies.lua
+++ b/df_dependencies/fireflies.lua
@@ -182,8 +182,6 @@ minetest.register_node("df_dependencies:firefly_bottle", {
 
 minetest.register_craft( {
 	output = "df_dependencies:firefly_bottle",
-	recipe = {
-		{"df_dependencies:firefly"},
-		{bottle}
-	}
+	type = "shapeless",
+	recipe = {"df_dependencies:firefly", bottle},
 })
diff --git a/df_farming/plump_helmet.lua b/df_farming/plump_helmet.lua
index 71266ea..3e0805a 100644
--- a/df_farming/plump_helmet.lua
+++ b/df_farming/plump_helmet.lua
@@ -55,9 +55,10 @@ local plump_helmet_on_place =  function(itemstack, placer, pointed_thing, plantn
 	end
 
 	-- add the node and remove 1 item from the itemstack
-	local newnode= {name = itemstack:get_name(), param2 = new_param2, param1=0}
+	local new_param2 = math.random(0,3)
+	local newnode= {name = plantname, param2 = new_param2, param1=0}
 	local oldnode= minetest.get_node(pt.above)
-	minetest.add_node(pt.above, {name = plantname, param2 = math.random(0,3)})
+	minetest.add_node(pt.above, newnode)
 	
 	local growth_permitted_function = df_farming.growth_permitted["df_farming:plump_helmet_spawn"] -- use the same permitted function for all plump helmets
 	if not growth_permitted_function or growth_permitted_function(pt.above) then
diff --git a/mine_gas/init.lua b/mine_gas/init.lua
index 74fbb06..c946879 100644
--- a/mine_gas/init.lua
+++ b/mine_gas/init.lua
@@ -122,6 +122,8 @@ minetest.register_abm({
 	end,
 })
 
+local soundfile_cool_lava = df_dependencies.soundfile_cool_lava
+
 minetest.register_abm({
 	label = "mine_gas:gas snuffing torches",
 	nodenames = {"group:torch"},
@@ -138,7 +140,7 @@ minetest.register_abm({
 	        end
 			minetest.set_node(pos, {name="mine_gas:gas"})
 			minetest.sound_play(
-				df_dependencies.soundfile_cool_lava,
+				soundfile_cool_lava,
 				{pos = pos, max_hear_distance = 16, gain = 0.1}
 			)
 		end	
@@ -147,7 +149,7 @@ minetest.register_abm({
 
 local tnt_boom = df_dependencies.tnt_boom
 
-if minetest.get_modpath("tnt") then
+if tnt_boom then
 	minetest.register_abm({
 		label = "mine_gas:gas ignition",
 		nodenames = {"group:torch", "group:igniter", "group:fire"}, -- checking for ignition sources because there will be fewer than there are gas nodes