diff --git a/language.def_lore b/language.def_lore
index 2bea61654..013e76a38 100644
--- a/language.def_lore
+++ b/language.def_lore
@@ -3065,13 +3065,13 @@ SWWM_LORETXT_RYUJI =
 "\cfI'm not crying, I swear.\c-";
 SWWM_LORETAG_SAFETYTETHER = "Safety Tether";
 SWWM_LORETAB_SAFETYTETHER = "Item";
-SWWM_LOREREL_SAFETYTETHER = "AkariLabs;Cyrus;LuckyCollar;Parthoris;Sidhe;Cronos;Saya;UAC;Unissix";
+SWWM_LOREREL_SAFETYTETHER = "AkariLabs;LuckyCollar;Parthoris;Sidhe;Cronos;Saya;UAC;Unissix";
 SWWM_LORETXT_SAFETYTETHER =
 "\cxDesignation:\c-\n"
 "\cf Safety Tether\c-\n"
 "\cxManufacturer:\c-\n"
 "\cf Akari Labs\c-\n"
-"\cf Cyrus Enterprises\c-\n"
+"\cf Unissix Crafts\c-\n"
 "\cxClassification:\c-\n"
 "\cf Short-distance Emergency Teleporter\c-\n"
 "\n"
@@ -3090,7 +3090,7 @@ SWWM_LORETXT_SAFETYTETHER2 =
 "\cf Safety Tether\c-\n"
 "\cxManufacturer:\c-\n"
 "\cf Akari Labs\c-\n"
-"\cf Cyrus Enterprises\c-\n"
+"\cf Unissix Crafts\c-\n"
 "\cxClassification:\c-\n"
 "\cf Short-distance Emergency Teleporter\c-\n"
 "\n"
diff --git a/language.es_lore b/language.es_lore
index ed022ce91..55f9427cb 100644
--- a/language.es_lore
+++ b/language.es_lore
@@ -2827,7 +2827,7 @@ SWWM_LORETXT_SAFETYTETHER =
 "\cf Enlace de Seguridad\c-\n"
 "\cxFabricante:\c-\n"
 "\cf Akari Labs\c-\n"
-"\cf Cyrus Enterprises\c-\n"
+"\cf Artesanía Unissix\c-\n"
 "\cxClasificación:\c-\n"
 "\cf Teletransporte de Emergencia de Corta Distancia\c-\n"
 "\n"
@@ -2846,7 +2846,7 @@ SWWM_LORETXT_SAFETYTETHER2 =
 "\cf Enlace de Seguridad\c-\n"
 "\cxFabricante:\c-\n"
 "\cf Akari Labs\c-\n"
-"\cf Cyrus Enterprises\c-\n"
+"\cf Artesanía Unissix\c-\n"
 "\cxClasificación:\c-\n"
 "\cf Teletransporte de Emergencia de Corta Distancia\c-\n"
 "\n"
diff --git a/language.version b/language.version
index 12b0afad2..0166492cc 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre \cu(Mon 20 Sep 19:22:42 CEST 2021)\c-";
-SWWM_SHORTVER="\cw1.2pre \cu(2021-09-20 19:22:42)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r1 \cu(Mon 20 Sep 23:36:13 CEST 2021)\c-";
+SWWM_SHORTVER="\cw1.2pre r1 \cu(2021-09-20 23:36:13)\c-";
diff --git a/lore/default/safetytether.txt b/lore/default/safetytether.txt
index 16dc21b78..594faf261 100644
--- a/lore/default/safetytether.txt
+++ b/lore/default/safetytether.txt
@@ -3,13 +3,13 @@ Safety Tether
 TAB
 Item
 REL
-AkariLabs;Cyrus;LuckyCollar;Parthoris;Sidhe;Cronos;Saya;UAC;Unissix
+AkariLabs;LuckyCollar;Parthoris;Sidhe;Cronos;Saya;UAC;Unissix
 TXT
 \cxDesignation:\c-
 \cf Safety Tether\c-
 \cxManufacturer:\c-
 \cf Akari Labs\c-
-\cf Cyrus Enterprises\c-
+\cf Unissix Crafts\c-
 \cxClassification:\c-
 \cf Short-distance Emergency Teleporter\c-
 
