diff --git a/README.md b/README.md
index f39581d3f..575629586 100644
--- a/README.md
+++ b/README.md
@@ -496,6 +496,16 @@ Fresh milk straight out of Ibuki herself. Due to the excess amount she produces
 
 A soft and squishy plush doll of you! This became very popular after the events of Doom, with the Demolitionist having defeated the demons and saved Earth. Fully articulated, face and tags glow in the dark.
 
+### Manarock (Heretic)
+![](docimg/manarokou.png)
+
+A delicious fruit from the realm of gods. Considered quite a delicacy, but also well-known for the fact its outer shell is deadly to mortals, as it contains an extremely potent neurotoxin. The fruit has to be peeled very carefully before consumption.
+
+### Lithium - Volume One (Heretic)
+![](docimg/lithium.png)
+
+A graphic novel of mysterious origin that appeared one day in stores. No one knows who made it. It appears to narrate the events of a catastrophic demonic invasion in a very very far future. Some theorize that this could have been delivered from another multiverse as a sort of *"apocalypse log"*.
+
 ### Toot Froot™ Peach Juice (Hexen)
 ![](docimg/tootfroot.png)
 
@@ -516,6 +526,11 @@ A single-volume manga by Saya Miyamoto "based on true events" about a young girl
 
 The most adorable and huggable plush doll of the cutest and sweetest emperor. This was not only also handcrafted by Nukritas 2xx, but also imbued with Kirin's magic, his blessing making anyone feel warm and fuzzy when holding it close to their heart. Like the Saya plush, also emits a cute giggle when squeezed.
 
+### Psykkonovexx (Hexen)
+![](docimg/psykkonovexx.png)
+
+One of the many instruments named after the Nine Kings of Kurenai. The Psykkonovexx could be described as something resembling an *"electric bagpipe"*, and it's a staple of modern Anarukon music composition.
+
 ## The HUD
 ![](docimg/hudsample.png)
 
diff --git a/language.version b/language.version
index 0f280ad77..2796d263b 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw1.1pre r2 \cu(Sat  4 Sep 22:53:57 CEST 2021)\c-";
-SWWM_SHORTVER="\cw1.1pre r2 \cu(2021-09-04 22:53:57)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw1.1pre r3 \cu(Sat  4 Sep 23:04:00 CEST 2021)\c-";
+SWWM_SHORTVER="\cw1.1pre r3 \cu(2021-09-04 23:04:00)\c-";
diff --git a/zscript/handler/swwm_handler_damage.zsc b/zscript/handler/swwm_handler_damage.zsc
index 14eb7c039..139684ed6 100644
--- a/zscript/handler/swwm_handler_damage.zsc
+++ b/zscript/handler/swwm_handler_damage.zsc
@@ -326,7 +326,7 @@ extend Class SWWMHandler
 		}
 		SWWMCredits.Give(src.player,score);
 		if ( scr ) scr.score = score;	// update final score
-		if ( !deathmatch && (level.killed_monsters+1 == level.total_monsters) && !allkills )
+		if ( !deathmatch && !(gameinfo.gametype&GAME_Hexen) && (level.killed_monsters+1 == level.total_monsters) && !allkills )
 		{
 			allkills = true;
 			SWWMCredits.Give(src.player,1000);
diff --git a/zscript/handler/swwm_handler_worldtick.zsc b/zscript/handler/swwm_handler_worldtick.zsc
index b3c3cb65c..9fadf5771 100644
--- a/zscript/handler/swwm_handler_worldtick.zsc
+++ b/zscript/handler/swwm_handler_worldtick.zsc
@@ -51,7 +51,7 @@ extend Class SWWMHandler
 			if ( players[i].itemcount > lastitemcount[i] )
 			{
 				int score = 10*(players[i].itemcount-lastitemcount[i]);
-				if ( !deathmatch && (level.total_items == level.found_items) && !allitems )
+				if ( !deathmatch && !(gameinfo.gametype&GAME_Hexen) && (level.total_items == level.found_items) && !allitems )
 				{
 					allitems = true;
 					Console.Printf(StringTable.Localize("$SWWM_LASTITEM"),players[i].GetUserName(),500);
@@ -128,6 +128,8 @@ extend Class SWWMHandler
 	{
 		// not in DM
 		if ( deathmatch ) return;
+		// not in Hexen, due to its fully hub-based nature
+		if ( gameinfo.gametype&GAME_Hexen ) return;
 		if ( !mapclear && (restartmus > 0) )
 		{
 			restartmus--;
diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc
index 60c1c4811..3ae3d2b8f 100644
--- a/zscript/swwm_player.zsc
+++ b/zscript/swwm_player.zsc
@@ -2520,7 +2520,7 @@ Class Demolitionist : PlayerPawn
 		int score = 100;
 		// last secret (this is called before counting it up, so have to subtract)
 		let hnd = SWWMHandler(EventHandler.Find("SWWMHandler"));
-		if ( !deathmatch && (level.found_secrets == level.total_secrets-1) && (!hnd || !hnd.allsecrets) )
+		if ( !deathmatch && !(gameinfo.gametype&GAME_Hexen) && (level.found_secrets == level.total_secrets-1) && (!hnd || !hnd.allsecrets) )
 		{
 			if ( hnd ) hnd.allsecrets = true;
 			score = 1000;