diff --git a/src/uncategorized/economics.tw b/src/uncategorized/economics.tw
index 22079b33e943ba6264a91f60498fadd583d54cae..bca251fe6548051e744b437afae41301d4336715 100644
--- a/src/uncategorized/economics.tw
+++ b/src/uncategorized/economics.tw
@@ -584,7 +584,7 @@ On formal occasions, you are announced as $PCTitle.
 	<</if>>
 <<elseif $arcologies[0].FSSubjugationist != "unset">>
 	<<if ($PC.race == $arcologies[0].FSSubjugationistRace)>>
-		<<if $rep > 15000 >>
+		<<if $rep > 15000>>
 			Your reputation is so strong that society has accepted your <<print $PC.race>>ness despite you being an inferior race.
 		<<else>>
 			Society @@color:red;loathes;@@ being lead by an inferior $PC.race, believeing that any other race would make a far better leader than you.
diff --git a/src/uncategorized/fMarry.tw b/src/uncategorized/fMarry.tw
index 8c1f6425b1a47d809bd69974bb3677572d5ee4e8..aaf16ccadcbb581b1e343b3a9a946130df6cdde3 100644
--- a/src/uncategorized/fMarry.tw
+++ b/src/uncategorized/fMarry.tw
@@ -234,9 +234,9 @@ Despite her devotion and trust, she is still a slave, and probably knows that he
 		<<elseif $assistantAppearance == "schoolgirl">>
 			"To get this marriage started," $assistantName concludes, "$activeSlave.slaveName, the rules say you should now <<if $PC.dick == 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina == 1>> and eat <<if $PC.title == 1>>his<<else>>her<</if>> pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. Pleased by the sight, $assistantName's avatar starts to jill off.
 		<<elseif $assistantAppearance == "angel">>
-			"To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you must now join $playerName in their bedroom and consumate this marriage." The slave looks confused. "After the wedding ends, would be the time." $assistantName says, covering her face in embarrassment at the thought.
+			"To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you must now join $PCName in their bedroom and consumate this marriage." The slave looks confused. "After the wedding ends, would be the time." $assistantName says, covering her face in embarrassment at the thought.
 		<<elseif $assistantAppearance == "cherub">>
-			"To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you should <<if $PC.dick == 1>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cock<<if $PC.vagina == 1>>and lick their pussy,<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s pussy<</if>>, in the privacy of $playerName's bedroom, of course." $assistantName hides her face in her hands at the thought.
+			"To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you should <<if $PC.dick == 1>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cock<<if $PC.vagina == 1>>and lick their pussy,<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s pussy<</if>>, in the privacy of $PCName's bedroom, of course." $assistantName hides her face in her hands at the thought.
 		<<elseif $assistantAppearance == "incubus">>
 			"To get this marriage started," $assistantName concludes, "$activeSlave.slaveName, you will now <<if $PC.dick == 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina == 1>> and eat <<if $PC.title == 1>>his<<else>>her<</if>> pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. Enjoying the sight, $assistantName's avatar begins to furiously stroke its shaft.
 		<<elseif $assistantAppearance == "succubus">>
diff --git a/src/uncategorized/masterSuite.tw b/src/uncategorized/masterSuite.tw
index 1b70b353be4b01a60fae3addb3b7ad3da047f980..4e4978627b82cefa8502cc6d1062cd9b801e310b 100644
--- a/src/uncategorized/masterSuite.tw
+++ b/src/uncategorized/masterSuite.tw
@@ -294,7 +294,7 @@ $masterSuiteNameCaps is furnished
 
 <br>$masterSuiteNameCaps has room for $masterSuite slaves to live comfortably<<if $masterSuiteUpgradeLuxury == 2>> in the moments when they're not in the fuckpit<<elseif $masterSuiteUpgradeLuxury == 1>> on its huge bed<</if>>.
 <<set _Tmult0 = Math.trunc($masterSuite*1000*$upgradeMultiplierArcology)>>
-[[Expand the Master Suite|Master Suite][$cash -= _Tmult0, $masterSuite += 5]] //Costs ¤_Tmult0//
+[[Expand the Master Suite|Master Suite][$cash -= _Tmult0, $masterSuite += 2]] //Costs ¤_Tmult0//
 
 <br>
 <<if $masterSuiteUpgradePregnancy == 1>>
