diff --git a/src/facilities/nursery/longChildDescription.tw b/src/facilities/nursery/longChildDescription.tw
index 4442780ca75ec36392e1e0d1fe9fef3c3487af1e..076f558440fcb7d3fd2ffc7085e12179897cb05b 100644
--- a/src/facilities/nursery/longChildDescription.tw
+++ b/src/facilities/nursery/longChildDescription.tw
@@ -2,7 +2,6 @@
 
 /*TODO: This may need rewriting - a lot of it is copy-pasted from longSlaveDescription.tw */
 
-<<run SlavePronouns($activeChild)>>
 <<setLocalPronouns $activeChild>>
 
 /* 000-250-006 */
diff --git a/src/pregmod/fFeet.tw b/src/pregmod/fFeet.tw
index 8acd1ee299e896a15e60fe71c06f6faac5798c10..aae2b44ba3442619614192c2a3a2f91f30bfe773 100644
--- a/src/pregmod/fFeet.tw
+++ b/src/pregmod/fFeet.tw
@@ -1,7 +1,7 @@
 :: FFeet [nobr]
 
 <<run clearSummaryCache($activeSlave)>>
-<<run SlavePronouns($activeSlave)>>
+<<setLocalPronouns $activeSlave>>
 
 <<set _footSeed = random(1,100)>>
 
diff --git a/src/pregmod/widgets/deathWidgets.tw b/src/pregmod/widgets/deathWidgets.tw
index ebc56cd5fc2a6fb2d52c55125e60c1321e925154..cb7e44ac4a9c002ed53f5a70b4a8071d320ba6f2 100644
--- a/src/pregmod/widgets/deathWidgets.tw
+++ b/src/pregmod/widgets/deathWidgets.tw
@@ -18,7 +18,7 @@ As $args[0].slaveName is going about $his business with $his overfilled $args[0]
 <</widget>>
 
 <<widget "DeathOldAge">>
-	<<run SlavePronouns($args[0])>>
+	<<setLocalPronouns $args[0]>>
 	<<if $args[0].assignment == "be confined in the arcade">>
 		You are notified by $arcadeName staff that one of the cabinets has broken down and will need to be replaced. It would seem ''@@.pink;$args[0].slaveName@@'', the fucktoy encased in it, died <<if $args[0].physicalAge >= 70>>naturally of old age despite<<else>>suddenly, unrelated to<</if>> $his living conditions. $He was a good unit; logs show $he was taking dick up until the very end.
 	<<elseif $args[0].assignment == "work in the dairy" && $dairyRestraintsSetting > 1>>
@@ -61,7 +61,7 @@ As $args[0].slaveName is going about $his business with $his overfilled $args[0]
 <</widget>>
 
 <<widget "DeathOverdose">>
-	<<run SlavePronouns($args[0])>>
+	<<setLocalPronouns $args[0]>>
 	<<if $args[0].assignment == "be confined in the arcade">>
 		You are notified by $arcadeName staff that one of the cabinets has broken down and will need to be replaced. It would seem ''@@.pink;$args[0].slaveName@@'', the fucktoy encased in it, died of an aphrodisiac overdose from the constant aphrodisiac injections. $He was a good unit; logs show $he was taking dick up until the very end.
 	<<elseif $args[0].assignment == "work in the dairy" && $dairyRestraintsSetting > 1>>
@@ -90,7 +90,7 @@ As $args[0].slaveName is going about $his business with $his overfilled $args[0]
 <</widget>>
 
 <<widget "DeathUnhealthy">>
-	<<run SlavePronouns($args[0])>>
+	<<setLocalPronouns $args[0]>>
 	<<if $args[0].assignment == "be confined in the arcade">>
 		You are notified by $arcadeName staff that one of the cabinets has broken down and will need to be replaced. It would seem ''@@.pink;$args[0].slaveName@@'', the fucktoy encased in it, died to poor health caused by $his living conditions. $He was a good unit; logs show $he was taking dick up until the very end.
 	<<elseif $args[0].assignment == "work in the dairy" && $dairyRestraintsSetting > 1>>
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index a28962ec0c2e308d60bf16d0467b5b46665ac7c1..1a8b0ad53e866692096c0c794cd4f35ad3ab26ea 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -2,7 +2,7 @@
 
 <<widget "seBirthPreChek">>
 
-<<run SlavePronouns($slaves[$i])>>
+<<setLocalPronouns $slaves[$i]>>
 
 <<set $humiliation = 0>>
 <<set $suddenBirth = 1>>
@@ -322,7 +322,7 @@
 	<</if>>
 <</for>>
 
