diff --git a/code/modules/smithing/anvil.dm b/code/modules/smithing/anvil.dm
index 2a8b476628..5ac705ee09 100644
--- a/code/modules/smithing/anvil.dm
+++ b/code/modules/smithing/anvil.dm
@@ -28,9 +28,9 @@
 	var/datum/material/workpiece_material
 	var/anvilquality = 0
 	var/qualitymod = 0
-	var/currentquality = 0
-	var/currentsteps = 0
-	var/strengthstepcostmod = 1
+	var/currentquality = 0 //lolman? what the fuck do these vars do?
+	var/currentsteps = 0 //even i don't know
+	var/strengthstepcostmod = 1 //todo: document this shit
 	var/stepsdone = ""
 	var/list/smithrecipes = list(RECIPE_AXE = /obj/item/smithing/axehead,
 	RECIPE_HAMMER = /obj/item/smithing/hammerhead,
@@ -149,7 +149,7 @@
 			workpiece_state = FALSE
 			finisheditem.quality = currentquality
 			finisheditem.set_custom_materials(workpiece_material)
-			currentquality = qualitymod
+			currentquality = 0
 			qualitymod = anvilquality
 			stepsdone = ""
 			currentsteps = 0
diff --git a/code/modules/smithing/finished_items.dm b/code/modules/smithing/finished_items.dm
index 7bd6f4e78e..d0d115fca8 100644
--- a/code/modules/smithing/finished_items.dm
+++ b/code/modules/smithing/finished_items.dm
@@ -10,7 +10,8 @@
 	var/quality
 	var/overlay_state = "stick"
 	var/mutable_appearance/overlay
-
+	var/wielded_mult = 1
+	var/wield_force = 15
 
 /obj/item/melee/smith/Initialize()
 	..()
@@ -23,16 +24,15 @@
 
 
 /obj/item/melee/smith/twohand
-	var/wielded_mult = 1.75
+	wielded_mult = 1.75
 
 
-/obj/item/melee/smith/twohand/ComponentInitialize()
-	. = ..()
+/obj/item/melee/smith/twohand/Initialize()
+	..()
 	AddComponent(/datum/component/butchering, 100, 70) //decent in a pinch, but pretty bad.
 	AddComponent(/datum/component/jousting)
 	AddElement(/datum/element/sword_point)
-	var/fw = force*wielded_mult
-	AddComponent(/datum/component/two_handed, force_unwielded=10, force_wielded=fw, icon_wielded="[icon_state]_wield")
+	AddComponent(/datum/component/two_handed, force_unwielded=force, force_wielded=wield_force, icon_wielded="[icon_state]_wield")
 
 
 ///////////////////////////
@@ -46,15 +46,15 @@
 
 /obj/item/pickaxe/smithed
 	name = "pickaxe"
-	desc = "A pickaxe that can sound rocks to find mineral deposits and stop gibtonite detonations."
+	desc = "A pickaxe."
 	icon = 'icons/obj/mining.dmi'
 	icon_state = "pickaxe"
 
 /obj/item/shovel/smithed
-	name = "prospector's pickaxe"
-	desc = "A pickaxe that can sound rocks to find mineral deposits and stop gibtonite detonations."
+	name = "shovel"
+	desc = "A shovel."
 	icon = 'icons/obj/mining.dmi'
-	icon_state = "pickaxe"
+	icon_state = "shovel"
 
 
 
diff --git a/code/modules/smithing/smithed_items.dm b/code/modules/smithing/smithed_items.dm
index 84ba872460..a4b12002d8 100644
--- a/code/modules/smithing/smithed_items.dm
+++ b/code/modules/smithing/smithed_items.dm
@@ -118,11 +118,13 @@
 
 /obj/item/smithing/javelinhead
 	name = "smithed javelin head"
-	finalitem = /obj/item/melee/smith/javelin
+	finalitem = /obj/item/melee/smith/twohand/javelin
 
 /obj/item/smithing/javelinhead/startfinish()
-	finalitem = new /obj/item/melee/smith/javelin(src)
-	finalitem.force += quality
+	var/obj/item/melee/smith/twohand/javelin/finalforreal = new /obj/item/melee/smith/twohand/javelin(src)
+	finalforreal.force += quality
+	finalforreal.wield_force = finalforreal.force*finalforreal.wielded_mult
+	finalitem = finalforreal
 	..()
 
 
@@ -182,20 +184,24 @@
 /obj/item/smithing/broadblade
 	name = "smithed broadsword blade"
 	finishingitem = /obj/item/swordhandle
-	finalitem = /obj/item/melee/smith/broadsword
+	finalitem = /obj/item/melee/smith/twohand/broadsword
 
 /obj/item/smithing/broadblade/startfinish()
-	finalitem = new /obj/item/melee/smith/broadsword(src)
-	finalitem.force += quality
+	var/obj/item/melee/smith/twohand/broadsword/finalforreal = new /obj/item/melee/smith/twohand/broadsword(src)
+	finalforreal.force += quality
+	finalforreal.wield_force = finalforreal.force*finalforreal.wielded_mult
+	finalitem = finalforreal
 	..()
 
 /obj/item/smithing/halberdhead
 	name = "smithed halberd head"
-	finalitem = /obj/item/melee/smith/halberd
+	finalitem = /obj/item/melee/smith/twohand/halberd
 
 /obj/item/smithing/halberdhead/startfinish()
-	finalitem = new /obj/item/melee/smith/halberd(src)
-	finalitem.force += quality
+	var/obj/item/melee/smith/twohand/halberd/finalforreal = new /obj/item/melee/smith/twohand/halberd(src)
+	finalforreal.force += quality
+	finalforreal.wield_force = finalforreal.force*finalforreal.wielded_mult
+	finalitem = finalforreal
 	..()
 
 /obj/item/stick