@@ -28,7 +28,7 @@ TXT
 \cf Safety Tether\c-
 \cxManufacturer:\c-
 \cf Akari Labs\c-
-\cf Cyrus Enterprises\c-
+\cf Unissix Crafts\c-
 \cxClassification:\c-
 \cf Short-distance Emergency Teleporter\c-
 
diff --git a/lore/es/safetytether.txt b/lore/es/safetytether.txt
index f24da66c1..3b065f55b 100644
--- a/lore/es/safetytether.txt
+++ b/lore/es/safetytether.txt
@@ -5,7 +5,7 @@ TXT
 \cf Enlace de Seguridad\c-
 \cxFabricante:\c-
 \cf Akari Labs\c-
-\cf Cyrus Enterprises\c-
+\cf Artesanía Unissix\c-
 \cxClasificación:\c-
 \cf Teletransporte de Emergencia de Corta Distancia\c-
 
@@ -24,7 +24,7 @@ TXT
 \cf Enlace de Seguridad\c-
 \cxFabricante:\c-
 \cf Akari Labs\c-
-\cf Cyrus Enterprises\c-
+\cf Artesanía Unissix\c-
 \cxClasificación:\c-
 \cf Teletransporte de Emergencia de Corta Distancia\c-
 
diff --git a/zscript/hud/swwm_hudextra.zsc b/zscript/hud/swwm_hudextra.zsc
index 8ad0f88cf..2e29e2cf7 100644
--- a/zscript/hud/swwm_hudextra.zsc
+++ b/zscript/hud/swwm_hudextra.zsc
@@ -380,7 +380,8 @@ Class SWWMDirectMessage : HUDMessageBase
 		}
 		else txt = StringTable.Localize("$SWWM_"..seqname..seqnum);
 		l = fnt.BreakLines(txt,220);
-		// append to the player's chat log
+		// append to the player's chat log (if it's valid)
+		if ( (seqnum < 1) || (seqnum > seqcnt) ) return;
 		let bar = SWWMStatusBar(StatusBar);
 		if ( bar )
 		{
diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc
index dfa845558..dbf88c83d 100644
--- a/zscript/swwm_player.zsc
+++ b/zscript/swwm_player.zsc
@@ -936,9 +936,18 @@ Class Demolitionist : PlayerPawn
 			}
 		}
 	}
+	override void CheckPoison()
+	{
+		// HAHA no
+		player.poisoncount = 0;
+	}
 	override void Tick()
 	{
 		Vector3 oldpos = pos;
+		// can't be poisoned
+		PoisonDurationReceived = 0;
+		PoisonPeriodReceived = 0;
+		PoisonDamageReceived = 0;
 		Super.Tick();
 		if ( hasteleported )
 		{
@@ -946,10 +955,6 @@ Class Demolitionist : PlayerPawn
 			oldpos = pos;
 			hasteleported = false;
 		}
-		// can't be poisoned
-		PoisonDurationReceived = 0;
-		PoisonPeriodReceived = 0;
-		PoisonDamageReceived = 0;
 		if ( !selflight )
 		{
 			selflight = Spawn("DemolitionistSelfLight",pos);
diff --git a/zscript/swwm_thinkers_player.zsc b/zscript/swwm_thinkers_player.zsc
index f4c51fdb0..bb1539784 100644
--- a/zscript/swwm_thinkers_player.zsc
+++ b/zscript/swwm_thinkers_player.zsc
@@ -456,6 +456,8 @@ Class SWWMLoreLibrary : Thinker
 				text = "SWWM_LORETXT_SANKAIDERIHA2";	// comments about kirin
 			else if ( text ~== "SWWM_LORETXT_SAYA" )
 				text = "SWWM_LORETXT_SAYA3";	// married kirin
+			else if ( text ~== "SWWM_LORETXT_SAFETYTETHER" )
+				text = "SWWM_LORETXT_SAFETYTETHER2";	// we're in cronos now
 			else if ( text ~== "SWWM_LORETXT_SERPENTRIDERS" )
 				text = "SWWM_LORETXT_SERPENTRIDERS2";	// defeated d'sparil
 			else if ( text ~== "SWWM_LORETXT_XANIMEN" )