diff --git a/modular_nova/modules/reagent_forging/code/forge.dm b/modular_nova/modules/reagent_forging/code/forge.dm
index a808f837dbd..42041eac5e1 100644
--- a/modular_nova/modules/reagent_forging/code/forge.dm
+++ b/modular_nova/modules/reagent_forging/code/forge.dm
@@ -801,7 +801,7 @@
 
 	in_use = TRUE
 	while(forge_temperature < 91)
-		if(!do_after(user, skill_modifier * forge_item.toolspeed, target = src))
+		if(!do_after(user, (skill_modifier * forge_item.toolspeed) SECONDS, target = src))
 			balloon_alert_to_viewers("stopped billowing")
 			in_use = FALSE
 			return ITEM_INTERACT_SUCCESS
diff --git a/modular_nova/modules/reagent_forging/code/forge_items.dm b/modular_nova/modules/reagent_forging/code/forge_items.dm
index 0141245f390..e70cc5c1ef5 100644
--- a/modular_nova/modules/reagent_forging/code/forge_items.dm
+++ b/modular_nova/modules/reagent_forging/code/forge_items.dm
@@ -25,7 +25,7 @@ GLOBAL_LIST_INIT(allowed_forging_materials, list(
 	icon = 'modular_nova/modules/reagent_forging/icons/obj/forge_items.dmi'
 	lefthand_file = 'modular_nova/modules/reagent_forging/icons/mob/forge_weapon_l.dmi'
 	righthand_file = 'modular_nova/modules/reagent_forging/icons/mob/forge_weapon_r.dmi'
-	toolspeed = 1 SECONDS
+	toolspeed = 1
 	///whether the item is in use or not
 	var/in_use = FALSE
 
@@ -38,7 +38,7 @@ GLOBAL_LIST_INIT(allowed_forging_materials, list(
 
 /obj/item/forging/tongs/primitive
 	name = "primitive forging tongs"
-	toolspeed = 2 SECONDS
+	toolspeed = 2
 
 /obj/item/forging/tongs/attack_self(mob/user, modifiers)
 	. = ..()
@@ -78,7 +78,7 @@ GLOBAL_LIST_INIT(allowed_forging_materials, list(
 
 /obj/item/forging/billow/primitive
 	name = "primitive forging billow"
-	toolspeed = 2 SECONDS
+	toolspeed = 2
 
 //incomplete pre-complete items
 /obj/item/forging/incomplete
diff --git a/modular_nova/modules/reagent_forging/code/forge_weapons.dm b/modular_nova/modules/reagent_forging/code/forge_weapons.dm
index fe3124e4ec2..74a8354b488 100644
--- a/modular_nova/modules/reagent_forging/code/forge_weapons.dm
+++ b/modular_nova/modules/reagent_forging/code/forge_weapons.dm
@@ -6,6 +6,7 @@
 	material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_GREYSCALE | MATERIAL_COLOR
 	obj_flags = UNIQUE_RENAME
 	obj_flags_nova = ANVIL_REPAIR
+	toolspeed = 0.9 //Slightly better than avg. - A forged hammer or knife is probably better than a standard one
 
 /obj/item/forging/reagent_weapon/Initialize(mapload)
 	. = ..()
@@ -75,6 +76,7 @@
 	attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
 	attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
 	sharpness = SHARP_EDGED
+	tool_behaviour = TOOL_KNIFE
 
 //what a cute gimmick
 /obj/item/forging/reagent_weapon/dagger/attack(mob/living/M, mob/living/user, params)
@@ -212,7 +214,7 @@
 		var/obj/item/forging/hammer/attacking_hammer = attacking_item
 		var/skill_modifier = user.mind.get_skill_modifier(/datum/skill/smithing, SKILL_SPEED_MODIFIER) * attacking_hammer.toolspeed
 		while(atom_integrity < max_integrity)
-			if(!do_after(user, skill_modifier, src))
+			if(!do_after(user, skill_modifier SECONDS, src))
 				return
 			var/fixing_amount = min(max_integrity - atom_integrity, 5)
 			atom_integrity += fixing_amount
diff --git a/modular_nova/modules/roundstart_implants/code/tool_subtypes.dm b/modular_nova/modules/roundstart_implants/code/tool_subtypes.dm
index d3a65078aed..66f10bac289 100644
--- a/modular_nova/modules/roundstart_implants/code/tool_subtypes.dm
+++ b/modular_nova/modules/roundstart_implants/code/tool_subtypes.dm
@@ -132,7 +132,7 @@
 /obj/item/forging/tongs/integrated
 	name = "heat-sheathed fingertip tongs"
 	desc = "Hardy heat-treated metal and integrated heatsinks allow these two fingertip replacement augs to act as one might use ordinary metallurgical tongs, resisting burns from all but the most raging forges."
-	toolspeed = 2 SECONDS
+	toolspeed = 2
 
 /obj/item/forging/tongs/integrated/Initialize(mapload)
 	. = ..()
@@ -141,7 +141,7 @@
 /obj/item/forging/billow/integrated
 	name = "motorized mini-bellows"
 	desc = "Let not its size deceive you, for the gale this hinged accordion-like aug can produce when activated is enough to stoke even the most timid fires into a frenzy. Has a health and safety warning on it which reads: 'DO NOT INSERT INTO MOUTH'."
-	toolspeed = 2 SECONDS
+	toolspeed = 2
 
 /obj/item/forging/billow/integrated/Initialize(mapload)
 	. = ..()