diff --git a/sounds/demolitionist/demowswing1.ogg b/sounds/demolitionist/demowswing1.ogg
index 455fd99ea..b6809c540 100644
Binary files a/sounds/demolitionist/demowswing1.ogg and b/sounds/demolitionist/demowswing1.ogg differ
diff --git a/sounds/demolitionist/demowswing2.ogg b/sounds/demolitionist/demowswing2.ogg
index 3d6ca69b1..cd7642fcc 100644
Binary files a/sounds/demolitionist/demowswing2.ogg and b/sounds/demolitionist/demowswing2.ogg differ
diff --git a/zscript/swwm_blazeit.zsc b/zscript/swwm_blazeit.zsc
index fe78a4ed6..ab1e175e3 100644
--- a/zscript/swwm_blazeit.zsc
+++ b/zscript/swwm_blazeit.zsc
@@ -1075,44 +1075,45 @@ Class Hellblazer : SWWMWeapon
 	User1:
 		XZW2 A 0 A_JumpByAmmoType("User1_1","User1_2","User1_3","User1_4","User1_G");
 	User1_1:
-		XZW2 A 4;
-		XZW6 BCDE 3;
+		XZW2 A 2;
+		XZW6 BCDE 2;
 		XZW6 FGH 1;
 		XZW6 IJK 2;
 		XZW6 LMNOPQRSTU 2;
 		Goto Ready_1;
 	User1_2:
-		XZW6 V 4;
-		XZWA Z 3;
-		XZWB ABC 3;
+		XZW6 V 2;
+		XZWA Z 2;
+		XZWB ABC 2;
 		XZWB DEF 1;
 		XZWB GHI 2;
 		XZWB JKLMNOPQRS 2;
 		Goto Ready_2;
 	User1_3:
-		XZWB T 4;
-		XZWF XYZ 3;
-		XZWG A 3;
+		XZWB T 2;
+		XZWF XYZ 2;
+		XZWG A 2;
 		XZWG BCD 1;
 		XZWG EFG 2;
 		XZWG HIJKLMNOPQ 2;
 		Goto Ready_3;
 	User1_4:
-		XZWG R 4;
-		XZWK YZ 3;
-		XZWL AB 3;
+		XZWG R 2;
+		XZWK YZ 2;
+		XZWL AB 2;
 		XZWL CDE 1;
 		XZWL FGH 2;
 		XZWL IJKLMNOPQR 2;
 		Goto Ready_4;
 	User1_G:
-		XZWL S 4
+		XZWL S 2
 		{
 			A_StartSound("hellblazer/meleestart",CHAN_WEAPON,CHANF_OVERLAP);
 			A_StartSound("demolitionist/wswing",CHAN_WEAPON,CHANF_OVERLAP);
 		}
-		XZWQ KLMN 3;
-		XZWQ OP 1;
+		XZWQ KLMN 2;
+		XZWQ O 1 A_Parry(9);
+		XZWQ P 1;
 		XZWQ Q 1 A_Melee(75);
 		XZWQ RSTUV 2;
 		XZWQ W 2 A_StartSound("hellblazer/meleeend",CHAN_WEAPON,CHANF_OVERLAP);
diff --git a/zscript/swwm_danmaku.zsc b/zscript/swwm_danmaku.zsc
index 5e4b5a377..5b49bd492 100644
--- a/zscript/swwm_danmaku.zsc
+++ b/zscript/swwm_danmaku.zsc
@@ -910,10 +910,11 @@ Class Eviscerator : SWWMWeapon
 			A_StartSound("demolitionist/wswing",CHAN_WEAPON,CHANF_OVERLAP);
 			return A_JumpIf(invoker.extended,"User1Ext");
 		}
-		XZW8 WXYZ 2;
-		XZW9 AB 2;
-		XZW9 C 2 A_Parry(9);
-		XZW9 D 2;
+		XZW8 WXY 2;
+		XZW8 Z 1;
+		XZW9 AB 1;
+		XZW9 C 1 A_Parry(9);
+		XZW9 D 1;
 		XZW9 E 2 A_Melee(60);
 		XZW9 FGH 2;
 		XZW9 I 2 A_StartSound("eviscerator/meleeend",CHAN_WEAPON,CHANF_OVERLAP);
@@ -921,9 +922,10 @@ Class Eviscerator : SWWMWeapon
 		Goto Ready;
 	User1Ext:
 		XZW4 Z 2;
-		XZWA NOPQRS 2;
-		XZWA T 2 A_Parry(9);
-		XZWA U 2;
+		XZWA NOP 2;
+		XZWA QRS 1;
+		XZWA T 1 A_Parry(9);
+		XZWA U 1;
 		XZWA V 2 A_Melee(60);
 		XZWA WXY 2;
 		XZWA Z 2 A_StartSound("eviscerator/meleeend",CHAN_WEAPON,CHANF_OVERLAP);
diff --git a/zscript/swwm_deepdarkimpact.zsc b/zscript/swwm_deepdarkimpact.zsc
index b09173ecc..18967b74a 100644
--- a/zscript/swwm_deepdarkimpact.zsc
+++ b/zscript/swwm_deepdarkimpact.zsc
@@ -473,12 +473,12 @@ Class DeepImpact : SWWMWeapon
 		XZW4 EFG 2;
 		Goto Ready;
 	User1:
-		XZW2 A 3 A_StartSound("demolitionist/wswing",CHAN_WEAPON,CHANF_OVERLAP);
-		XZW4 H 4 A_StartSound("demolitionist/reloadbeg",CHAN_WEAPON,CHANF_OVERLAP);
-		XZW4 I 3;
-		XZW4 J 2 A_Parry(9);
+		XZW2 A 2 A_StartSound("demolitionist/wswing",CHAN_WEAPON,CHANF_OVERLAP);
+		XZW4 H 2 A_StartSound("demolitionist/reloadbeg",CHAN_WEAPON,CHANF_OVERLAP);
+		XZW4 I 2;
+		XZW4 J 1 A_Parry(9);
 		XZW4 KLM 1;
-		XZW4 N 3 A_Melee(60);
+		XZW4 N 4 A_Melee(60);
 		XZW4 O 3 { invoker.PlayUpSound(self); }
 		XZW4 PQRSTUV 2;
 		Goto Ready;
diff --git a/zscript/swwm_jackhammer.zsc b/zscript/swwm_jackhammer.zsc
index 522eccc26..6c6da614d 100644
--- a/zscript/swwm_jackhammer.zsc
+++ b/zscript/swwm_jackhammer.zsc
@@ -625,7 +625,7 @@ Class PusherWeapon : SWWMWeapon
 	User1:
 		XZW2 A 2 A_StartSound("demolitionist/wswing",CHAN_WEAPON,CHANF_OVERLAP);
 		XZW5 ABC 2;
-		XZW5 D 2 A_Parry(9);
+		XZW5 D 1 A_Parry(9);
 		XZW5 EFGH 1;
 		XZW5 I 0 A_Melee(70);
 		XZW5 IJ 2;