diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm
index 9b8494018a8..3a3e29af17d 100644
--- a/code/game/objects/items/weapons/flamethrower.dm
+++ b/code/game/objects/items/weapons/flamethrower.dm
@@ -157,6 +157,10 @@
 	update_icon()
 	return
 
+/obj/item/weapon/flamethrower/CheckParts()
+	weldtool = locate(/obj/item/weapon/weldingtool) in contents
+	igniter = locate(/obj/item/device/assembly/igniter) in contents
+	update_icon()
 
 //Called from turf.dm turf/dblclick
 /obj/item/weapon/flamethrower/proc/flame_turf(turflist)
@@ -195,10 +199,6 @@
 
 /obj/item/weapon/flamethrower/full/New(var/loc)
 	..()
-	for(var/obj/item/weapon/weldingtool/W in src)
-		weldtool = W
-	for(var/obj/item/device/assembly/igniter/I in src)
-		igniter = I
 	if(!weldtool)
 		weldtool = new /obj/item/weapon/weldingtool(src)
 	weldtool.status = 0
@@ -211,4 +211,4 @@
 /obj/item/weapon/flamethrower/full/tank/New(var/loc)
 	..()
 	ptank = new /obj/item/weapon/tank/internals/plasma/full(src)
-	update_icon()
\ No newline at end of file
+	update_icon()
diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm
index 870e0115d75..d8934a1372f 100644
--- a/code/game/objects/items/weapons/tanks/tank_types.dm
+++ b/code/game/objects/items/weapons/tanks/tank_types.dm
@@ -96,6 +96,7 @@
 		F.ptank = src
 		user.unEquip(src)
 		src.loc = F
+		F.update_icon()
 	return
 
 /obj/item/weapon/tank/internals/plasma/full/New()
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index fe4713a37c5..e4266c752f0 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -308,6 +308,7 @@
 //Toggles the welder off and on
 /obj/item/weapon/weldingtool/proc/toggle(mob/user, message = 0)
 	if(!status)
+		user << "<span class='notice'>[src] can't be turned on while unsecured.</span>"
 		return
 	welding = !welding
 	if(welding)
diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm
index b7583bed928..ef5c30fd07c 100644
--- a/code/modules/crafting/recipes.dm
+++ b/code/modules/crafting/recipes.dm
@@ -5,7 +5,7 @@
 	var/tools[] = list() //type paths of items needed but not consumed
 	var/time = 30 //time in deciseconds
 	var/parts[] = list() //type paths of items that will be placed in the result
-	var/chem_catalists[] = list() //like tools but for reagents
+	var/chem_catalysts[] = list() //like tools but for reagents
 
 
 /datum/table_recipe/IED
@@ -84,10 +84,10 @@
 
 /datum/table_recipe/flamethrower
 	name = "Flamethrower"
-	result = /obj/item/weapon/flamethrower/full
+	result = /obj/item/weapon/flamethrower
 	reqs = list(/obj/item/weapon/weldingtool = 1,
 				/obj/item/device/assembly/igniter = 1,
-				/obj/item/stack/rods = 2)
+				/obj/item/stack/rods = 1)
 	parts = list(/obj/item/device/assembly/igniter = 1,
 				/obj/item/weapon/weldingtool = 1)
 	tools = list(/obj/item/weapon/screwdriver)
diff --git a/code/modules/crafting/table.dm b/code/modules/crafting/table.dm
index d94e96c7bf8..749648f43fd 100644
--- a/code/modules/crafting/table.dm
+++ b/code/modules/crafting/table.dm
@@ -17,8 +17,8 @@
 					if(table_contents[B] >= R.reqs[A])
 						continue main_loop
 			return 0
-	for(var/A in R.chem_catalists)
-		if(table_contents[A] < R.chem_catalists[A])
+	for(var/A in R.chem_catalysts)
+		if(table_contents[A] < R.chem_catalysts[A])
 			return 0
 	return 1
 
@@ -196,12 +196,12 @@
 						req_text += " [R.reqs[A]] [RE.name]"
 						qdel(RE)
 
-				if(R.chem_catalists.len)
-					catalist_text += ", Catalists:"
-					for(var/C in R.chem_catalists)
+				if(R.chem_catalysts.len)
+					catalist_text += ", Catalysts:"
+					for(var/C in R.chem_catalysts)
 						if(ispath(C, /datum/reagent))
 							var/datum/reagent/RE = new C
-							catalist_text += " [R.chem_catalists[C]] [RE.name]"
+							catalist_text += " [R.chem_catalysts[C]] [RE.name]"
 							qdel(RE)
 				if(R.tools.len)
 					tool_text += ", Tools:"