diff --git a/src/npc/descriptions/fAnus.tw b/src/npc/descriptions/fAnus.tw
index a6b4a8f3519519db4408aff5d8f81353fb12f116..e2b552e92f6b7b8a075aba230c400977378d259f 100644
--- a/src/npc/descriptions/fAnus.tw
+++ b/src/npc/descriptions/fAnus.tw
@@ -62,7 +62,7 @@ You call $him over so you can
 		$He is clearly unhappy at the idea of taking a dick up $his butt. $He obeys orders anyway, and lies there wincing and moaning as you<<if ($PC.dick == 0)>> don a strap-on and<</if>> fuck $his ass. You gently ease into $his butthole and slowly accelerate your thrusting into $his ass. However $he still squeals in pain as you continue pounding. @@.lime;$His tight little ass has been broken in,@@ and $he @@.gold;fears further anal pain.@@
 		<<set $activeSlave.trust -= 5>>
 	<<else>>
-		$He is appalled at the idea of taking it up the ass<<if ($PC.dick == 0)>> and cries with fear as you don a strap-on<</if>>. $He does anyway though, sobbing into the cushions<<if $activeSlave.amp != 1>> while you hold $his arms behind $his<</if>>. You force yourself into $his butthole and continue thrusting your member into $his ass. $He sobs and cries with disgust while you pump into $his rear. The painful anal rape @@.mediumorchid;decreases $his devotion to you.@@ @@.lime;$His tight little ass has been broken in,@@ and $he is @@.gold;terrified of further anal pain.@@
+		$He is appalled at the idea of taking it up the ass<<if ($PC.dick == 0)>> and cries with fear as you don a strap-on<</if>>. $He does anyway though, sobbing into the cushions<<if $activeSlave.amp != 1>> while you hold $his arms behind $him<</if>>. You force yourself into $his butthole and continue thrusting your member into $his ass. $He sobs and cries with disgust while you pump into $his rear. The painful anal rape @@.mediumorchid;decreases $his devotion to you.@@ @@.lime;$His tight little ass has been broken in,@@ and $he is @@.gold;terrified of further anal pain.@@
 		<<set $activeSlave.devotion -= 10, $activeSlave.trust -= 10>>
 	<</if>>
 	<<set $activeSlave.anus++>>
diff --git a/src/npc/descriptions/fButt.tw b/src/npc/descriptions/fButt.tw
index 1d301049371445acdac7e93184885acd6c9fc10d..16e29748d2235a138e17b91460af9c30177e29eb 100644
--- a/src/npc/descriptions/fButt.tw
+++ b/src/npc/descriptions/fButt.tw
@@ -93,7 +93,7 @@ You call $him over so you can
 	<<elseif ($activeSlave.devotion >= -20)>>
 		$He is clearly unhappy at the idea of taking a dick up $his butt. $He obeys orders anyway, and lies there wincing and moaning as you<<if ($PC.dick == 0)>> don a strap-on and<</if>> fuck $his ass. @@.lime;$His tight little ass has been broken in,@@ and $he @@.gold;fears further anal pain.@@
 	<<else>>
-		$He is appalled at the idea of taking it up the ass<<if ($PC.dick == 0)>> and cries with fear as you don a strap-on<</if>>. $He does anyway though, sobbing into the cushions<<if $activeSlave.amp !== 1>> while you hold $his arms behind $his<</if>>. You force yourself into $his butthole. $He sobs and cries with disgust while you continue thrusting into $his ass. The painful anal rape @@.mediumorchid;decreases $his devotion to you.@@ @@.lime;$His tight little ass has been broken in,@@ and $he is @@.gold;terrified of further anal pain.@@
+		$He is appalled at the idea of taking it up the ass<<if ($PC.dick == 0)>> and cries with fear as you don a strap-on<</if>>. $He does anyway though, sobbing into the cushions<<if $activeSlave.amp !== 1>> while you hold $his arms behind $him<</if>>. You force yourself into $his butthole. $He sobs and cries with disgust while you continue thrusting into $his ass. The painful anal rape @@.mediumorchid;decreases $his devotion to you.@@ @@.lime;$His tight little ass has been broken in,@@ and $he is @@.gold;terrified of further anal pain.@@
 		<<set $activeSlave.devotion -= 5>>
 	<</if>>
 	<<set $activeSlave.anus++>>
diff --git a/src/npc/fDance.tw b/src/npc/fDance.tw
index 63bbbab087dd8ee4c76ed873fb504484e19533fe..388fa4b9e8b93804fb4960aa4088f42d027b0636 100644
--- a/src/npc/fDance.tw
+++ b/src/npc/fDance.tw
@@ -111,7 +111,7 @@ $His face is
 	<<elseif ($activeSlave.face <= 40)>>
 		begging for sex, being so enticing and sultry.
 	<<elseif ($activeSlave.face <= 95)>>
-		constantly turning you on, with the sensual structure of $his beautiful never letting sex leave your mind.
+		constantly turning you on, with the sensual structure of $his beautiful face never letting sex leave your mind.
 	<<else>>
 		making you
 		<<if $PC.dick != 0>>
@@ -132,11 +132,11 @@ $His face is
 	<<elseif $activeSlave.face < -10>>
 		not great to look at, but perplexing and abnormal. You try to focus on $his body instead.
 	<<elseif ($activeSlave.face <= 10)>>
-		interesting and unusual. It isn't particularly attractive, but none of your slaves have a face quite like $his.
+		interesting and unusual. It isn't particularly attractive, but none of your slaves have a face quite like $hers.
 	<<elseif ($activeSlave.face <= 40)>>
 		exotic and alluring, just attractive enough to make $him good office décor, but not so much that it's distracting.
 	<<elseif ($activeSlave.face <= 95)>>
-		a testament to the benefits of a global slave market.It makes $him a perfect office trophy.
+		a testament to the benefits of a global slave market. It makes $him a perfect office trophy.
 	<<else>>
 		an exotic masterpiece. Having $him dance in your office is like hanging foreign art on the walls, a perfect trophy of your slaving reach.
 	<</if>>
diff --git a/src/player/actions/fCaress.tw b/src/player/actions/fCaress.tw
index aaca1987d630bfabd5886549445a4337b4880883..5e3cc924f19136a8a4a9cfee5e4847fc169496f9 100644
--- a/src/player/actions/fCaress.tw
+++ b/src/player/actions/fCaress.tw
@@ -85,7 +85,7 @@ Then, you gently tilt $his <<if $activeSlave.face > 95>>overwhelmingly stunning<
 <<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "cumslut") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
 	$He stiffens at your touch but slowly relaxes to your fingers on $his face. As you move your fingers along $his lips, $he reacts almost as though $he's receiving oral. $He starts to gently suck your fingers, moaning into your hand and pressing $himself lewdly against your <<if $PC.boobs == 1>>prominent breasts<<else>>manly chest<</if>>.<<if ($activeSlave.teeth == "pointy")>> $He's very careful to avoid spearing your tongue with $his sharp teeth.<</if>> $He achieves a weak orgasm before you stop caressing $him. <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate undiminished lust with $his <<= App.Desc.eyeColor($activeSlave)>> eyes, since $he does not speak $language well enough to express $himself.<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>$He does $his best to communicate undiminished lust with $his <<= App.Desc.eyeColor($activeSlave)>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he liked that.<<else>>"That wa<<s>> fun, <<Master>>," $he <<say>>s lustfully.<</if>> $He looks at you as if $he wants more than your hands touching $him.
 <<elseif ($activeSlave.devotion > 50)>>
-	$He accepts your touch with devotion, leaning $his head back at your gentle caress along $his face. $He leans $his body forward, pressing $himself against you, and you feel the intense heat from $his body against your <<if $PC.boobs == 1>>soft breasts<<else>>manly chest<</if>>. $He gradually closes $his eyes and when you finally stop, <<if ($activeSlave.amp != 1)>>$he runs $his hand delightfully across $his face where you last touched $his<</if>>, a euphoric look on $his $activeSlave.skin face. <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate devotion with $his <<= App.Desc.eyeColor($activeSlave)>> eyes, since $he's not confident in $his ability to express it in $language.<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>$He does $his best to communicate devotion with $his <<= App.Desc.eyeColor($activeSlave)>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he loves you.<<else>>"I love you, <<Master>>," $he <<say>>s jubilantly.<</if>> $He looks at you longingly, almost as if $he's bursting to say that $he wants more than your mere caress.
+	$He accepts your touch with devotion, leaning $his head back at your gentle caress along $his face. $He leans $his body forward, pressing $himself against you, and you feel the intense heat from $his body against your <<if $PC.boobs == 1>>soft breasts<<else>>manly chest<</if>>. $He gradually closes $his eyes and when you finally stop, <<if ($activeSlave.amp != 1)>>$he runs $his hand delightfully across $his face where you last touched $him<</if>>, a euphoric look on $his $activeSlave.skin face. <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate devotion with $his <<= App.Desc.eyeColor($activeSlave)>> eyes, since $he's not confident in $his ability to express it in $language.<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>$He does $his best to communicate devotion with $his <<= App.Desc.eyeColor($activeSlave)>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he loves you.<<else>>"I love you, <<Master>>," $he <<say>>s jubilantly.<</if>> $He looks at you longingly, almost as if $he's bursting to say that $he wants more than your mere caress.
 <<elseif ($activeSlave.devotion > 20)>>
 	$He accepts your touch willingly. As you are so close to $him, you sense considerable turmoil in the <<if ($activeSlave.physicalAge > 30)>>$woman<<else>>$girl<</if>>; $he's doing $his duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your touch across $his face. When you finally move your hand away, $his <<= App.Desc.eyeColor($activeSlave)>> eyes gaze into yours searchingly, looking for answers that are not there. <<if (($activeSlave.amp == 1) && (!canTalk($activeSlave)))>>$His eyes beg for an answer: is that it?<<elseif !canTalk($activeSlave)>>$He signs hesitantly, asking if that's it.<<else>>$He asks hesitantly, "I-i<<s>> that it, <<Master>>?"<</if>>
 <<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust < -20)>>
diff --git a/src/pregmod/pAssociatesPublicSlut.tw b/src/pregmod/pAssociatesPublicSlut.tw
index c4f5f2e0d34c3c26f35cb9c1e050e1419670d27e..7041c1eafd73f7c81ae15f6e2d261f40fb6eb480 100644
--- a/src/pregmod/pAssociatesPublicSlut.tw
+++ b/src/pregmod/pAssociatesPublicSlut.tw
@@ -17,11 +17,11 @@ You take a detour down one of the minor byways that feed into the Promenade prop
 <br><br>
 
 <<if _num < $seeDicks>>
