diff --git a/language.version b/language.version
index 2be89bcf0..f3b8ed7be 100644
--- a/language.version
+++ b/language.version
@@ -1,2 +1,2 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r790 \cu(Sat 23 Jan 18:27:52 CET 2021)";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r791 \cu(Sun 24 Jan 21:09:54 CET 2021)";
diff --git a/zmapinfo.txt b/zmapinfo.txt
index a86e12803..5e5643bed 100644
--- a/zmapinfo.txt
+++ b/zmapinfo.txt
@@ -86,7 +86,13 @@ GameInfo
 		"KirinCummiesGesture",
 		"MilkBreadsGesture",
 		"KirinMangaGesture",
-		"KirinPlushGesture"
+		"KirinPlushGesture",
+		// miscellaneous actors that cause first-load lag
+		"SaltBeam",
+		"YnykronBeam",
+		"YnykronAltBeam",
+		"BiosparkChildBeam"
+
 }
 
 ClearSkills
diff --git a/zscript/dlc1/swwm_dlcammo.zsc b/zscript/dlc1/swwm_dlcammo.zsc
index c3d681552..279cf7d87 100644
--- a/zscript/dlc1/swwm_dlcammo.zsc
+++ b/zscript/dlc1/swwm_dlcammo.zsc
@@ -127,6 +127,11 @@ Class QuadravolAmmo : Ammo
 		+FLOATBOB;
 		FloatBobStrength 0.25;
 	}
+	override void ModifyDropAmount( int dropamount )
+	{
+		Super.ModifyDropAmount(dropamount);
+		Amount = min(Amount,1);
+	}
 	States
 	{
 	Spawn:
@@ -178,6 +183,11 @@ Class DarkCanister : Ammo
 		+FLOATBOB;
 		FloatBobStrength 0.25;
 	}
+	override void ModifyDropAmount( int dropamount )
+	{
+		Super.ModifyDropAmount(dropamount);
+		Amount = min(Amount,1);
+	}
 	States
 	{
 	Spawn:
@@ -206,6 +216,11 @@ Class EMPCore : Ammo
 		+FLOATBOB;
 		FloatBobStrength 0.25;
 	}
+	override void ModifyDropAmount( int dropamount )
+	{
+		Super.ModifyDropAmount(dropamount);
+		Amount = min(Amount,1);
+	}
 	States
 	{
 	Spawn:
@@ -279,6 +294,11 @@ Class RayAmmo : Ammo
 		+FLOATBOB;
 		FloatBobStrength 0.25;
 	}
+	override void ModifyDropAmount( int dropamount )
+	{
+		Super.ModifyDropAmount(dropamount);
+		Amount = min(Amount,1);
+	}
 	States
 	{
 	Spawn:
@@ -309,6 +329,11 @@ Class RayBattery : Ammo
 		+FLOATBOB;
 		FloatBobStrength 0.25;
 	}
+	override void ModifyDropAmount( int dropamount )
+	{
+		Super.ModifyDropAmount(dropamount);
+		Amount = min(Amount,1);
+	}
 	States
 	{
 	Spawn:
@@ -359,6 +384,11 @@ Class GrandAmmo : Ammo
 		+FLOATBOB;
 		FloatBobStrength 0.25;
 	}
+	override void ModifyDropAmount( int dropamount )
+	{
+		Super.ModifyDropAmount(dropamount);
+		Amount = min(Amount,1);
+	}
 	States
 	{
 	Spawn:
diff --git a/zscript/swwm_ammo.zsc b/zscript/swwm_ammo.zsc
index b23082ff3..607dda4a3 100644
--- a/zscript/swwm_ammo.zsc
+++ b/zscript/swwm_ammo.zsc
@@ -1078,6 +1078,11 @@ Class SparkUnit : Ammo
 		Radius 6;
 		Height 22;
 	}
+	override void ModifyDropAmount( int dropamount )
+	{
+		Super.ModifyDropAmount(dropamount);
+		Amount = min(Amount,1);
+	}
 	States
 	{
 	Spawn:
@@ -1112,6 +1117,11 @@ Class SilverBulletAmmo : Ammo
 		Radius 10;
 		Height 26;
 	}
+	override void ModifyDropAmount( int dropamount )
+	{
+		Super.ModifyDropAmount(dropamount);
+		Amount = min(Amount,1);
+	}
 	States
 	{
 	Spawn:
@@ -1142,6 +1152,11 @@ Class SilverBulletAmmo2 : Ammo
 		Radius 10;
 		Height 26;
 	}
+	override void ModifyDropAmount( int dropamount )
+	{
+		Super.ModifyDropAmount(dropamount);
+		Amount = min(Amount,1);
+	}
 	States
 	{
 	Spawn:
@@ -1268,6 +1283,11 @@ Class CandyGunAmmo : Ammo
 		Radius 6;
 		Height 24;
 	}
+	override void ModifyDropAmount( int dropamount )
+	{
+		Super.ModifyDropAmount(dropamount);
+		Amount = min(Amount,1);
+	}
 	States
 	{
 	Spawn:
@@ -1362,6 +1382,11 @@ Class YnykronAmmo : Ammo
 		Radius 8;
 		Height 24;
 	}
+	override void ModifyDropAmount( int dropamount )
+	{
+		Super.ModifyDropAmount(dropamount);
+		Amount = min(Amount,1);
+	}
 	States
 	{
 	Spawn: