diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 72175380f050fe79ad5bf69b87409f92e742b696..662adbdc68b12e729b48b70b073c8d3eab09c8c6 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -509,7 +509,7 @@ The Free City features ''$neighboringArcologies'' arcologies in addition to your
 	<</if>>
 <</if>>
 
-<<if !["RomanRevivalist", "AztecRevivalist", "EgyptianRevivalist", "EdoRevivalist", "ArabianRevivalist", "ChineseRevivalist"].includes($targetArcology.type)>>
+<<if !["ArabianRevivalist", "AztecRevivalist", "ChineseRevivalist", "EdoRevivalist", "EgyptianRevivalist", "RomanRevivalist"].includes($targetArcology.type)>>
 	<br>
 	The lingua franca of your arcology is <<textbox "$language" $language "Intro Summary">>.
 	<<if $language != "English">>
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 139542dfbff8389f798aa81d95d29eb801f7bfc6..9398dfcbdfa15f1b8fe8b91ecf9dea53e02c0527 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -3000,7 +3000,7 @@ LORE: INTERVIEWS
 	| [[XY|Encyclopedia][$encyclopedia = "Hormones (XY)"]]
 <</if>>
 
-<<if["Anal Skill", "Combat Skill", "Entertainment Skill", "Oral Skill", "Skills", "Vaginal Skill", "Whoring Skill"].includes($encyclopedia)>>
+<<if ["Anal Skill", "Combat Skill", "Entertainment Skill", "Oral Skill", "Skills", "Vaginal Skill", "Whoring Skill"].includes($encyclopedia)>>
 	<br><br>//Skills// | [[Career Experience|Encyclopedia][$encyclopedia = "Career Experience"]]
 
 	<br>[[Anal Skill|Encyclopedia][$encyclopedia = "Anal Skill"]]
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index c93950f3455ce2e22d15b7723b01edf63e0620b8..865c8a92f9bbfbfe63a3c97d26e883f3968b0440 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -385,7 +385,7 @@ window.DefaultRules = (function() {
 					r += `${slave.slaveName} has been given no collar.`;
 				else if ((slave.collar === "pretty jewelry"))
 					r += `${slave.slaveName} has been given ${slave.collar}.`;
-				else if ((["dildo gag", "massive dildo gag", "ball gag", "bit gag", "neck corset", "porcelain mask", "bell collar", "bowtie"].includes(slave.collar)))
+				else if ((["ball gag", "bell collar", "bit gag", "bowtie", "dildo gag", "massive dildo gag", "neck corset", "porcelain mask"].includes(slave.collar)))
 					r += `${slave.slaveName} has been given a ${slave.collar}.`;
 				else
 					r += `${slave.slaveName} has been given a ${slave.collar} collar.`;
diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index 9c39da5275f54596d0cd549ebbbdd957630caea5..265b4d9cd0496baad14bee734be7bd717e57c9bb 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -62,7 +62,7 @@ window.generateRandomEventPoolStandard = function (eventSlave) {
 					}
 				}
 
-				if (eventSlave.entertainSkill >= 60 || ["an exotic dancer", "a dancer", "a house DJ", "a party girl", "an aspiring pop star"].includes(eventSlave.career)) {
+				if (eventSlave.entertainSkill >= 60 || ["a dancer", "a house DJ", "a party girl", "an aspiring pop star", "an exotic dancer"].includes(eventSlave.career)) {
 					if (canHear(eventSlave)) {
 						if (eventSlave.health > 40) {
 							if (eventSlave.devotion > 50) {
@@ -708,7 +708,7 @@ window.generateRandomEventPoolStandard = function (eventSlave) {
 
 				if (eventSlave.physicalAge > 35) {
 					if (eventSlave.speechRules !== "restrictive") {
-						if (["whore", "serve the public", "work in the brothel", "serve in the club"].includes(eventSlave.assignment)) {
+						if (["serve in the club", "serve the public", "whore", "work in the brothel"].includes(eventSlave.assignment)) {
 							if (eventSlave.devotion >= -20) {
 								if (eventSlave.devotion <= 95) {
 									State.variables.RESSevent.push("ara ara");
@@ -1050,7 +1050,7 @@ window.generateRandomEventPoolStandard = function (eventSlave) {
 
 			if (eventSlave.voice > 0) {
 				if (eventSlave.lips <= 95) {
-					if (!["dildo gag", "massive dildo gag", "ball gag", "bit gag"].includes(eventSlave.collar)) {
+					if (!["ball gag", "bit gag", "dildo gag", "massive dildo gag"].includes(eventSlave.collar)) {
 						if (eventSlave.accent === 3) {
 							if (eventSlave.devotion <= 50) {
 								if (eventSlave.trust > -10) {
@@ -1296,7 +1296,7 @@ window.generateRandomEventPoolStandard = function (eventSlave) {
 				}
 			}
 
-			if (["whore", "serve the public", "work in the brothel", "serve in the club"].includes(eventSlave.assignment)) {
+			if (["serve in the club", "serve the public", "whore", "work in the brothel"].includes(eventSlave.assignment)) {
 				if (eventSlave.vagina !== 0) {
 					if (eventSlave.anus !== 0) {
 						if (canDoAnal(eventSlave)) {
diff --git a/src/npc/fRelation.tw b/src/npc/fRelation.tw
index 3c4e2b535bfed63c3a3411733989259bb18a0e25..d372496017a8791c434815f3f467037f1e97f877 100644
--- a/src/npc/fRelation.tw
+++ b/src/npc/fRelation.tw
@@ -64,7 +64,7 @@ You call both $activeSlave.slaveName and $slaves[$partner].slaveName to your off
 	<<set $activeSlave.oralCount++, $slaves[$partner].oralCount++, $oralTotal++>>
 	<<= PartnerVCheck()>>
 <<elseif canWalk($activeSlave) && canWalk($slaves[$partner]) && ($activeSlave.devotion > 50) && ($slaves[$partner].devotion > 20) && (_activeSlaveRel == "mother" || _activeSlaveRel == "father")>>
-	$activeSlave.slaveName gives you a little smile when $he hears you wish to fuck $him and $his daughter $slaves[$partner].slaveName<<if ($PC.dick == 0)>> and sees your strap-on<</if>>. On your direction, $activeSlave.slaveName sits on the couch. When $slaves[$partner].slaveName enters, _his2 _activeSlaveRel spreads $his arms and tells _him2 to sit on $his lap. $slaves[$partner].slaveName gets the idea and straddles $him so they're face to face. You take $slaves[$partner].slaveName from behind; _he2 gasps as _he2 feels _his2 _activeSlaveRel's hands stimulate _him2 from the front. They make out shamelessly while you take your pleasure. When you finish, $activeSlave.slaveName lies down on the couch so $slaves[$partner].slaveName can ride $his <<if $seeRace == 1>>$activeSlave.race <</if>>face. As $he sucks the cum out of $his daughter's sopping fuckhole, $slaves[$partner].slaveName sucks you hard again. In the mood for something harder this time, you jam yourself into the older $activeSlave.slaveName. $slaves[$partner].slaveName gets off $activeSlave.slaveName's face so _he2 can offer _himself2 for fondling and groping while you pound $activeSlave.slaveName. After you're done, $slaves[$partner].slaveName returns _his2 _activeSlaveRel's affection and gives $him some gentle oral as the older slave lies there exhausted.
+	$activeSlave.slaveName gives you a little smile when $he <<if canHear($activeSlave)>>hears<<else>>learns<</if>> you wish to fuck $him and $his daughter $slaves[$partner].slaveName<<if ($PC.dick == 0)>> and <<if canSee($activeSlave)>>sees<<else>>acknowledges<</if>> your strap-on<</if>>. On your direction, $activeSlave.slaveName sits on the couch. When $slaves[$partner].slaveName enters, _his2 _activeSlaveRel spreads $his arms and tells _him2 to sit on $his lap. $slaves[$partner].slaveName gets the idea and straddles $him so they're face to face. You take $slaves[$partner].slaveName from behind; _he2 gasps as _he2 feels _his2 _activeSlaveRel's hands stimulate _him2 from the front. They make out shamelessly while you take your pleasure. When you finish, $activeSlave.slaveName lies down on the couch so $slaves[$partner].slaveName can ride $his <<if $seeRace == 1>>$activeSlave.race <</if>>face. As $he sucks the cum out of $his daughter's sopping fuckhole, $slaves[$partner].slaveName sucks you hard again. In the mood for something harder this time, you jam yourself into the older $activeSlave.slaveName. $slaves[$partner].slaveName gets off $activeSlave.slaveName's face so _he2 can offer _himself2 for fondling and groping while you pound $activeSlave.slaveName. After you're done, $slaves[$partner].slaveName returns _his2 _activeSlaveRel's affection and gives $him some gentle oral as the older slave lies there exhausted.
 	<<set $activeSlave.oralCount += 2, $slaves[$partner].oralCount += 2, $oralTotal += 2>>
 	<<= BothVCheck()>>
 	<<= PartnerVCheck()>>
diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw
index f55d448879d777c89edc76d1e515e4da31a4b09c..a509fbbeaa0dda98cd7c6c94cfb8d54cdd1f7056 100644
--- a/src/pregmod/newChildIntro.tw
+++ b/src/pregmod/newChildIntro.tw
@@ -1258,7 +1258,7 @@ You beckon the curious $girl to your hefty breasts, having noticed how hungrily
 		<<set $activeSlave.health -= 10>>
 		<<set $activeSlave.boobShape = "normal">>
 		<<replace "#result">>
-			You escort $him to the remote surgery, strap $him in, and put $him under. When $he awakes, $he can't keep $his hands off $his new ridiculous fake tits. $He's @@.hotpink;deliriously happy@@ that $he has $his own pair of monster breasts straining $his chest and @@.mediumaquamarine;bounces cheerfully@@ when $he hears they'll keep growing, despite $his near inability to stay upright. As with all surgery @@.red;$his health has been slightly affected.@@
+			You escort $him to the remote surgery, strap $him in, and put $him under. When $he awakes, $he can't keep $his hands off $his new ridiculous fake tits. $He's @@.hotpink;deliriously happy@@ that $he has $his own pair of monster breasts straining $his chest and @@.mediumaquamarine;bounces cheerfully@@ when $he <<if canHear($activeSlave)>>hears<<else>>discovers<</if>> they'll keep growing, despite $his near inability to stay upright. As with all surgery @@.red;$his health has been slightly affected.@@
 		<</replace>>
 		<</link>> //This option costs <<print cashFormat($surgeryCost)>>//
 	<<elseif $activeSlave.boobs < 1000>>
@@ -1284,7 +1284,7 @@ You beckon the curious $girl to your hefty breasts, having noticed how hungrily
 		<<set $activeSlave.health -= 10>>
 		<<set $activeSlave.boobShape = "normal">>
 		<<replace "#result">>
-			You escort $him to the remote surgery, strap $him in, and put $him under. When $he awakes, $he can't keep $his hands off $his new fake balloons. $He's @@.hotpink;deliriously happy@@ that $he has $his own pair of big breasts hanging from $his chest and @@.mediumaquamarine;bounces cheerfully@@ when $he hears they'll keep growing. As with all surgery @@.red;$his health has been slightly affected.@@
+			You escort $him to the remote surgery, strap $him in, and put $him under. When $he awakes, $he can't keep $his hands off $his new fake balloons. $He's @@.hotpink;deliriously happy@@ that $he has $his own pair of big breasts hanging from $his chest and @@.mediumaquamarine;bounces cheerfully@@ when $he <<if canHear($activeSlave)>>hears<<else>>discovers<</if>> they'll keep growing. As with all surgery @@.red;$his health has been slightly affected.@@
 		<</replace>>
 		<</link>> //This option costs <<print cashFormat($surgeryCost)>>//
 	<<else>>
@@ -1300,7 +1300,7 @@ You beckon the curious $girl to your hefty breasts, having noticed how hungrily
 			<<set $activeSlave.trust += 15>>
 			<<set $activeSlave.bellyAccessory = "a huge empathy belly">>
 			<<replace "#result">>
-				You tell $him to cover $his eyes and wait while you go fetch something for $him. Lugging back the biggest empathy belly you had available, you slip it onto $him, eliciting a grunt of discomfort. You order $him to open $his eyes and look $himself over. $He's @@.hotpink;deliriously happy@@ at $his huge belly and @@.mediumaquamarine;bounces cheerfully@@ when $he hears $he can keep it. $He spends the rest of the day bumping into things and struggling to adjust to the huge weight hanging off $his front.
+				You tell $him to cover $his eyes and wait while you go fetch something for $him. Lugging back the biggest empathy belly you had available, you slip it onto $him, eliciting a grunt of discomfort. You order $him to open $his eyes and look $himself over. $He's @@.hotpink;deliriously happy@@ at $his huge belly and @@.mediumaquamarine;bounces cheerfully@@ when $he <<if canHear($activeSlave)>>hears<<else>>discovers<</if>> $he can keep it. $He spends the rest of the day bumping into things and struggling to adjust to the huge weight hanging off $his front.
 			<</replace>>
 		<</link>>
 	<</if>>
@@ -1313,7 +1313,7 @@ You beckon the curious $girl to your hefty breasts, having noticed how hungrily
 			<<set $activeSlave.health -= 50>>
 			<<run SetBellySize($activeSlave)>>
 			<<replace "#result">>
-				You escort $him to the remote surgery, strap $him in, and put $him under. When $he awakes from $his induced coma, $he nearly faints at the <<if canSee($activeSlave)>>sight<<else>>feeling<</if>> of $his immense middle. $He's @@.hotpink;deliriously happy@@ at $his hugeness and @@.mediumaquamarine;squirms happily@@ when $he hears you can make it bigger, despite the fact that it is nearly as large as $he is and pins $him to the bed $he lies upon. As it was an invasive surgery, @@.red;$his health has been greatly affected.@@
+				You escort $him to the remote surgery, strap $him in, and put $him under. When $he awakes from $his induced coma, $he nearly faints at the <<if canSee($activeSlave)>>sight<<else>>feeling<</if>> of $his immense middle. $He's @@.hotpink;deliriously happy@@ at $his hugeness and @@.mediumaquamarine;squirms happily@@ when $he <<if canHear($activeSlave)>>hears<<else>>discovers<</if>> you can make it bigger, despite the fact that it is nearly as large as $he is and pins $him to the bed $he lies upon. As it was an invasive surgery, @@.red;$his health has been greatly affected.@@
 			<</replace>>
 		<</link>> //This option costs <<print cashFormat($surgeryCost)>>//
 	<</if>>
@@ -1325,7 +1325,7 @@ You beckon the curious $girl to your hefty breasts, having noticed how hungrily
 		<<set $activeSlave.health -= 10>>
 		<<run SetBellySize($activeSlave)>>
 		<<replace "#result">>
-			You escort $him to the remote surgery, strap $him in, and put $him under. When $he awakes, $he can't keep $his hands off $his new bulbous middle. $He's @@.hotpink;deliriously happy@@ that $he has $his own round belly and @@.mediumaquamarine;bounces cheerfully@@ when $he hears you can make it bigger. As with all surgery @@.red;$his health has been slightly affected.@@
+			You escort $him to the remote surgery, strap $him in, and put $him under. When $he awakes, $he can't keep $his hands off $his new bulbous middle. $He's @@.hotpink;deliriously happy@@ that $he has $his own round belly and @@.mediumaquamarine;bounces cheerfully@@ when $he <<if canHear($activeSlave)>>hears<<else>>discovers<</if>> you can make it bigger. As with all surgery @@.red;$his health has been slightly affected.@@
 		<</replace>> //This option costs <<print cashFormat($surgeryCost)>>//
 	<</link>>
 <</if>>
@@ -1475,7 +1475,7 @@ You beckon the curious $girl to your hefty breasts, having noticed how hungrily
 		<<run cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)>>
 		<<set $activeSlave.health -= 10>>
 		<<replace "#result">>
-			You escort $him to the remote surgery, strap $him in, and put $him under. When $he awakes, $he can't keep $his hands off $his new fake bottom. $He's @@.hotpink;deliriously happy@@ that $he has $his own pair of big butt cheeks hanging from $his rear and @@.mediumaquamarine;bounces them cheerfully@@ when $he hears they'll keep growing. As with all surgery @@.red;$his health has been slightly affected.@@
+			You escort $him to the remote surgery, strap $him in, and put $him under. When $he awakes, $he can't keep $his hands off $his new fake bottom. $He's @@.hotpink;deliriously happy@@ that $he has $his own pair of big butt cheeks hanging from $his rear and @@.mediumaquamarine;bounces them cheerfully@@ when $he <<if canHear($activeSlave)>>hears<<else>>discovers<</if>> they'll keep growing. As with all surgery @@.red;$his health has been slightly affected.@@
 		<</replace>>
 		<</link>> //This option costs <<print cashFormat($surgeryCost)>>//
 	<<else>>
diff --git a/src/pregmod/reMaleCitizenHookup.tw b/src/pregmod/reMaleCitizenHookup.tw
index 3520034db431be5ce47d3f096fb1d77666dd24be..03bf1292df03f8a308365ecfbd9d82e9b9550562 100644
--- a/src/pregmod/reMaleCitizenHookup.tw
+++ b/src/pregmod/reMaleCitizenHookup.tw
@@ -190,7 +190,7 @@ He's clearly attracted to you; even the most consummate actor would have difficu
 	You're not exactly starved for casual sex, but you've never thought there was any such thing as too much of a good thing. <<if _FS != "Physical Idealist">>You pull his arm around your waist<<else>>You nudge him in the ribs and motion to the door<</if>>. You hear a slight gasp from him as he realizes that his gambit has succeeded with more immediate effect than he expected. He shivers with anticipation as you steer him back through a side door, grabbing a pair of glasses of <<if $PC.refreshmentType == 1>>$PC.refreshment<<else>>liquor<</if>> on the way, and making a discreet exit towards your private suite.
 	<<if $Concubine != 0 && $Concubine.intelligence+$Concubine.intelligenceImplant > 50>>
 		<<setLocalPronouns $Concubine 2>>
-		$Concubine.slaveName is there, of course, and _he2 instantly sees that _his2 continued presence for a ménage à trois is wanted by both you and your guest.
+		$Concubine.slaveName is there, of course, and _he2 instantly <<if canSee($Concubine)>>sees<<else>>realizes<</if>> that _his2 continued presence for a ménage à trois is wanted by both you and your guest.
 	<</if>>
 	Your guest restrains his eager praise now that you're in private, but his wide-eyed appreciation of your domain is compliment enough. Once in your suite, you undress him, revealing
 	<<switch _FS>>
diff --git a/src/societies/aztec/slaveSacrifice.tw b/src/societies/aztec/slaveSacrifice.tw
index a38fb0d1640b37f9ca3dcdff71dc8d831bdaa595..306876e502865cae23f5f505761552135a2360fd 100644
--- a/src/societies/aztec/slaveSacrifice.tw
+++ b/src/societies/aztec/slaveSacrifice.tw
@@ -194,7 +194,7 @@
 
 		<<if ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetish != "none")>>
 			<<if ($activeSlave.fetish == "submissive")>>
-				$He makes sure is ready to take any order $he might be given, and it's evident that $he enjoys it every time $he is ordered to do something. As the week progresses $he finds $himself close to the limits of $his submission. As much as $he tries to keep $his hands to $himself, $his sexual frustration finally wins the battle, and $he desperately tries to masturbate, only for $him to discover how effective the chastity belt really is. $He cries in frustration and shame for being unable to fulfill $his orders. The signs of sexual frustration are more evident on $his body as time goes by and it is common to see $him repeating "<<Master>> told me no touching your<<s>>elf i<<s>> allowed" over and over again as $he shifts $his weight from foot to foot. The only thing that seems to shut $him up is when $he is ordered to come closer to drink, renew $his dose of aphrodisiacs or when ordered to be prepared to sleep. As soon as $he hears the order, $his body twitches and a soft moan can be heard. By the end of the week $he fights to remain standing up almost delusional as $he was told to remain on $his feet but the signs of exhaustion often bring $him to $his knees. Sometimes $he tries to touch $himself down there only to burst into tears when $he is unable to do so.
+				$He makes sure is ready to take any order $he might be given, and it's evident that $he enjoys it every time $he is ordered to do something. As the week progresses $he finds $himself close to the limits of $his submission. As much as $he tries to keep $his hands to $himself, $his sexual frustration finally wins the battle, and $he desperately tries to masturbate, only for $him to discover how effective the chastity belt really is. $He cries in frustration and shame for being unable to fulfill $his orders. The signs of sexual frustration are more evident on $his body as time goes by and it is common to see $him repeating "<<Master>> told me no touching your<<s>>elf i<<s>> allowed" over and over again as $he shifts $his weight from foot to foot. The only thing that seems to shut $him up is when $he is ordered to come closer to drink, renew $his dose of aphrodisiacs or when ordered to be prepared to sleep. As soon as $he <<if canHear($activeSlave)>>hears<<elseif canSee($activeSlave)>>sees<<else>>recognizes<</if>> the order, $his body twitches and a soft moan can be heard. By the end of the week $he fights to remain standing up almost delusional as $he was told to remain on $his feet but the signs of exhaustion often bring $him to $his knees. Sometimes $he tries to touch $himself down there only to burst into tears when $he is unable to do so.
 			<<elseif ($activeSlave.fetish == "masochist")>>
 				$He seems to enjoy the pain $his sacrifice submits $him to. Through the week is fairly common to see $his moaning and showing other signs of pleasure that seem to be fairly unrelated to the huge amounts of aphrodisiacs that run through $him. Every time the shot it is injected to $his body $he pants and thrusts, enjoying the pain of $his swollen <<if $activeSlave.dick != 0>>dick<<else>>pussy lips<</if>> throbbing inside $his chastity belt. As the week progresses, $he starts to frequently faint, as $he refuses to even drink the tea that keeps $him hydrated or sleep whatsoever, instead choosing to focus on the pain of being constantly aroused. As a precaution, alternative methods to keep $him hydrated are put in place to avoid the pleasure of being forced to drink every few hours as $he was caught several times trying to cum from it. By the end of the week $he needs to be constantly reanimated to fulfill $his vigil, moaning as $he comes to conscience as the exhaustion and pain on $his body washes over to $him.
 			<<elseif ($activeSlave.fetish == "cumslut")>> /*Will need to be completely rewritten*/
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index a1ddf817e2b243099908afa1053d7a585ff37247..4b11b47efc97a0ca5e9279cf0218632498e6b6c8 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -8925,7 +8925,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 <<link "Enter the shower and take $him">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	$He's so occupied that $he doesn't hear you until you seize $him under the armpits and drag $him to $his feet. $His massive dickhead pops free of $his mouth and $he squeaks in surprise as you push $his<<if $activeSlave.belly >= 5000>> <<if $activeSlave.bellyPreg >= 3000>>gravid<<else>>rounded<</if>> body<</if>> against the wall of the shower and stuff your <<if $PC.dick == 0>>strap-on<<else>>dick<</if>> up $his
+	$He's so occupied that $he doesn't <<if canHear($activeSlave)>>hear<<else>>notice<</if>> you until you seize $him under the armpits and drag $him to $his feet. $His massive dickhead pops free of $his mouth and $he squeaks in surprise as you push $his<<if $activeSlave.belly >= 5000>> <<if $activeSlave.bellyPreg >= 3000>>gravid<<else>>rounded<</if>> body<</if>> against the wall of the shower and stuff your <<if $PC.dick == 0>>strap-on<<else>>dick<</if>> up $his
 	<<if canDoVaginal($activeSlave)>>
 		cunt.
 	<<else>>
@@ -9538,7 +9538,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 <br><<link "Sneak it into $his ass instead">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	Despite $himself, $he breaks down when $he <<if canSee($activeSlave)>>sees<<else>>hears<</if>> you coming over and kneeling down to line your cock up with the entrance to $his
+	Despite $himself, $he breaks down when $he <<if canSee($activeSlave)>>sees<<elseif canHear($activeSlave)>>hears<<else>>notices<</if>> you coming over and kneeling down to line your cock up with the entrance to $his
 	<<if ($activeSlave.vagina == 1)>>
 		deliciously tight
 	<<elseif ($activeSlave.vagina == 2)>>
@@ -10369,7 +10369,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 		brings $his hands to $his breasts to <<if $activeSlave.nipples != "fuckable">>tease $his erect<<else>>finger $his swollen<</if>> nipples.
 	<</if>>
 	<br><br>
-	$He's extremely pent up, and orgasms twice with <<if $PC.dick == 1>>your dick in $his mouth<<if $PC.vagina == 1>> first and $his tongue quivering along your pussylips second<</if>><<else>>$his mouth on your cunt<</if>>. The mental effects of this formative little experience are impossible to control with precision. Over the next few days, you notice that whenever $he sees you,
+	$He's extremely pent up, and orgasms twice with <<if $PC.dick == 1>>your dick in $his mouth<<if $PC.vagina == 1>> first and $his tongue quivering along your pussylips second<</if>><<else>>$his mouth on your cunt<</if>>. The mental effects of this formative little experience are impossible to control with precision. Over the next few days, you notice that whenever <<if canSee($activeSlave)>>$he sees you<<else>>you see $him<</if>>,
 	<<if (random(0,1) == 1)>>
 		$he licks $his lips unconsciously. $He seems to be developing the beginnings of a lovely @@.lightcoral;oral fixation.@@
 		<<set $activeSlave.fetish = "cumslut", $activeSlave.fetishKnown = 1, $activeSlave.fetishStrength = 10>>
@@ -11988,7 +11988,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 <br><<link "Keep $him quiet but spend some time with $him">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	You announce that you're finished with business for the day, and feel like some quiet time. $He cannot keep <<if canSee($activeSlave)>>a gleam of humor out of $his eye<<else>>the corners of $his lips from rising slightly<</if>> at hearing 'quiet time,' and $he <<if $activeSlave.amp == 1>>presents $himself to be carried<<else>>follows you<</if>> happily enough. When $he <<if canSee($activeSlave)>>sees<<else>>realizes<</if>> you're headed to your bedroom $he begins to anticipate $his <<= WrittenMaster($activeSlave)>>'s <<if $PC.dick == 0>>strap-on<<else>>cock<</if>>, but is surprised to find that instead of using $him you simply
+	You announce that you're finished with business for the day, and feel like some quiet time. $He cannot keep <<if canSee($activeSlave)>>a gleam of humor out of $his eye<<else>>the corners of $his lips from rising slightly<</if>> at <<if canHear($activeSlave)>>hearing<<else>>the phrase<</if>> 'quiet time,' and $he <<if $activeSlave.amp == 1>>presents $himself to be carried<<else>>follows you<</if>> happily enough. When $he <<if canSee($activeSlave)>>sees<<else>>realizes<</if>> you're headed to your bedroom $he begins to anticipate $his <<= WrittenMaster($activeSlave)>>'s <<if $PC.dick == 0>>strap-on<<else>>cock<</if>>, but is surprised to find that instead of using $him you simply
 	<<if $activeSlave.amp == 1>>
 		place $him in bed and curl up around $his limbless torso.
 	<<elseif $activeSlave.bellyPreg >= 5000>>
@@ -13399,7 +13399,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 	<<else>>
 		<<= AnalVCheck()>>
 	<</if>>
-	There's no hesitation or fear at all on $his face when $he sees you're returning $him to your penthouse; @@.mediumaquamarine;$his trust in you has increased.@@
+	There's no hesitation or fear at all on $his face when $he <<if canSee($activeSlave)>>sees<<else>>notices<</if>> you're returning $him to your penthouse; @@.mediumaquamarine;$his trust in you has increased.@@
 	<<set $activeSlave.trust += 4>>
 	<</replace>>
 <</link>><<if (canDoAnal($activeSlave) || canDoVaginal($activeSlave)) && (($activeSlave.vagina == -1) && ($activeSlave.anus == 0)) || ($activeSlave.vagina == 0)>> //This option will take virginity//<</if>>
@@ -18507,7 +18507,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 				you've decided to fuck $his pussy. $He starts at the sudden vulgarity, even with your cock resting against the soft skin between the bottom of $his vulva and $his anus, and shudders with sudden pleasure as you use a hand to guide yourself inside $his welcoming channel.
 				<<= VaginalVCheck()>>
 			<<else>>
-				$his ass is yours. $He starts at the sudden vulgarity, even though hearing that the cock that's pressing against $his butt will be going inside it soon can't be that surprising. $He cocks $his hips obediently, letting you force your dick up $his asshole.
+				$his ass is yours. $He starts at the sudden vulgarity, even though <<if canHear($activeSlave)>>hearing<<else>>discovering<</if>> that the cock that's pressing against $his butt will be going inside it soon can't be that surprising. $He cocks $his hips obediently, letting you force your dick up $his asshole.
 				<<= AnalVCheck()>>
 			<</if>>
 			You take $him standing,
@@ -20479,7 +20479,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 	<<replace "#result">>
 	You tell $him that the wardrobe's sorting system will present $him with a new outfit, just for today. $He's to go try it on and come right back, to see how it fits. "Thank<<s>>, <<Master>>!" $he <<say>>s brightly, and hurries off to see what's in store for $him. $He might be a slave and a $desc but girls everywhere love trying on new clothes. $He makes an entrance when $he comes back, spinning around to show off. $He's wearing the briefest possible string bikini. The top, rather than having patches of material to cover $his nipples, forms a string triangle around them, framing them but not covering them. The bottom is a single string in front, <<if $activeSlave.dick>>which looks rather sad and alone, pushed aside by $his dick as it is<<elseif $activeSlave.labia>>and it's embraced completely by $his generous pussylips<<else>>and it threatens to disappear inside $his pussylips<</if>>. "Thi<<s>> feel<<s>> <<s>>o hot, <<Master>>," $he <<say>>s, and
 	<<if $activeSlave.fetishKnown && $activeSlave.fetish == "humiliation">>
-		blushes cutely. $He looks up at you, sees the way you're staring at $him, and hangs $his head, blushing even harder.
+		blushes cutely. $He looks up at you, <<if canSee($activeSlave)>>sees<<else>>feels<</if>> the way you're staring at $him, and hangs $his head, blushing even harder.
 	<<elseif $activeSlave.fetishKnown && $activeSlave.fetish == "buttslut">>
 		turns around again, bending a little and cocking $his hips to show off the way the string between $his buttocks totally fails to conceal $his <<if $activeSlave.anus > 2>>huge soft asspussy<<elseif $activeSlave.anus > 1>>nice butthole<<else>>tight little anus<</if>>.
 	<<elseif $activeSlave.fetishKnown && $activeSlave.fetish == "boobs">>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 22726f13edc1e9fdd7c59d4215ec5499474f94b3..0457b87fe4b4350423a8957a1ff0b05b39c0e2e7 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -202,16 +202,18 @@
 <<case "taste test">>
 
 You look into the part of the kitchens used for slave feeding one morning during a quiet time, finding the area deserted except for <<EventNameLink>>. $He
+<<if canSee($activeSlave)>>
+	sees you enter
+<<elseif canHear($activeSlave)>>
+	hears you enter
+<<else>>
+	feels a light touch on $his shoulder
+<</if>>
+	and
 <<if $cockFeeder == 1>>
-	hears you enter and stops sucking $his feeder phallus,
+	stops sucking $his feeder phallus,
 <<else>>
-	<<if canSee($activeSlave)>>
-		sees you enter and puts $his cup of liquid slave food down,
-	<<elseif canHear($activeSlave)>>
-		hears you enter and puts $his cup of liquid slave food down,
-	<<else>>
-		feels a light touch on $his shoulder and puts $his cup of liquid slave food down,
-	<</if>>
+	puts $his cup of liquid slave food down,
 <</if>>
 but you make a dismissive "go back to what you were doing" <<if canSee($activeSlave)>>gesture<<elseif canHear($activeSlave)>>sound<<else>>nudge<</if>>, and $he obediently
 <<if $cockFeeder == 1>>
@@ -821,7 +823,7 @@ The milking machine cum receptacle is designed to be warm, wet, and stimulating,
 <</if>>
 $His other hand is <<if $subSlave.scrotum == 0>>massaging the place where $subSlave.slaveName's scrotum used to be<<elseif $subSlave.scrotum < $activeSlave.balls>>gently massaging $subSlave.slaveName's overfilled scrotum, which _his2 balls fill to the point of discomfort<<elseif $subSlave.scrotum > $activeSlave.balls+1>>playing with $subSlave.slaveName's loose scrotum<<else>>massaging $subSlave.slaveName's balls<</if>>.
 <br><br>
-$subSlave.slaveName is getting _his2 dick sucked<<if $subSlave.lactation == 0>> and _his2 ass fucked<<else>>, _his2 ass fucked, and _his2 boobs milked<</if>>. _He2's so overstimulated that _he2's shaking; a tremendous orgasm is building within _him2. _He2 <<if $subSlave.voice != 0>>groans<<else>>makes a harsh rasping noise<</if>>, which $activeSlave.slaveName hears, and $subSlave.slaveName tenses, which $activeSlave.slaveName feels in $his mouth and hands. Smiling around the penis in $his mouth, pleased by the approach of a gush of delectable semen, $activeSlave.slaveName hums encouragement into $subSlave.slaveName's <<if canAchieveErection($subSlave)>>rock-hard<<else>>soft<</if>> dickhead<<if $subSlave.scrotum>> and visibly tickles $subSlave.slaveName's balls with $his naughty pink tongue<</if>>.
+$subSlave.slaveName is getting _his2 dick sucked<<if $subSlave.lactation == 0>> and _his2 ass fucked<<else>>, _his2 ass fucked, and _his2 boobs milked<</if>>. _He2's so overstimulated that _he2's shaking; a tremendous orgasm is building within _him2. _He2 <<if $subSlave.voice != 0>>groans<<else>>makes a harsh rasping noise<</if>>, which $activeSlave.slaveName <<if canHear($activeSlave)>>hears<<else>>can feel<</if>>, and $subSlave.slaveName tenses, which $activeSlave.slaveName feels in $his mouth and hands. Smiling around the penis in $his mouth, pleased by the approach of a gush of delectable semen, $activeSlave.slaveName hums encouragement into $subSlave.slaveName's <<if canAchieveErection($subSlave)>>rock-hard<<else>>soft<</if>> dickhead<<if $subSlave.scrotum>> and visibly tickles $subSlave.slaveName's balls with $his naughty pink tongue<</if>>.
 
 <<case "interslave begging">>
 
@@ -1246,7 +1248,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
 <br><<link "Dominate the slave on top">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	You make no reply, but <<if $PC.dick == 1>>advance on the couch, stripping down to reveal a raging erection<<if $PC.vagina == 1>> and ready cunt<</if>>.<<else>>move to a side table, selecting a formidable strap-on.<</if>> <<if canSee($activeSlave)>>Seeing<<else>>Hearing<</if>> this, $activeSlave.slaveName @@.hotpink;giggles with anticipation,@@ and pulls $subSlave.slaveName's knees back farther. The slave whines at the stretch, and then gasps as the invading phallus pops free of _his2 asshole. _His2 anus <<if $subSlave.anus > 2>>gapes lewdly, its sphincter so well stretched that it stays invitingly open,<<elseif $subSlave.anus > 1>>gapes slightly, its sphincter remaining just barely open,<<else>>closes up again immediately once it's no longer being penetrated. Its rosebud is<</if>> glistening with lube<<if canPenetrate($activeSlave)>> and precum from $activeSlave.slaveName's cock<</if>>. But you decide to be more circumspect. Pressing your <<if $PC.dick == 1>>dickhead<<else>>phallus<</if>> into $subSlave.slaveName's mouth, you tell _him2 to be thorough with _his2 saliva<<if $PC.vagina == 1>> and not to worry about your pussy<</if>>. _His2 eyes widen at the implication, and _he2 starts to suck lushly.
+	You make no reply, but <<if $PC.dick == 1>>advance on the couch, stripping down to reveal a raging erection<<if $PC.vagina == 1>> and ready cunt<</if>>.<<else>>move to a side table, selecting a formidable strap-on.<</if>> <<if canSee($activeSlave)>>Seeing<<elseif canHear($activeSlave>>Hearing<<else>>Acknowledging<</if>> this, $activeSlave.slaveName @@.hotpink;giggles with anticipation,@@ and pulls $subSlave.slaveName's knees back farther. The slave whines at the stretch, and then gasps as the invading phallus pops free of _his2 asshole. _His2 anus <<if $subSlave.anus > 2>>gapes lewdly, its sphincter so well stretched that it stays invitingly open,<<elseif $subSlave.anus > 1>>gapes slightly, its sphincter remaining just barely open,<<else>>closes up again immediately once it's no longer being penetrated. Its rosebud is<</if>> glistening with lube<<if canPenetrate($activeSlave)>> and precum from $activeSlave.slaveName's cock<</if>>. But you decide to be more circumspect. Pressing your <<if $PC.dick == 1>>dickhead<<else>>phallus<</if>> into $subSlave.slaveName's mouth, you tell _him2 to be thorough with _his2 saliva<<if $PC.vagina == 1>> and not to worry about your pussy<</if>>. _His2 eyes widen at the implication, and _he2 starts to suck lushly.
 	<br><br>
 	Suddenly, _he2 jerks and squeals into your <<if $PC.dick == 1>>dick<<else>>crotch<</if>>. With you standing there, $activeSlave.slaveName can't really see much, and $he can't drop $subSlave.slaveName's legs without throwing everything into confusion. So, $he's reduced to blind jabs to get $his <<if canPenetrate($activeSlave)>>cock<<else>>strap-on<</if>> back up the poor slave's butt. It takes $him quite a while to manage it, and when $he's finally seated, $subSlave.slaveName gives as huge a sigh as _he2 can manage with a phallus down _his2 throat. _His2 relief is short lived, however, because soon afterward, you withdraw, leaving a string of spit between _his2 wet lips and the <<if $PC.dick == 1>>head of your turgid cock<<else>>massive head of your strap-on<</if>>.
 	<br><br>
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index a1342eced5a031dab1c29ea94104bb2542f77c17..abaca9fbff5752918a680a026ad857ad1f2c4e61 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -685,7 +685,7 @@ Choose a tattoo style:
 				<<set _degradationTemp += 1>>
 			<</if>>
 
-			<<if !["tribal patterns", "flowers", "paternalist", 0].includes($tattooChoice)>>
+			<<if !["flowers", "paternalist", "tribal patterns", 0].includes($tattooChoice)>>
 				<<set $degradation += _degradationTemp>>
 			<</if>>
 
diff --git a/src/uncategorized/ptWorkaround.tw b/src/uncategorized/ptWorkaround.tw
index ab87d8a12b547e7a5ae5ad1e1ef87141e4220ff4..e1319dd0dc20f638cad12722e680c9ad05bdd498 100644
--- a/src/uncategorized/ptWorkaround.tw
+++ b/src/uncategorized/ptWorkaround.tw
@@ -411,7 +411,7 @@
 		$activeSlave.slaveName is really wild and stern measures must be taken. So, $he is<<if !canDoAnal($activeSlave) || ($activeSlave.vagina > -1 && !canDoVaginal($activeSlave))>> stripped of $his protective chastity and<</if>> forced, struggling and screaming, into a latex suit that completely blinds, deafens, and immobilizes $him. So attired, the only places where $he can feel any sensations at all other than endless latex darkness are $his <<if ($activeSlave.dick != 0) && ($activeSlave.vagina != -1)>>pussy, and cock<<elseif ($activeSlave.dick != 0)>>cock<<else>>pussy<</if>> and backdoor. For $him, time becomes a featureless, torturous boredom broken only by occasional rape. Eventually, $he becomes so @@.mediumorchid;desperate@@ for something, anything, to break the monotony that $he begins to look forward to the next time a phallus will @@.gold;force@@ its way into $him.
 		<<= BothVCheck(6, 3)>>
 	<<elseif ($activeSlave.devotion < -50) && ($activeSlave.hStyle != "shaved") && (random(1,100) > 90)>>
-		$activeSlave.slaveName needs to be taken down a peg. Fortunately, you know just the thing. You bring $him into a bathroom, place a chair in the tub, and tie $him securely to the chair. $He isn't too perturbed — $he probably expects a facefuck under running water or something like that — but $he begins to cry when $he hears you switch on an electric shaver. $he luxuriates in $his hair, flaunting it every chance $he gets; it's something of value in a bleak slave world and $he sobs as you shave it off $him. Afterward, $he sniffles and @@.gold;looks at you in fear@@ and @@.mediumorchid;unhappiness@@ when you rub $his newly bald scalp. Of course, there's always the body modification studio if you ever feel like $he's earned $his hair back.
+		$activeSlave.slaveName needs to be taken down a peg. Fortunately, you know just the thing. You bring $him into a bathroom, place a chair in the tub, and tie $him securely to the chair. $He isn't too perturbed — $he probably expects a facefuck under running water or something like that — but $he begins to cry when $he <<if canHear($activeSlave)>>hears you switch on<<elseif canSee($activeSlave)>>sees you pull out<<else>>feels the cool touch of>>/if>> an electric shaver. $He luxuriates in $his hair, flaunting it every chance $he gets; it's something of value in a bleak slave world and $he sobs as you shave it off $him. Afterward, $he sniffles and @@.gold;looks at you in fear@@ and @@.mediumorchid;unhappiness@@ when you rub $his newly bald scalp. Of course, there's always the body modification studio if you ever feel like $he's earned $his hair back.
 		<<set $activeSlave.hStyle = "shaved", $activeSlave.hLength = 0>>
 	<<elseif canDoAnal($activeSlave) && (random(1,100) < 10)>>
 		Sometimes, there's no need to be clever. The first indication $he gets that you've decided to train $him this week is when $he wakes suddenly in the middle of the night to the burning sensation of a <<if $PC.dick == 1>>cock<<else>>strap-on<</if>> being shoved up $his ass. Not knowing what is happening, $he struggles, but since $he was already lying in $his bed you just lie on top of $him and press $his wriggling body into the sheets as you assrape $him. For the rest of the week, $he finds $himself grabbed and fucked. $He can't help but @@.gold;become used to the abuse@@ despite $his @@.mediumorchid;resentment.@@
diff --git a/src/uncategorized/reAWOL.tw b/src/uncategorized/reAWOL.tw
index bc188aa5ddcb8dac12c2ae83c337496d23851c24..337379f6c287bc260d5c67be5cffe6c5f3d65576 100644
--- a/src/uncategorized/reAWOL.tw
+++ b/src/uncategorized/reAWOL.tw
@@ -91,7 +91,7 @@ Your window of opportunity to act is closing. If you have plans for punishing th
 
 					<<link "You want $him dead">>
 						<<replace "#SFresult">>
-							Despite the trouble $he has caused you, the culmination of this mercenary's wanton flight from the rest of the $mercenariesTitle is decidedly anti-climatic. The last you hear of $him is in the footnote of one of your daily reports, with some minute yet suitably gory pictures as an accompaniment. When the stolen weapons are returned to their rightful place in your arcology, the unfortunate matter is concluded once and for all. @@.green;Your reputation and $arcologies[0].name's prosperity improves,@@ a result of the fear crossing you will bring, in addition toshowing your citizens that you are willing and able to deal with such matters in-house.
+							Despite the trouble $he has caused you, the culmination of this mercenary's wanton flight from the rest of the $mercenariesTitle is decidedly anti-climatic. The last you hear of $him is in the footnote of one of your daily reports, with some minute yet suitably gory pictures as an accompaniment. When the stolen weapons are returned to their rightful place in your arcology, the unfortunate matter is concluded once and for all. @@.green;Your reputation and $arcologies[0].name's prosperity improves,@@ a result of the fear crossing you will bring, in addition to showing your citizens that you are willing and able to deal with such matters in-house.
 							<<set $arcologies[0].prosperity += 2>>
 							<<run repX(5000, "event", $activeSlave)>>
 							<<if $arcologies[0].prosperity > $AProsperityCap>>
diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw
index 1ab369f10b62864ae54ce56cb0cb82c7fe1dbe5c..54dc48e2bc813bcac848bc8019e71a8c9a6691ce 100644
--- a/src/uncategorized/reShelterInspection.tw
+++ b/src/uncategorized/reShelterInspection.tw
@@ -36,7 +36,7 @@
 <<set $activeSlave.hLength = 40>>
 <<set $activeSlave.hStyle = "up">>
 <<set $activeSlave.energy = random(5,50)>>
-<<set $activeSlave.behavioralQuirk = either("hates men", "hates women", "gluttonous", "liberated")>>
+<<set $activeSlave.behavioralQuirk = either("gluttonous", "hates men", "hates women", "liberated")>>
 <<set $activeSlave.sexualQuirk = either("apathetic", "idealistic")>>
 <<set $activeSlave.clothes = either("conservative clothing", "nice business attire")>>
 
@@ -160,7 +160,7 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
 		<<else>>
 			_He2 struggles to resist in any way _he2 can, but _he2 is too firmly anchored to move.
 		<</if>>
-		Before _he2 gets the chance to swear defiance against you, another patron rams his dick down _his2 throat, putting a stop to that notion. _His2 hands ball into fists as _he2 endures _his2 spitroasting.
+		Before _he2 gets the chance to swear defiance against you, another patron rams his dick down _his2 throat, putting a stop to that notion. _His2 hands ball into fists as _he2 endures _his2 first spitroasting.
 		<<set $shelterAbuse += 15>>
 		<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
 		<<run newSlave($activeSlave)>> /* skip New Slave Intro */
@@ -251,24 +251,24 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
 
 		<<case "You got her at the Slave Shelter. Her previous owner forced her to cut off her dick and balls and cook them.">>
 			<<if _Inspectee.dick > _originSlave.dick>>
-				"I see that you've given $him a replacement tool," _he2 reaches down and gives it an exploratory fondle,
+				"I see that you've given $him a replacement tool," _he2 says as _he2 reaches down and gives it an exploratory fondle,
 				<<if canAchieveErection(_Inspectee)>>
-					"it even works, that's lovely." The inspector looks deflated, and reluctantly makes a positive note on _his2 tablet.
+					"It even works, that's lovely." The inspector looks deflated, and reluctantly makes a positive note on _his2 tablet.
 				<<else>>
-					"it seems to be non-functional, but it's a nice gesture at least." The inspector looks deflated, and reluctantly makes a positive note on _his2 tablet.
+					"It seems to be non-functional, but it's a nice gesture at least." The inspector looks deflated, and reluctantly makes a positive note on _his2 tablet.
 				<</if>>
 				<<set _inspectionResult-->>
 			<</if>>
 			<<if _Inspectee.balls > _originSlave.balls && _Inspectee.scrotum>>
 				<<if _Inspectee.dick > _originSlave.dick>>
-					"And these work too, right?" _he2 asks as _he2 points to $his dangling balls. "So $he has been fully restored, that's something." The inspector adds another positive note to the inspection.
+					"And these work too, right?" _he2 asks as _he2 points to $his dangling balls. "So $he has been fully restored; that's something." The inspector adds another positive note to the inspection.
 					<<set _inspectionResult-->>
 				<<else>>
 					"I take it these testicles are more than just an implant? I'm sure $he appreciates the gesture, though what good are they without a penis?" The inspector shakes _his2 head and notes your attempt to undo the damages to _Inspectee.slaveName.
 				<</if>>
 			<</if>>
 
-			<<if !["apathetic", "neglectful"].includes(_Inspectee.sexualFlaw) && !["odd", "anorexic"].includes(_Inspectee.behavioralFlaw) && !["none", "masochist"].includes(_Inspectee.fetish)>>
+			<<if !["apathetic", "neglectful"].includes(_Inspectee.sexualFlaw) && !["anorexic", "odd"].includes(_Inspectee.behavioralFlaw) && !["none", "masochist"].includes(_Inspectee.fetish)>>
 				The inspector can see that $his personality is much better than before. The inspector looks deflated, and reluctantly makes a positive note on _his2 tablet.
 				<<set $shelterAbuse -= 3>>
 			<</if>>
@@ -278,7 +278,7 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
 				The inspector can see that $he has a new set of breasts. The inspector looks deflated, and reluctantly makes a positive note on _his2 tablet.
 				<<set $shelterAbuse -= 2>>
 			<</if>>
-			<<if !["apathetic", "neglectful", "self hating"].includes(_Inspectee.sexualFlaw) && !["odd", "anorexic"].includes(_Inspectee.behavioralFlaw) && !["none", "masochist"].includes(_Inspectee.fetish)>>
+			<<if !["apathetic", "neglectful", "self hating"].includes(_Inspectee.sexualFlaw) && !["anorexic", "odd"].includes(_Inspectee.behavioralFlaw) && !["none", "masochist"].includes(_Inspectee.fetish)>>
 				The inspector can see that $his personality is much better than before. The inspector looks deflated, and reluctantly makes a positive note on _his2 tablet.
 				<<set $shelterAbuse -= 3>>
 			<</if>>
@@ -429,19 +429,19 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
 		<<switch _Inspectee.assignment>>
 		<<case "whore" "work in the brothel">>
 			<<if (_Inspectee.fetishStrength > 95) || (_Inspectee.energy > 95)>>
-				_Inspectee.slaveName says happily, "I'm a whore!" The inspector makes a "go on" gesture, and the slave continues, "It'<<s>> awe<<s>>ome. Nothing but cock, every day." The inspector looks deflated, and reluctantly makes a positive note on _his2 tablet.
+				_Inspectee.slaveName says happily, "I'm a whore!" The inspector makes a 'go on' gesture, and the slave continues, "It'<<s>> awe<<s>>ome. Nothing but cock, every day." The inspector looks deflated, and reluctantly makes a positive note on _his2 tablet.
 				<<set $shelterAbuse -= 1>>
 			<<else>>
-				_Inspectee.slaveName says confidently, "I'm a whore!" The inspector makes a go-on gesture, and the slave continues, "It'<<s>> hard work <<s>>ometime<<s>>, but I'm okay. I'm much happier with my current owner, thank you." The inspector looks pleased, and says _he2'll put out a @@.green;good word@@ about you.
+				_Inspectee.slaveName says confidently, "I'm a whore!" The inspector makes a 'go on' gesture, and the slave continues, "It'<<s>> hard work <<s>>ometime<<s>>, but I'm okay. I'm much happier with my current owner, thank you." The inspector looks pleased, and says _he2'll put out a @@.green;good word@@ about you.
 				<<run repX(500, "event", _Inspectee)>>
 				<<set $shelterAbuse -= 1>>
 			<</if>>
 		<<case "serve the public" "serve in the club">>
 			<<if (_Inspectee.fetishStrength > 95) || (_Inspectee.energy > 95)>>
-				_Inspectee.slaveName says happily, "I'm a <<s>>lut!" The inspector makes a go-on gesture, and the slave continues, "It'<<s>> awe<<s>>ome. Nothing but cute boy<<s>> and girl<<s>>, every day." The inspector looks deflated, and reluctantly makes a positive note on _his2 tablet.
+				_Inspectee.slaveName says happily, "I'm a <<s>>lut!" The inspector makes a 'go on' gesture, and the slave continues, "It'<<s>> awe<<s>>ome. Nothing but cute boy<<s>> and girl<<s>>, every day." The inspector looks deflated, and reluctantly makes a positive note on _his2 tablet.
 				<<set $shelterAbuse -= 1>>
 			<<else>>
-				_Inspectee.slaveName says confidently, "I'm a <<s>>lut!" The inspector makes a go-on gesture, and the slave continues, "It'<<s>> not bad. I'm much happier with my current owner, thank you." The inspector looks pleased, and says _he2'll put out a @@.green;good word@@ about you.
+				_Inspectee.slaveName says confidently, "I'm a <<s>>lut!" The inspector makes a 'go on' gesture, and the slave continues, "It'<<s>> not bad. I'm much happier with my current owner, thank you." The inspector looks pleased, and says _he2'll put out a @@.green;good word@@ about you.
 				<<run repX(500, "event", _Inspectee)>>
 				<<set $shelterAbuse -= 1>>
 			<</if>>
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index 2c7ad44b341719ba4dfc1312ffb6c639bb0f6ba1..ef7b3ac069a67c96428ffa30dbcc66c8e6207d89 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -1510,7 +1510,7 @@ It would cost <<print cashFormat($contractCost)>> to enslave the two of them.
 
 <<case "mismatched pair">>
 
-<<setLocalProPronouns $HeadGirl 3>>
+<<setLocalPronouns $HeadGirl 3>>
 Your Head Girl comes to see you. _He3 flags a slave posted for sale on your desk. The posting seems completely unimpressive — just a bitch barely past $his <<= ordinalSuffix($activeSlave.actualAge)>> birthday with basic implants and a pathetic little dick — until _he3 points out that the person posting $him for sale is $his sister. $His slightly older, naturally female sister. Who, to go by the pictures, the younger sibling has desperately been trying to mold $himself to look more like.
 
 <br><br>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 413364fdd1c2fc266fc07e53f066aa30e73cc74e..e30373fc953b81aa7c8fc7ea10366238dd8f130a 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -4264,7 +4264,7 @@
 					$He is @@.mediumaquamarine;thankful@@ that $he isn't permitted to eat the treats. $He's seen others try one, only to start shoveling them down.
 					<<set $slaves[$i].trust++>>
 				<<elseif $slaves[$i].behavioralFlaw == "gluttonous">>
-					$He @@.mediumorchid;resents@@ not being allowed to stuff $his face with the tempting treats like the other slaves $he sees.
+					$He @@.mediumorchid;resents@@ not being allowed to stuff $his face with the tempting treats like the other slaves<<if canSee($slaves[$i])>> $he sees<</if>>.
 					<<set $slaves[$i].devotion -= 2>>
 				<<elseif $slaves[$i].behavioralFlaw == "anorexic">>
 					$He @@.hotpink;is relieved@@ that $he doesn't have to eat the treat and is @@.mediumaquamarine;thankful@@ for your apparent consideration.
diff --git a/src/uncategorized/saTakeClasses.tw b/src/uncategorized/saTakeClasses.tw
index 9ebea83b08aa035e7da72c2d5a55d90a41c97f01..76f043b31fe66e5646d9f6f23db6315eb286bb78 100644
--- a/src/uncategorized/saTakeClasses.tw
+++ b/src/uncategorized/saTakeClasses.tw
@@ -68,7 +68,7 @@
 	With $his inability to hear and see, absorbing the content is extremely difficult.
 	<<set _learning = -2>>
 <<elseif !canHear($slaves[$i]) || !canSee($slaves[$i])>>
-	With $his impairements, $he needs special lessons to properly learn.
+	With $his impairments, $he needs special lessons to properly learn.
 	<<set _learning = 0>>
 <</if>>
 
diff --git a/src/uncategorized/slaveShelter.tw b/src/uncategorized/slaveShelter.tw
index 3e5cea4d830878115fc77d26a4f81fc554a4f04a..393423374909a764ae96568986df5cd7b73b992f 100644
--- a/src/uncategorized/slaveShelter.tw
+++ b/src/uncategorized/slaveShelter.tw
@@ -351,16 +351,16 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
 	<<set $shelterSlave.health = random(-80,-60)>>
 	<<set $shelterSlave.chem = 1000>>
 	<<if ($shelterSlave.dick > 0) && (random(1,2) == 1)>>
-	<<set $shelterSlave.dick = random(5,6)>>
+		<<set $shelterSlave.dick = random(5,6)>>
 	<</if>>
 	<<if ($shelterSlave.balls > 0) && (random(1,2) == 1)>>
-	<<set $shelterSlave.balls = random(5,10)>>
+		<<set $shelterSlave.balls = random(5,10)>>
 	<</if>>
 	<<if (random(1,3) == 1)>>
-	<<set $shelterSlave.boobs += 100*random(10,30)>>
+		<<set $shelterSlave.boobs += 100*random(10,30)>>
 	<</if>>
 	<<if (random(1,3) == 1)>>
-	<<set $shelterSlave.butt += random(3,5)>>
+		<<set $shelterSlave.butt += random(3,5)>>
 	<</if>>
 	<<set $shelterSlave.behavioralFlaw = either("anorexic", "gluttonous", "odd")>>
 	<<set $shelterSlave.sexualFlaw = either("apathetic", "hates anal", "hates oral", "hates penetration")>>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index 0d5188fc7e2466cbc718a84a5203fd63df0aa901..2845ddf4d178af520eb63fdab54945b5b2fe29ef 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -947,7 +947,7 @@ As the remote surgery's long recovery cycle completes,
 	<<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>>
 		When $he exits the room, $he feels that $his face is numb,
 		<<if $activeSlave.ID == $Bodyguard.ID>>
-			and <<if canSee($activeSlave)>>throwing a glance at the mirror, $he frightens $himself<<else>> upon hearing of $his new scar<</if>>, but is @@.hotpink;happier@@ with $his new look and @@.mediumaquamarine;more confident@@ that $he's the girl for the job.
+			and upon <<if canSee($activeSlave)>>throwing a glance at the mirror<<else>>being informed of $his new scar<</if>>, $he frightens $himself, but is @@.hotpink;happier@@ with $his new look and @@.mediumaquamarine;more confident@@ that $he's the girl for the job.
 			<<set $activeSlave.devotion += 5>>
 			<<set $activeSlave.trust += 5>>
 		<<elseif $activeSlave.devotion > 20>>
@@ -955,7 +955,7 @@ As the remote surgery's long recovery cycle completes,
 			<<set $activeSlave.devotion += 2>>
 			<<set $activeSlave.trust -= 2>>
 		<<else>>
-			and, when <<if canSee($activeSlave)>>$he looks at $himself in the mirror<<else>>is informed of $his new look<</if>>, $he is @@.mediumorchid;disgusted@@ by the @@.gold;awful scar@@ $he now bears.
+			and, when $he <<if canSee($activeSlave)>>looks at $himself in the mirror<<else>>is informed of $his new look<</if>>, $he is @@.mediumorchid;disgusted@@ by the @@.gold;awful scar@@ $he now bears.
 			<<set $activeSlave.devotion -= 10>>
 			<<set $activeSlave.trust -= 10>>
 		<</if>>