diff --git a/src/uncategorized/matchmaking.tw b/src/uncategorized/matchmaking.tw
index e9bc9acf64cb1e02cc69fff4ee093bbd195c65be..bd79136f8f1d3c5ab175682ab1b727e34fb390c2 100644
--- a/src/uncategorized/matchmaking.tw
+++ b/src/uncategorized/matchmaking.tw
@@ -264,9 +264,9 @@ Despite her devotion and trust, she is still a slave, and probably knows that he
 		<<elseif $assistantAppearance == "schoolgirl">>
 			"To get this marriage started," $assistantName concludes, "$eventSlave.slaveName, the rules say you should now <<if $PC.dick == 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina == 1>> and eat <<if $PC.title == 1>>his<<else>>her<</if>> pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. Pleased by the sight, $assistantName's avatar starts to jill off.
 		<<elseif $assistantAppearance == "angel">>
-			"To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you must now join $playerName in their bedroom and consumate this marriage." The slave looks confused. "After the wedding ends, would be the time." $assistantName says, covering her face in embarrassment at the thought.
+			"To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you must now join $PCName in their bedroom and consumate this marriage." The slave looks confused. "After the wedding ends, would be the time." $assistantName says, covering her face in embarrassment at the thought.
 		<<elseif $assistantAppearance == "cherub">>
-			"To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you should <<if $PC.dick == 1>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cock<<if $PC.vagina == 1>>and lick their pussy,<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s pussy<</if>>, in the privacy of $playerName's bedroom, of course." $assistantName hides her face in her hands at the thought.
+			"To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you should <<if $PC.dick == 1>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cock<<if $PC.vagina == 1>>and lick their pussy,<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s pussy<</if>>, in the privacy of $PCName's bedroom, of course." $assistantName hides her face in her hands at the thought.
 		<<elseif $assistantAppearance == "incubus">>
 			"To get this marriage started," $assistantName concludes, "$activeSlave.slaveName, you will now <<if $PC.dick == 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina == 1>> and eat <<if $PC.title == 1>>his<<else>>her<</if>> pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. Enjoying the sight, $assistantName's avatar begins to furiously stroke its shaft.
 		<<elseif $assistantAppearance == "succubus">>
diff --git a/src/uncategorized/pBioreactorPerfected.tw b/src/uncategorized/pBioreactorPerfected.tw
index d4c3fc14de809ece4ff81bb563a821b78e9a9218..71ee96e744a36edf058d6f7c3bbe6aaa92c8833e 100644
--- a/src/uncategorized/pBioreactorPerfected.tw
+++ b/src/uncategorized/pBioreactorPerfected.tw
@@ -27,31 +27,46 @@ When you need peace and quiet to work through a difficult problem, you sometimes
 <<if $assistant == 0>>
 	symbol is visible on a screen across the last cow in the row from you, glowing gently to get your attention.
 <<else>>
-	<<if $assistantAppearance == "monstergirl">>
+	<<switch $assistantAppearance>>
+	<<case "monstergirl">>
 		monstergirl avatar is visible on a screen across the last cow in the row from you, waving cheerfully for your attention with one of her hands and a couple of her hair-tentacles.
-	<<elseif $assistantAppearance == "shemale">>
+	<<case "shemale">>
 		shemale avatar is visible on a screen across the last cow in the row from you, waving for your attention. (Her bouncy waving makes her ever-erect cock wave too.)
-	<<elseif $assistantAppearance == "amazon">>
+	<<case "amazon">>
 		amazon avatar is visible on a screen across the last cow in the row from you, jumping up and down for your attention.
-	<<elseif $assistantAppearance == "businesswoman">>
+	<<case "businesswoman">>
 		businesswoman avatar is visible on a screen across the last cow in the row from you, waving politely for your attention and pointing to a tablet in her hand.
-	<<elseif $assistantAppearance == "fairy">>
+	<<case "fairy">>
 		fairy avatar is visible on a screen across the last cow in the row from you, waving energetically and pointing to a tablet that she's sitting on.
-	<<elseif $assistantAppearance == "pregnant fairy">>
+	<<case "pregnant fairy">>
 		pregnant fairy avatar is visible on a screen across the last cow in the row from you, waving energetically and pointing to a tablet that she's sitting on.
-	<<elseif $assistantAppearance == "goddess">>
+	<<case "goddess">>
 		goddess avatar is visible on a screen across the last cow in the row from you, waving demurely for your attention and holding up one of her dribbling breasts.