-/* Here support for partial birth cases but if slaves still NOT have broomother implant. Right now remaining babies will be lost, need to add research option for selective births. It should control labor and stop it after ready to birth babies out. Should be Repopulation FS research before broodmothers (their implant obviously have it as a part of functional). */
+/* Here support for partial birth cases but if slaves still NOT have broodmother implant. Right now remaining babies will be lost, need to add research option for selective births. It should control labor and stop it after ready to birth babies out. Should be Repopulation FS research before broodmothers (their implant obviously have it as a part of functional). */
 <<if $slaves[$i].broodmother == 0>>
 	<<if $slaves[$i].prematureBirth == 1>>  /* emergency birth, anything less than 23 weeks of age is not making it through this */
 		<<set $slaves[$i].curStillBirth = $slaves[$i].womb.length>>
@@ -542,7 +542,7 @@ This decriptions can be expanded with more outcomes later. But it's not practica
 		$He had exceedingly narrow hips, completely unsuitable for childbirth. As $he struggled on $his <<if _curBabies > 1>>first<</if>> child, $his pelvic bone strained under the pressure until it could no longer hold together and @@.red;agonizingly snapped.@@
 		<<if $slaves[$i].fetish != "mindbroken">>
 			<<if ($slaves[$i].fetish == "masochist")>>
-				<<if $slaves[$i].fetishKnown == 0>>What would have made most girls blackout from pain sent $him into the lewdest orgasm you've seen today. $He @@.lightcoral;must get off to pain.@@.<<set $slaves[$i].fetishKnown = 1>><<else>> $He claims to have never climaxed so hard and @@.hotpink;wishes her hips could have stayed that narrow for next time.@@<</if>>
+				<<if $slaves[$i].fetishKnown == 0>>What would have made most girls blackout from pain sent $him into the lewdest orgasm you've seen today. $He @@.lightcoral;must get off to pain.@@.<<set $slaves[$i].fetishKnown = 1>><<else>> $He claims to have never climaxed so hard and @@.hotpink;wishes $his hips could have stayed that narrow for next time.@@<</if>>
 				<<set $slaves[$i].devotion += 5>>
 			<<elseif $slaves[$i].devotion > 70>>
 				When $he comes to, $his pelvis has already been patched up. $He is just glad that $he managed to finish giving birth despite the hindrance.
diff --git a/src/societies/aztec/slaveSacrifice.tw b/src/societies/aztec/slaveSacrifice.tw
index 11032cc8bdd02d933aaebf922be32965eabb6bca..bdd908e52ed4224db76812a8ca5f2a74ed5d8b07 100644
--- a/src/societies/aztec/slaveSacrifice.tw
+++ b/src/societies/aztec/slaveSacrifice.tw
@@ -1,7 +1,7 @@
 :: Aztec Slave Sacrifice [nobr]
 
 <<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Main", $showEncyclopedia = 1, $encyclopedia = "Aztec Revivalism">>
-<<run SlavePronouns($activeSlave)>>
+<<setLocalPronouns $activeSlave >>
 <<run Enunciate($activeSlave)>>
 
 <<set _activeSlaveRepSacrifice = repGainSacrifice()>>
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index 5ac0af06e75bbce913aa96ff3719ec9ad5693d8e..dbecadf784a54c8eda221ab18516c068a55f7a9e 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -2,7 +2,7 @@
 
 <<set $nextButton = "Continue", $nextLink = "Slave Interact">>
 <<run clearSummaryCache($activeSlave)>>
-<<run SlavePronouns($activeSlave)>>
+<<setLocalPronouns $activeSlave>>
 <<run Enunciate($activeSlave)>>
 
 <<set $showEncyclopedia = 1, $encyclopedia = "The Studio">>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 057172ab89a125d5f2c236ba5efff5fd3ae169c9..2e96c590150ac80a192230df59fd528926d16910 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -1,6 +1,5 @@
 :: Long Slave Description [nobr]
 
-<<run SlavePronouns($activeSlave)>>
 <<run SlaveStatClamp($activeSlave)>>
 <<set $beauty = Beauty($activeSlave)>>
 <<setLocalPronouns $activeSlave>>
diff --git a/src/uncategorized/pUndergroundRailroad.tw b/src/uncategorized/pUndergroundRailroad.tw
index 132424369b0d2d0c10418dff580255fd151c187c..0993e9f90c35990b1580ff90a3f0bec7af06dce0 100644
--- a/src/uncategorized/pUndergroundRailroad.tw
+++ b/src/uncategorized/pUndergroundRailroad.tw
@@ -2,7 +2,7 @@
 
 <<set $nextButton = " ", $nextLink = "Random Nonindividual Event">> /* hide button until user makes a selection */
 
