diff --git a/language.version b/language.version
index 300622424..ad51a7bcf 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r16 \cu(Sat  9 Oct 21:43:05 CEST 2021)\c-";
-SWWM_SHORTVER="\cw1.2pre r16 \cu(2021-10-09 21:43:05)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r17 \cu(Sun 10 Oct 00:44:01 CEST 2021)\c-";
+SWWM_SHORTVER="\cw1.2pre r17 \cu(2021-10-10 00:44:01)\c-";
diff --git a/sounds/voice/default/va/demogetpuntzerbeta.ogg b/sounds/voice/default/va/demogetpuntzerbeta.ogg
index 85687916c..997f8ffef 100644
Binary files a/sounds/voice/default/va/demogetpuntzerbeta.ogg and b/sounds/voice/default/va/demogetpuntzerbeta.ogg differ
diff --git a/zscript/handler/swwm_handler_damage.zsc b/zscript/handler/swwm_handler_damage.zsc
index 75ccb3265..c63c79c07 100644
--- a/zscript/handler/swwm_handler_damage.zsc
+++ b/zscript/handler/swwm_handler_damage.zsc
@@ -141,7 +141,7 @@ extend Class SWWMHandler
 			{
 				if ( e.Thing.IsFriend(e.DamageSource) )
 					lastcombat = AddOneliner("friendhit",1,10);
-				else if ( (!lastcombat || (gametic > lastcombat+100)) && !Random[DemoLines](0,(e.DamageSource.bBOSS||e.DamageSource.FindInventory("BossMarker"))?2:4) && !SWWMHDoomHandler.IsCuteGirl(e.DamageSource) ) // [HDoom] don't shout at the girls
+				else if ( (!lastcombat || (gametic > lastcombat+80)) && !Random[DemoLines](0,(e.DamageSource.bBOSS||e.DamageSource.FindInventory("BossMarker"))?1:3) && !SWWMHDoomHandler.IsCuteGirl(e.DamageSource) ) // [HDoom] don't shout at the girls
 					lastcombat = AddOneliner("gethit",1,15);
 			}
 			highesttic = gametic;
@@ -180,7 +180,7 @@ extend Class SWWMHandler
 			{
 				if ( e.Thing.IsFriend(src) )
 					lastcombat = AddOneliner("friendkill",1,5);
-				else if ( (!lastcombat || (gametic > lastcombat+100)) && !Random[DemoLines](0,(e.Thing.bBOSS||e.Thing.FindInventory("BossMarker"))?2:5) && !SWWMHDoomHandler.IsCuteGirl(e.Thing) )	// [HDoom] don't shout at the girls
+				else if ( (!lastcombat || (gametic > lastcombat+80)) && !Random[DemoLines](0,(e.Thing.bBOSS||e.Thing.FindInventory("BossMarker"))?0:2) && !SWWMHDoomHandler.IsCuteGirl(e.Thing) )	// [HDoom] don't shout at the girls
 					lastcombat = AddOneliner("scorekill",1,15);
 			}
 		}
diff --git a/zscript/handler/swwm_handler_worldtick.zsc b/zscript/handler/swwm_handler_worldtick.zsc
index 8d30e2cd0..237fa4a44 100644
--- a/zscript/handler/swwm_handler_worldtick.zsc
+++ b/zscript/handler/swwm_handler_worldtick.zsc
@@ -99,6 +99,7 @@ extend Class SWWMHandler
 		if ( !cti ) cti = ThinkerIterator.Create("Actor");
 		else cti.Reinit();
 		Actor a, keyactor = null;
+		bool bossfound = false;
 		while ( a = Actor(cti.Next()) )
 		{
 			if ( !a.player && !a.bISMONSTER ) continue;
@@ -128,6 +129,8 @@ extend Class SWWMHandler
 				enteredcombat = true;
 				if ( (a is 'Korax') || (a is 'Sorcerer1') || (a.GetClassName() == "ArchangelusA") )
 					keyactor = a;
+				if ( a.bBOSS || a.FindInventory("BossMarker") )
+					bossfound = true;
 			}
 		}
 		// special combat start lines
@@ -140,7 +143,7 @@ extend Class SWWMHandler
 			return;
 		}
 		// be smart, demo-chan, don't shout if you're invisible, or you'll make it worse
-		if ( enteredcombat && (!highesttic || (gametic > highesttic+700)) && !players[consoleplayer].mo.FindInventory("GhostPower") )
+		if ( enteredcombat && ((bossfound && (!lastcombat || (gametic > lastcombat+120))) || (!bossfound && (!highesttic || (gametic > highesttic+700)))) && !players[consoleplayer].mo.FindInventory("GhostPower") )
 			lastcombat = AddOneliner("fightstart",1,10);
 	}