diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 2b7e106faddbd32310c18d24e57f6d8ede95d550..a0d57b6b2e4545b85629062302a397525997febf 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -6167,7 +6167,7 @@ brought in to you. This time <<EventNameLink $activeSlave>> has been sent to del
<<set $rep += 50>>
<<set $activeSlave.oralCount++, $oralTotal++>>
<<elseif ($activeSlave.fetish == "humiliation")>>
- You sit down on a balcony bench and pull $him down to sit on your <<if $PC.dick == 0>>strap-on<<else>>cock<</if>>, and then pull $his legs as wide as they'll go as you fuck $him, displaying everything to the whole balcony<<if $activeSlave.belly >= 120000>>; $his _belly stomach hangs so low that it blocks the view, however<<else>><<if $PC.vagina == 1>><<if $PC.dick == 1>>: incidentally including your own pussy, which slides up and down as you piston the cock above it in and out of $his<</if>><</if>><</if>>. $He @@.hotpink;laps up@@ the @@.green;openly aroused@@ stares from $his growing audience.
+ You sit down on a balcony bench and pull $him down to sit on your <<if $PC.dick == 0>>strap-on<<else>>cock<</if>>, and then pull $his legs as wide as they'll go as you fuck $him, displaying everything to the whole balcony<<if $activeSlave.belly >= 120000>>; $his _belly stomach hangs so low that it blocks the view, however<<else>><<if $PC.vagina == 1>><<if $PC.dick == 1>>: incidentally including your own pussy, which slides up and down as you piston the cock above it in and out of $him<</if>><</if>><</if>>. $He @@.hotpink;laps up@@ the @@.green;openly aroused@@ stares from $his growing audience.
<<set $rep += 100>>
<<set $activeSlave.devotion += 3>>
<<if canDoVaginal($activeSlave)>>
@@ -10722,7 +10722,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<</if>>
without putting too much weight on $his poor overused butthole. You ask $him about $his day.
<<if !canTalk($activeSlave)>>
- $He uses gestures to recount it through her tears. Apparently while one guy was using $his anus, another thought it was hot and waited for him to be done before using $him in turn, without letting her rest or clean $himself. It took four cocks total for another slave to notice and rescue $him.
+ $He uses gestures to recount it through $his tears. Apparently while one guy was using $his anus, another thought it was hot and waited for him to be done before using $him in turn, without letting $him rest or clean $himself. It took four cocks total for another slave to notice and rescue $him.
<<else>>
$He <<say>>s, a little tearfully, "<<Master>>, thi<<s>> guy wanted to u<<s>>e my butt in public. <<S>>o of cour<<s>>e I let him, and he made me <<s>>it in hi<<s>> lap to do it, and held my leg<<s>> back <<s>>o everyone could <<s>>ee! And then another guy thought it wa<<s>> hot and waited, and then fucked me in my a<<ss>> too. Another girl finally noti<<c>>ed and re<<s>>cued me after four cock<<s>>, <<Master>>. I'm really <<s>>ore."
<</if>>
@@ -17233,7 +17233,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<</if>>
<<set $fixedNationality = "American">>
<<include "Generate New Slave">>
- <<set _origin = "You enslaved her for abusing " + $eventSlave.slaveName + " while she was serving the public.">>
+ <<set _origin = "You enslaved her for abusing " + $eventSlave.slaveName + " while " + $he + " was serving the public.">>
<<set $activeSlave.origin = _origin>>
<<set $activeSlave.career = "a student">>
<<set $activeSlave.markings = "none", $activeSlave.weight = -20>>
diff --git a/src/uncategorized/cellblock.tw b/src/uncategorized/cellblock.tw
index a34fd44e292b0fea6e4b0bf53de443e2c680b293..f8eedd24c715d2c900b739c59a0c1b75a3de3137 100644
--- a/src/uncategorized/cellblock.tw
+++ b/src/uncategorized/cellblock.tw
@@ -2,10 +2,6 @@
<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Cellblock", $showEncyclopedia = 1, $encyclopedia = "Cellblock", $cellblockSlaves = $CellBiIDs.length>>
-<<if $Wardeness != 0>>
- <<setLocalPronouns $Wardeness>>
-<</if>>
-
<<if $cellblockName != "the Cellblock">>
<<set $cellblockNameCaps = $cellblockName.replace("the ", "The ")>>
<</if>>
diff --git a/src/uncategorized/economics.tw b/src/uncategorized/economics.tw
index e6940f71d838e76675e19d037d8a1dfb282659e3..fe14d337c86205aef6c95ea4cd28021be16efb60 100644
--- a/src/uncategorized/economics.tw
+++ b/src/uncategorized/economics.tw
@@ -16,9 +16,16 @@
<br><br>
<<if $useTabs == 0>>
- <<include "Neighbors Development">>
+<<include "Neighbors Development">>
+<br><br>
+
+<<include "Arcology Management">>
+
+<<if $FSAnnounced > 0>>
<br><br>
+ <<include "FS Developments">>
+<</if>>
<<if $corpAnnounced == 1>>
<br><br>
@@ -29,6 +36,7 @@
<<else>>
<<include "Corporation Developments">>
<</if>>
+<</if>>
<<if $secExp == 1>>
<br><br>
@@ -37,18 +45,13 @@
<<include "securityReport">>
<</if>>
- <<if $secExp == 1>>
- <br><br>
- <<include "authorityReport">>
- <br><br>
- <<include "securityReport">>
- <</if>>
+<br><br>
- <br><br>
+<<include "Reputation">>
- <<include "Reputation">>
+<br><br>
- <br><br>
+<<include "Personal Business">>
<<if ($PC.boobs == 1 && $PC.boobsBonus > 0) || $PC.pregKnown == 1 || $playerAging != 0>>
<br><br>
@@ -75,8 +78,7 @@
<button class="tablinks" onclick="opentab(event, 'Reputation')">Reputation</button>
<button class="tablinks" onclick="opentab(event, 'Business')">Personal Business</button>
<<if ($PC.boobs == 1 && $PC.boobsBonus > 0) || $PC.pregKnown == 1 || $playerAging != 0>>
- <br><br>
- <<include "Personal Notes">>
+ <button class="tablinks" onclick="opentab(event, 'Personal')">Personal Notes</button>
<</if>>
</div>
@@ -94,55 +96,55 @@
<<if $FSAnnounced > 0>>
<div id="Societies" class="tabcontent">
- <div class="content">
- <<include "FS Developments">>
- </div>
+ <div class="content">
+ <<include "FS Developments">>
+ </div>
</div>
<</if>>
<<if $corpAnnounced == 1>>
<div id="Corporation" class="tabcontent">
- <div class="content">
- <<if $corpIncorporated == 0>>
- <span id="incorporate">
- You have not yet committed funds to create a publicly traded slave trading corporation. <<link "Lay the groundwork for incorporation">><<set $corpIncorporated = 1>><<set $sharePrice = 10>><<set $oldSharePrice = $sharePrice>><<set $personalShares = 2000>><<set $cash -= 30000>><<set $publicShares = 1000>><<set $corpCash = 20000>><<set $generalAssets = 500>><<set $slaveAssets = 1000>><<set $entrapmentAssets = 500>><<set $captureAssets = 500>><<set $trainingAssets = 500>><<set $surgicalAssets = 500>><<set $drugAssets = 500>><<replace "#incorporate">><<print "The groundwork has been laid for the incorporation of a publicly traded slave trading corporation. The IPO will involve 1000 shares at <<print cashFormat(10)>>/share.">><</replace>><</link>> //Costs <<print cashFormat(30000)>>//
- </span>
- <<else>>
- <<include "Corporation Developments">>
- <</if>>
- </div>
+ <div class="content">
+ <<if $corpIncorporated == 0>>
+ <span id="incorporate">
+ You have not yet committed funds to create a publicly traded slave trading corporation. <<link "Lay the groundwork for incorporation">><<set $corpIncorporated = 1>><<set $sharePrice = 10>><<set $oldSharePrice = $sharePrice>><<set $personalShares = 2000>><<set $cash -= 30000>><<set $publicShares = 1000>><<set $corpCash = 20000>><<set $generalAssets = 500>><<set $slaveAssets = 1000>><<set $entrapmentAssets = 500>><<set $captureAssets = 500>><<set $trainingAssets = 500>><<set $surgicalAssets = 500>><<set $drugAssets = 500>><<replace "#incorporate">><<print "The groundwork has been laid for the incorporation of a publicly traded slave trading corporation. The IPO will involve 1000 shares at <<print cashFormat(10)>>/share.">><</replace>><</link>> //Costs <<print cashFormat(30000)>>//
+ </span>
+ <<else>>
+ <<include "Corporation Developments">>
+ <</if>>
+ </div>
</div>
<</if>>
<div id="Authority" class="tabcontent">
-<div class="content">
-<<include "authorityReport">>
-</div>
+ <div class="content">
+ <<include "authorityReport">>
+ </div>
</div>
<div id="securityReport" class="tabcontent">
-<div class="content">
-<<include "securityReport">>
-</div>
+ <div class="content">
+ <<include "securityReport">>
+ </div>
</div>
<div id="Reputation" class="tabcontent">
-<div class="content">
-<<include "Reputation">>
-</div>
+ <div class="content">
+ <<include "Reputation">>
+ </div>
</div>
<div id="Business" class="tabcontent">
-<div class="content">
-<<include "Personal Business">>
-</div>
+ <div class="content">
+ <<include "Personal Business">>
+ </div>
</div>
<<if ($PC.boobs == 1 && $PC.boobsBonus > 0) || $PC.pregKnown == 1 || $playerAging != 0>>
<div id="Personal" class="tabcontent">
- <div class="content">
- <<include "Personal Notes">>
- </div>
+ <div class="content">
+ <<include "Personal Notes">>
+ </div>
</div>
<</if>>
diff --git a/src/uncategorized/theSlavegirlSchool.tw b/src/uncategorized/theSlavegirlSchool.tw
index 784a60a26f85c24921670e5bc4eccf44c83d940c..50fef1f068e773d58c2b19ad43d7e5c907ee02d7 100644
--- a/src/uncategorized/theSlavegirlSchool.tw
+++ b/src/uncategorized/theSlavegirlSchool.tw
@@ -35,7 +35,7 @@
<</if>>
<br>[["Decline to purchase " + $him + " and check out another slave"|The Slavegirl School][$slavesSeen += 1]]
<<if $newSlaves.length > 0>>
- <br>[[Finish your order of slaves"|Bulk Slave Intro]]
+ <br>[[Finish your order of slaves|Bulk Slave Intro]]
<</if>>
<br><br>