-	The one restraining him is a business associate of yours. She's a beautiful woman who cuts a gorgeous figure in her expensive, tasteful business attire. You have some rapport with one another and she greets you cheerily and you make small talk as she finishes up shackling her newly minted slave. He was, she explains, her boyfriend, who had accrued significant debt due to his severe lack of business sense and tact. She had bought out his debt in order to save him from enslavement, only to find out not long after that he had been cheating on her with another free woman. Since she owned his debt, it took only a few formalities to turn him into her property as revenge. "Since he likes sluts so much, I'm going to turn him into one!" She giggles, while stroking the struggling traps luxurious bleach blonde hair. Her eyes light up as her gaze returns to you. You know what's coming, and are surprised it took this long for it to occur to her. She reaches around her slave and spreads his ass cheeks. "<<if $PC.title == 1>>Sir<<else>> Ma'am<</if>>, it would honor me if you fucked him!"
+	The one restraining him is a business associate of yours. She's a beautiful woman who cuts a gorgeous figure in her expensive, tasteful business attire. You have some rapport with one another and she greets you cheerily and you make small talk as she finishes up shackling her newly minted slave. He was, she explains, her boyfriend, who had accrued significant debt due to his severe lack of business sense and tact. She had bought out his debt in order to save him from enslavement, only to find out not long after that he had been cheating on her with another free woman. Since she owned his debt, it took only a few formalities to turn him into her property as revenge. "Since he likes sluts so much, I'm going to turn him into one!" She giggles, while stroking the struggling traps luxurious bleach blonde hair. Her eyes light up as her gaze returns to you. You know what's coming, and are surprised it took this long for it to occur to her. She reaches around her slave and spreads his ass cheeks. "<<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>, it would honor me if you fucked him!"
 
 	You consider the slave's anus. Your associate has clearly spent all day customizing her new toy, it looks freshly bleached and is smooth and inviting. It effectively has been transformed into a sex organ.
 <<else>>
-	The one restraining her is a business associate of yours. He's a well built man who cuts a handsome figure in his expensive, tasteful business attire. You have some rapport with one another and he greets you cheerily and you make small talk as he finishes up shackling his newly minted slave. She was, he explains, his girlfriend, who had accrued significant debt due to her severe lack of business sense and tact. He had bought out her debt in order to save her from enslavement, only to find out not long after that she had been cheating on him with another free man. Since he owned her debt, it took only a few formalities to turn her into his property as revenge." She was already a slut, I've simply made her look the part, and play it more honestly!" he chuckles, while fondling the struggling bimbo's ample ass. He favors you with a rueful smile as his gaze returns to you. You know what's coming, and are surprised it took this long for it to occur to him. He reaches around his slave and spreads her ass cheeks. "<<if $PC.title == 1>>Sir<<else>> Ma'am<</if>>, it would honor me if you fucked her! I've had her hymen restored just a few hours ago, first time is all yours if you want it."
+	The one restraining her is a business associate of yours. He's a well built man who cuts a handsome figure in his expensive, tasteful business attire. You have some rapport with one another and he greets you cheerily and you make small talk as he finishes up shackling his newly minted slave. She was, he explains, his girlfriend, who had accrued significant debt due to her severe lack of business sense and tact. He had bought out her debt in order to save her from enslavement, only to find out not long after that she had been cheating on him with another free man. Since he owned her debt, it took only a few formalities to turn her into his property as revenge." She was already a slut, I've simply made her look the part, and play it more honestly!" he chuckles, while fondling the struggling bimbo's ample ass. He favors you with a rueful smile as his gaze returns to you. You know what's coming, and are surprised it took this long for it to occur to him. He reaches around his slave and spreads her ass cheeks. "<<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>, it would honor me if you fucked her! I've had her hymen restored just a few hours ago, first time is all yours if you want it."
 
 	You consider the slave's pussy. Your associate has clearly spent all day customizing his new toy, it looks tight and inviting. Surprisingly, she's quite moist, indicating that in spite of her struggling, she's actually rather aroused, seems she has a bit of a fetish for humiliation. She'll assuredly make an excellent slave if that's the case.
 <</if>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index b85d810a7444ede444f79a912f2b341ef633a217..95dfb136e5d8b389d7061f69657bb73ee33feb1d 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -3688,7 +3688,7 @@ Done!
 
 <<set $JobIDArray = resetJobIDArray()>>
 
-/* unifify cybermod & vanilla */
+/* unify cybermod & vanilla */
 /* limbs */
 <<if def $limbs>>
 	<<set $adjustProsthetics = []>>
@@ -3861,7 +3861,7 @@ Done!
 <<if def $cyberMod>>
 	<<unset $cyberMod>>
 <</if>>
-/* unifify cybermod & vanilla finished*/
+/* unify cybermod & vanilla finished*/
 
 
 /* reset NaNArray after BC is run */
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index c1335ee746ccaf5aa5a0b02d6e7794f42ba2515d..090ad0860c471918fd2a522229ccb7cce69b0c62 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -318,15 +318,15 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 	<</replace>>
 <</link>>
 <<if $activeSlave.prestige == 0>>
-<br><<link "Put public emphasis on $him with the objective of making $him famous">>
-	<<EventNameDelink $activeSlave>>
-	<<replace "#result">>
-	For the coming week, $he does the publicity rounds. It's a little different than a free celebrity might do, but the mere act of letting $him be interviewed is enough of a display of your confidence in $his loyalty that people @@.green;take notice.@@ $He will be @@.green;forever remembered@@ as one of the first slaves to go before the press and articulately explain why $he loves being your property. $He looks good doing it, too.
-	<<run cashX(-10000, "event", $activeSlave)>>
-	<<run repX(2500, "event", $activeSlave)>>
-	<<set $activeSlave.prestige = 1>>
-	<</replace>>
-<</link>> //This option will cost <<print cashFormat(10000)>>//
+	<br><<link "Put public emphasis on $him with the objective of making $him famous">>
+		<<EventNameDelink $activeSlave>>
+		<<replace "#result">>
+		For the coming week, $he does the publicity rounds. It's a little different than a free celebrity might do, but the mere act of letting $him be interviewed is enough of a display of your confidence in $his loyalty that people @@.green;take notice.@@ $He will be @@.green;forever remembered@@ as one of the first slaves to go before the press and articulately explain why $he loves being your property. $He looks good doing it, too.
+		<<run cashX(-10000, "event", $activeSlave)>>
+		<<run repX(2500, "event", $activeSlave)>>
+		<<set $activeSlave.prestige = 1>>
+		<</replace>>
+	<</link>> //This option will cost <<print cashFormat(10000)>>//
 <</if>>
 
 <<case "tired collectrix">>
@@ -409,42 +409,42 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 	<</replace>>
 <</link>>
 <<if ($activeSlave.anus > 0)>>
