diff --git a/code/game/objects/items/weapons/material/swords.dm b/code/game/objects/items/weapons/material/swords.dm
index 9d1e344007..312660842d 100644
--- a/code/game/objects/items/weapons/material/swords.dm
+++ b/code/game/objects/items/weapons/material/swords.dm
@@ -42,11 +42,7 @@
 	item_state = "longsword"
 	applies_material_colour = 0
 	slot_flags = SLOT_BELT | SLOT_BACK
-
-/obj/item/weapon/material/sword/longsword/pre_attack(var/mob/living/target, var/mob/living/user)
-	if(istype(target))
-		cleave(user, target)
-	..()
+	can_cleave = TRUE
 
 /obj/item/weapon/material/sword/sabre
 	name = "sabre"
@@ -66,6 +62,7 @@
 	applies_material_colour = 0
 	drop_sound = 'sound/items/drop/axe.ogg'
 	pickup_sound = 'sound/items/pickup/axe.ogg'
+	can_cleave = TRUE
 
 /obj/item/weapon/material/sword/battleaxe/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
 	if(unique_parry_check(user, attacker, damage_source) && prob(10))
@@ -74,11 +71,6 @@
 		return 1
 	return 0
 
-/obj/item/weapon/material/sword/battleaxe/pre_attack(var/mob/living/target, var/mob/living/user)
-	if(istype(target))
-		cleave(user, target)
-	..()
-
 /obj/item/weapon/material/sword/khopesh
 	name = "khopesh"
 	desc = "An ancient sword shapped like a sickle."
diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm
index 8632ec8fb4..2b3461d1d1 100644
--- a/code/game/objects/items/weapons/material/twohanded.dm
+++ b/code/game/objects/items/weapons/material/twohanded.dm
@@ -175,46 +175,32 @@
 	icon_state = "riding_crop0"
 	attack_verb = list("cropped","spanked","swatted","smacked","peppered")
 
-/obj/item/weapon/material/twohanded/pike
+/obj/item/weapon/material/twohanded/spear/pike
 	name = "pike"
 	icon_state = "pike0"
 	base_icon = "pike"
 	desc = "A long spear used by the infantry in ancient times."
-	force = 5
-	applies_material_colour = 1
-	unwielded_force_divisor = 0.2
-	force_divisor = 0.3
 	edge = TRUE
-	w_class = ITEMSIZE_LARGE
-	slot_flags = SLOT_BACK
 	attack_verb = list("attacked", "poked", "jabbed", "gored", "stabbed")
 	default_material = "steel"
-	reach = 2
 	applies_material_colour = 0
-	sharp = 1
 	drop_sound = 'sound/items/drop/woodweapon.ogg'
 	pickup_sound = 'sound/items/pickup/woodweapon.ogg'
 
-/obj/item/weapon/material/twohanded/halberd
+/obj/item/weapon/material/twohanded/spear/halberd
 	icon_state = "halberd0"
 	base_icon = "halberd"
 	name = "halberd"
 	desc = "A sharp axe mounted on the top of a long spear."
-	force = 6
 	applies_material_colour = 0
-	unwielded_force_divisor = 0.4
-	force_divisor = 0.5
-	sharp = 1
 	edge = 1
-	reach = 2
 	attack_verb = list("attacked", "poked", "jabbed","gored", "chopped", "cleaved", "torn", "cut", "stabbed")
-	slot_flags = SLOT_BACK
 	drop_sound = 'sound/items/drop/woodweapon.ogg'
 	pickup_sound = 'sound/items/pickup/woodweapon.ogg'
 	can_cleave = TRUE
 
 
-/obj/item/weapon/material/twohanded/pike/pitchfork
+/obj/item/weapon/material/twohanded/spear/pike/pitchfork
 	icon_state = "pitchfork0"
 	base_icon = "pitchfork"
 	name = "pitchfork"
diff --git a/code/modules/projectiles/guns/launcher/bows.dm b/code/modules/projectiles/guns/launcher/bows.dm
index 5129d9d445..7de22cb799 100644
--- a/code/modules/projectiles/guns/launcher/bows.dm
+++ b/code/modules/projectiles/guns/launcher/bows.dm
@@ -1,6 +1,6 @@
 /obj/item/weapon/arrow/wood
 	name = "wooden arrow"
-	desc = "A wooden arrow with a stone tip, simple, but gets the job done"
+	desc = "A wooden arrow with a stone tip. Simple, but gets the job done."
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "arrow"
 	item_state = "bolt"