-	<<elseif $assistantAppearance == "hypergoddess">>
+	<<case "hypergoddess">>
 		goddess avatar is visible on a screen across the last cow in the row from you, she is aggressively milking herself trying to get your attention.
-	<<elseif $assistantAppearance == "loli">>
+	<<case "loli">>
 		child avatar is visible on a screen across the last cow in the row from you, jumping up and down for your attention.
-	<<elseif $assistantAppearance == "preggololi">>
+	<<case "preggololi">>
 		child avatar is visible on a screen across the last cow in the row from you, waving her arms over her head.
-	<<elseif $assistantAppearance == "schoolgirl">>
+	<<case "angel">>
+		angel avatar is visible on a screen across the last cow in the row from you, waving her arms and flapping her wings.
+	<<case "cherub">>
+		chureb avatar is visible on a screen across the last cow in the row from you, fluttering back and forth while waving her hands.
+	<<case "incubus">>
+		incubus avatar is visible on a screen across the last cow in the row from you, idly rubbing her dick with one hand and beckoning you with the other.
+	<<case "succubus">>
+		succubus avatar is visible on a screen across the last cow in the row from you; she is happily mooning you.
+	<<case "imp">>
+		impish avatar is visible on a screen across the last cow in the row from you, flying back and forth while waving her hands.
+	<<case "witch">>
+		witch avatar is visible on a screen across the last cow in the row from you, hopping up and down while waving her arms over her head.
+	<<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
+		avatar is visible on a screen across the last cow in the row from you; it has produced countless flashing tubercles across its body.
+	<<case "schoolgirl">>
 		schoolgirl avatar is visible on a screen across the last cow in the row from you, waving cutely for your attention and pointing to a tablet in her hand.
-	<<else>>
+	<<default>>
 		symbol is visible on a screen across the last cow in the row from you, spinning and glowing gently to get your attention.
-	<</if>>
+	<</switch>>
 <</if>>
 <br><br>
 <<if $assistant == 0>>
@@ -65,31 +80,46 @@ You stop and consider the cow, from her titanic breasts to her <<if $activeSlave
 	Additionally, there is nothing more that can be done to make her breasts any bigger<<if $activeSlave.balls > 5>> or her testicles any more productive<<elseif $activeSlave.ovaries == 1>> or her womb any more productive<</if>>. Her development is essentially final, and that status can be made official. She could be redesignated as equipment. Other than her designation, this would make little difference: the machine would be slightly less cautious with her drugs, future intubations, and such. She would be removed from the slave lists."
 <<else>>
 	"She's never leaving here, not without surgery. And even then, she's forgotten almost everything, and she won't be getting it back."
-	<<if $assistantAppearance == "monstergirl">>
+	<<switch $assistantAppearance>>
+	<<case "monstergirl">>
 		The monstergirl positions herself on the screen to create an optical illusion that makes it look like she's gently petting the slave's shoulders. She looks meditative.
-	<<elseif $assistantAppearance == "shemale">>
+	<<case "shemale">>
 		The shemale positions herself on the screen to create an optical illusion that makes it look like she's gently petting the slave's shoulders. She looks uncharacteristically meditative.
-	<<elseif $assistantAppearance == "amazon">>
+	<<case "amazon">>
 		The amazon positions herself on the screen to create an optical illusion that makes it look like she's gently petting the slave's shoulders. She looks meditative.
-	<<elseif $assistantAppearance == "businesswoman">>
+	<<case "businesswoman">>
 		The businesswoman positions herself on the screen to create an optical illusion that makes it look like she's gently petting the slave's shoulders. She looks meditative.
-	<<elseif $assistantAppearance == "fairy">>
+	<<case "fairy">>
 		The fairy positions herself on the screen to create an optical illusion that makes it look like she's standing on her shoulder and hugging her cheek.
-	<<elseif $assistantAppearance == "pregnant fairy">>
+	<<case "pregnant fairy">>
 		The pregnant fairy positions herself on the screen to create an optical illusion that makes it look like she's standing on her shoulder and hugging her cheek.
-	<<elseif $assistantAppearance == "goddess">>
+	<<case "goddess">>
 		The goddess positions herself on the screen to create an optical illusion that makes it look like she's gently caressing the slave's shoulders. She looks meditative.
-	<<elseif $assistantAppearance == "hypergoddess">>
+	<<case "hypergoddess">>
 		The goddess positions herself on the screen to create an optical illusion that makes it look like she's gently caressing the slave's shoulders. She looks meditative.
