diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index e3b1c666adc8b49790f10c1ed4a19ecc07b784f8..526284a123e2aa73c4c81415b0c1e728b124fb04 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -231,10 +231,7 @@ window.newSlave = /** @param {App.Entity.SlaveState} slave */ function newSlave(
 		}
 	}
 
-	/* add to facilities array if needed */
-	if (slave.assignment !== "rest") {
-		assignJob(slave, slave.assignment);
-	}
+	assignJob(slave, slave.assignment);
 
 	/** do not run the Rules Assistant before adding the new slave to the slaves list! **/
 	if (V.ui !== "start" && V.universalRulesNewSlavesRA === 1 && V.rulesAssistantAuto !== 0) {
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index 93b6a172a0a8c75616cec163a012f519cf2394fb..93ea2152a3abad1a9882792981e239475116e3b5 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -1685,7 +1685,7 @@ window.FacilityDatatypeCleanup = (function() {
 /**
  * Cleans up a slave record assuming it is used for the gene pool.
  *
- * It removes all the unneded for the gene pool attributes.
+ * It removes all the unneeded properties for the gene pool attributes.
  * @todo remove after refactoring the slave state class
  */
 App.Entity.Utils.GenePoolRecordCleanup = (function () {
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index a23fad97f2d5fcf8fc1dfa4d1a01cc523687a4f7..f22f67076bad69394a6fda76dd59496e8038e460 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -1211,7 +1211,7 @@ window.SkillIncrease = (function() {
 	function OralSkillIncrease(slave, skillIncrease) {
 		const He = capFirstChar(slave.pronoun);
 		const his = slave.possessivePronoun;
-		let r;
+		let r = '';
 		skillIncrease = skillIncrease || State.variables.skillIncrease || 1;
 
 		if (slave.oralSkill <= 10) {
@@ -1239,7 +1239,7 @@ window.SkillIncrease = (function() {
 	/** @param {App.Entity.SlaveState} slave */
 	function VaginalSkillIncrease(slave, skillIncrease) {
 		const He = capFirstChar(slave.pronoun);
-		let r;
+		let r = '';
 		skillIncrease = skillIncrease || State.variables.skillIncrease || 1;
 
 		if (slave.vaginalSkill <= 10) {
@@ -1268,7 +1268,7 @@ window.SkillIncrease = (function() {
 	function AnalSkillIncrease(slave, skillIncrease) {
 		const He = capFirstChar(slave.pronoun);
 		const his = slave.possessivePronoun;
-		let r;
+		let r ='';
 		skillIncrease = skillIncrease || State.variables.skillIncrease || 1;
 
 		if (slave.analSkill <= 10) {
@@ -1297,7 +1297,7 @@ window.SkillIncrease = (function() {
 	function WhoreSkillIncrease(slave, skillIncrease) {
 		const He = capFirstChar(slave.pronoun);
 		const his = slave.possessivePronoun;
-		let r;
+		let r ='';
 		skillIncrease = skillIncrease || State.variables.skillIncrease || 1;
 
 		if (slave.whoreSkill <= 10) {
@@ -1325,7 +1325,7 @@ window.SkillIncrease = (function() {
 	/** @param {App.Entity.SlaveState} slave */
 	function EntertainSkillIncrease(slave, skillIncrease) {
 		const He = capFirstChar(slave.pronoun);
-		let r;
+		let r ='';
 		skillIncrease = skillIncrease || State.variables.skillIncrease || 1;
 
 		if (slave.entertainSkill <= 10) {
diff --git a/src/uncategorized/REFI.tw b/src/uncategorized/REFI.tw
index 65b1a811e5f7509a072cdb86ce5f0332ec5e2a6f..0c95290b55e4c37a290968182f104f40463c2380 100644
--- a/src/uncategorized/REFI.tw
+++ b/src/uncategorized/REFI.tw
@@ -137,11 +137,13 @@
 
 /* 000-250-006 */
 <<if $seeImages == 1>>
-	<div class="imageRef medImg">
-		<<SlaveArt $subSlave 2 0>>
-	</div>
-	<div class="imageRef medImg">
-		<<SlaveArt $activeSlave 2 0>>
+	<div class="imageColumn">
+		<div class="imageRef medImg">
+			<<SlaveArt $subSlave 2 0>>
+		</div>
+		<div class="imageRef medImg">
+			<<SlaveArt $activeSlave 2 0>>
+		</div>
 	</div>
 <</if>>
 /* 000-250-006 */
@@ -475,15 +477,17 @@ It seems $he passed by while you were drinking from $subSlave.slaveName and foun
 	<<st $subSlave.analCount++, $analTotal++>>
 <</if>>
 
-<<SetNonLocalPronouns $seeDicks>>
+<<setNonlocalPronouns $seeDicks>>
 
 /* 000-250-006 */
 <<if $seeImages == 1>>
-	<div class="imageRef medImg">
-		<<SlaveArt $subSlave 2 0>>
-	</div>
-	<div class="imageRef medImg">
-		<<SlaveArt $activeSlave 2 0>>
+	<div class="imageColumn">
+		<div class="imageRef medImg">
+			<<SlaveArt $subSlave 2 0>>
+		</div>
+		<div class="imageRef medImg">
+			<<SlaveArt $activeSlave 2 0>>
+		</div>
 	</div>
 <</if>>
 /* 000-250-006 */
@@ -532,6 +536,19 @@ It seems $he passed by while $subSlave.slaveName was dominating the other <<if $
 
 <<case "submissive">>
 
+/* 000-250-006 */
+<<if $seeImages == 1>>
+	<div class="imageColumn">
+		<div class="imageRef medImg">
+			<<SlaveArt $subSlave 2 0>>
+		</div>
+		<div class="imageRef medImg">
+			<<SlaveArt $activeSlave 2 0>>
+		</div>
+	</div>
+<</if>>
+/* 000-250-006 */
+
 $subSlave.slaveName is lying on the edge of your desk with _his2<<if $subSlave.belly >= 1500>> bloated<</if>> body helpless beneath you, your <<if $PC.dick == 1>>dick<<else>>strap-on<</if>> in _him2, and your hands around _his2 neck. It's just breath play, and you're practiced enough that _he2's in no danger. _He2's such a sexual submissive that _he2 sometimes acts out if not managed. This happens when _he2 feels the urge to misbehave in order to access punishment, so you personally ensure that _he2 can indulge _his2 submissiveness when _he2 needs it. _He2 does not orgasm with you, _his2 complete servitude to your pleasure fulfilling a deeper need than that. _He2 leaves your office with a serene look on _his2 face, passing <<EventNameLink>>, who is
 <<if $activeSlave.amp == 1>>
 	propped limblessly nearby. $He has
@@ -576,6 +593,19 @@ It seems $he passed by while you were dominating $subSlave.slaveName. <<if $acti
 
 <<case "buttslut">>
 
+/* 000-250-006 */
+<<if $seeImages == 1>>
+	<div class="imageColumn">
+		<div class="imageRef medImg">
+			<<SlaveArt $subSlave 2 0>>
+		</div>
+		<div class="imageRef medImg">
+			<<SlaveArt $activeSlave 2 0>>
+		</div>
+	</div>
+<</if>>
+/* 000-250-006 */
+
 In the middle of the afternoon, you take a break from work to fuck $subSlave.slaveName in your office. $subSlave.slaveName is such a complete buttslut that _he2's enjoying _himself2 to an almost indecent degree: moaning, begging, or just smiling idiotically with _his2 mouth open and _his2 tongue lolling. After you finish and _he2 leaves, you notice $activeSlave.slaveName at the door to your office. You call $his in.
 <br><br>
 <<EventNameLink>> hesitates before explaining $himself, and the $desc is obviously aroused:
@@ -615,11 +645,13 @@ It seems $he passed by while you were buttfucking $subSlave.slaveName and found
 <<set _clothesTemp = $subSlave.clothes, $subSlave.clothes = "no clothing", $subSlave.oralCount++, $oralTotal++>>
 /* 000-250-006 */
 <<if $seeImages == 1>>
-	<div class="imageRef medImg">
-		<<SlaveArt $subSlave 2 0>>
-	</div>
-	<div class="imageRef medImg">
-		<<SlaveArt $activeSlave 2 0>>
+	<div class="imageColumn">
+		<div class="imageRef medImg">
+			<<SlaveArt $subSlave 2 0>>
+		</div>
+		<div class="imageRef medImg">
+			<<SlaveArt $activeSlave 2 0>>
+		</div>
 	</div>
 <</if>>
 /* 000-250-006 */
@@ -665,6 +697,19 @@ It seems $he passed by while $subSlave.slaveName was <<if $PC.dick > 0>>in the m
 
 <<case "humiliation">>
 
+/* 000-250-006 */
+<<if $seeImages == 1>>
+	<div class="imageColumn">
+		<div class="imageRef medImg">
+			<<SlaveArt $subSlave 2 0>>
+		</div>
+		<div class="imageRef medImg">
+			<<SlaveArt $activeSlave 2 0>>
+		</div>
+	</div>
+<</if>>
+/* 000-250-006 */
+
 You have $subSlave.slaveName pinned up against a railing on a balcony that overlooks a public atrium. Passersby below cannot see you, but they can certainly see $subSlave.slaveName's upper body as _he2 takes your dick. _He2's blushing furiously with the sex and with _his2 trademark mixed arousal and embarrassment at having an audience. _He2 makes a show of trying to disguise the fact that _he2's getting railed, but it's obvious. When you finish, you pull _him2 off the railing so _he2 can clean up. <<EventNameLink>> <<if canSee($activeSlave)>>saw<<elseif canHear($activeSlave)>>heard<<else>>felt the heat from<</if>> the denouement of this exhibitionist fun, and seems intrigued.
 <br><br>
 <<EventNameLink>> hesitates before explaining $himself, and the $desc is obviously aroused:
diff --git a/src/uncategorized/endWeek.tw b/src/uncategorized/endWeek.tw
index 489fea5e476d89a4f92444f1643c4ef5f256cee2..51155d1610a83924a20c4a28da56085974ea4f46 100644
--- a/src/uncategorized/endWeek.tw
+++ b/src/uncategorized/endWeek.tw
@@ -55,6 +55,13 @@
 		}
 	}
 })>>
+<<set $organs = $organs.filter(function(o) {
+	if (o.weeksToCompletion <= 0) {
+		$completedOrgans.push(o);
+		return false;
+	}
+	return true;
+})>>
 <</if>>
 
 <<if $incubatorOrgans.length > 0>>
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index 7c09e603ce0672a9d4c1c511e938eae088a3bf3e..e379ab652bc5d36ac108ba2586517f913d89170b 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -111,66 +111,67 @@ __''MAIN MENU''__&nbsp;&nbsp;&nbsp;&nbsp;//[[Summary Options]]//
 		<<if $useSlaveSummaryOverviewTab == 1>>
 		<button class="tablinks" onclick="opentab(event, 'overview')" id="tab overview">Overview</button>
 		<</if>>
-		<button class="tablinks" onclick="opentab(event, 'resting')" id="tab resting">
+		<button class="tablinks" onclick="opentab(event, 'resting')" id="tab resting"> /*leaving resting always on as it changes a lot from week to week. */
 			Resting
 			<<if $JobIDArray['rest'].length > 0>>
 				($JobIDArray['rest'].length)
 			<</if>>
 		</button>
-		<button class="tablinks" onclick="opentab(event, 'stay confined')" id="tab stay confined">
-			Confined
-			<<if $JobIDArray['stay confined'].length > 0>>
+		<<if $JobIDArray['stay confined'].length > 0>>
+			<button class="tablinks" onclick="opentab(event, 'stay confined')" id="tab stay confined">
+				Confined
 				($JobIDArray['stay confined'].length)
-			<</if>>
-		</button>
-		<button class="tablinks" onclick="opentab(event, 'take classes')" id="tab take classes">
-			Students
-			<<if $JobIDArray['take classes'].length > 0>>
-				($JobIDArray['take classes'].length)
-			<</if>>
-		</button>
-		<button class="tablinks" onclick="opentab(event, 'please you')" id="tab please you">
-			Fucktoys
-			<<if $JobIDArray['please you'].length > 0>>
-				($JobIDArray['please you'].length)
-			<</if>>
-		</button>
-		<button class="tablinks" onclick="opentab(event, 'whore')" id="tab whore">
-			Whores
-			<<if $JobIDArray['whore'].length > 0>>
-				($JobIDArray['whore'].length)
-			<</if>>
-		</button>
-		<button class="tablinks" onclick="opentab(event, 'serve the public')" id="tab serve the public">
-			Public Servants
-			<<if $JobIDArray['serve the public'].length > 0>>
-				($JobIDArray['serve the public'].length)
-			<</if>>
-		</button>
-		<button class="tablinks" onclick="opentab(event, 'be a servant')" id="tab be a servant">
-			Servants
-			<<if $JobIDArray['be a servant'].length > 0>>
-				($JobIDArray['be a servant'].length)
-			<</if>>
-		</button>
-		<button class="tablinks" onclick="opentab(event, 'get milked')" id="tab milked">
-			Cows
-			<<if $JobIDArray['get milked'].length > 0>>
-				($JobIDArray['get milked'].length)
-			<</if>>
-		</button>
-		<button class="tablinks" onclick="opentab(event, 'work a glory hole')" id="tab work a glory hole">
-			Gloryhole
-			<<if $JobIDArray['work a glory hole'].length > 0>>
-				($JobIDArray['work a glory hole'].length)
-			<</if>>
-		</button>
-		<button class="tablinks" onclick="opentab(event, 'be a subordinate slave')" id="tab be a subordinate slave">
-			Subordinate slaves
-			<<if $JobIDArray['be a subordinate slave'].length > 0>>
-				($JobIDArray['be a subordinate slave'].length)
-			<</if>>
-		</button>
+			</button>
+		<</if>>
+		<<if $JobIDArray['take classes'].length > 0>>
+			<button class="tablinks" onclick="opentab(event, 'take classes')" id="tab take classes">
+				Students
+				($JobIDArray['take classes'].length)				
+			</button>
+		<</if>>
+		<<if $JobIDArray['please you'].length > 0>>
+			<button class="tablinks" onclick="opentab(event, 'please you')" id="tab please you">
+				Fucktoys
+				($JobIDArray['please you'].length)				
+			</button>
+		<</if>>
+		<<if $JobIDArray['whore'].length > 0>>
+			<button class="tablinks" onclick="opentab(event, 'whore')" id="tab whore">
+				Whores
+				($JobIDArray['whore'].length)				
+			</button>
+		<</if>>
+		<<if $JobIDArray['serve the public'].length > 0>>
+			<button class="tablinks" onclick="opentab(event, 'serve the public')" id="tab serve the public">
+				Public Servants				
+				($JobIDArray['serve the public'].length)				
+			</button>
+		<</if>>
+		<<if $JobIDArray['be a servant'].length > 0>>
+			<button class="tablinks" onclick="opentab(event, 'be a servant')" id="tab be a servant">
+				Servants				
+				($JobIDArray['be a servant'].length)				
+			</button>
+		<</if>>
+		<<if $JobIDArray['get milked'].length > 0>>
+			<button class="tablinks" onclick="opentab(event, 'get milked')" id="tab milked">
+				Cows				
+				($JobIDArray['get milked'].length)				
+			</button>
+		<</if>>
+		<<if $JobIDArray['work a glory hole'].length > 0>>
+			<button class="tablinks" onclick="opentab(event, 'work a glory hole')" id="tab work a glory hole">
+				Gloryhole				
+				($JobIDArray['work a glory hole'].length)			
+			</button>
+		<</if>>
+		<<if $JobIDArray['be a subordinate slave'].length > 0>>
+			<button class="tablinks" onclick="opentab(event, 'be a subordinate slave')" id="tab be a subordinate slave">
+				Subordinate slaves
+				($JobIDArray['be a subordinate slave'].length)				
+			</button>
+		<</if>>
+
 		<button class="tablinks" onclick="opentab(event, 'all')" id="tab all">
 			All
 			<<if _penthouseSlaves > 0>>
@@ -473,23 +474,23 @@ __''MAIN MENU''__&nbsp;&nbsp;&nbsp;&nbsp;//[[Summary Options]]//
 		<script>document.getElementById("tab overview").click();</script>
 	<<elseif ($tabChoice.Main == "resting")>>
 		<script>document.getElementById("tab resting").click();</script>
-	<<elseif ($tabChoice.Main == "stay confined")>>
+	<<elseif ($tabChoice.Main == "stay confined" && $JobIDArray['stay confined'].length)>>
 		<script>document.getElementById("tab stay confined").click();</script>
-	<<elseif ($tabChoice.Main == "take classes")>>
+	<<elseif ($tabChoice.Main == "take classes") && $JobIDArray['take classes'].length>>
 		<script>document.getElementById("tab take classes").click();</script>
-	<<elseif ($tabChoice.Main == "please you")>>
+	<<elseif ($tabChoice.Main == "please you") && $JobIDArray['please you'].length>>
 		<script>document.getElementById("tab please you").click();</script>
-	<<elseif ($tabChoice.Main == "whore")>>
+	<<elseif ($tabChoice.Main == "whore" && $JobIDArray['whore'].length)>>
 		<script>document.getElementById("tab whore").click();</script>
-	<<elseif ($tabChoice.Main == "serve the public")>>
+	<<elseif ($tabChoice.Main == "serve the public") && $JobIDArray['serve the public'].length>>
 		<script>document.getElementById("tab serve the public").click();</script>
-	<<elseif ($tabChoice.Main == "be a servant")>>
+	<<elseif ($tabChoice.Main == "be a servant") && $JobIDArray['be a servant'].length>>
 		<script>document.getElementById("tab be a servant").click();</script>
-	<<elseif ($tabChoice.Main == "get milked")>>
+	<<elseif ($tabChoice.Main == "get milked") && $JobIDArray['get milked'].length>>
 		<script>document.getElementById("tab get milked").click();</script>
-	<<elseif ($tabChoice.Main == "work a glory hole")>>
+	<<elseif ($tabChoice.Main == "work a glory hole") && $JobIDArray['work a glory hole'].length>>
 		<script>document.getElementById("tab work a glory hole").click();</script>
-	<<elseif ($tabChoice.Main == "be a subordinate slave")>>
+	<<elseif ($tabChoice.Main == "be a subordinate slave") && $JobIDArray['be a subordinate slave'].length>>
 		<script>document.getElementById("tab be a subordinate slave").click();</script>
 	<<elseif ($tabChoice.Main == "all")>>
 		<script>document.getElementById("tab all").click();</script>
diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw
index 91a6e2d75fb7e2233fcb92bea9296cacc2af8e3c..e4f648dead7c1289e6e973809e48e0ab4ba3434e 100644
--- a/src/uncategorized/pRivalryHostage.tw
+++ b/src/uncategorized/pRivalryHostage.tw
@@ -194,11 +194,51 @@
 	<<set $activeSlave.intelligence = 100, $activeSlave.intelligenceImplant = 30>>
 	<<set $activeSlave.whoreSkill = 100, $activeSlave.entertainSkill = 100>>
 <</switch>>
+
+<<set $activeSlave.trust = 0>>
+<<set $activeSlave.devotion = 0>>
 <<set $activeSlave.visualAge = $activeSlave.actualAge>>
 <<set $activeSlave.physicalAge = $activeSlave.actualAge>>
 <<set $activeSlave.ovaryAge = $activeSlave.actualAge>>
 <<ResyncHeight $activeSlave>>
 
+<<switch $rivalryFS>>
+<<case "Repopulation Focus">>
+	<<set $activeSlave.preg = -3>>
+<<case "Body Purism">>
+	<<set $activeSlave.boobs = 300>>
+<<case "Slimness Enthusiasm">>
+	<<set $activeSlave.weight = -20>>
+	<<set $activeSlave.boobs = 800>>
+<<case "Pastoralism">>
+	<<set $activeSlave.weight = 100>>
+	<<set $activeSlave.muscles = 0>>
+	<<set $activeSlave.boobs = 1200>>
+<<case "Cummunism">>
+	<<set $activeSlave.boobs = 800>>
+	<<set $activeSlave.weight = -20>>
+<<case "Physical Idealism">>
+	<<set $activeSlave.boobs = 200>>
+	<<set $activeSlave.butt = 1>>
+	<<set $activeSlave.weight = -20>>
+<<case "Hedonistic Decadence">>
+	<<set $activeSlave.weight = 100>>
+	<<set $activeSlave.muscles = 0>>
+	<<set $activeSlave.boobs = 1200>>
+<</switch>>
+
+<span id="artFrame">
+	/* 000-250-006 */
+	<<if $seeImages == 1>>
+		<<if $imageChoice == 1>>
+			<div class="imageRef lrgVector"><div class="mask">&nbsp;</div><<SlaveArt $activeSlave 2 0>></div>
+		<<else>>
+			<div class="imageRef lrgRender"><div class="mask">&nbsp;</div><<SlaveArt $activeSlave 2 0>></div>
+		<</if>>
+	<</if>>
+	/* 000-250-006 */
+</span>
+
 <<setLocalPronouns $activeSlave>>
 <<setPlayerPronouns>>
 
@@ -301,7 +341,6 @@ but look what I have here! I just acquired $him recently. Lovely, isn't $he? I k
 	I'm going to destroy $him. Holes first, of course. I'll have to get more inventive after that, and I'll leave $his vocal cords for last. That way, $he'll be able to beg. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave begins to scream, and the noise goes on and on. And on.
 <<case "Repopulation Focus">>
 	I'm going to ruin $his womb, making sure $he can never have children again. I bet you spent lots of nights fantasizing about $him with a huge belly didn't you?
-	<<set $activeSlave.preg = -3>>
 <<case "Eugenics">>
 	<<if $seeHyperPreg == 1>>
 		I'm going to have $him knocked up; not with my seed, of course, but the seed of the lowest of the low. I'm also going to fill $him with the most powerful experimental fertility drugs out there. $He'll have so many children shoved into $his poor womb $he'll be bursting at the seams. But $he'll enjoy that, won't you <<= SlaveFullName($activeSlave)>>?" The slave nods hesitantly, but with evident arousal.
@@ -312,7 +351,6 @@ but look what I have here! I just acquired $him recently. Lovely, isn't $he? I k
 	$He's going to be my lover. $He'll have everything $he could ever want, and I'll be sure to let $him know all about what you do to your slaves. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave nods uncertainly.
 <<case "Body Purism">>
 	I'm going to give $him a nice pair of fake tits. No reason to be excessively clever when I can just make $his tits so huge $he won't be able to walk. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave begins to sob.
-	<<set $activeSlave.boobs = 300>>
 <<case "Transformation Fetishism">>
 	$He's going to be my lover. I'll be sure to let $him know all about what you do to your slaves, and rest assured, I'll never treat $him that way. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave nods uncertainly.
 <<case "Youth Preferentialism">>
@@ -321,29 +359,16 @@ but look what I have here! I just acquired $him recently. Lovely, isn't $he? I k
 	I've set $him up with a nice young girl already. I believe they'll be a perfect match. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave nods uncertainly.
 <<case "Slimness Enthusiasm">>
 	I think I'll make $his IV line permanent. After all, $he's never going off breast growth hormones. I'd estimate $he shouldn't be able to walk within a month. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave begins to sob.
-	<<set $activeSlave.weight = -20>>
-	<<set $activeSlave.boobs = 800>>
 <<case "Asset Expansionism">>
 	$He's going to be my lover. I'll be sure to let $him know all about what you do to your slaves, and rest assured, I'll never give $him growth hormones, not one single dose. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave nods uncertainly.
 <<case "Pastoralism">>
 	$He's going to be my spotter. Girls should be strong, smoking hot ladies, not disgusting cows. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave nods uncertainly.
-	<<set $activeSlave.weight = 100>>
-	<<set $activeSlave.muscles = 0>>
-	<<set $activeSlave.boobs = 1200>>
 <<case "Cummunism">>
 	$He's going to be my personal milk dispenser. I shouldn't have to chain $him to my desk after the first month, since $his udders will pin $him in place. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave begins to sob.
-	<<set $activeSlave.boobs = 800>>
-	<<set $activeSlave.weight = -20>>
 <<case "Physical Idealism">>
 	$He's going to learn to enjoy yourself. I'm going to force $his face full of food, $his cunt full of dicks and discover $his deepest, darkest desires. Wouldn't you like that, <<= SlaveFullName($activeSlave)>>?" The slave begins to sob. "To start, how about a weigh in? Sixty three and a half kilograms, such a pity, but don't worry, I'll have $him nice and plump soon enough."
-	<<set $activeSlave.boobs = 200>>
-	<<set $activeSlave.butt = 1>>
-	<<set $activeSlave.weight = -20>>
 <<case "Hedonistic Decadence">>
 	$He's going to be my spotter. Girls should be strong, smoking hot ladies, not disgusting obese slobs. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave nods uncertainly.
-	<<set $activeSlave.weight = 100>>
-	<<set $activeSlave.muscles = 0>>
-	<<set $activeSlave.boobs = 1200>>
 <<case "Chattel Religionism">>
 	$He's going to be the perfect courtesan. No preaching, no praying, just good, clean sex for money. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave nods uncertainly.
 <<case "Multiculturalism">>
@@ -352,8 +377,6 @@ but look what I have here! I just acquired $him recently. Lovely, isn't $he? I k
 	$He's shaping up to be a good slave. I'm keeping $him informed of your revisionist nonsense, and what your slaves suffer because of it. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave nods uncertainly.
 <</switch>>
 
-<<set $activeSlave.trust = 0>>
-<<set $activeSlave.devotion = 0>>
 Your rival smiles icily. "I'll keep you informed of $his progress. I wouldn't want you to miss a moment of it."
 <br><br>
 You're forging a new frontier in warfare here. This, then, is the new frontier in psychological warfare.
diff --git a/src/uncategorized/reBoomerang.tw b/src/uncategorized/reBoomerang.tw
index 9575cf067ec771050fedf778d12d8a1f06a10f39..2d6580a55010943f805037d8d3b2665505cf5688 100644
--- a/src/uncategorized/reBoomerang.tw
+++ b/src/uncategorized/reBoomerang.tw
@@ -230,7 +230,7 @@ brings up the relevant feeds. There's a naked body crumpled pathetically against
 	<<set $activeSlave.buttImplant = random(2,4), $activeSlave.butt = Math.clamp($activeSlave.butt+$activeSlave.buttImplant,0,10)>>
 	<<set $activeSlave.lipsImplant = 10*random(1,3), $activeSlave.lips = Math.clamp($activeSlave.lips+$activeSlave.lipsImplant,0,100)>>
 <<case "D milf staffing" "trainer staffing">>
-	<<setNonLocalPronouns $seeDicks>>
+	<<setNonlocalPronouns $seeDicks>>
 	"I'm a good <<s>>lave trainer, ju<<s>>t like you <<s>>old me to be. Too good." $His eyes look hollow. "I can't get what I'm doing to the<<s>>e <<= _girlU>><<s>> out of my head. Every young _girlU I meet, I get to know _himU and under<<s>>tand _himU. And then I break _himU down and turn _himU into a brainle<<ss>> little fuckpuppet." $He swallows. "I can't. Not anymore."
 	<<set $activeSlave.fetish = "dom", $activeSlave.fetishStrength = 100>>
 	<<set $activeSlave.behavioralFlaw = "arrogant", $activeSlave.sexualFlaw = "crude">>
diff --git a/src/uncategorized/rieEligibilityCheck.tw b/src/uncategorized/rieEligibilityCheck.tw
index 238d270059c1ed7671d5d375fd07c0990e0cc94d..c4a1ea04810ecc16f6173310487155ebb8df0328 100644
--- a/src/uncategorized/rieEligibilityCheck.tw
+++ b/src/uncategorized/rieEligibilityCheck.tw
@@ -1,7 +1,5 @@
 :: RIE Eligibility Check
 
-<<link "Skip week-end events" "Next Week">><</link>>
-
 <<silently>>
 
 <<set $eventSlave = 0, $eligibleSlaves = []>>