-<br><<link "It can wait until after some rough sex with the Concubine">>
-	<<EventNameDelink $activeSlave>>
-	<<replace "#result">>
-	When you enter your suite, the dim light reveals $activeSlave.slaveName waiting with $his beautiful body laid across the bed. When $he sees <<if ($PC.dick == 0)>>the big strap-on you're wearing<<else>>the kind of sex you're in the mood for<</if>>, $he turns over and pushes $his face down into the sheets. $He pulls $his knees under $himself and reaches back to pull $his <<if ($activeSlave.butt > 5)>>huge<<elseif ($activeSlave.butt > 2)>>sizable<<else>>pretty<</if>> buttocks apart, relaxing and then clenching $his <<if ($activeSlave.anus > 2)>>gaping<<elseif ($activeSlave.anus > 1)>>big<<else>>tight<</if>> asshole invitingly. $He starts <<if !canTalk($activeSlave)>>to point an inviting finger at $his backdoor,<<else>>to beg "Plea<<s>>e a<<ss>>rape me, M-" into the sheets,<</if>> but you interrupt $him by shoving $him forward so that $he's all the way face-down on the bed. $He knows how you like it and starts to wriggle, struggle, and whine as you roughly sodomize $him, <<if ($PC.dick == 0)>>the strap-on<<else>>your cock<</if>> ramming straight up $his ass despite the uncomfortable angle, <<if ($activeSlave.butt > 5)>>which $his huge ass makes easier for $him by limiting how deeply you can fuck $him without $his buttocks spread wide.<<elseif ($activeSlave.butt > 2)>>which $his big behind makes easier for $him by limiting how deeply you can fuck $him.<<else>>which $his modest ass makes harder for $him by allowing you to get really deep inside $his anus.<</if>> $He continues to wrestle with you, sometimes even managing to dislodge <<if ($PC.dick == 0)>>the strap-on<<else>>your dick<</if>>, allowing you the <<if ($PC.dick == 0)>>cruel delight<<else>>delicious sensation<</if>> of pushing it back up $his butt each time. Despite the pretense $his enjoyment is obvious;
-	<<if ($activeSlave.chastityPenis == 1)>>
-		though $his cock has been placed in a chastity cage, $he's grinding against you as eagerly as if it wasn't there at all.
-	<<elseif ($activeSlave.dick > 0) && ($activeSlave.hormoneBalance >= 100)>>
-		though $his hormone-filled body can't get $his dick hard any more, $he's leaking precum all over the bed.
-	<<elseif $activeSlave.dick > 0 && $activeSlave.balls > 0 && $activeSlave.ballType == "sterile">>
-		though $his useless balls can't muster the effort to get $his dick hard any more, $he's leaking precum all over the bed.
-	<<elseif ($activeSlave.dick > 0) && ($activeSlave.balls == 0)>>
-		though $his gelded body can't get $his dick hard any more, $he's leaking precum all over the bed.
-	<<elseif canAchieveErection($activeSlave)>>
-		$he can't stop $himself from humping $his rock-hard cock against the sheets below $him.
-	<<elseif $activeSlave.dick > 7>>
-		though $his oversized dick has grown too large to even dream of becoming erect, $he's leaking precum all over the bed.
-	<<elseif $activeSlave.dick > 0>>
-		though $he can't get hard, $he's leaking precum all over the bed.
-	<<elseif $activeSlave.clit > 1>>
-		$he can't stop $himself from humping $his erect clit against the sheets below $him.
-	<<else>>
-		$his pussy is so wet $he's leaving a wet spot on the sheets beneath $him.
-	<</if>>
-	$He finally orgasms, sobbing with overstimulation when you pound $him for a while longer before <<if ($PC.dick == 0)>>finding your own climax<<else>>shooting rope after rope of cum into $him<</if>>. $He quickly cleans you with $his mouth and heads to the shower. When $he gets out you're back at work, but $he comes out to @@.hotpink;plant a kiss on you.@@
-	<<set $activeSlave.devotion += 10>>
-	<<set $activeSlave.counter.oral += 1>>
-	<<set $oralTotal += 1>>
-	<<if ($activeSlave.vagina > 0)>>
-		<<set $activeSlave.counter.vaginal += 1>>
-		<<set $vaginalTotal += 1>>
-	<<elseif ($activeSlave.anus > 0)>>
-		<<set $activeSlave.counter.anal += 1>>
-		<<set $analTotal += 1>>
-	<</if>>
-	<</replace>>
-<</link>>
+	<br><<link "It can wait until after some rough sex with the Concubine">>
+		<<EventNameDelink $activeSlave>>
+		<<replace "#result">>
+		When you enter your suite, the dim light reveals $activeSlave.slaveName waiting with $his beautiful body laid across the bed. When $he sees <<if ($PC.dick == 0)>>the big strap-on you're wearing<<else>>the kind of sex you're in the mood for<</if>>, $he turns over and pushes $his face down into the sheets. $He pulls $his knees under $himself and reaches back to pull $his <<if ($activeSlave.butt > 5)>>huge<<elseif ($activeSlave.butt > 2)>>sizable<<else>>pretty<</if>> buttocks apart, relaxing and then clenching $his <<if ($activeSlave.anus > 2)>>gaping<<elseif ($activeSlave.anus > 1)>>big<<else>>tight<</if>> asshole invitingly. $He starts <<if !canTalk($activeSlave)>>to point an inviting finger at $his backdoor,<<else>>to beg "Plea<<s>>e a<<ss>>rape me, M-" into the sheets,<</if>> but you interrupt $him by shoving $him forward so that $he's all the way face-down on the bed. $He knows how you like it and starts to wriggle, struggle, and whine as you roughly sodomize $him, <<if ($PC.dick == 0)>>the strap-on<<else>>your cock<</if>> ramming straight up $his ass despite the uncomfortable angle, <<if ($activeSlave.butt > 5)>>which $his huge ass makes easier for $him by limiting how deeply you can fuck $him without $his buttocks spread wide.<<elseif ($activeSlave.butt > 2)>>which $his big behind makes easier for $him by limiting how deeply you can fuck $him.<<else>>which $his modest ass makes harder for $him by allowing you to get really deep inside $his anus.<</if>> $He continues to wrestle with you, sometimes even managing to dislodge <<if ($PC.dick == 0)>>the strap-on<<else>>your dick<</if>>, allowing you the <<if ($PC.dick == 0)>>cruel delight<<else>>delicious sensation<</if>> of pushing it back up $his butt each time. Despite the pretense $his enjoyment is obvious;
+		<<if ($activeSlave.chastityPenis == 1)>>
+			though $his cock has been placed in a chastity cage, $he's grinding against you as eagerly as if it wasn't there at all.
+		<<elseif ($activeSlave.dick > 0) && ($activeSlave.hormoneBalance >= 100)>>
+			though $his hormone-filled body can't get $his dick hard any more, $he's leaking precum all over the bed.
+		<<elseif $activeSlave.dick > 0 && $activeSlave.balls > 0 && $activeSlave.ballType == "sterile">>
+			though $his useless balls can't muster the effort to get $his dick hard any more, $he's leaking precum all over the bed.
+		<<elseif ($activeSlave.dick > 0) && ($activeSlave.balls == 0)>>
+			though $his gelded body can't get $his dick hard any more, $he's leaking precum all over the bed.
+		<<elseif canAchieveErection($activeSlave)>>
+			$he can't stop $himself from humping $his rock-hard cock against the sheets below $him.
+		<<elseif $activeSlave.dick > 7>>
+			though $his oversized dick has grown too large to even dream of becoming erect, $he's leaking precum all over the bed.
+		<<elseif $activeSlave.dick > 0>>
+			though $he can't get hard, $he's leaking precum all over the bed.
+		<<elseif $activeSlave.clit > 1>>
+			$he can't stop $himself from humping $his erect clit against the sheets below $him.
+		<<else>>
+			$his pussy is so wet $he's leaving a wet spot on the sheets beneath $him.
+		<</if>>
+		$He finally orgasms, sobbing with overstimulation when you pound $him for a while longer before <<if ($PC.dick == 0)>>finding your own climax<<else>>shooting rope after rope of cum into $him<</if>>. $He quickly cleans you with $his mouth and heads to the shower. When $he gets out you're back at work, but $he comes out to @@.hotpink;plant a kiss on you.@@
+		<<set $activeSlave.devotion += 10>>
+		<<set $activeSlave.counter.oral += 1>>
+		<<set $oralTotal += 1>>
+		<<if ($activeSlave.vagina > 0)>>
+			<<set $activeSlave.counter.vaginal += 1>>
+			<<set $vaginalTotal += 1>>
+		<<elseif ($activeSlave.anus > 0)>>
+			<<set $activeSlave.counter.anal += 1>>
+			<<set $analTotal += 1>>
+		<</if>>
+		<</replace>>
+	<</link>>
 <</if>>
 
 <<case "bodyguard bedtime">>
diff --git a/src/uncategorized/PETS.tw b/src/uncategorized/PETS.tw
index e4790bc2f41705a43c641bcb8aa92574c37f6380..1424afcebf58b1c3fc8c6920813b823cbd7b94a1 100644
--- a/src/uncategorized/PETS.tw
+++ b/src/uncategorized/PETS.tw
@@ -118,7 +118,7 @@ $subSlave.slaveName is at the head of the class. In this case, the literal head
 
 As you pass the entrance to the hall of cells where <<EventNameLink>> breaks bitches late one night, you hear some muffled cursing, followed by moans. Curious, you lean into the one cell with an open door and are treated to the sight of $activeSlave.slaveName holding $subSlave.slaveName's head between $his legs, receiving what is very obviously non-consensual oral sex. $activeSlave.slaveName is clearly enjoying $himself, but gathers $himself together and greets you properly, without stopping.
 <br><br>
-"Told thi<<s>> whore I wa<<s>>n't turning the light<<s>> off in _his2 cell until _he2 got me off. _He2 can't <<s>>leep with 'em on, and bitche<<s>> do anything for a little <<s>>leep," $he explains.
+"Told thi<<s>> whore I wa<<s>>n't turning the light<<s>> off in <<his 2>> cell until <<he 2>> got me off. <<He 2>> can't <<s>>leep with 'em on, and bitche<<s>> do anything for a little <<s>>leep," $he explains.
 
 <<case "comforting attendant">>
 
@@ -156,112 +156,112 @@ You decide to knit up care's raveled sleave with a break in the spa. You have yo
 	<</replace>>
 <</link>>
 <<if canDoVaginal($activeSlave) || canDoAnal($activeSlave)>>
-<br><<link "Rape $him for molesting patients">>
-	<<EventNameDelink $activeSlave>>
-	<<replace "#result">>
-	You shove $activeSlave.slaveName hard, forcing a surprised shriek out of $him as $he crashes forward into $subSlave.slaveName's <<if $subSlave.boobs > 2000>>helpfully pillowlike bosom<<elseif $subSlave.boobs > 500>>healthy tits<<else>>chest<</if>>, and then ram your pelvis up against $him, pinning $him against $his patient. $subSlave.slaveName's eyelids flicker, but _he2 does not wake up, despite your assault <<if canPenetrate($activeSlave)>>shoving $activeSlave.slaveName's cock as far up _his2 asshole as it will go<<else>>trapping $activeSlave.slaveName's hands between them and pushing $his fingers even farther up $subSlave.slaveName's asshole<</if>>. $activeSlave.slaveName tries to shift a little, but receives a peremptory push back to where $he was. $He realizes $he's to lie still and take what's coming to $him, and $he does $his best to relax.
-	<br><br>
-	<<if $PC.dick == 1>>
-		<<if canDoVaginal($activeSlave)>>
-			<<if $activeSlave.vagina > 2>>
-				$His roomy cunt takes your brutal thrusting without trouble. To communicate your message, $he needs to be uncomfortable, so you deliberately force $him down farther and fuck $him at an awkward angle. Your harsh pounding begins to force groans out of $him.
-			<<elseif $activeSlave.vagina > 1>>
-				$He gasps as you force your cock inside $his cunt without any accommodation for $his comfort. This is supposed to send a message, so you send a message, fucking $him without mercy. $He begins to groan under the harsh pounding.
+	<br><<link "Rape $him for molesting patients">>
+		<<EventNameDelink $activeSlave>>
+		<<replace "#result">>
+		You shove $activeSlave.slaveName hard, forcing a surprised shriek out of $him as $he crashes forward into $subSlave.slaveName's <<if $subSlave.boobs > 2000>>helpfully pillowlike bosom<<elseif $subSlave.boobs > 500>>healthy tits<<else>>chest<</if>>, and then ram your pelvis up against $him, pinning $him against $his patient. $subSlave.slaveName's eyelids flicker, but _he2 does not wake up, despite your assault <<if canPenetrate($activeSlave)>>shoving $activeSlave.slaveName's cock as far up _his2 asshole as it will go<<else>>trapping $activeSlave.slaveName's hands between them and pushing $his fingers even farther up $subSlave.slaveName's asshole<</if>>. $activeSlave.slaveName tries to shift a little, but receives a peremptory push back to where $he was. $He realizes $he's to lie still and take what's coming to $him, and $he does $his best to relax.
+		<br><br>
+		<<if $PC.dick == 1>>
+			<<if canDoVaginal($activeSlave)>>
+				<<if $activeSlave.vagina > 2>>
+					$His roomy cunt takes your brutal thrusting without trouble. To communicate your message, $he needs to be uncomfortable, so you deliberately force $him down farther and fuck $him at an awkward angle. Your harsh pounding begins to force groans out of $him.
+				<<elseif $activeSlave.vagina > 1>>
+					$He gasps as you force your cock inside $his cunt without any accommodation for $his comfort. This is supposed to send a message, so you send a message, fucking $him without mercy. $He begins to groan under the harsh pounding.
+				<<else>>
+					$He whines as you force your cock inside $his tight cunt. This is supposed to send a message, so you send a message, treating $him like a veteran whore who can take anything. $He begins to groan under the harsh pounding, $his poor little pussy unused to this kind of abuse.
+				<</if>>
+				<<set $activeSlave.counter.vaginal += 1>>
+				<<set $vaginalTotal += 1>>
 			<<else>>
-				$He whines as you force your cock inside $his tight cunt. This is supposed to send a message, so you send a message, treating $him like a veteran whore who can take anything. $He begins to groan under the harsh pounding, $his poor little pussy unused to this kind of abuse.
+				<<if $activeSlave.anus > 2>>
+					$His roomy anus takes your brutal thrusting without trouble. To communicate your message, $he needs to be uncomfortable, so you push a couple of fingers up there alongside your dick. $He wriggles helplessly, starting to groan as you rape $his asshole.
+				<<elseif $activeSlave.anus > 1>>
+					$He gasps as you force your cock up $his ass without waiting for $him to relax or get ready. This is supposed to send a message, so you send a message, buttfucking $him without mercy. $He begins to groan under the harsh anal pounding.
+				<<else>>
+					$He whines as you force your cock up $his tight ass. This is supposed to send a message, so you send a message, treating $him like a veteran anal whore who can take anything. $He begins to scream under the harsh pounding, $his poor little butthole unused to this kind of abuse.
+				<</if>>
+				<<set $activeSlave.counter.anal += 1>>
+				<<set $analTotal += 1>>
 			<</if>>