-	<<elseif $assistantAppearance == "loli">>
+	<<case "loli">>
 		The little girl positions herself on the screen to create an optical illusion that makes it look like she's gently petting the slave's shoulders. She looks meditative.
-	<<elseif $assistantAppearance == "preggololi">>
+	<<case "preggololi">>
 		The little girl positions herself on the screen to create an optical illusion that makes it look like she's gently petting the slave's shoulders. She looks meditative.
-	<<elseif $assistantAppearance == "schoolgirl">>
+	<<case "angel">>
+		The angel positions herself on the screen to create an optical illusion that makes it look like she's gently carressing the slave. She looks meditative.
+	<<case "cherub">>
+		The churub positions herself on the screen to create an optical illusion that makes it look like she's gently petting the slave's shoulders while hovering over them. She looks meditative.
+	<<case "incubus">>
+		The incubus positions herself on the screen to create an optical illusion that makes it look like she's gently groping the slave's rear. She looks uncharacteristically meditative.
+	<<case "succubus">>
+		The succubus positions herself on the screen to create an optical illusion that makes it look like she's resting her breasts on the slave's head. She looks uncharacteristically meditative.
+	<<case "imp">>
+		The churub positions herself on the screen to create an optical illusion that makes it look like she's gently rubbing the slave's shoulders while hovering over them. She looks uncharacteristically meditative.
+	<<case "witch">>
+		The witch positions herself on the screen to create an optical illusion that makes it look like she's gently caressing the slave's shoulders. She looks meditative.
+	<<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
+		It positions herself on the screen to create an optical illusion that makes it look like she's gently caressing the slave's breasts and groin with fleshy tentacles. She looks uncharacteristically meditative.
+	<<case "schoolgirl">>
 		The schoolgirl positions herself on the screen to create an optical illusion that makes it look like she's gently petting the slave's shoulders. She looks uncharacteristically meditative.
-	<<else>>
+	<<default>>
 		The symbol on the screen dissolves down to create a gentle backlight behind the slave.
-	<</if>>
+	<</switch>>
 	"She's beautiful, isn't she? Perfect. There's nothing more that can be done, to make her udders any bigger<<if $activeSlave.balls > 5>> or her balls any more productive<<elseif $activeSlave.ovaries == 1>> or her womb any more productive<</if>>. She's complete, and she's part of this machine now, and that's all she'll ever be. I can make that status official, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>. I'd redesignate her as equipment. It wouldn't change much, other than a designation. I'd just be a little less cautious with her drugs, future intubations, things like that. But for slave purposes, she'd be gone. Just a part of $dairyName, forever. Or, until she wears out in <<if $activeSlave.physicalAge > 38>>a few years<<elseif $activeSlave.physicalAge > 30>>a decade or so<<else>>a couple of decades<</if>>."
 <</if>>
 
@@ -103,31 +133,46 @@ You stop and consider the cow, from her titanic breasts to her <<if $activeSlave
 		<<if $activeSlave.ovaries == 1>><<print 100*Math.trunc((52*(45-$activeSlave.physicalAge))/100)>> liters of vaginal secretions, <<print 5*(45-$activeSlave.physicalAge)>> slaves,<</if>>
 		and <<print 1000*Math.trunc((300*52*(45-$activeSlave.physicalAge))/1000)>> liters of milk over a <<print 45-$activeSlave.physicalAge>> year period before its biological components must be replaced."
 		<<if $assistant > 0>>
-			<<if $assistantAppearance == "monstergirl">>
+			<<switch $assistantAppearance>>
+			<<case "monstergirl">>
 				Her avatar watches the new equipment with almost motherly affection, her tentacle hair writhing obscurely.
-			<<elseif $assistantAppearance == "shemale">>
+			<<case "shemale">>
 				Her avatar sits down and produces a glass of milk. She drains it in one long chug, and then begins to jerk off.
-			<<elseif $assistantAppearance == "amazon">>
+			<<case "amazon">>
 				Her avatar sits down with a clatter of bone ornaments, produces a skin of milk, and takes a long pull.
-			<<elseif $assistantAppearance == "businesswoman">>
+			<<case "businesswoman">>
 				Her avatar stands on the screen, watching the new equipment with an air of satisfaction.
-			<<elseif $assistantAppearance == "fairy">>
+			<<case "fairy">>
 				Her avatar hovers around, humming a tune while checking the new equipment.
-			<<elseif $assistantAppearance == "pregnant fairy">>
+			<<case "pregnant fairy">>
 				Her avatar hovers around, humming a soft tune while checking the new equipment.
