diff --git a/zscript/HDBulletLib/Ammunition/50AE.zsc b/zscript/HDBulletLib/Ammunition/50AE.zsc
index bab029e..cdef0ab 100644
--- a/zscript/HDBulletLib/Ammunition/50AE.zsc
+++ b/zscript/HDBulletLib/Ammunition/50AE.zsc
@@ -2,94 +2,94 @@
 // CREATED BY ACCENSUS
 // ------------------------------
 
-class HDB_50AE : HDBulletActor
-{
-	Default
-	{
-		PushFactor 0.375;
-		Mass 220;
-		Speed HDCONST_MPSTODUPT * 520;
-		Accuracy 260;
-		Stamina 1270;
-		WoundHealth 45;
-		HDBulletActor.Hardness 3;
-	}
-}
+// class HDB_50AE : HDBulletActor
+// {
+// 	Default
+// 	{
+// 		PushFactor 0.375;
+// 		Mass 220;
+// 		Speed HDCONST_MPSTODUPT * 520;
+// 		Accuracy 260;
+// 		Stamina 1270;
+// 		WoundHealth 45;
+// 		HDBulletActor.Hardness 3;
+// 	}
+// }
 
-class HDSpent50AE : HDSpent9mm
-{
-	Default
-	{
-		BounceSound "misc/casing";
-		XScale 0.8;
-		YScale 0.7;
-	}
-	States
-	{
-		Spawn:
-			PBRS A 2 NoDelay
-			{
-				A_SetRoll(roll + 45, SPF_INTERPOLATE);
-			}
-			Loop;
-		Death:
-			PBRS # -1;
-			Stop;
-	}
-}
+// class HDSpent50AE : HDSpent9mm
+// {
+// 	Default
+// 	{
+// 		BounceSound "misc/casing";
+// 		XScale 0.8;
+// 		YScale 0.7;
+// 	}
+// 	States
+// 	{
+// 		Spawn:
+// 			PBRS A 2 NoDelay
+// 			{
+// 				A_SetRoll(roll + 45, SPF_INTERPOLATE);
+// 			}
+// 			Loop;
+// 		Death:
+// 			PBRS # -1;
+// 			Stop;
+// 	}
+// }
 
-class HD50AEAmmo : HDRoundAmmo
-{
-	override void SplitPickup()
-	{
-		SplitPickupBoxableRound(10, 50, "HD50AEBoxPickup", "TEN9A0", "PRNDA0");
-	}
+// class HD50AEAmmo : HDRoundAmmo
+// {
+// 	override void SplitPickup()
+// 	{
+// 		SplitPickupBoxableRound(10, 50, "HD50AEBoxPickup", "TEN9A0", "PRNDA0");
+// 	}
 
-	const EncRoundLoaded = 0.65;
-	const EncRound = EncRoundLoaded * 1.4;
+// 	const EncRoundLoaded = 0.65;
+// 	const EncRound = EncRoundLoaded * 1.4;
 
-	Default
-	{
-		+INVENTORY.IGNORESKILL
-		+CANNOTPUSH
-		+FORCEXYBILLBOARD
-		+ROLLSPRITE
-		+ROLLCENTER
-		+HDPICKUP.MULTIPICKUP
-		XScale 0.9;
-		YScale 0.8;
-		Tag "$TAG_50AE";
-		Inventory.icon "TEN9A0";
-		Inventory.PickupMessage "$PICKUP_50AE";
-		HDPickup.RefId "50r";
-		HDPickup.Bulk EncRound;
-	}
+// 	Default
+// 	{
+// 		+INVENTORY.IGNORESKILL
+// 		+CANNOTPUSH
+// 		+FORCEXYBILLBOARD
+// 		+ROLLSPRITE
+// 		+ROLLCENTER
+// 		+HDPICKUP.MULTIPICKUP
+// 		XScale 0.9;
+// 		YScale 0.8;
+// 		Tag "$TAG_50AE";
+// 		Inventory.icon "TEN9A0";
+// 		Inventory.PickupMessage "$PICKUP_50AE";
+// 		HDPickup.RefId "50r";
+// 		HDPickup.Bulk EncRound;
+// 	}
 	
-	States
-	{
-		Spawn:
-			PRND A -1;
-			TEN9 A -1;
-			Stop;
-	}
-}
+// 	States
+// 	{
+// 		Spawn:
+// 			PRND A -1;
+// 			TEN9 A -1;
+// 			Stop;
+// 	}
+// }
 
 
-class HD50AEBoxPickup : HDUPK
-{
-	Default
-	{
-		Scale 0.32;
-		HDUPK.Amount 50;
-		HDUPK.PickupSound "weapons/pocket";
-		HDUPK.PickupMessage "$PICKUP_50AEBOX";
-		HDUPK.PickupType "HD50AEAmmo";
-	}
+// class HD50AEBoxPickup : HDUPK
+// {
+// 	Default
+// 	{
+// 		Scale 0.32;
+// 		HDUPK.Amount 50;
+// 		HDUPK.PickupSound "weapons/pocket";
+// 		HDUPK.PickupMessage "$PICKUP_50AEBOX";
+// 		HDUPK.PickupType "HD50AEAmmo";
+// 	}
 
-	states
-	{
-		Spawn:
-			50AE X -1;
-			Stop;
-	}
-}
\ No newline at end of file
+// 	states
+// 	{
+// 		Spawn:
+// 			50AE X -1;
+// 			Stop;
+// 	}
+// }
\ No newline at end of file
diff --git a/zscript/HDBulletLib/SpawnHandler.zsc b/zscript/HDBulletLib/SpawnHandler.zsc
index 5daa935..bc4e369 100644
--- a/zscript/HDBulletLib/SpawnHandler.zsc
+++ b/zscript/HDBulletLib/SpawnHandler.zsc
@@ -3,7 +3,7 @@ const HDCONST_HDBLEVENT = HDCONST_BPSPAWNPOOLEVENT + 1;
 class HDBulletLibHandler : EventHandler {
     // [Ace] Order here must match bitshifting order in menudef and zscript files. - [Ted, UZ]
     static const class<HDAmmo> RemovedClasses[] = {
-		'HDNDMLoose',
+        'HDNDMLoose',
         'HDSlugAmmo',
         'HD500SWLightAmmo',
         'HD500SWHeavyAmmo',
@@ -621,8 +621,8 @@ class HDBulletLibAmmoSpawner: EventHandler {
             let item = Inventory(thing);
             if (
                 (prespawn || ammoSpawn.isPersistent)
-             && (!(item && item.owner) && prespawn)
-             && !ammoSpawn.replaceAmmo
+                && (!(item && item.owner) && prespawn)
+                && !ammoSpawn.replaceAmmo
             ) {
                 foreach (spawnReplace : ammoSpawn.spawnReplaces) {
                     if (spawnReplace.name ~== candidateName) {