-<<set $activeSlave = $slaves.find(function(s) { return s.fuckdoll == 0 && s.fetish != "mindbroken" && s.amp != 1 && s.devotion < 75 && s.trust < 75 && s.indenture == -1 && canWalk(s) && canTalk(s) && ["whore", "serve the public", "serve in the club", "work in the brothel"].includes(s.assignment); })>>
+<<set $activeSlave = $slaves.find(function(s) { return s.fuckdoll == 0 && s.fetish != "mindbroken" && s.amp != 1 && s.devotion < 75 && s.trust < 75 && s.indenture == -1 && canWalk(s) && canTalk(s) && ["serve in the club", "serve the public", "whore", "work in the brothel"].includes(s.assignment); })>>
 <<if (ndef $activeSlave)>> /* search again without assignments limitation */
 	<<set $activeSlave = $slaves.find(function(s) { return s.fuckdoll == 0 && s.fetish != "mindbroken" && s.amp != 1 && s.devotion < 75 && s.trust < 75 && s.indenture == -1 && canTalk(s); })>>
 	<<if (ndef $activeSlave)>> /* we will find one */
@@ -51,7 +51,7 @@ One fine day, as normal as any day surrounded by your slaves can be, you're sitt
 	<<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
 		_HisA avatar twitches slightly before sprouting multiple eyes facing all directions.
 	<<case "schoolgirl">>
-		_HisA avatar puts on such a hard look of concentration that its eyes cross.
+		_HisA avatar puts on such a hard look of concentration that _hisA eyes cross.
 	<<default>>
 		_HisA symbol avatar spins with frustration.
 	<</switch>>
diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index 7506db1c460ed8427a7ca3549875809c4a130d57..a5633ea953677e39361ec75f9a3482c297096074 100644
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw
@@ -32,7 +32,6 @@
 	<<set _flag = random(1,100), $partner = "">>
 <</if>>
 
-<<run SlavePronouns($activeSlave)>> /* are we including passages that need this? */
 <<setLocalPronouns $activeSlave>>
 
 <span id="walk">
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 32c617122a912a65cb358ec9942d65e0f7d5ed95..7b92338a7dc70a7d3c8b73d8150c585ec4707179 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -494,7 +494,7 @@
 %/
 <<widget "OralSkillIncrease">>
 
-<<run SlavePronouns($args[0])>>
+<<setLocalPronouns $args[0]>>
 <<if $args[0].oralSkill <= 10>>
 	<<if $args[0].oralSkill+$skillIncrease > 10>>
 		@@.green;$He now has basic knowledge about oral sex,@@ and can at least suck a dick without constant gagging.
@@ -523,7 +523,7 @@
 %/
 <<widget "VaginalSkillIncrease">>
 
-<<run SlavePronouns($args[0])>>
+<<setLocalPronouns $args[0]>>
 <<if $args[0].vaginalSkill <= 10>>
 	<<if $args[0].vaginalSkill+$skillIncrease > 10>>
 		@@.green;$He now has basic knowledge about vaginal sex,@@ and can avoid some of the common pitfalls and turnoffs.
@@ -552,7 +552,7 @@
 %/
 <<widget "AnalSkillIncrease">>
 
-<<run SlavePronouns($args[0])>>
+<<setLocalPronouns $args[0]>>
 <<if $args[0].analSkill <= 10>>
 	<<if $args[0].analSkill+$skillIncrease > 10>>
 		@@.green;$He now has basic knowledge about anal sex,@@ and can accept penetration of $his anus without danger.
@@ -581,7 +581,7 @@
 %/
 <<widget "WhoreSkillIncrease">>
 
-<<run SlavePronouns($args[0])>>
+<<setLocalPronouns $args[0]>>
 <<if $args[0].whoreSkill <= 10>>
 	<<if $args[0].whoreSkill+$skillIncrease > 10>>
 		@@.green;$He now has basic knowledge about how to whore,@@ and can avoid some potentially dangerous situations.
@@ -610,7 +610,7 @@
 %/
 <<widget "EntertainSkillIncrease">>
 
-<<run SlavePronouns($args[0])>>
+<<setLocalPronouns $args[0]>>
 <<if $args[0].entertainSkill <= 10>>
 	<<if $args[0].entertainSkill+$skillIncrease > 10>>
 		@@.green;$He now has basic knowledge about how to be entertaining,@@ and can usually avoid serious faux pas.