-			<<elseif $assistantAppearance == "goddess">>
+			<<case "goddess">>
 				Her avatar sits down, kneading her milky tits in empathy, a hint of simulated jealousy in the way she watches the new equipment.
-			<<elseif $assistantAppearance == "hypergoddess">>
+			<<case "hypergoddess">>
 				Her avatar sits down, kneading her milky tits in empathy, a hint of simulated jealousy in the way she watches the new equipment.
-			<<elseif $assistantAppearance == "loli">>
+			<<case "loli">>
 				Her avatar sits down, rubbing her flat chest sadly as she watches the new equipment.
-			<<elseif $assistantAppearance == "preggololi">>
+			<<case "preggololi">>
 				Her avatar sits down, pinching her milky nipples in empathy, a hint of simulated jealousy in the way she watches the new equipment.
-			<<elseif $assistantAppearance == "schoolgirl">>
+			<<case "angel">>
+				Her avatar blushes as she watches the new equipment. "She'll feed so many hungry mouths..."
+			<<case "cherub">>
+				Her avatar blushes at the sight of the new equipment. She quickly buries her face in her palms at the perversion.
+			<<case "incubus">>
+				Her avatar starts jerking off to the sight of the new bioreactor. She throws you a smirk, "But you like MY milk best, don't you?"
+			<<case "succubus">>
+				Her avatar rubs her breasts, steadily swelling them until a gush of milk escapes her nipples. "Mine will always be your favorite."
+			<<case "imp">>
+				Her avatar licks her lips at the new equipment, longing to taste it.
+			<<case "witch">>
+				Her avatar sits down and brings her hands to her breasts wondering if she could make them big and milky for you too.
+			<<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
+				Her avatar's breasts steadily begin swelling, its belly following not long after. Once it is similar in size to the new equipment, a pair of tentacles extend from its back and clamp onto its nipples, eagerly suckling milk from its unatural udders.
+			<<case "schoolgirl">>
 				Her avatar sits down, watching the new equipment with an air of embarrassment. The schoolgirl blushes, and begins to masturbate.
-			<<else>>
+			<<default>>
 				Her avatar symbol returns to gentle spinning, doing so in synchronicity with the undulations of the new equipment's breasts.
-			<</if>>
+			<</switch>>
 		<</if>>
 		"Future redesignations can always be disabled from $dairyName interface."
 		<<if ($activeSlave.ovaries == 1)>>
diff --git a/src/uncategorized/saRivalries.tw b/src/uncategorized/saRivalries.tw
index 45d94cc472b4ba3e648d67dff3df7ea86270c9d2..ef3f96648e0f8aa4dfda6bb3357d65e234c81698 100644
--- a/src/uncategorized/saRivalries.tw
+++ b/src/uncategorized/saRivalries.tw
@@ -70,13 +70,13 @@
 		$slaves[$i].slaveName and _SlaveJ.slaveName's @@color:lightgreen;feud dissipates a little.@@
 		<<set _SlaveJ.rivalry -= 1, $slaves[$i].rivalry -= 1>>
 	<</if>>
-<<elseif $familyTesting == 1 && ($slaves[$i].mother == _SlaveJ.ID || $slaves[$i].father == _SlaveJ.ID || _SlaveJ.mother == $slaves[$i].ID || SlaveJ.father == $slaves[$i].ID || areSisters($slaves[$i], _SlaveJ)) && (random(1,100) > 80)>>
+<<elseif $familyTesting == 1 && ($slaves[$i].mother == _SlaveJ.ID || $slaves[$i].father == _SlaveJ.ID || _SlaveJ.mother == $slaves[$i].ID || _SlaveJ.father == $slaves[$i].ID || areSisters($slaves[$i], _SlaveJ)) && (random(1,100) > 80)>>
 		$slaves[$i].slaveName and _SlaveJ.slaveName @@color:lightsalmon;pursue their family rivalry.@@
 		<<set _SlaveJ.rivalry -= 1, $slaves[$i].rivalry -= 1>>
 <<elseif ($slaves[$i].relation != 0) && ($slaves[$i].relationTarget == $slaves[$i].rivalryTarget) && (random(1,100) > 80)>>
 	$slaves[$i].slaveName and _SlaveJ.slaveName @@color:lightsalmon;pursue their family rivalry.@@
 	<<set _SlaveJ.rivalry += 1, $slaves[$i].rivalry += 1>>