-			<<set $activeSlave.counter.vaginal += 1>>
-			<<set $vaginalTotal += 1>>
 		<<else>>
-			<<if $activeSlave.anus > 2>>
-				$His roomy anus takes your brutal thrusting without trouble. To communicate your message, $he needs to be uncomfortable, so you push a couple of fingers up there alongside your dick. $He wriggles helplessly, starting to groan as you rape $his asshole.
-			<<elseif $activeSlave.anus > 1>>
-				$He gasps as you force your cock up $his ass without waiting for $him to relax or get ready. This is supposed to send a message, so you send a message, buttfucking $him without mercy. $He begins to groan under the harsh anal pounding.
+			<<if canDoVaginal($activeSlave)>>
+				<<if $activeSlave.vagina > 2>>
+					To communicate your message, $he needs to be uncomfortable, so you carefully form your fingers into a beak shape and push your fist up inside $him. $He screams as your knuckles push past $his pussylips, and then starts to groan as you fistfuck $his lewd cunt.
+				<<elseif $activeSlave.vagina > 1>>
+					$He gasps as you ram three fingers into $his cunt without any accommodation for $his comfort. This is supposed to send a message, so you send a message, fingerfucking $him without mercy. $He begins to groan under the harsh molestation.
+				<<else>>
+					$He whines as you force two fingers inside $his tight cunt. This is supposed to send a message, so you send a message, treating $him like a veteran whore who can take a serious fingerfucking. $He begins to groan under the harsh molestation, $his poor little pussy unused to this kind of abuse.
+				<</if>>
+				<<set $activeSlave.counter.vaginal += 1>>
+			<<set $vaginalTotal += 1>>
 			<<else>>
-				$He whines as you force your cock up $his tight ass. This is supposed to send a message, so you send a message, treating $him like a veteran anal whore who can take anything. $He begins to scream under the harsh pounding, $his poor little butthole unused to this kind of abuse.
+				<<if $activeSlave.anus > 2>>
+					To communicate your message, $he needs to be uncomfortable, so you carefully form your fingers into a beak shape and push your fist up $his ass. $He screams as your knuckles push past $his sphincter, and then starts to groan as you fistfuck $his lewd butthole.
+				<<elseif $activeSlave.anus > 1>>
+					$He gasps as you ram three fingers up $his butt without any accommodation at all. This is supposed to send a message, so you send a message, fingerfucking $his asshole without mercy. $He begins to groan under the harsh anal molestation.
+				<<else>>
+					$He whines as you force two fingers inside $his tight ass. This is supposed to send a message, so you send a message, treating $him like a veteran whore who can take a serious anal fingerfucking. $He begins to groan under the harsh molestation, $his girly little butthole unused to this kind of abuse.
+				<</if>>
+				<<set $activeSlave.counter.anal += 1>>
+				<<set $analTotal += 1>>
 			<</if>>
-			<<set $activeSlave.counter.anal += 1>>
-			<<set $analTotal += 1>>
-		<</if>>
-	<<else>>
-		<<if canDoVaginal($activeSlave)>>
-		<<if $activeSlave.vagina > 2>>
-			To communicate your message, $he needs to be uncomfortable, so you carefully form your fingers into a beak shape and push your fist up inside $him. $He screams as your knuckles push past $his pussylips, and then starts to groan as you fistfuck $his lewd cunt.
-		<<elseif $activeSlave.vagina > 1>>
-			$He gasps as you ram three fingers into $his cunt without any accommodation for $his comfort. This is supposed to send a message, so you send a message, fingerfucking $him without mercy. $He begins to groan under the harsh molestation.
-		<<else>>
-			$He whines as you force two fingers inside $his tight cunt. This is supposed to send a message, so you send a message, treating $him like a veteran whore who can take a serious fingerfucking. $He begins to groan under the harsh molestation, $his poor little pussy unused to this kind of abuse.
-		<</if>>
-		<<set $activeSlave.counter.vaginal += 1>>
-		<<set $vaginalTotal += 1>>
-		<<else>>
-		<<if $activeSlave.anus > 2>>
-			To communicate your message, $he needs to be uncomfortable, so you carefully form your fingers into a beak shape and push your fist up $his ass. $He screams as your knuckles push past $his sphincter, and then starts to groan as you fistfuck $his lewd butthole.
-		<<elseif $activeSlave.anus > 1>>
-			$He gasps as you ram three fingers up $his butt without any accommodation at all. This is supposed to send a message, so you send a message, fingerfucking $his asshole without mercy. $He begins to groan under the harsh anal molestation.
-		<<else>>
-			$He whines as you force two fingers inside $his tight ass. This is supposed to send a message, so you send a message, treating $him like a veteran whore who can take a serious anal fingerfucking. $He begins to groan under the harsh molestation, $his girly little butthole unused to this kind of abuse.
 		<</if>>
-		<<set $activeSlave.counter.anal += 1>>
-		<<set $analTotal += 1>>
-		<</if>>
-	<</if>>
-	$subSlave.slaveName lies forgotten underneath $him, insensible even with the Nurse's body being sawed back and forth across _him2. $activeSlave.slaveName is such a horny slut that $he starts to enjoy $himself a little once $he gets used to what you're doing to $him, but then you climax and discard $him, leaving $him looking forlorn and tousled. $He knows $he crossed a line, and @@.hotpink;privately resolves@@ to be a little less handsy in the future.
-	<<set $activeSlave.devotion += 4>>
-	<</replace>>
-<</link>>
+		$subSlave.slaveName lies forgotten underneath $him, insensible even with the Nurse's body being sawed back and forth across _him2. $activeSlave.slaveName is such a horny slut that $he starts to enjoy $himself a little once $he gets used to what you're doing to $him, but then you climax and discard $him, leaving $him looking forlorn and tousled. $He knows $he crossed a line, and @@.hotpink;privately resolves@@ to be a little less handsy in the future.
+		<<set $activeSlave.devotion += 4>>
+		<</replace>>
+	<</link>>
 <</if>>
 <<if canDoVaginal($activeSlave) || canDoAnal($activeSlave)>>
-<br><<link "Have sex with $him while $he molests the patient">>
-	<<EventNameDelink $activeSlave>>
-	<<replace "#result">>
-	You announce your presence to $activeSlave.slaveName by groping $his <<if $subSlave.butt > 7>>absurd butt<<elseif $subSlave.butt > 3>>generous buttocks<<else>>cute behind<</if>>. $He jumps, startled, and emits a short scream of surprise that trails off into a moan of sexual anticipation as you continue to knead and massage $his $activeSlave.skin bottom. $He starts thrusting again, but carefully, so gently that $he doesn't need to stop for you to insert
-	<<if $PC.dick == 1>>
-		your hard cock into $his
-		<<if canDoVaginal($activeSlave)>>
-			hot cunt.
-			<<set $activeSlave.counter.vaginal += 1>>
-			<<set $vaginalTotal += 1>>
-		<<else>>
-			willing anus.
-			<<set $activeSlave.counter.anal += 1>>
-			<<set $analTotal += 1>>
-		<</if>>
-		<<if $PC.vagina == 1>>Then you grab one of $his hands and pull it down under $him. $He gets the idea, and fingers your pussy while you fuck $him.<</if>>
-	<<else>>
-		a couple of fingers into $his
-		<<if canDoVaginal($activeSlave)>>
-			hot cunt.
-			<<set $activeSlave.counter.vaginal += 1>>
-			<<set $vaginalTotal += 1>>
+	<br><<link "Have sex with $him while $he molests the patient">>
+		<<EventNameDelink $activeSlave>>
+		<<replace "#result">>
+		You announce your presence to $activeSlave.slaveName by groping $his <<if $subSlave.butt > 7>>absurd butt<<elseif $subSlave.butt > 3>>generous buttocks<<else>>cute behind<</if>>. $He jumps, startled, and emits a short scream of surprise that trails off into a moan of sexual anticipation as you continue to knead and massage $his $activeSlave.skin bottom. $He starts thrusting again, but carefully, so gently that $he doesn't need to stop for you to insert
+		<<if $PC.dick == 1>>
+			your hard cock into $his
+			<<if canDoVaginal($activeSlave)>>
+				hot cunt.
+				<<set $activeSlave.counter.vaginal += 1>>
+				<<set $vaginalTotal += 1>>
+			<<else>>
+				willing anus.
+				<<set $activeSlave.counter.anal += 1>>
+				<<set $analTotal += 1>>
+			<</if>>
+			<<if $PC.vagina == 1>>Then you grab one of $his hands and pull it down under $him. $He gets the idea, and fingers your pussy while you fuck $him.<</if>>
 		<<else>>
-			willing anus.
-			<<set $activeSlave.counter.anal += 1>>
-			<<set $analTotal += 1>>
+			a couple of fingers into $his
+			<<if canDoVaginal($activeSlave)>>
+				hot cunt.
+				<<set $activeSlave.counter.vaginal += 1>>
+				<<set $vaginalTotal += 1>>
+			<<else>>
+				willing anus.
+				<<set $activeSlave.counter.anal += 1>>
+				<<set $analTotal += 1>>
+			<</if>>
+			One of $his hands, now freed, snakes around between you to pleasure you in turn. Its index and ring fingers slide deliciously between your folds to either side of your moist channel, into which the middle finger begins to delve.
 		<</if>>
-		One of $his hands, now freed, snakes around between you to pleasure you in turn. Its index and ring fingers slide deliciously between your folds to either side of your moist channel, into which the middle finger begins to delve.
-	<</if>>
-	You nip $his neck and pull $his upper torso and neck around far enough around for you to plant half a kiss on the side of $his panting mouth.
-	<br><br>
-	This is far too much for $activeSlave.slaveName, and $he shakes with orgasm. $He isn't getting off that easily; you fuck $him slowly, letting $him ride aftershocks until $he bottoms out and $his arousal starts to build again. $He never stopped gently thrusting into the insensible $subSlave.slaveName, who is so thoroughly affected by the drugs that only _his2 unconscious bodily reactions offer any indication that _he2's getting fucked too.
-	<br><br>
-	When you finally finish with $activeSlave.slaveName and step away, allowing $him to step back in turn, $he looks at you with @@.mediumaquamarine;flirty confidence@@ and husks, "<<Master>>, that wa<<s>> really pervertedly good. Even by the <<s>>tandard<<s>> around here." You make no verbal reply, but give $him an open-handed swat across $his $activeSlave.skin buttocks as $he turns to clean up $his patient's asshole. $He squeaks with surprise a second time, so startled that
-	<<if $PC.dick == 1>>
-		$his well-fucked
-		<<if canDoVaginal($activeSlave)>>
-			cunt
+		You nip $his neck and pull $his upper torso and neck around far enough around for you to plant half a kiss on the side of $his panting mouth.
+		<br><br>
+		This is far too much for $activeSlave.slaveName, and $he shakes with orgasm. $He isn't getting off that easily; you fuck $him slowly, letting $him ride aftershocks until $he bottoms out and $his arousal starts to build again. $He never stopped gently thrusting into the insensible $subSlave.slaveName, who is so thoroughly affected by the drugs that only _his2 unconscious bodily reactions offer any indication that _he2's getting fucked too.
+		<br><br>
+		When you finally finish with $activeSlave.slaveName and step away, allowing $him to step back in turn, $he looks at you with @@.mediumaquamarine;flirty confidence@@ and husks, "<<Master>>, that wa<<s>> really pervertedly good. Even by the <<s>>tandard<<s>> around here." You make no verbal reply, but give $him an open-handed swat across $his $activeSlave.skin buttocks as $he turns to clean up $his patient's asshole. $He squeaks with surprise a second time, so startled that
+		<<if $PC.dick == 1>>
+			$his well-fucked
+			<<if canDoVaginal($activeSlave)>>
+				cunt
+			<<else>>
+				backdoor
+			<</if>>
+			releases a blob of cum to go sliding down $his leg as $he works.
 		<<else>>
-			backdoor
+			$he stumbles against $subSlave.slaveName's boobs again.
 		<</if>>
-		releases a blob of cum to go sliding down $his leg as $he works.
-	<<else>>
-		$he stumbles against $subSlave.slaveName's boobs again.
-	<</if>>
-	<br><br>
-	The next morning, $subSlave.slaveName notices that _his2 ass is a little sore, and _he2 can't remember any reason why it would be. _He2 shrugs. In _his2 life, this is nothing unsurprising.
-	<<set $activeSlave.trust += 4>>
-	<</replace>>
-<</link>>
+		<br><br>
+		The next morning, $subSlave.slaveName notices that _his2 ass is a little sore, and _he2 can't remember any reason why it would be. _He2 shrugs. In _his2 life, this is nothing unsurprising.
+		<<set $activeSlave.trust += 4>>
+		<</replace>>
+	<</link>>
 <</if>>
 
 <<case "stewardess beating">>
@@ -337,26 +337,26 @@ You decide to knit up care's raveled sleave with a break in the spa. You have yo
 	<</replace>>
 <</link>>
 <<if ($subSlave.anus > 0) && canDoAnal($subSlave)>>
-<br><<link "The prisoner will take it up the butt, too, if _he2 wants sleep">>
-	<<EventNameDelink $activeSlave>>
-	<<replace "#result">>
-	You silently interrupt $activeSlave.slaveName and indicate that $he should sit down on the cell's bed without letting $subSlave.slaveName's head out from between $his legs. $He sits down with a thump, dragging the struggling $subSlave.slaveName with $him. You<<if ($PC.dick == 0)>> pull on a strap-on, and then<</if>> seize $subSlave.slaveName's hips and hoist them into the air, giving _him2 a horrible second of anticipation as you manhandle <<if ($PC.dick == 0)>>the cruelly large phallus<<else>>your cock<</if>> into place. _He2 gives a strangled squeal of protest at the feeling of you pushing your way inexorably up _his2 poor anus, making $activeSlave.slaveName jerk with surprise at the sensation of $subSlave.slaveName howling into $his crotch. Twenty minutes later, you and $activeSlave.slaveName leave _him2 @@.hotpink;quiescent@@ on the floor of the cell. After $he locks the door after $himself, $activeSlave.slaveName can't resist the urge to @@.hotpink;offer you a cheerful high-five.@@
-	<<set $activeSlave.devotion += 10, $activeSlave.counter.oral += 1, $oralTotal += 1>>
-	<<set $subSlave.devotion += 4, $subSlave.counter.oral += 2, $oralTotal += 12, $subSlave.counter.anal += 1, $analTotal += 1>>
-	<<set $slaves[$slaveIndices[$subSlave.ID]] = $subSlave>>
-	<</replace>>
-<</link>>
+	<br><<link "The prisoner will take it up the butt, too, if _he2 wants sleep">>
+		<<EventNameDelink $activeSlave>>
+		<<replace "#result">>
+		You silently interrupt $activeSlave.slaveName and indicate that $he should sit down on the cell's bed without letting $subSlave.slaveName's head out from between $his legs. $He sits down with a thump, dragging the struggling $subSlave.slaveName with $him. You<<if ($PC.dick == 0)>> pull on a strap-on, and then<</if>> seize $subSlave.slaveName's hips and hoist them into the air, giving _him2 a horrible second of anticipation as you manhandle <<if ($PC.dick == 0)>>the cruelly large phallus<<else>>your cock<</if>> into place. _He2 gives a strangled squeal of protest at the feeling of you pushing your way inexorably up _his2 poor anus, making $activeSlave.slaveName jerk with surprise at the sensation of $subSlave.slaveName howling into $his crotch. Twenty minutes later, you and $activeSlave.slaveName leave _him2 @@.hotpink;quiescent@@ on the floor of the cell. After $he locks the door after $himself, $activeSlave.slaveName can't resist the urge to @@.hotpink;offer you a cheerful high-five.@@
+		<<set $activeSlave.devotion += 10, $activeSlave.counter.oral += 1, $oralTotal += 1>>
+		<<set $subSlave.devotion += 4, $subSlave.counter.oral += 2, $oralTotal += 12, $subSlave.counter.anal += 1, $analTotal += 1>>
+		<<set $slaves[$slaveIndices[$subSlave.ID]] = $subSlave>>
+		<</replace>>
+	<</link>>
 <</if>>
 <<if ($subSlave.vagina > 0) && canDoVaginal($subSlave)>>
-<br><<link "The prisoner will take it up the pussy, too, if _he2 wants sleep">>
-	<<EventNameDelink $activeSlave>>
-	<<replace "#result">>
-	You silently interrupt $activeSlave.slaveName and indicate that $he should sit down on the cell's bed without letting $subSlave.slaveName's head out from between $his legs. $He sits down with a thump, dragging the struggling $subSlave.slaveName with $him. You<<if ($PC.dick == 0)>> pull on a strap-on, and then<</if>> seize $subSlave.slaveName's hips and hoist them into the air, giving _him2 a horrible second of anticipation as you manhandle <<if ($PC.dick == 0)>>the cruelly large phallus<<else>>your cock<</if>> into place. _He2 gives a strangled squeal of protest at the feeling of you pushing your way inexorably up _his2 poor pussy, making $activeSlave.slaveName jerk with surprise at the sensation of $subSlave.slaveName howling into $his crotch. Twenty minutes later, you and $activeSlave.slaveName leave _him2 @@.hotpink;quiescent@@ on the floor of the cell. After $he locks the door after $himself, $activeSlave.slaveName can't resist the urge to @@.hotpink;offer you a cheerful high-five.@@
-	<<set $activeSlave.devotion += 10, $activeSlave.counter.oral += 1, $oralTotal += 1>>
-	<<set $subSlave.devotion += 4, $subSlave.counter.oral += 2, $oralTotal += 2, $subSlave.counter.vaginal += 1, $vaginalTotal += 1>>
-	<<set $slaves[$slaveIndices[$subSlave.ID]] = $subSlave>>
-	<</replace>>
-<</link>>
+	<br><<link "The prisoner will take it up the pussy, too, if _he2 wants sleep">>
+		<<EventNameDelink $activeSlave>>
+		<<replace "#result">>
+		You silently interrupt $activeSlave.slaveName and indicate that $he should sit down on the cell's bed without letting $subSlave.slaveName's head out from between $his legs. $He sits down with a thump, dragging the struggling $subSlave.slaveName with $him. You<<if ($PC.dick == 0)>> pull on a strap-on, and then<</if>> seize $subSlave.slaveName's hips and hoist them into the air, giving _him2 a horrible second of anticipation as you manhandle <<if ($PC.dick == 0)>>the cruelly large phallus<<else>>your cock<</if>> into place. _He2 gives a strangled squeal of protest at the feeling of you pushing your way inexorably up _his2 poor pussy, making $activeSlave.slaveName jerk with surprise at the sensation of $subSlave.slaveName howling into $his crotch. Twenty minutes later, you and $activeSlave.slaveName leave _him2 @@.hotpink;quiescent@@ on the floor of the cell. After $he locks the door after $himself, $activeSlave.slaveName can't resist the urge to @@.hotpink;offer you a cheerful high-five.@@
+		<<set $activeSlave.devotion += 10, $activeSlave.counter.oral += 1, $oralTotal += 1>>
+		<<set $subSlave.devotion += 4, $subSlave.counter.oral += 2, $oralTotal += 2, $subSlave.counter.vaginal += 1, $vaginalTotal += 1>>
+		<<set $slaves[$slaveIndices[$subSlave.ID]] = $subSlave>>
+		<</replace>>
+	<</link>>
 <</if>>
 
 <<case "comforting attendant">>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 38715d714503893ee688db3988e5fbea1bf07941..4862e5ae98a333e4d73eba54b956211bc9d7b146 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -2037,7 +2037,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
 			<<if $activeSlave.dick > 3>>
 				strokes $himself a couple of times, showing off $his <<if $activeSlave.dick > 5>>monstrous penis<<else>>big dick<</if>>. "Come on, don't you want thi<<s>> thing up your a<<ss>>?" $he asks.
 			<<else>>
-				gestures to $his <<if $activeSlave.dick > 1>>modest<<else>>pathetic<</if>> penis. "I know it'<<s>> really <<s>>mall," $he <<say>>s. "But I'll u<<s>>e finger<<s>>, too. I'll make sure you get off."
+				gestures to $his <<if $activeSlave.dick > 1>>modest<<else>>pathetic<</if>> penis. "I know it'<<s>> really <<s>>mall," $he <<say>>s. "But I'll u<<s>>e finger<<s>>, too. I'll make <<s>>ure you get off."
 			<</if>>
 		<<else>>
 			"I know you can't take it up your a<<ss>> right now," says $activeSlave.slaveName, "but can't I rim you for a while fir<<s>>t?"
@@ -2053,7 +2053,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
 	<<case "pregnancy">>
 		loves to be inseminated,
 		<<if $subSlave.pregKnown == 1>>
-			even though _he2's already pregnant. "Come on, you know you want my <<s>>emen," <<say>>s $activeSlave.slaveName, idly toying with the precum gathering at $his tip. "<<if _vaginal>>I'll do my be<<s>>t to shoot it all the way up into your womb. I might even make you pregnant twi<<c>>e, I'll cum in you <<s>>o hard<<else>>I'll fill your a<<ss>> up<</if>>."
+			even though _he2's already pregnant. "Come on, you know you want my <<s>>emen," <<say>>s $activeSlave.slaveName, idly toying with the precum gathering at $his tip. "<<if _vaginal>>I'll do my be<<s>>t to <<sh>>oot it all the way up into your womb. I might even make you pregnant twi<<c>>e, I'll cum in you <<s>>o hard<<else>>I'll fill your a<<ss>> up<</if>>."
 			<<set $subSlave.lactationDuration = 2>>
 			<<set $subSlave.boobs -= $subSlave.boobsMilk, $subSlave.boobsMilk = 0>>
 		<<else>>