-<<elseif $familyTesting == 1 && ($slaves[$i].mother == _SlaveJ.ID || $slaves[$i].father == _SlaveJ.ID || _SlaveJ.mother == $slaves[$i].ID || SlaveJ.father == $slaves[$i].ID || areSisters($slaves[$i], _SlaveJ)) > 0 && (random(1,100) > 80)>>
+<<elseif $familyTesting == 1 && ($slaves[$i].mother == _SlaveJ.ID || $slaves[$i].father == _SlaveJ.ID || _SlaveJ.mother == $slaves[$i].ID || _SlaveJ.father == $slaves[$i].ID || areSisters($slaves[$i], _SlaveJ)) > 0 && (random(1,100) > 80)>>
 		$slaves[$i].slaveName and _SlaveJ.slaveName @@color:lightgreen;patch up their family relationship.@@
 		<<set _SlaveJ.rivalry -= 1, $slaves[$i].rivalry -= 1>>
 <<elseif ($slaves[$i].relation != 0) && ($slaves[$i].relationTarget == $slaves[$i].rivalryTarget) && (random(1,100) > 80)>>
diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw
index 7a7da5de6e1d7c11211952973499e05078343d9d..687364df5614fea59f1b0513b8859bde1814d5e3 100644
--- a/src/uncategorized/saServeThePublic.tw
+++ b/src/uncategorized/saServeThePublic.tw
@@ -1287,6 +1287,7 @@ Her appearance attracted $beauty members of the public (<<print Math.trunc($beau
 <</if>>
 <<if ($slaves[$i].preg > 20)>>
 	<<set $vignettes.push({text: "she earned extra gratitude from a citizen who likes to do nothing more than cuddle with her swollen belly,", type: "rep", effect: 1})>>
+	<<set $vignettes.push({text: "a night with guy who likes rough, hard sex with heavily pregnant girls took its toll on her", type: "health", effect: -1})>>
 <</if>>
 <<if ($slaves[$i].inflation > 1)>>
 	<<set $vignettes.push({text: "she earned extra gratitude from a citizen who loved the way her belly sloshed and moved to his teasing,", type: "rep", effect: 1})>>
diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw
index 880979a85545b3f5127cc9fdff8ecf41d5f485b5..0ad792a554883577ca5e51dc1d412a766d063539 100644
--- a/src/uncategorized/saWhore.tw
+++ b/src/uncategorized/saWhore.tw
@@ -1287,6 +1287,7 @@ In total, you were paid @@color:yellowgreen;¤<<print Math.trunc($beauty*$FResul
 <</if>>
 <<if ($slaves[$i].preg > 20)>>
 	<<set $vignettes.push({text: "she earned repeat business from a customer who likes to do nothing more than cuddle with her swollen belly,", type: "cash", effect: 1})>>
+	<<set $vignettes.push({text: "a night with guy who likes rough, hard sex with heavily pregnant girls took its toll on her", type: "health", effect: -1})>>
 <</if>>
 <<if ($slaves[$i].inflation > 1)>>
 	<<set $vignettes.push({text: "she earned repeat business from a customer who loved the way her belly moved as he fucked her,", type: "cash", effect: 1})>>
diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw
index ba4b49f6943fbae46d8878cee6fd843958c6927f..7920dca9f94bc774e4062e3e21733629a55a2637 100644
--- a/src/uncategorized/schoolroomReport.tw
+++ b/src/uncategorized/schoolroomReport.tw
@@ -2,6 +2,18 @@
 
 <<set _idleBonus = 0, _FLsFetish = 0, _DL = $SchlRiIDs.length, $schoolroomSlaves = _DL, _SL = $slaves.length, _FLs = -1>>
 
+<<for _dI = 0; _dI < _DL; _dI++>>
+<<set _i = $SchlRiIDs[_dI].Index, _ID = $SchlRiIDs[_dI].ID>>
+<<if _ID != $slaves[_i].ID>>
+	/% Slaves.ID and $SchlRiIDs.ID's don't match-up so let's find her %/
+	<<for _i = 0; _i < _SL; _i++>>
+	<<if _ID == $slaves[_i].ID>>
+		/% Correct the Index %/
+		<<set $SchlRiIDs[_dI].Index = _i>>
+	<</if>>
+	<</for>>
+<</if>>
+<</for>>
 <<SlaveSort $SchlRiIDs>>
 
 <<if $schoolroomDecoration != "standard">>