@@ -2074,7 +2074,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
 	<<case "masochist">>
 		is a slut for pain. "I'll hurt you," <<say>>s $activeSlave.slaveName hesitantly. Seeing that this is well received, $he plunges on. "I'll rape you. Come on, I'm going to pound you <<s>>o hard and twi<<s>>t your nipple<<s>> until you don't know what hurt<<s>> wor<<s>>t, your tit<<s>> or your <<if _vaginal>>cunt<<else>>butthole<</if>>."
 	<<default>>
-		is pretty vanilla in bed. "Come on," <<say>>s $activeSlave.slaveName reassuringly. "You'll come more than I do, I promi<<s>>e. Fir<<s>>t I'll <<if $subSlave.dick > 0>>blow you<<else>>eat you out<</if>>. Then we'll make love. <<if $activeSlave.dick > 2>>Thi<<s>> dick will make you shudder<<else>>I'm kind of <<s>>mall down there, but I'll u<<s>>e my hand<<s>> too<</if>>."
+		is pretty vanilla in bed. "Come on," <<say>>s $activeSlave.slaveName reassuringly. "You'll come more than I do, I promi<<s>>e. Fir<<s>>t I'll <<if $subSlave.dick > 0>>blow you<<else>>eat you out<</if>>. Then we'll make love. <<if $activeSlave.dick > 2>>Thi<<s>> dick will make you <<sh>>udder<<else>>I'm kind of <<s>>mall down there, but I'll u<<s>>e my hand<<s>> too<</if>>."
 		<<set $activeSlave.counter.oral++, $oralTotal++>>
 		<<set $subSlave.counter.oral++, $oralTotal++>>
 	<</switch>>
@@ -2158,7 +2158,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
 	<br><br>
 	$He's painfully aroused, of course. $He just got to watch a <<if $PC.title>>handsome guy fuck a<<else>>hot girl fuck another<</if>> hot girl<<if !_vaginal>>'s ass<</if>>, right in front of $him. And this while already laboring under a severe case of blue balls. "<<Master>>," $he <<say>>s nonspecifically. $He knows you did that in front of $him for $his benefit, at least partly, and $he wouldn't know what to make of it or how to respond, even if $he were in possession of $his faculties. Which $he isn't. All $his blood is very obviously located in <<if $activeSlave.vagina > -1>>$his lovely futanari hard-on<<else>>$his desperately erect penis<</if>>. You point to where $subSlave.slaveName just got fucked, and announce that $activeSlave.slaveName can get off if $he wants, but not by fucking $subSlave.slaveName. $He gets to come with <<if $PC.dick>>your cock<<else>>a strap-on<</if>> <<if canDoVaginal($activeSlave)>>fucking $him<<else>>up $his ass<</if>>.
 	<br><br>
-	$activeSlave.slaveName is familiar with your libido, but even so, $he's impressed. $He's also in dire need of relief, and at this point, $he's so horny that the prospect of any sex is attractive, even if it isn't the kind of sex $he was originally planning. So $he hops up eagerly enough and opens $his legs for you, $his erect member <<if $activeSlave.belly >= 10000>>uncomfortably trapped by $his <<if $activeSlave.bellyPreg >= 8000>>_belly pregnancy<<else>>_belly belly<</if>><<else>>sticking out forgotten<</if>> as $he <<if canDoVaginal($activeSlave)>>spreads $his pussy<<else>>offers you $his asshole<</if>>. You fuck it, even more roughly than you fucked $subSlave.slaveName's <<if _vaginal>>cunt<<else>>anus<</if>>, and since you've just climaxed recently, it's a while before you orgasm again. $activeSlave.slaveName cums long before you, spattering $himself messily, moaning "Oh, M-<<Master>>, ye<<s>>, oh fuck ye<<s>>, my <<if _vaginal>>pu<<ss>>y, my fucking pu<<ss>>y<<else>>a<<ss>>, my fucking a<<ss>>hole<</if>>" so @@.hotpink;whorishly@@ that there's no indication $he was ever even considering fucking anyone.
+	$activeSlave.slaveName is familiar with your libido, but even so, $he's impressed. $He's also in dire need of relief, and at this point, $he's so horny that the prospect of any sex is attractive, even if it isn't the kind of sex $he was originally planning. So $he hops up eagerly enough and opens $his legs for you, $his erect member <<if $activeSlave.belly >= 10000>>uncomfortably trapped by $his <<if $activeSlave.bellyPreg >= 8000>>_belly pregnancy<<else>>_belly belly<</if>><<else>>sticking out forgotten<</if>> as $he <<if canDoVaginal($activeSlave)>>spreads $his pussy<<else>>offers you $his asshole<</if>>. You fuck it, even more roughly than you fucked $subSlave.slaveName's <<if _vaginal>>cunt<<else>>anus<</if>>, and since you've just climaxed recently, it's a while before you orgasm again. $activeSlave.slaveName cums long before you, spattering $himself messily, moaning "Oh, <<Master>>, ye<<s>>, oh fuck ye<<s>>, my <<if _vaginal>>pu<<ss>>y, my fucking pu<<ss>>y<<else>>a<<ss>>, my fucking a<<ss>>hole<</if>>" so @@.hotpink;whorishly@@ that there's no indication $he was ever even considering fucking anyone.
 	<<set $activeSlave.devotion += 3>>
 	<<if canDoVaginal($activeSlave)>>
 		<<set $activeSlave.counter.vaginal++, $vaginalTotal++>>
diff --git a/src/uncategorized/matchmaking.tw b/src/uncategorized/matchmaking.tw
index c952b5108d08b26a62acfcc5dc13c0dd8a960e6b..b6fe91ee68b3ee6ecd8285bd63b48d749b237d5e 100644
--- a/src/uncategorized/matchmaking.tw
+++ b/src/uncategorized/matchmaking.tw
@@ -49,25 +49,25 @@ You tell $eventSlave.slaveName that you're going to marry $him. (A proposal, of
 	$he says, "Thank you, <<Master>>. I am going to do my be<<s>>t to be a
 	<<if ($eventSlave.fetishKnown == 1) && ($eventSlave.fetishStrength > 60)>>
 		<<if ($eventSlave.fetish == "submissive")>>
-		perfect <<s>>ubmi<<ss>>ive wife to you,
+			perfect <<s>>ubmi<<ss>>ive wife to you,
 		<<elseif ($eventSlave.fetish == "cumslut")>>
-		perfect oral wifey,
+			perfect oral wifey,
 		<<elseif ($eventSlave.fetish == "humiliation")>>
-		hot wife for you,
+			hot wife for you,
 		<<elseif ($eventSlave.fetish == "buttslut")>>
-		perfect little anal wifey,
+			perfect little anal wifey,
 		<<elseif ($eventSlave.fetish == "boobs")>>
-		<<if $eventSlave.boobs > 800>>perfect big-boobed<<else>>perfect-boobed<</if>> wife
+			<<if $eventSlave.boobs > 800>>perfect big-boobed<<else>>perfect-boobed<</if>> wife
 		<<elseif ($eventSlave.fetish == "pregnancy")>>
-		perfect barefoot breeding wife,
+			perfect barefoot breeding wife,
 		<<elseif ($eventSlave.fetish == "dom")>>
-		perfect, you know, <<sh>>aring wife with other <<s>>lave<<s>>,
+			perfect, you know, <<sh>>aring wife with other <<s>>lave<<s>>,
 		<<elseif ($eventSlave.fetish == "sadist")>>
-		perfect wife to u<<s>>e on other <<s>>lave<<s>>,
+			perfect wife to u<<s>>e on other <<s>>lave<<s>>,
 		<<elseif ($eventSlave.fetish == "masochist")>>
-		good, beaten wife,
+			good, beaten wife,
 		<<else>>
-		good wife,
+			good wife,
 		<</if>>
 	<<else>>
 		good wife,
@@ -232,25 +232,25 @@ Despite $his devotion and trust, $he is still a slave, and probably knows that $
 		$His slave dick is hidden by its chastity cage.
 	<<elseif canAchieveErection($eventSlave)>>
 		<<if ($eventSlave.dick > 4) && ($eventSlave.belly >= 5000)>>
-		$He's hugely erect, with $his lacy g-string only serving to hold $his dick agonizingly pressed against the bottom of $his _belly <<if $eventSlave.bellyPreg >= 3000>>pregnant <</if>>belly.
+			$He's hugely erect, with $his lacy g-string only serving to hold $his dick agonizingly pressed against the bottom of $his _belly <<if $eventSlave.bellyPreg >= 3000>>pregnant <</if>>belly.
 		<<elseif $eventSlave.dick > 4>>
-		$He's hugely erect, with $his lacy g-string only serving to hold $his dick upright along $his belly.
+			$He's hugely erect, with $his lacy g-string only serving to hold $his dick upright along $his belly.
 		<<else>>
-		$His erection tents the front of $his lacy g-string.
+			$His erection tents the front of $his lacy g-string.
 		<</if>>
 	<<elseif ($eventSlave.dick > 0)>>
 		<<if $eventSlave.dick > 10>>
-		$His huge soft cock is allowed to dangle freely as no g-string could hope to contain it.
+			$His huge soft cock is allowed to dangle freely as no g-string could hope to contain it.
 		<<elseif $eventSlave.dick > 4>>
-		$His big soft cock forms a lewd mass, stuffed into $his lacy g-string.
+			$His big soft cock forms a lewd mass, stuffed into $his lacy g-string.
 		<<else>>
-		$His lacy g-string perfectly conceals $his soft dick.
+			$His lacy g-string perfectly conceals $his soft dick.
 		<</if>>
 	<<else>>
 		<<if $eventSlave.clit > 1>>
-		$His huge clit is quite hard, making $him shift uncomfortably as $his lacy g-string stimulates it.
+			$His huge clit is quite hard, making $him shift uncomfortably as $his lacy g-string stimulates it.
 		<<else>>
-		$His lacy g-string is starting to look a bit moist in front.
+			$His lacy g-string is starting to look a bit moist in front.
 		<</if>>
 	<</if>>
 	<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> marries $him to you in a brief ceremony adapted for slaves and their owners. You place a simple steel ring on $his finger; $he does not reciprocate, since this marriage does not bind you.
@@ -299,25 +299,25 @@ Despite $his devotion and trust, $he is still a slave, and probably knows that $
 		"Done," _heA says when you climax. "Enjoy your
 		<<if ($eventSlave.fetishKnown == 1) && ($eventSlave.fetishStrength > 60)>>
 			<<if ($eventSlave.fetish == "submissive")>>
-			submissive slave wife!"
+				submissive slave wife!"
 			<<elseif ($eventSlave.fetish == "cumslut")>>
-			slave wife's mouth!"
+				slave wife's mouth!"
 			<<elseif ($eventSlave.fetish == "humiliation")>>
-			exhibitionist slave wife!"
+				exhibitionist slave wife!"
 			<<elseif ($eventSlave.fetish == "buttslut")>>
-			slave wife's butthole!"
+				slave wife's butthole!"
 			<<elseif ($eventSlave.fetish == "boobs")>>
-			slave wife's boobs!"
+				slave wife's boobs!"
 			<<elseif ($eventSlave.fetish == "pregnancy")>>
-			breeder wife!"
+				breeder wife!"
 			<<elseif ($eventSlave.fetish == "dom")>>
-			slave wife's aggression!"
+				slave wife's aggression!"
 			<<elseif ($eventSlave.fetish == "sadist")>>
-			slave wife's sadistic tendencies!"
+				slave wife's sadistic tendencies!"
 			<<elseif ($eventSlave.fetish == "masochist")>>
-			slave wife's pain!"
+				slave wife's pain!"
 			<<else>>
-			slave wife!"
+				slave wife!"
 			<</if>>
 		<<else>>
 			slave wife!"
@@ -340,34 +340,34 @@ Despite $his devotion and trust, $he is still a slave, and probably knows that $
 	<</replace>>
 <</link>>
 <<if $cash > 10000>>
-<br>Invite prominent citizens to a wedding (This will cost <<print cashFormat(10000)>>):
-<br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Straightforward ceremony">>
-	<<replace "#result2">>
-	You order $assistantName to invite deserving citizens to a straightforward ceremony for a slave being married to a slaveowner, and to make the arrangement. The wedding will take place during the upcoming week.
-	<<set $weddingPlanned = 1>>
-	<<run cashX(-10000, "event")>>
-	<</replace>>
-<</link>>
-<<if ($eventSlave.vagina != 0) && ($eventSlave.anus != 0) && ($eventSlave.breedingMark != 1 || $propOutcome == 0)>>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Orgiastic ceremony">>
-	<<replace "#result2">>
-	You order $assistantName to invite deserving citizens to an orgiastic ceremony for a slave being married to a slaveowner, and to make the arrangements. The wedding orgy will take place during the upcoming week.
-	<<set $weddingPlanned = 2>>
-	<<run cashX(-10000, "event")>>
-	<</replace>>
-<</link>> //This will involve the slave having sex with a very large number of citizens//
-<</if>>
-<<if isFertile($eventSlave) && ($PC.dick == 1)>>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Impregnation ceremony">>
-	<<replace "#result2">>
-	You order $assistantName to invite deserving citizens to a ceremony for a fertile slave being married to a slaveowner, and to make the arrangements. The wedding will take place during the upcoming week.
-	<<set $weddingPlanned = 3>>
-	<<run cashX(-10000, "event")>>
-	<</replace>>
-<</link>> //This will involve you impregnating the slave//
-<</if>>
+	<br>Invite prominent citizens to a wedding (This will cost <<print cashFormat(10000)>>):
+	<br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Straightforward ceremony">>
+		<<replace "#result2">>
+		You order $assistantName to invite deserving citizens to a straightforward ceremony for a slave being married to a slaveowner, and to make the arrangement. The wedding will take place during the upcoming week.
+		<<set $weddingPlanned = 1>>
+		<<run cashX(-10000, "event")>>
+		<</replace>>
+	<</link>>
+	<<if ($eventSlave.vagina != 0) && ($eventSlave.anus != 0) && ($eventSlave.breedingMark != 1 || $propOutcome == 0)>>
+		<br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Orgiastic ceremony">>
+			<<replace "#result2">>
+			You order $assistantName to invite deserving citizens to an orgiastic ceremony for a slave being married to a slaveowner, and to make the arrangements. The wedding orgy will take place during the upcoming week.
+			<<set $weddingPlanned = 2>>
+			<<run cashX(-10000, "event")>>
+			<</replace>>
+		<</link>> //This will involve the slave having sex with a very large number of citizens//
+	<</if>>
+	<<if isFertile($eventSlave) && ($PC.dick == 1)>>
+		<br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Impregnation ceremony">>
+			<<replace "#result2">>
+			You order $assistantName to invite deserving citizens to a ceremony for a fertile slave being married to a slaveowner, and to make the arrangements. The wedding will take place during the upcoming week.
+			<<set $weddingPlanned = 3>>
+			<<run cashX(-10000, "event")>>
+			<</replace>>
+		<</link>> //This will involve you impregnating the slave//
+	<</if>>
 <<else>>
-<br>//You cannot afford an elaborate ceremony//
+	<br>//You cannot afford an elaborate ceremony//
 <</if>>
 </span>
 
diff --git a/src/uncategorized/pMercenaryRomeo.tw b/src/uncategorized/pMercenaryRomeo.tw
index fc0e9f5ecd96c72911abe20d223138dcbbc16999..cd9e023d23e1de6b481d0d53c5fadd85249cb32c 100644
--- a/src/uncategorized/pMercenaryRomeo.tw
+++ b/src/uncategorized/pMercenaryRomeo.tw
@@ -68,7 +68,7 @@ proffered by an attentive slave girl, he seems almost bashful.
 	<<link "Decline, and tell $him not to see him">>
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
-			$activeSlave.slaveName obeys your orders not to see the old mercenary. Though neither he or $activeSlave.slaveName says a word about it, his squadmates are not so closemouthed. Soon the tragic story of The Mercenary and the Slave Girl is being told in bars and brothels across the Free City, with you naturally playing @@.red;the role of the villain.@@
+			$activeSlave.slaveName obeys your orders not to see the old mercenary. Though neither he or $activeSlave.slaveName says a word about it, his squadmates are not so closemouthed. Soon the tragic story of The Mercenary and the Slave $Girl is being told in bars and brothels across the Free City, with you naturally playing @@.red;the role of the villain.@@
 			<<run repX(-1000, "event")>>
 			<<unset $romeoID>>
 		<</replace>>
@@ -92,7 +92,7 @@ proffered by an attentive slave girl, he seems almost bashful.
 				<<else>>
 					$He gestures towards the nearest camera and he helps $him back into your penthouse.
 				<</if>>
-				The only thing she wants after being freed is to return to your side.
+				The only thing $he wants after being freed is to return to your side.
 				"I thought I was giving $him a better life... But $he already had everything $he wanted. I'm sorry for putting you in such a position." You can hear the sadness in his voice. "Thank you for your time. I'm sorry to have bothered you."
 				Since $he returned to slavery, it's only fair to return the credits he paid for $him. He thanks you hollowly before heading on his way.
 			<<else>>
@@ -114,22 +114,22 @@ proffered by an attentive slave girl, he seems almost bashful.
 		<<replace "#result">>
 			The mercenary cannot believe his ears. After you repeat yourself twice, he leaves to collect your gift, thanking you clumsily. On the video feeds, you see that $activeSlave.slaveName can hardly believe what's
 			<<if $activeSlave.relationship == -3 && $activeSlave.fetish != "mindbroken" && $activeSlave.devotion+$activeSlave.trust > 190>>
-				happening. You can't hear what he says as he takes out a ring, but $his reaction speaks clearly. She says "No."
+				happening. You can't hear what he says as he takes out a ring, but $his reaction speaks clearly. $He says "No."
 				<<if $activeSlave.amp != 1>>
-					She points back into your penthouse and returns to $his home.
+					$He points back into your penthouse and returns to $his home.
 				<<else>>
-					She gestures towards the nearest camera and he helps $him back into your penthouse.
+					$He gestures towards the nearest camera and he helps $him back into your penthouse.
 				<</if>>
-				The only thing she wants after being freed is to return to your side.
-				"I thought I was giving $him a better life... But she already had everything she wanted. I'm sorry for putting you in such a position." You can hear the sadness in his voice. "Thank you for your time. I'm sorry to have bothered you."
+				The only thing $he wants after being freed is to return to your side.
+				"I thought I was giving $him a better life... But $he already had everything $he wanted. I'm sorry for putting you in such a position." You can hear the sadness in his voice. "Thank you for your time. I'm sorry to have bothered you."
 			<<else>>
 				happened.
 				<<if $activeSlave.amp != 1>>
-					She hugs him, sobbing into his shoulder. As they walk hand in hand down towards his quarters,
+					$He hugs him, sobbing into his shoulder. As they walk hand in hand down towards his quarters,
 				<<else>>
 					As he picks up $his limbless form to give $him a hug,
 				<</if>>
-				she gives the nearest camera a little nod and silently mouths the words "Thank you, <<= WrittenMaster($activeSlave)>>." You smile to yourself; when they get there they'll find flowers and a paid reservation at the arcology's best restaurant. Soon the story is being told in bars and brothels across the Free City, with you naturally playing @@.green;a starring role.@@ Some days later, you hear a dramatization is being filmed, with an aging action star playing the mercenary, a rising starlet playing $activeSlave.slaveName, and a noted character actor playing you.
+				$he gives the nearest camera a little nod and silently mouths the words "Thank you, <<= WrittenMaster($activeSlave)>>." You smile to yourself; when they get there they'll find flowers and a paid reservation at the arcology's best restaurant. Soon the story is being told in bars and brothels across the Free City, with you naturally playing @@.green;a starring role.@@ Some days later, you hear a dramatization is being filmed, with an aging action star playing the mercenary, a rising starlet playing $activeSlave.slaveName, and a noted character actor playing you.
 				<<run repX(15000, "event")>>
 				<<set _poster = "a poster for the movie that was made about the love between one of your mercenaries and " + $activeSlave.slaveName>>
 				<<set $trinkets.push(_poster)>>
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index 2159a18440b02b80ab2ef36005739395a73502d8..64b8a4e6b35a34d1894e23a5281480d732b0ea46 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -402,8 +402,8 @@
 	<<set _X = 1>>
 <</if>>
 /* <<if $PC.actualAge >= $IsPastPrimePC>> */
-/* <<set _Cal = Math.ceil(random($AgeTrainingLowerBoundPC,$AgeTrainingUpperBoundPC)*$AgeEffectOnTrainerEffectivenessPC)>> */
-/* <<set _X = 0>> */
+	/* <<set _Cal = Math.ceil(random($AgeTrainingLowerBoundPC,$AgeTrainingUpperBoundPC)*$AgeEffectOnTrainerEffectivenessPC)>> */
+	/* <<set _X = 0>> */
 /* <</if>> */
 
 <<if $PCWounded != 1>>
@@ -815,8 +815,7 @@ Routine upkeep of your demesne costs @@.yellow;<<print cashFormat($costs)>>.@@
 
 <<if $secExp == 1>>
 	<<if $weapManu == 1>>
-		<br>
-		<br>
+		<br><br>
 		The weapons manufacturing complex produces armaments
 		<<if $weapProductivity <= 2>>
 			at a steady pace.
@@ -1026,53 +1025,53 @@ The RomanFS may need further tweaking (it probably got weaker). Could increase t
 <<set $slaveCostFactor = menialSlaveCost()/1000>>
 <<if $arcologies[0].FSRomanRevivalist > random(1,150)>>
 	<<if $slaveCostFactor > 0.8>>
-	<br><br>@@.yellow;Your Roman Revivalism is having an effect on the slave market and has driven local prices down@@ by convincing slave traders that this is a staunchly pro-slavery area.<br>
-	<<set $menialSupplyFactor += 2000>>
+		<br><br>@@.yellow;Your Roman Revivalism is having an effect on the slave market and has driven local prices down@@ by convincing slave traders that this is a staunchly pro-slavery area.<br>
+		<<set $menialSupplyFactor += 2000>>
 	<<else>>
-	<br><br>@@.yellow;Your Roman Revivalism is having an effect on the slave market and is holding local prices down@@ by convincing slave traders that this is a staunchly pro-slavery area.<br>
+		<br><br>@@.yellow;Your Roman Revivalism is having an effect on the slave market and is holding local prices down@@ by convincing slave traders that this is a staunchly pro-slavery area.<br>
 	<</if>>
 <</if>>
 
 <<if $difficultySwitch == 1>>
-<<if $econWeatherDamage > 0>>
-	<<set _repairSeed = random(1,3)>>
-	<<if $disasterResponse == 0>>
-		<<if _repairSeed == 3>>
-			<<set $econWeatherDamage -= 1>>
-			<<set $localEcon += 1>>
-		<</if>>
-	<<elseif $disasterResponse == 1>>
-		<<if _repairSeed > 1>>
-			<<set $econWeatherDamage -= 1>>
-			<<set $localEcon += 1>>
-		<</if>>
-	<<else>>
-		<<if _repairSeed == 3>>
-			<<if $econWeatherDamage > 1>>
-				<<set $econWeatherDamage -= 2>>
-				<<set $localEcon += 2>>
-			<<else>>
+	<<if $econWeatherDamage > 0>>
+		<<set _repairSeed = random(1,3)>>
+		<<if $disasterResponse == 0>>
+			<<if _repairSeed == 3>>
+				<<set $econWeatherDamage -= 1>>
+				<<set $localEcon += 1>>
+			<</if>>
+		<<elseif $disasterResponse == 1>>
+			<<if _repairSeed > 1>>
 				<<set $econWeatherDamage -= 1>>
 				<<set $localEcon += 1>>
 			<</if>>
 		<<else>>
-			<<set $econWeatherDamage -= 1>>
-			<<set $localEcon += 1>>
+			<<if _repairSeed == 3>>
+				<<if $econWeatherDamage > 1>>
+					<<set $econWeatherDamage -= 2>>
+					<<set $localEcon += 2>>
+				<<else>>
+					<<set $econWeatherDamage -= 1>>
+					<<set $localEcon += 1>>
+				<</if>>
+			<<else>>
+				<<set $econWeatherDamage -= 1>>
+				<<set $localEcon += 1>>
+			<</if>>
 		<</if>>
 	<</if>>
-<</if>>
-<<if $terrain != "oceanic">>
-	<<if $weatherToday.severity == 3>>
-		<<set $localEcon -= 1>>
-		<<set $econWeatherDamage += 1>>
-		<br><br>This week's terrible weather did a number on the region, @@.red;hurting the local economy.@@ <<if $disasterResponse == 0>>//Investing in a disaster response unit will speed up recovery//<</if>>
-	<<elseif $weatherToday.severity > 3>>
-		<<set $localEcon -= 3>>
-		<<set $econWeatherDamage += 3>>
-		<br><br>This week's extreme weather ravaged the region, @@.red;the local economy is seriously disrupted.@@ <<if $disasterResponse == 0>>//Investing in a disaster response unit will speed up recovery//<</if>>
+	<<if $terrain != "oceanic">>
+		<<if $weatherToday.severity == 3>>
+			<<set $localEcon -= 1>>
+			<<set $econWeatherDamage += 1>>
+			<br><br>This week's terrible weather did a number on the region, @@.red;hurting the local economy.@@ <<if $disasterResponse == 0>>//Investing in a disaster response unit will speed up recovery//<</if>>
+		<<elseif $weatherToday.severity > 3>>
+			<<set $localEcon -= 3>>
+			<<set $econWeatherDamage += 3>>
+			<br><br>This week's extreme weather ravaged the region, @@.red;the local economy is seriously disrupted.@@ <<if $disasterResponse == 0>>//Investing in a disaster response unit will speed up recovery//<</if>>
+		<</if>>
 	<</if>>
 <</if>>
-<</if>>
 
 <<if $SF.Toggle && $SF.Active >= 1>> <<= App.SF.AAR()>> <</if>>
 <br>
diff --git a/src/uncategorized/seRetirement.tw b/src/uncategorized/seRetirement.tw
index 64a38f05d82b344254879ad20b9cc83f8d089a4a..0d3c9ea1d74bab0f854b8133a7ab9d8dcc82ede8 100644
--- a/src/uncategorized/seRetirement.tw
+++ b/src/uncategorized/seRetirement.tw
@@ -74,10 +74,10 @@ $He's certainly going to have some adjustments to make.
 <<if $activeSlave.energy > 90>>
 	Notably, dealing with $his formidable sex drive is now $his business. You suspect the arcology's clubs are about to receive a fanatical new regular, and the arcology's whores may not know what hit them when $he realizes that $he's now quite capable of buying whatever $he wants on a semi-regular basis.
 	<<if $activeSlave.skill.anal+$activeSlave.skill.oral >= 120>>
-	$He's so sexually skilled, though, that $he probably won't have much trouble. $He'll probably have more than a few eager lovers within days.
+		$He's so sexually skilled, though, that $he probably won't have much trouble. $He'll probably have more than a few eager lovers within days.
 	<</if>>
 	<<if $activeSlave.face > 40>>
-	$He's certainly attractive enough that $he'll have no trouble finding as many casual hookups as $he likes.
+		$He's certainly attractive enough that $he'll have no trouble finding as many casual hookups as $he likes.
 	<</if>>
 <</if>>
 
@@ -95,11 +95,11 @@ $He's certainly going to have some adjustments to make.
 	<br><br>
 	$He has a reputation from $his long service as your Head Girl. To $his bemusement, and considerable satisfaction, $he has multiple job offers from slaving operations without even having to circulate $his resume.
 	<<if $activeSlave.fetish == "sadist">>
-	The prospect of a virtually unlimited field for abuse and rape is something $he'd pay for, now that $he has $his own money. $He's excited beyond description to find that there are people interested in paying $him to exercise $his exquisitely horrible skills.
+		The prospect of a virtually unlimited field for abuse and rape is something $he'd pay for, now that $he has $his own money. $He's excited beyond description to find that there are people interested in paying $him to exercise $his exquisitely horrible skills.
 	<<elseif $activeSlave.fetish == "dom">>
-	Dominance is second nature to $him. Though $he doesn't have to work, $his slaving skills are valuable enough that $he'd probably be tempted by the pay $he can expect, even if $he didn't derive real pleasure from exercising them.
+		Dominance is second nature to $him. Though $he doesn't have to work, $his slaving skills are valuable enough that $he'd probably be tempted by the pay $he can expect, even if $he didn't derive real pleasure from exercising them.
 	<<else>>
-	$His annuity means that $he doesn't have to work, but $he's inclined to do so. $His skills command reasonable wages in the slave training field, and between those prospects and $his annuity, $he stands to become wealthy.
+		$His annuity means that $he doesn't have to work, but $he's inclined to do so. $His skills command reasonable wages in the slave training field, and between those prospects and $his annuity, $he stands to become wealthy.
 	<</if>>
 <<elseif ($toSearchAlt.indexOf("is world famous for") != -1)>>
 	<br><br>
diff --git a/src/uncategorized/seWeddingSingle.tw b/src/uncategorized/seWeddingSingle.tw
index d4f249b65a96641a927905efec468dc56d24073d..968a44b7eac36431e9be2f05d87c3bbcb987c282 100644
--- a/src/uncategorized/seWeddingSingle.tw
+++ b/src/uncategorized/seWeddingSingle.tw
@@ -331,25 +331,25 @@ In the days leading up to your wedding, $slaves[_wedS].slaveName spent $his time
 		$His slave dick is hidden by its chastity cage.
 	<<elseif canAchieveErection($slaves[_wedS])>>
 		<<if ($slaves[_wedS].dick > 4) && ($slaves[_wedS].belly >= 5000)>>
-		$He's hugely erect, with $his lacy g-string only serving to hold $his dick agonizingly pressed against the bottom of $his _belly <<if $slaves[_wedS].bellyPreg >= 3000>>pregnant <</if>>belly.
+			$He's hugely erect, with $his lacy g-string only serving to hold $his dick agonizingly pressed against the bottom of $his _belly <<if $slaves[_wedS].bellyPreg >= 3000>>pregnant <</if>>belly.
 		<<elseif $slaves[_wedS].dick > 4>>
-		$He's hugely erect, with $his lacy g-string only serving to hold $his dick upright along $his belly.
+			$He's hugely erect, with $his lacy g-string only serving to hold $his dick upright along $his belly.
 		<<else>>
-		$His erection tents the front of $his lacy g-string.
+			$His erection tents the front of $his lacy g-string.
 		<</if>>
 	<<elseif ($slaves[_wedS].dick > 0)>>
 		<<if $slaves[_wedS].dick > 10>>
-		$His huge soft cock is allowed to dangle freely as no g-string could hope to contain it.
+			$His huge soft cock is allowed to dangle freely as no g-string could hope to contain it.
 		<<elseif $slaves[_wedS].dick > 4>>
-		$His big soft cock forms a lewd mass, stuffed into $his lacy g-string.
+			$His big soft cock forms a lewd mass, stuffed into $his lacy g-string.
 		<<else>>
-		$His lacy g-string perfectly conceals $his soft dick.
+			$His lacy g-string perfectly conceals $his soft dick.
 		<</if>>
 	<<else>>
 		<<if $slaves[_wedS].clit > 1>>
-		$His huge clit is quite hard, making $his shift uncomfortably as $his lacy g-string stimulates it.
+			$His huge clit is quite hard, making $his shift uncomfortably as $his lacy g-string stimulates it.
 		<<else>>
-		$His lacy g-string covers $his womanhood demurely.
+			$His lacy g-string covers $his womanhood demurely.
 		<</if>>
 	<</if>>
 	There is no aisle for $him to <<if $slaves[_wedS].amp == 1>>be carried<<else>>walk<</if>> down, just a small space at the head of the room where you're standing alone, and there's no one to <<if $slaves[_wedS].amp == 1>>walk alongside the slave carrying<<else>>walk<</if>> $him there; this symbolizes $his submission to you