diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index 42887f82a0e8310816fb004af21ff6e9a0ac48b5..69dd71720e69dc18943683c19ede4f0b67d8fcd8 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -1081,39 +1081,31 @@ App.Data.resetOnNGPlus = {
 	weddingPlanned: 0,
 	/** @type {string|Array<{ID:number, trainingRegimen:string}>} */
 	personalAttention: "sex",
-	/** @type {FC.SlaveStateOrZero}  */
-	HeadGirl: 0,
+	HeadGirlID: 0,
 	HGTimeInGrade: 0,
 	HGEnergy: 0,
 	HGCum: 0,
-	/** @type {FC.SlaveStateOrZero} */
-	Recruiter: 0,
+	RecruiterID: 0,
 	recruiterTarget: "desperate whores",
 	recruiterProgress: 0,
 	recruiterIdleRule: "number",
 	recruiterIdleNumber: 20,
 	recruiterIOUs: 0,
 	bodyguardTrains: 1,
-	/** @type {FC.SlaveStateOrZero} */
-	Bodyguard: 0,
-	/** @type {FC.SlaveStateOrZero} */
-	Madam: 0,
+	BodyguardID: 0,
+	MadamID: 0,
 	djID: 0,
-	/** @type {FC.SlaveStateOrZero} */
-	Milkmaid: 0,
+	MilkmaidID: 0,
 	milkmaidImpregnates: 0,
-	/** @type {FC.SlaveStateOrZero} */
-	Farmer: 0,
+	FarmerID: 0,
 	StewardessID: 0,
 	stewardessImpregnates: 0,
 	SchoolteacherID: 0,
 	AttendantID: 0,
-	/** @type {FC.SlaveStateOrZero} */
-	Matron: 0,
+	MatronID: 0,
 	NurseID: 0,
 	WardenessID: 0,
-	/** @type {FC.SlaveStateOrZero} */
-	Concubine: 0,
+	ConcubineID: 0,
 
 	justiceEvents: ["slave deal", "slave training", "majority deal", "indenture deal", "virginity deal", "breeding deal"], /* not in setupVars because we remove events from this array as they occur */
 	prisonCircuit: ["low tier criminals", "gangs and smugglers", "white collar", "military prison"],
diff --git a/js/003-data/policiesData.js b/js/003-data/policiesData.js
index 36a63d97ba43d0e04c20b3073a257e7b672fb972..269206d55e0aa51e1b98f45ac343710ebb7e7ad1 100644
--- a/js/003-data/policiesData.js
+++ b/js/003-data/policiesData.js
@@ -499,7 +499,7 @@ App.Data.Policies.Selection = {
 					const el = new DocumentFragment();
 					if (V.LurcherID !== 0) {
 						el.append(`Your current lurcher is `);
-						el.append(App.UI.DOM.slaveDescriptionDialog(getSlave(V.LurcherID)));
+						el.append(App.UI.DOM.slaveDescriptionDialog(S.Lurcher));
 					}
 					return el;
 				}
@@ -1698,8 +1698,8 @@ App.Data.Policies.Selection = {
 				titleClass: "lime",
 				text: "your Head Girl will be given legal status as your Consort.",
 				get activatedText() {
-					if (V.HeadGirl.ID) {
-						const {his} = getPronouns(getSlave(V.HeadGirl.ID));
+					if (S.HeadGirl) {
+						const {his} = getPronouns(S.HeadGirl);
 						return `your Head Girl holds legal status as your Consort, increasing ${his} prominence.`;
 					} else {
 						return `though you do not currently have a Head Girl, they would hold legal status as your Consort, increasing their prominence.`;
@@ -1767,16 +1767,16 @@ App.Data.Policies.Selection = {
 				title: "Slave Administrator Enabling Law",
 				titleClass: "lime",
 				get text() {
-					if (V.HeadGirl.ID) {
-						const {him} = getPronouns(getSlave(V.HeadGirl.ID));
+					if (S.HeadGirl) {
+						const {him} = getPronouns(S.HeadGirl);
 						return `will afford your Head Girl considerable legal power, allowing ${him} to accomplish even more slave training.`;
 					} else {
 						return `will afford a Head Girl considerable legal power, allowing them to accomplish even more slave training.`;
 					}
 				},
 				get activatedText() {
-					if (V.HeadGirl.ID) {
-						const {him} = getPronouns(getSlave(V.HeadGirl.ID));
+					if (S.HeadGirl) {
+						const {him} = getPronouns(S.HeadGirl);
 						return `affords your Head Girl considerable legal power, allowing ${him} to accomplish even more slave training.`;
 					} else {
 						return `affords a Head Girl considerable legal power, allowing them to accomplish even more slave training.`;
diff --git a/src/004-base/specialSlavesProxy.js b/src/004-base/specialSlavesProxy.js
index 92622b4efbf40a734577d4532cc4fc371868ca8d..66e3e91824dea7f78409d0df536133ff9f5050c5 100644
--- a/src/004-base/specialSlavesProxy.js
+++ b/src/004-base/specialSlavesProxy.js
@@ -6,37 +6,37 @@ App.SpecialSlavesProxy = class SpecialSlavesProxy {
 		return slaveStateById(V.AttendantID);
 	}
 	get Bodyguard() {
-		return V.Bodyguard;
+		return slaveStateById(V.BodyguardID);
 	}
 	get Concubine() {
-		return V.Concubine;
+		return slaveStateById(V.ConcubineID);
 	}
 	get DJ() {
 		return slaveStateById(V.djID);
 	}
 	get Farmer() {
-		return V.Farmer;
+		return slaveStateById(V.FarmerID);
 	}
 	get HeadGirl() {
-		return V.HeadGirl;
+		return slaveStateById(V.HeadGirlID);
 	}
 	get Lurcher() {
 		return slaveStateById(V.LurcherID);
 	}
 	get Madam() {
-		return V.Madam;
+		return slaveStateById(V.MadamID);
 	}
 	get Matron() {
-		return V.Matron;
+		return slaveStateById(V.MatronID);
 	}
 	get Milkmaid() {
-		return V.Milkmaid;
+		return slaveStateById(V.MilkmaidID);
 	}
 	get Nurse() {
 		return slaveStateById(V.NurseID);
 	}
 	get Recruiter() {
-		return V.Recruiter;
+		return slaveStateById(V.RecruiterID);
 	}
 	get Schoolteacher() {
 		return slaveStateById(V.SchoolteacherID);
diff --git a/src/Mods/DinnerParty/dinnerPartyExecution.tw b/src/Mods/DinnerParty/dinnerPartyExecution.tw
index 1631d9f9448e86c493a2cc214ea3ede756059fb2..ca9fecf951f41adfe350b9100f929c18fdee8838 100644
--- a/src/Mods/DinnerParty/dinnerPartyExecution.tw
+++ b/src/Mods/DinnerParty/dinnerPartyExecution.tw
@@ -419,24 +419,24 @@
 		<</for>>
 
 		/% Head Girl abuse %/
-		<<if ($HeadGirl != 0) && ($activeSlave.assignment != "be your Head Girl")>>
-			<<setLocalPronouns $HeadGirl 2>>
+		<<if ($HeadGirlID != 0) && ($activeSlave.assignment != "be your Head Girl")>>
+			<<setLocalPronouns _S.HeadGirl 2>>
 			<br><br>
 			You notice a group of guests corner your Head Girl. The group consists of some very powerful people. Most of them arcology owners themselves, some of them have more powerful arcologies than yours.
-			$HeadGirl.slaveName tries to slip away, but _he2 was grabbed at the neck by the leader of the pack. He pulls _him2 down to the ground forcefully.
-			$HeadGirl.slaveName knows better than to resist, _he2 is still a slave despite _his2 position as your Head Girl. A slave does not raise their hand against a Master, even one that's not _his2 own. The leader rips off _his2 dress, exposing _his2 bare chest. Your Head Girl is frozen in terror when _he2 is lifted onto the hastily cleared dining hall table by several of the men. _His2 eyes desperately search for you. You are the only one who can stop this. All that's required is a single word from you.
-			$HeadGirl.slaveName's eyes meets yours; the look of relief on _his2 face is soon replaced by the sad realization that you will not intervene.
-			_His2 mouth just barely forms the word "<<= WrittenMaster($HeadGirl)>>" as you shake your head, so _he2 closes _his2 mouth and resigns $himself to _his2 fate.
+			_S.HeadGirl.slaveName tries to slip away, but _he2 was grabbed at the neck by the leader of the pack. He pulls _him2 down to the ground forcefully.
+			_S.HeadGirl.slaveName knows better than to resist, _he2 is still a slave despite _his2 position as your Head Girl. A slave does not raise their hand against a Master, even one that's not _his2 own. The leader rips off _his2 dress, exposing _his2 bare chest. Your Head Girl is frozen in terror when _he2 is lifted onto the hastily cleared dining hall table by several of the men. _His2 eyes desperately search for you. You are the only one who can stop this. All that's required is a single word from you.
+			_S.HeadGirl.slaveName's eyes meets yours; the look of relief on _his2 face is soon replaced by the sad realization that you will not intervene.
+			_His2 mouth just barely forms the word "<<= WrittenMaster(_S.HeadGirl)>>" as you shake your head, so _he2 closes _his2 mouth and resigns $himself to _his2 fate.
 			<br>
-			Your Head Girl is placed across the corner of the dining hall table face-down, _his2 arm<<if hasBothArms($HeadGirl)>>s<</if>> and leg<<if hasBothLegs($HeadGirl)>>s<</if>> held down by four men. _He2 finds a hand on _his2 ass, groping roughly, then another hand on the other cheek, roughly parting _his2 globes to get better access.
+			Your Head Girl is placed across the corner of the dining hall table face-down, _his2 arm<<if hasBothArms(_S.HeadGirl)>>s<</if>> and leg<<if hasBothLegs(_S.HeadGirl)>>s<</if>> held down by four men. _He2 finds a hand on _his2 ass, groping roughly, then another hand on the other cheek, roughly parting _his2 globes to get better access.
 			/% Pussy Check %/
-			<<if ($HeadGirl.vagina >= 0) && canDoVaginal($HeadGirl)>>
+			<<if (_S.HeadGirl.vagina >= 0) && canDoVaginal(_S.HeadGirl)>>
 				A finger traces along _his2 slit, finding the source of that moisture and pressing its way in. Another finger was added and the hand began to finger fuck _him2 roughly. After a few seconds a third finger was added and then a fourth, stretching _his2 pussy.
-				$HeadGirl.slaveName screams loudly as the entire hand was shoved up _his2 cunt without warning.
+				_S.HeadGirl.slaveName screams loudly as the entire hand was shoved up _his2 cunt without warning.
 				_His2 pussy has @@.lime;loosened.@@
-				<<set $HeadGirl.vagina += 1>>
+				<<set _S.HeadGirl.vagina += 1>>
 			<</if>>
-			One man moves to the head of $HeadGirl.slaveName and shoved his cock into _his2 mouth, fucking _his2 throat roughly. He buries his cock deep down _his2 throat all the way to his balls.
+			One man moves to the head of _S.HeadGirl.slaveName and shoved his cock into _his2 mouth, fucking _his2 throat roughly. He buries his cock deep down _his2 throat all the way to his balls.
 			He places both hands around _his2 neck and squeezes with every stroke. Your Head Girl's face turns red and _he2 gags uncontrollably. _His2 eyes roll back as another man shoves his hard cock in _his2 asshole, sodomizing _him2 with no mercy. As your Head Girl makes squeaking noises in pain, several guests pick up forks and jab it at _his2 butt and _his2 back, chanting "More meat... More meat..." and "Squeal, piggy, squeal." You slump over your chair at the head of the table. Gulping down your drink, you suppress the urge to order your security drones to open fire on those men. You know they would never dare to harm your Head Girl, not permanently, at least not anything your remote surgery couldn't fix. It's not as if you haven't done worse to your slaves, but the message is clear; the attack on your Head Girl was meant as disrespect and an insult towards you. Raping your Head Girl is like raping you. You stare at the group of men gang raping your Head Girl at the end of your own dining table, burning their @@.yellow;names and their faces@@ into your memory as they take turns fucking _him2. They make use of _his2 every hole. When they are done, _he2 is left on the floor, battered and bruised, covered in cum and blood from superficial wounds.
 			The leader of the pack pulls out his half erect cock and
 			<<if $seePee == 1>>
@@ -456,8 +456,8 @@
 			<br><br>
 			The abuse your Head Girl suffers had @@.red;decreased _his2 health@@ and _he2 is @@.mediumorchid;less devoted@@ to you, as you allowed _him2 to be abused.
 			<br>
-			<<run healthDamage($HeadGirl, 20)>>
-			<<set $HeadGirl.devotion -= 20>>
+			<<run healthDamage(_S.HeadGirl, 20)>>
+			<<set _S.HeadGirl.devotion -= 20>>
 			<<set _generateEnemies = 1>>
 		<</if>>
 	<</if>>
@@ -578,4 +578,4 @@
 		<<set $MOD_enemyList.push($MOD_enemy)>>
 	<</for>>
 <</if>>
-*/
\ No newline at end of file
+*/
diff --git a/src/Mods/SecExp/attackHandler.tw b/src/Mods/SecExp/attackHandler.tw
index 11ee23f4ac78843b3b83180baea117a2aeb30e55..b51aaa35b909dc3f420c89fff4bfe78e4f0995b5 100644
--- a/src/Mods/SecExp/attackHandler.tw
+++ b/src/Mods/SecExp/attackHandler.tw
@@ -214,97 +214,99 @@
 			<<set _tacChance += 0.30>>
 		<</if>>
 	<<elseif $leadingTroops == "bodyguard">>
-		<<if $Bodyguard.devotion < -20>>
+		<<if _S.Bodyguard.devotion < -20>>
 			<<set _slaveMod -= 0.15>>
-		<<elseif $Bodyguard.devotion > 50>>
+		<<elseif _S.Bodyguard.devotion > 50>>
 			<<set _slaveMod += 0.15>>
 		<</if>>
-		<<if ($rep < 10000 && $SecExp.core.authority < 10000) || $Bodyguard.prestige < 1>>
+		<<if ($rep < 10000 && $SecExp.core.authority < 10000) || _S.Bodyguard.prestige < 1>>
 			<<set _militiaMod -= 0.15>>
 			<<set _mercMod -= 0.15>>
 			<<set _SFMod -= 0.15>>
-		<<elseif $Bodyguard.prestige >= 2>>
+		<<elseif _S.Bodyguard.prestige >= 2>>
 			<<set _militiaMod += 0.10>>
 			<<set _mercMod += 0.10>>
 			<<set _SFMod += 0.10>>
 		<</if>>
-		<<if (setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career) || setup.secExCombatPrestige.includes($Bodyguard.prestigeDesc)) && $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 95>>
+		<<set _BGCareerGivesBonus = setup.bodyguardCareers.includes(_S.Bodyguard.career) || setup.HGCareers.includes(_S.Bodyguard.career) || setup.secExCombatPrestige.includes(_S.Bodyguard.prestigeDesc)>>
+		<<set _BGTotalIntelligence = _S.Bodyguard.intelligence+_S.Bodyguard.intelligenceImplant>>
+		<<if _BGCareerGivesBonus && _BGTotalIntelligence > 95>>
 			<<set _atkMod += 0.25>>
 			<<set _defMod += 0.25>>
 			<<set _tacChance += 0.50>>
-		<<elseif $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 95>>
+		<<elseif _BGTotalIntelligence > 95>>
 			<<set _atkMod += 0.20>>
 			<<set _defMod += 0.15>>
 			<<set _tacChance += 0.35>>
-		<<elseif (setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career) || setup.secExCombatPrestige.includes($Bodyguard.prestigeDesc)) && $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 50>>
+		<<elseif _BGCareerGivesBonus && _BGTotalIntelligence > 50>>
 			<<set _atkMod += 0.15>>
 			<<set _defMod += 0.10>>
 			<<set _tacChance += 0.25>>
-		<<elseif $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 50>>
+		<<elseif _BGTotalIntelligence > 50>>
 			<<set _atkMod += 0.10>>
 			<<set _defMod += 0.10>>
 			<<set _tacChance += 0.20>>
-		<<elseif (setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career) || setup.secExCombatPrestige.includes($Bodyguard.prestigeDesc)) && $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 15>>
+		<<elseif _BGCareerGivesBonus && _BGTotalIntelligence > 15>>
 			<<set _atkMod += 0.10>>
 			<<set _defMod += 0.05>>
 			<<set _tacChance += 0.15>>
-		<<elseif $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 15>>
+		<<elseif _BGTotalIntelligence > 15>>
 			<<set _atkMod += 0.5>>
 			<<set _defMod += 0.05>>
 			<<set _tacChance += 0.10>>
-		<<elseif !(setup.bodyguardCareers.includes($Bodyguard.career) && setup.HGCareers.includes($Bodyguard.career) && setup.secExCombatPrestige.includes($Bodyguard.prestigeDesc)) || $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -50>>
+		<<elseif !_BGCareerGivesBonus || _BGTotalIntelligence < -50>>
 			<<set _atkMod -= 0.15>>
 			<<set _defMod -= 0.15>>
 			<<set _tacChance -= 0.30>>
-		<<elseif $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -50>>
+		<<elseif _BGTotalIntelligence < -50>>
 			<<set _atkMod -= 0.15>>
 			<<set _defMod -= 0.10>>
 			<<set _tacChance -= 0.25>>
-		<<elseif !(setup.bodyguardCareers.includes($Bodyguard.career) && setup.HGCareers.includes($Bodyguard.career) && setup.secExCombatPrestige.includes($Bodyguard.prestigeDesc)) || $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -15>>
+		<<elseif !_BGCareerGivesBonus || _BGTotalIntelligence < -15>>
 			<<set _atkMod -= 0.10>>
 			<<set _defMod -= 0.10>>
 			<<set _tacChance -= 0.20>>
-		<<elseif $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -15>>
+		<<elseif _BGTotalIntelligence < -15>>
 			<<set _atkMod -= 0.10>>
 			<<set _defMod -= 0.05>>
 			<<set _tacChance -= 0.15>>
 		<</if>>
 			/* does she get wounded? */
-		<<if $Bodyguard.skill.combat == 1>>
+		<<if _S.Bodyguard.skill.combat == 1>>
 			<<set _woundChance -= 2>>
 		<</if>>
-		<<set _woundChance -= 0.25 * (getLimbCount($Bodyguard, 105))>>
-		<<if $Bodyguard.health.condition >= 50>>
+		<<set _woundChance -= 0.25 * (getLimbCount(_S.Bodyguard, 105))>>
+		<<if _S.Bodyguard.health.condition >= 50>>
 			<<set _woundChance -= 1>>
 		<</if>>
-		<<if $Bodyguard.weight > 130>>
+		<<if _S.Bodyguard.weight > 130>>
 			<<set _woundChance += 1>>
 		<</if>>
-		<<if $Bodyguard.muscles < -30>>
+		<<if _S.Bodyguard.muscles < -30>>
 			<<set _woundChance += 1>>
 		<</if>>
-		<<if getBestVision($Bodyguard) === 0>>
+		<<if getBestVision(_S.Bodyguard) === 0>>
 			<<set _woundChance += 1>>
 		<</if>>
-		<<if $Bodyguard.heels == 1>>
+		<<if _S.Bodyguard.heels == 1>>
 			<<set _woundChance += 1>>
 		<</if>>
-		<<if $Bodyguard.boobs >= 1400>>
+		<<if _S.Bodyguard.boobs >= 1400>>
 			<<set _woundChance += 1>>
 		<</if>>
-		<<if $Bodyguard.butt >= 6>>
+		<<if _S.Bodyguard.butt >= 6>>
 			<<set _woundChance += 1>>
 		<</if>>
-		<<if $Bodyguard.belly >= 10000>>
+		<<if _S.Bodyguard.belly >= 10000>>
 			<<set _woundChance += 1>>
 		<</if>>
-		<<if $Bodyguard.dick >= 8>>
+		<<if _S.Bodyguard.dick >= 8>>
 			<<set _woundChance += 1>>
 		<</if>>
-		<<if $Bodyguard.balls >= 8>>
+		<<if _S.Bodyguard.balls >= 8>>
 			<<set _woundChance += 1>>
 		<</if>>
-		<<if $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -95>>
+		<<if _BGTotalIntelligence < -95>>
 			<<set _woundChance += 1>>
 		<</if>>
 		<<if random(1,100) <= _woundChance>>
@@ -316,103 +318,102 @@
 			<<set _enemyMod += 0.2>>
 		<</if>>
 		/* 60% chance of getting combat skill if not already have it */
-		<<if $Bodyguard.skill.combat == 0 && random(1,100) <= 60>>
+		<<if _S.Bodyguard.skill.combat == 0 && random(1,100) <= 60>>
 			<<set $gainedCombat = 1>>
-			<<set _i = $slaveIndices[$Bodyguard.ID]>>
-			<<set $slaves[_i].skill.combat = 1>>
+			<<set _S.Bodyguard.skill.combat = 1>>
 		<</if>>
 	<<elseif $leadingTroops == "headGirl">>
-		<<if $HeadGirl.devotion < -20>>
+		<<if _S.HeadGirl.devotion < -20>>
 			<<set _slaveMod -= 0.15>>
-		<<elseif $HeadGirl.devotion > 51>>
+		<<elseif _S.HeadGirl.devotion > 51>>
 			<<set _slaveMod += 0.15>>
 		<</if>>
-		<<if ($rep < 10000 && $SecExp.core.authority < 10000) || $HeadGirl.prestige < 1>>
+		<<if ($rep < 10000 && $SecExp.core.authority < 10000) || _S.HeadGirl.prestige < 1>>
 			<<set _militiaMod -= 0.15>>
 			<<set _mercMod -= 0.15>>
 			<<set _SFMod -= 0.15>>
-		<<elseif $HeadGirl.prestige >= 2>>
+		<<elseif _S.HeadGirl.prestige >= 2>>
 			<<set _militiaMod += 0.10>>
 			<<set _mercMod += 0.10>>
 			<<set _SFMod += 0.10>>
 		<</if>>
-		<<if (setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career) || setup.secExCombatPrestige.includes($HeadGirl.prestigeDesc)) && $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 95>>
+		<<if (setup.bodyguardCareers.includes(_S.HeadGirl.career) || setup.HGCareers.includes(_S.HeadGirl.career) || setup.secExCombatPrestige.includes(_S.HeadGirl.prestigeDesc)) && _S.HeadGirl.intelligence+_S.HeadGirl.intelligenceImplant > 95>>
 			<<set _atkMod += 0.25>>
 			<<set _defMod += 0.25>>
 			<<set _tacChance += 0.50>>
-		<<elseif $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 95>>
+		<<elseif _S.HeadGirl.intelligence+_S.HeadGirl.intelligenceImplant > 95>>
 			<<set _atkMod += 0.20>>
 			<<set _defMod += 0.15>>
 			<<set _tacChance += 0.35>>
-		<<elseif (setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career) || setup.secExCombatPrestige.includes($HeadGirl.prestigeDesc)) && $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 50>>
+		<<elseif (setup.bodyguardCareers.includes(_S.HeadGirl.career) || setup.HGCareers.includes(_S.HeadGirl.career) || setup.secExCombatPrestige.includes(_S.HeadGirl.prestigeDesc)) && _S.HeadGirl.intelligence+_S.HeadGirl.intelligenceImplant > 50>>
 			<<set _atkMod += 0.15>>
 			<<set _defMod += 0.10>>
 			<<set _tacChance += 0.25>>
-		<<elseif $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 50>>
+		<<elseif _S.HeadGirl.intelligence+_S.HeadGirl.intelligenceImplant > 50>>
 			<<set _atkMod += 0.10>>
 			<<set _defMod += 0.10>>
 			<<set _tacChance += 0.20>>
-		<<elseif (setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career) || setup.secExCombatPrestige.includes($HeadGirl.prestigeDesc)) && $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 15>>
+		<<elseif (setup.bodyguardCareers.includes(_S.HeadGirl.career) || setup.HGCareers.includes(_S.HeadGirl.career) || setup.secExCombatPrestige.includes(_S.HeadGirl.prestigeDesc)) && _S.HeadGirl.intelligence+_S.HeadGirl.intelligenceImplant > 15>>
 			<<set _atkMod += 0.10>>
 			<<set _defMod += 0.05>>
 			<<set _tacChance += 0.15>>
-		<<elseif $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 15>>
+		<<elseif _S.HeadGirl.intelligence+_S.HeadGirl.intelligenceImplant > 15>>
 			<<set _atkMod += 0.05>>
 			<<set _defMod += 0.05>>
 			<<set _tacChance += 0.10>>
-		<<elseif !(setup.bodyguardCareers.includes($HeadGirl.career) && setup.HGCareers.includes($HeadGirl.career) && setup.secExCombatPrestige.includes($HeadGirl.prestigeDesc)) || $HeadGirl.intelligence+$HeadGirl.intelligenceImplant < -50>>
+		<<elseif !(setup.bodyguardCareers.includes(_S.HeadGirl.career) && setup.HGCareers.includes(_S.HeadGirl.career) && setup.secExCombatPrestige.includes(_S.HeadGirl.prestigeDesc)) || _S.HeadGirl.intelligence+_S.HeadGirl.intelligenceImplant < -50>>
 			<<set _atkMod -= 0.15>>
 			<<set _defMod -= 0.15>>
 			<<set _tacChance -= 0.30>>
-		<<elseif $HeadGirl.intelligence+$HeadGirl.intelligenceImplant < -50>>
+		<<elseif _S.HeadGirl.intelligence+_S.HeadGirl.intelligenceImplant < -50>>
 			<<set _atkMod -= 0.15>>
 			<<set _defMod -= 0.10>>
 			<<set _tacChance -= 0.25>>
-		<<elseif !(setup.bodyguardCareers.includes($HeadGirl.career) && setup.HGCareers.includes($HeadGirl.career) && setup.secExCombatPrestige.includes($HeadGirl.prestigeDesc)) || $HeadGirl.intelligence+$HeadGirl.intelligenceImplant < -15>>
+		<<elseif !(setup.bodyguardCareers.includes(_S.HeadGirl.career) && setup.HGCareers.includes(_S.HeadGirl.career) && setup.secExCombatPrestige.includes(_S.HeadGirl.prestigeDesc)) || _S.HeadGirl.intelligence+_S.HeadGirl.intelligenceImplant < -15>>
 			<<set _atkMod -= 0.10>>
 			<<set _defMod -= 0.10>>
 			<<set _tacChance -= 0.20>>
-		<<elseif $HeadGirl.intelligence+$HeadGirl.intelligenceImplant < -15>>
+		<<elseif _S.HeadGirl.intelligence+_S.HeadGirl.intelligenceImplant < -15>>
 			<<set _atkMod -= 0.10>>
 			<<set _defMod -= 0.05>>
 			<<set _tacChance -= 0.15>>
 		<</if>>
 		/* does she get wounded? */
-		<<if $HeadGirl.skill.combat == 1>>
+		<<if _S.HeadGirl.skill.combat == 1>>
 			<<set _woundChance -= 3>>
 		<</if>>
-		<<set _woundChance -= 0.25 * (getLimbCount($HeadGirl, 105))>>
-		<<if $HeadGirl.health.condition >= 50>>
+		<<set _woundChance -= 0.25 * (getLimbCount(_S.HeadGirl, 105))>>
+		<<if _S.HeadGirl.health.condition >= 50>>
 			<<set _woundChance -= 2>>
 		<</if>>
-		<<if $HeadGirl.weight > 130>>
+		<<if _S.HeadGirl.weight > 130>>
 			<<set _woundChance += 1>>
 		<</if>>
-		<<if $HeadGirl.muscles < -30>>
+		<<if _S.HeadGirl.muscles < -30>>
 			<<set _woundChance += 1>>
 		<</if>>
-		<<if getBestVision($HeadGirl) === 0>>
+		<<if getBestVision(_S.HeadGirl) === 0>>
 			<<set _woundChance += 1>>
 		<</if>>
-		<<if $HeadGirl.heels == 1>>
+		<<if _S.HeadGirl.heels == 1>>
 			<<set _woundChance += 1>>
 		<</if>>
-		<<if $HeadGirl.boobs >= 1400>>
+		<<if _S.HeadGirl.boobs >= 1400>>
 			<<set _woundChance += 1>>
 		<</if>>
-		<<if $HeadGirl.butt >= 6>>
+		<<if _S.HeadGirl.butt >= 6>>
 			<<set _woundChance += 1>>
 		<</if>>
-		<<if $HeadGirl.belly >= 10000>>
+		<<if _S.HeadGirl.belly >= 10000>>
 			<<set _woundChance += 1>>
 		<</if>>
-		<<if $HeadGirl.dick >= 8>>
+		<<if _S.HeadGirl.dick >= 8>>
 			<<set _woundChance += 1>>
 		<</if>>
-		<<if $HeadGirl.balls >= 8>>
+		<<if _S.HeadGirl.balls >= 8>>
 			<<set _woundChance += 1>>
 		<</if>>
-		<<if $HeadGirl.intelligence+$HeadGirl.intelligenceImplant < -95>>
+		<<if _S.HeadGirl.intelligence+_S.HeadGirl.intelligenceImplant < -95>>
 			<<set _woundChance += 1>>
 		<</if>>
 		<<if random(1,100) <= _woundChance>>
@@ -424,9 +425,9 @@
 			<<set _enemyMod += 0.2>>
 		<</if>>
 		/* 60% chance of getting combat skill if not already have it */
-		<<if $HeadGirl.skill.combat == 0 && random(1,100) <= 60>>
+		<<if _S.HeadGirl.skill.combat == 0 && random(1,100) <= 60>>
 			<<set $gainedCombat = 1>>
-			<<set _i = $slaveIndices[$HeadGirl.ID]>>
+			<<set _i = $slaveIndices[$HeadGirlID]>>
 			<<set $slaves[_i].skill.combat = 1>>
 		<</if>>
 	<<elseif $leadingTroops == "citizen">>
diff --git a/src/Mods/SecExp/attackOptions.tw b/src/Mods/SecExp/attackOptions.tw
index 15b05eaa48593f489b86ba7c8addfa0983d4a8be..a406c100041c1a96cb91d959141d4caafc8a272f 100644
--- a/src/Mods/SecExp/attackOptions.tw
+++ b/src/Mods/SecExp/attackOptions.tw
@@ -202,9 +202,9 @@ __Battle Plan__:
 <<case "assistant">>
 	<<set _leader = "$assistant.name will">>
 <<case "bodyguard">>
-	<<set _leader = "$Bodyguard.slaveName will">>
+	<<set _leader = "_S.Bodyguard.slaveName will">>
 <<case "headGirl">>
-	<<set _leader = "$HeadGirl.slaveName will">>
+	<<set _leader = "_S.HeadGirl.slaveName will">>
 <<case "citizen">>
 	<<set _leader = "The citizens' militia commander will">>
 <<case "mercenary">>
@@ -227,19 +227,19 @@ __Battle Plan__:
 		<<set _leader = "$assistant.name will">>
 		<<replace "#leader">><strong><<print _leader>></strong><</replace>>
 	<</link>>
-	<<if $Bodyguard != 0 && $slavesOfficers == 1>>
+	<<if $BodyguardID != 0 && $slavesOfficers == 1>>
 		|
 		<<link "Let your bodyguard lead your troops">>
 			<<set $leadingTroops = "bodyguard">>
-			<<set _leader = "$Bodyguard.slaveName will">>
+			<<set _leader = "_S.Bodyguard.slaveName will">>
 			<<replace "#leader">><strong><<print _leader>></strong><</replace>>
 		<</link>>
 	<</if>>
-	<<if $HeadGirl != 0 && $slavesOfficers == 1>>
+	<<if $HeadGirlID != 0 && $slavesOfficers == 1>>
 		|
 		<<link "Let your Head Girl lead your troops">>
 			<<set $leadingTroops = "headGirl">>
-			<<set _leader = "$HeadGirl.slaveName will">>
+			<<set _leader = "_S.HeadGirl.slaveName will">>
 			<<replace "#leader">><strong><<print _leader>></strong><</replace>>
 		<</link>>
 	<</if>>
diff --git a/src/Mods/SecExp/attackReport.tw b/src/Mods/SecExp/attackReport.tw
index e73de6208a3b6a89bfacdd5c89995bdd80a8f086..6e6c204e5a142f74f1c98e38d199fc9b99c7e52b 100644
--- a/src/Mods/SecExp/attackReport.tw
+++ b/src/Mods/SecExp/attackReport.tw
@@ -854,16 +854,16 @@
 			your assistant performs admirably. _HisA vast computing power allows _himA to be everywhere on the battlefield, greatly enhancing the efficiency of your troops and the effectiveness of your battle plan.
 		<</if>>
 	<<elseif $leadingTroops == "bodyguard">>
-		<<setLocalPronouns $Bodyguard>>
+		<<setLocalPronouns _S.Bodyguard>>
 		<<if $auto == 1>>$assistant.name<<else>>You<</if>> decided it will be your bodyguard that leads the troops.
 		<<if App.SecExp.conflict.deployedUnits('slaves') >= 1>>
-			<<if $Bodyguard.devotion < -20>>
+			<<if _S.Bodyguard.devotion < -20>>
 				$His low devotion has a negative impact on the morale of your slave soldiers.
-			<<elseif $Bodyguard.devotion > 51>>
+			<<elseif _S.Bodyguard.devotion > 51>>
 				$His devotion to you has a positive impact on the morale of your slave soldiers, proud to be led by one of their own.
 			<</if>>
 		<</if>>
-		<<if _oldRep < 10000 && _oldAuth < 10000 || $Bodyguard.prestige < 1>>
+		<<if _oldRep < 10000 && _oldAuth < 10000 || _S.Bodyguard.prestige < 1>>
 			<<if App.SecExp.conflict.deployedUnits('militia') >= 1>>
 				Your volunteers <<if App.SecExp.conflict.deployedUnits('slaves') >= 1>>however<</if>> are not enthusiastic to have a slave as a
 				<<if $SF.Toggle && $SF.Active >= 1 && App.SecExp.conflict.deployedUnits('mercs') == 1 && $SFIntervention>>
@@ -882,7 +882,7 @@
 			<<elseif $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
 				Your soldiers <<if App.SecExp.conflict.deployedUnits('slaves') >= 1>>however<</if>> are not enthusiastic to have a slave as a commander.
 			<</if>>
-		<<elseif $Bodyguard.prestige >= 2>>
+		<<elseif _S.Bodyguard.prestige >= 2>>
 			<<if App.SecExp.conflict.deployedUnits('militia') >= 1>>
 				Your
 				<<if App.SecExp.conflict.deployedUnits('mercs') == 1 && $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
@@ -921,25 +921,27 @@
 				Your soldiers <<if App.SecExp.conflict.deployedUnits('slaves') >= 1>>however,<</if>> are not enthusiastic to have a slave as a commander, but they trust you enough not to question your decision.
 			<</if>>
 		<</if>>
-		<<if (setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career) || setup.secExCombatPrestige.includes($Bodyguard.prestigeDesc)) && $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 95>>
+		<<set _BGCareerGivesBonus = setup.bodyguardCareers.includes(_S.Bodyguard.career) || setup.HGCareers.includes(_S.Bodyguard.career) || setup.secExCombatPrestige.includes(_S.Bodyguard.prestigeDesc)>>
+		<<set _BGTotalIntelligence = _S.Bodyguard.intelligence+_S.Bodyguard.intelligenceImplant>>
+		<<if _BGCareerGivesBonus && _BGTotalIntelligence > 95>>
 			With $his experience and $his great intellect, $he is able to exploit the smallest of tactical advantages, making your troops very effective.
-		<<elseif $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 95>>
+		<<elseif _BGTotalIntelligence > 95>>
 			While $he lacks experience, $his great intellect allows $him to seize and exploit any tactical advantage the battlefield offers $him.
-		<<elseif (setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career) || setup.secExCombatPrestige.includes($Bodyguard.prestigeDesc)) && $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 50>>
+		<<elseif _BGCareerGivesBonus && _BGTotalIntelligence > 50>>
 			Having both the experience and the intelligence, $he performs admirably as your commander. $His competence greatly increases the efficiency of your troops.
-		<<elseif $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 50>>
+		<<elseif _BGTotalIntelligence > 50>>
 			Despite not having a lot of experience as a leader, $his intelligence makes $him a good commander, increasing the efficiency of your troops.
-		<<elseif (setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career) || setup.secExCombatPrestige.includes($Bodyguard.prestigeDesc)) && $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 15>>
+		<<elseif _BGCareerGivesBonus && _BGTotalIntelligence > 15>>
 			Thanks to $his experience, $he is a decent commander, competently guiding your troops through the battle.
-		<<elseif $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 15>>
+		<<elseif _BGTotalIntelligence > 15>>
 			Lacking experience, $his performance as a commander is rather forgettable.
-		<<elseif !(setup.bodyguardCareers.includes($Bodyguard.career) && setup.HGCareers.includes($Bodyguard.career) && setup.secExCombatPrestige.includes($Bodyguard.prestigeDesc)) || $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -50>>
+		<<elseif !_BGCareerGivesBonus || _BGTotalIntelligence < -50>>
 			Despite the experience $he accumulated during $his past career, $his very low intelligence is a great disadvantage for your troops.
-		<<elseif $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -50>>
+		<<elseif _BGTotalIntelligence < -50>>
 			Without experience and low intelligence, $he performs horribly as a commander, greatly affecting your troops.
-		<<elseif !(setup.bodyguardCareers.includes($Bodyguard.career) && setup.HGCareers.includes($Bodyguard.career) && setup.secExCombatPrestige.includes($Bodyguard.prestigeDesc)) || $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -15>>
+		<<elseif !_BGCareerGivesBonus || _BGTotalIntelligence < -15>>
 			Despite the experience $he accumulated during $his past career, $he lacks the intelligence to apply it quickly and effectively, making for a rather poor performance in the field.
-		<<elseif $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -15>>
+		<<elseif _BGTotalIntelligence < -15>>
 			$He lacks the experience and the intelligence to be an effective commander, the performance of your troops suffers because of $his poor leadership.
 		<</if>>
 		<<if $gainedCombat == 1>>
@@ -947,7 +949,7 @@
 		<</if>>
 		<<if $leaderWounded == 1>>
 			Unfortunately, @@.red;$he sustained major injuries.@@
-			<<set _woundType = App.SecExp.inflictBattleWound(getSlave($Bodyguard.ID))>>
+			<<set _woundType = App.SecExp.inflictBattleWound(_S.Bodyguard))>>
 			<<if _woundType == "voice">>
 				A stray bullet hit $his neck. While $he fortunately avoided fatal hemorrhaging, $his vocal cords were irreparably damaged.
 			<<elseif _woundType == "eyes">>
@@ -964,19 +966,18 @@
 		<<if $battleResult == 3 && $SecExp.settings.battle.allowSlavePrestige == 1>>
 			<<set _found = 0>>
 			<<for _i = 0; _i < $slaveVictories.length; _i++>>
-				<<if $slaveVictories[_i].ID == $Bodyguard.ID>>
+				<<if $slaveVictories[_i].ID == $BodyguardID>>
 					<<set $slaveVictories[_i].victories++>>
 					<<set _found = 1>>
 					<<if $slaveVictories[_i].victories >= 10>>
-						<<if $Bodyguard.prestige < 3>>
-							<<set _j = $slaveIndices[$Bodyguard.ID]>>
-							<<set $slaves[_j].prestige++>>
-							<<if $slaves[_j].prestige == 1>>
-								<<set $slaves[_j].prestigeDesc = "$He is well known for being a great commander.">>
-							<<elseif $slaves[_j].prestige == 2>>
-								<<set $slaves[_j].prestigeDesc = "$He is famous for being an incredible commander.">>
-							<<elseif $slaves[_j].prestige == 3>>
-								<<set $slaves[_j].prestigeDesc = "$He is known as a legendary commander all over the world.">>
+						<<if _S.Bodyguard.prestige < 3>>
+							<<set _S.Bodyguard.prestige++>>
+							<<if _S.Bodyguard.prestige == 1>>
+								<<set _S.Bodyguard.prestigeDesc = "$He is well known for being a great commander.">>
+							<<elseif _S.Bodyguard.prestige == 2>>
+								<<set _S.Bodyguard.prestigeDesc = "$He is famous for being an incredible commander.">>
+							<<elseif _S.Bodyguard.prestige == 3>>
+								<<set _S.Bodyguard.prestigeDesc = "$He is known as a legendary commander all over the world.">>
 							<</if>>
 							<<set $slaveVictories[_i].victories = 0>>
 							$He brought your army to victory so many times that $his @@.green;prestige has increased.@@
@@ -986,21 +987,21 @@
 				<</if>>
 			<</for>>
 			<<if _found == 0>>
-				<<set _newSlave = {ID: $Bodyguard.ID, victories: 0}>>
+				<<set _newSlave = {ID: $BodyguardID, victories: 0}>>
 				<<set $slaveVictories.push(_newSlave)>>
 			<</if>>
 		<</if>>
 	<<elseif $leadingTroops == "headGirl">>
-		<<setLocalPronouns $HeadGirl>>
+		<<setLocalPronouns _S.HeadGirl>>
 		<<if $auto == 1>>$assistant.name<<else>>You<</if>> decided it will be your Head Girl that leads the troops.
 		<<if App.SecExp.conflict.deployedUnits('slaves') >= 1>>
-			<<if $HeadGirl.devotion < -20>>
+			<<if _S.HeadGirl.devotion < -20>>
 				$His low devotion has a negative impact on the morale of your slave soldiers.
-			<<elseif $HeadGirl.devotion > 51>>
+			<<elseif _S.HeadGirl.devotion > 51>>
 				$His devotion to you has a positive impact on the morale of your slave soldiers, proud to be led by one of their own.
 			<</if>>
 		<</if>>
-		<<if _oldRep < 10000 && _oldAuth < 10000 || $HeadGirl.prestige < 1>>
+		<<if _oldRep < 10000 && _oldAuth < 10000 || _S.HeadGirl.prestige < 1>>
 			<<if App.SecExp.conflict.deployedUnits('militia') >= 1>>
 				Your volunteers <<if App.SecExp.conflict.deployedUnits('slaves') >= 1>>however<</if>> are not enthusiastic to have a slave as a
 				<<if App.SecExp.conflict.deployedUnits('mercs') == 1 && $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
@@ -1019,7 +1020,7 @@
 			<<elseif $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
 				Your soldiers <<if App.SecExp.conflict.deployedUnits('slaves') >= 1>>however<</if>> are not enthusiastic to have a slave as a commander.
 			<</if>>
-		<<elseif $HeadGirl.prestige >= 2>>
+		<<elseif _S.HeadGirl.prestige >= 2>>
 			<<if App.SecExp.conflict.deployedUnits('militia') >= 1>>
 				Your
 				<<if App.SecExp.conflict.deployedUnits('mercs') == 1 && $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
@@ -1058,25 +1059,25 @@
 				Your soldiers <<if App.SecExp.conflict.deployedUnits('slaves') >= 1>>however<</if>> are not enthusiastic to have a slave as a commander, but they trust you enough not to question your decision.
 			<</if>>
 		<</if>>
-		<<if (setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career) || setup.secExCombatPrestige.includes($HeadGirl.prestigeDesc)) && $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 95>>
+		<<if (setup.bodyguardCareers.includes(_S.HeadGirl.career) || setup.HGCareers.includes(_S.HeadGirl.career) || setup.secExCombatPrestige.includes(_S.HeadGirl.prestigeDesc)) && _S.HeadGirl.intelligence+_S.HeadGirl.intelligenceImplant > 95>>
 			With $his experience and $his great intellect, $he is able to exploits the smallest of tactical advantages, making your troops greatly effective.
-		<<elseif $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 95>>
+		<<elseif _S.HeadGirl.intelligence+_S.HeadGirl.intelligenceImplant > 95>>
 			While $he lacks experience, $his great intellect allows $him to seize and exploit any tactical advantage the battlefield offers $him.
-		<<elseif (setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career) || setup.secExCombatPrestige.includes($HeadGirl.prestigeDesc)) && $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 50>>
+		<<elseif (setup.bodyguardCareers.includes(_S.HeadGirl.career) || setup.HGCareers.includes(_S.HeadGirl.career) || setup.secExCombatPrestige.includes(_S.HeadGirl.prestigeDesc)) && _S.HeadGirl.intelligence+_S.HeadGirl.intelligenceImplant > 50>>
 			Having both the experience and the intelligence, $he performs admirably as your commander. $His competence greatly increases the efficiency of your troops.
-		<<elseif $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 50>>
+		<<elseif _S.HeadGirl.intelligence+_S.HeadGirl.intelligenceImplant > 50>>
 			Despite not having a lot of experience as a leader, $his intelligence makes $him a good commander, increasing the efficiency of your troops.
-		<<elseif (setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career) || setup.secExCombatPrestige.includes($HeadGirl.prestigeDesc)) && $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 15>>
+		<<elseif (setup.bodyguardCareers.includes(_S.HeadGirl.career) || setup.HGCareers.includes(_S.HeadGirl.career) || setup.secExCombatPrestige.includes(_S.HeadGirl.prestigeDesc)) && _S.HeadGirl.intelligence+_S.HeadGirl.intelligenceImplant > 15>>
 			Thanks to $his experience, $he is a decent commander, competently guiding your troops through the battle.
-		<<elseif $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 15>>
+		<<elseif _S.HeadGirl.intelligence+_S.HeadGirl.intelligenceImplant > 15>>
 			Lacking experience $his performance as a commander is rather forgettable.
-		<<elseif !(setup.bodyguardCareers.includes($HeadGirl.career) && setup.HGCareers.includes($HeadGirl.career) && setup.secExCombatPrestige.includes($HeadGirl.prestigeDesc)) || $HeadGirl.intelligence+$HeadGirl.intelligenceImplant < -50>>
+		<<elseif !(setup.bodyguardCareers.includes(_S.HeadGirl.career) && setup.HGCareers.includes(_S.HeadGirl.career) && setup.secExCombatPrestige.includes(_S.HeadGirl.prestigeDesc)) || _S.HeadGirl.intelligence+_S.HeadGirl.intelligenceImplant < -50>>
 			Despite the experience $he accumulated during $his past career, $his very low intelligence is a great disadvantage for your troops.
-		<<elseif $HeadGirl.intelligence+$HeadGirl.intelligenceImplant < -50>>
+		<<elseif _S.HeadGirl.intelligence+_S.HeadGirl.intelligenceImplant < -50>>
 			Without experience and low intelligence, $he performs horribly as a commander, greatly affecting your troops.
-		<<elseif !(setup.bodyguardCareers.includes($HeadGirl.career) && setup.HGCareers.includes($HeadGirl.career) && setup.secExCombatPrestige.includes($HeadGirl.prestigeDesc)) || $HeadGirl.intelligence+$HeadGirl.intelligenceImplant < -15>>
+		<<elseif !(setup.bodyguardCareers.includes(_S.HeadGirl.career) && setup.HGCareers.includes(_S.HeadGirl.career) && setup.secExCombatPrestige.includes(_S.HeadGirl.prestigeDesc)) || _S.HeadGirl.intelligence+_S.HeadGirl.intelligenceImplant < -15>>
 			Despite the experience $he accumulated during $his past career, $he lacks the intelligence to apply it quickly and effectively, making for a rather poor performance in the field.
-		<<elseif $HeadGirl.intelligence+$HeadGirl.intelligenceImplant < -15>>
+		<<elseif _S.HeadGirl.intelligence+_S.HeadGirl.intelligenceImplant < -15>>
 			$He lacks the experience and the intelligence to be an effective commander, the performance of your troops suffers because of $his poor leadership.
 		<</if>>
 		<<if $gainedCombat == 1>>
@@ -1084,7 +1085,7 @@
 		<</if>>
 		<<if $leaderWounded == 1>>
 			Unfortunately, @@.red;$he sustained major injuries.@@
-			<<set _woundType = App.SecExp.inflictBattleWound(getSlave($Bodyguard.ID))>>
+			<<set _woundType = App.SecExp.inflictBattleWound(_S.Bodyguard)>>
 			<<if _woundType == "voice">>
 				A stray bullet hit $his neck. While $he fortunately avoided fatal hemorrhaging, $his vocal cords were irreparably damaged.
 			<<elseif _woundType == "eyes">>
@@ -1101,12 +1102,12 @@
 		<<if $battleResult == 3 && $SecExp.settings.battle.allowSlavePrestige == 1>>
 			<<set _found = 0>>
 			<<for _i = 0; _i < $slaveVictories.length; _i++>>
-				<<if $slaveVictories[_i].ID == $HeadGirl.ID>>
+				<<if $slaveVictories[_i].ID == $HeadGirlID>>
 					<<set $slaveVictories[_i].victories++>>
 					<<set _found = 1>>
 					<<if $slaveVictories[_i].victories >= 10>>
-						<<if $HeadGirl.prestige < 3>>
-							<<set _j = $slaveIndices[$HeadGirl.ID]>>
+						<<if _S.HeadGirl.prestige < 3>>
+							<<set _j = $slaveIndices[$HeadGirlID]>>
 							<<set $slaves[_j].prestige++>>
 							<<if $slaves[_j].prestige == 1>>
 								<<set $slaves[_j].prestigeDesc = "$He is well known for being a great commander.">>
@@ -1123,7 +1124,7 @@
 				<</if>>
 			<</for>>
 			<<if _found == 0>>
-				<<set _newSlave = {ID: $HeadGirl.ID, victories: 0}>>
+				<<set _newSlave = {ID: $HeadGirlID, victories: 0}>>
 				<<set $slaveVictories.push(_newSlave)>>
 			<</if>>
 		<</if>>
@@ -1528,4 +1529,4 @@
 <</for>>
 <<for _i = 0; _i < $mercUnits.length; _i++>>
 	<<set $mercUnits[_i].isDeployed = 0>>
-<</for>>
\ No newline at end of file
+<</for>>
diff --git a/src/Mods/SecExp/buildings/propagandaHub.tw b/src/Mods/SecExp/buildings/propagandaHub.tw
index 2d147704b537648d320f6f847c241c28ef25af7a..a2d306128a40497d382c550b4156c663d54d2251 100644
--- a/src/Mods/SecExp/buildings/propagandaHub.tw
+++ b/src/Mods/SecExp/buildings/propagandaHub.tw
@@ -14,15 +14,15 @@ Propaganda Hub
 
 The propaganda hub is a surprisingly inconspicuous building, dimly lit from the outside. You are well aware however of its role and its importance. You confidently enter its unassuming doorway and calmly review the work being done here.
 
-<<if $Recruiter != 0>>
-	<<setLocalPronouns $Recruiter>>
+<<if $RecruiterID != 0>>
+	<<setLocalPronouns _S.Recruiter>>
 	<br><br>
 	<<if $SecExp.buildings.propHub.recuriterOffice == 0>>
-		<<link "Give <span class='slave-name'><<= SlaveFullName($Recruiter)>></span> an office.""propagandaHub">>
+		<<link "Give <span class='slave-name'><<= SlaveFullName(_S.Recruiter)>></span> an office.""propagandaHub">>
 			<<set $SecExp.buildings.propHub.recuriterOffice = 1>>
 		<</link>>
 	<<else>>
-		<<link "Remove <span class='slave-name'><<= SlaveFullName($Recruiter)>></span> from $his office.""propagandaHub">>
+		<<link "Remove <span class='slave-name'><<= SlaveFullName(_S.Recruiter)>></span> from $his office.""propagandaHub">>
 			<<set $SecExp.buildings.propHub.recuriterOffice = 0>>
 		<</link>>
 	<</if>>
diff --git a/src/Mods/SecExp/rebellionReport.tw b/src/Mods/SecExp/rebellionReport.tw
index d6977359a9802640750bdd68027c7636ee5d028a..19542a95f2988e7fd7b260578712f5b1ef933c82 100644
--- a/src/Mods/SecExp/rebellionReport.tw
+++ b/src/Mods/SecExp/rebellionReport.tw
@@ -518,12 +518,12 @@
 <<else>>
 	The garrison assigned to the facility housing $assistant.name's mainframe prevented any sabotage attempt.
 <</if>>
-<<if $garrison.penthouse == 1 && $Bodyguard != 0>>
-	<<setLocalPronouns $Bodyguard 2>>
+<<if $garrison.penthouse == 1 && $BodyguardID != 0>>
+	<<setLocalPronouns _S.Bodyguard 2>>
 	The garrison assigned to the penthouse together with your loyal Bodyguard stopped all assaults against your penthouse with ease.
-<<elseif $Bodyguard != 0>>
+<<elseif $BodyguardID != 0>>
 	<<if random(1,100) <= 75>>
-		During the fighting a group of slaves assaulted the penthouse. Your Bodyguard, $Bodyguard.slaveName, stood strong against the furious attack.
+		During the fighting a group of slaves assaulted the penthouse. Your Bodyguard, _S.Bodyguard.slaveName, stood strong against the furious attack.
 		<<set _woundChance = 0>>
 		<<if $PC.career == "mercenary" || $PC.career == "gang">>
 			<<set _woundChance -= 5>>
@@ -560,50 +560,50 @@
 		<<else>>
 			Fortunately you managed to avoid injury.
 		<</if>>
-		<<if $Concubine != 0>>
-			<<setLocalPronouns $Concubine>>
+		<<if _S.Concubine>>
+			<<setLocalPronouns _S.Concubine>>
 			<<set _woundChance = 0>>
-			<<if $Concubine.skill.combat == 1>>
+			<<if _S.Concubine.skill.combat == 1>>
 				<<set _woundChance -= 2>>
 			<</if>>
-			<<set _woundChance -= 0.25 * (getLimbCount($Concubine, 105))>>
-			<<if $Concubine.health.condition >= 50>>
+			<<set _woundChance -= 0.25 * (getLimbCount(_S.Concubine, 105))>>
+			<<if _S.Concubine.health.condition >= 50>>
 				<<set _woundChance -= 1>>
 			<</if>>
-			<<if $Concubine.weight > 130>>
+			<<if _S.Concubine.weight > 130>>
 				<<set _woundChance += 1>>
 			<</if>>
-			<<if $Concubine.muscles < -30>>
+			<<if _S.Concubine.muscles < -30>>
 				<<set _woundChance += 1>>
 			<</if>>
-			<<if getBestVision($Concubine) === 0>>
+			<<if getBestVision(_S.Concubine) === 0>>
 				<<set _woundChance += 1>>
 			<</if>>
-			<<if $Concubine.heels == 1>>
+			<<if _S.Concubine.heels == 1>>
 				<<set _woundChance += 1>>
 			<</if>>
-			<<if $Concubine.boobs >= 1400>>
+			<<if _S.Concubine.boobs >= 1400>>
 				<<set _woundChance += 1>>
 			<</if>>
-			<<if $Concubine.butt >= 6>>
+			<<if _S.Concubine.butt >= 6>>
 				<<set _woundChance += 1>>
 			<</if>>
-			<<if $Concubine.belly >= 10000>>
+			<<if _S.Concubine.belly >= 10000>>
 				<<set _woundChance += 1>>
 			<</if>>
-			<<if $Concubine.dick >= 8>>
+			<<if _S.Concubine.dick >= 8>>
 				<<set _woundChance += 1>>
 			<</if>>
-			<<if $Concubine.balls >= 8>>
+			<<if _S.Concubine.balls >= 8>>
 				<<set _woundChance += 1>>
 			<</if>>
-			<<if $Concubine.intelligence+$Concubine.intelligenceImplant < -95>>
+			<<if _S.Concubine.intelligence+_S.Concubine.intelligenceImplant < -95>>
 				<<set _woundChance += 1>>
 			<</if>>
 			<<set _woundChance *= random(2,4)>>
 			<<if random(1,100) <= _woundChance>>
 				Your Concubine was unfortunately caught in the crossfire and
-				<<set _woundType = App.SecExp.inflictBattleWound(getSlave($Concubine.ID))>>
+				<<set _woundType = App.SecExp.inflictBattleWound(_S.Concubine)>>
 				<<if _woundType == "voice">>
 					a splinter pierced $his throat, severing $his vocal cords.
 				<<elseif _woundType == "eyes">>
@@ -617,49 +617,49 @@
 				<</if>>
 			<</if>>
 		<</if>>
-		<<setLocalPronouns $Bodyguard>>
+		<<setLocalPronouns _S.Bodyguard>>
 		<<set _woundChance = 0>>
-		<<if $Bodyguard.skill.combat == 1>>
+		<<if _S.Bodyguard.skill.combat == 1>>
 			<<set _woundChance -= 2>>
 		<</if>>
-		<<set _woundChance -= 0.25 * (getLimbCount($Bodyguard, 105))>>
-		<<if $Bodyguard.health.condition >= 50>>
+		<<set _woundChance -= 0.25 * (getLimbCount(_S.Bodyguard, 105))>>
+		<<if _S.Bodyguard.health.condition >= 50>>
 			<<set _woundChance -= 1>>
 		<</if>>
-		<<if $Bodyguard.weight > 130>>
+		<<if _S.Bodyguard.weight > 130>>
 			<<set _woundChance += 1>>
 		<</if>>
-		<<if $Bodyguard.muscles < -30>>
+		<<if _S.Bodyguard.muscles < -30>>
 			<<set _woundChance += 1>>
 		<</if>>
-		<<if getBestVision($Bodyguard) === 0>>
+		<<if getBestVision(_S.Bodyguard) === 0>>
 			<<set _woundChance += 1>>
 		<</if>>
-		<<if $Bodyguard.heels == 1>>
+		<<if _S.Bodyguard.heels == 1>>
 			<<set _woundChance += 1>>
 		<</if>>
-		<<if $Bodyguard.boobs >= 1400>>
+		<<if _S.Bodyguard.boobs >= 1400>>
 			<<set _woundChance += 1>>
 		<</if>>
-		<<if $Bodyguard.butt >= 6>>
+		<<if _S.Bodyguard.butt >= 6>>
 			<<set _woundChance += 1>>
 		<</if>>
-		<<if $Bodyguard.belly >= 10000>>
+		<<if _S.Bodyguard.belly >= 10000>>
 			<<set _woundChance += 1>>
 		<</if>>
-		<<if $Bodyguard.dick >= 8>>
+		<<if _S.Bodyguard.dick >= 8>>
 			<<set _woundChance += 1>>
 		<</if>>
-		<<if $Bodyguard.balls >= 8>>
+		<<if _S.Bodyguard.balls >= 8>>
 			<<set _woundChance += 1>>
 		<</if>>
-		<<if $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -95>>
+		<<if _S.Bodyguard.intelligence+_S.Bodyguard.intelligenceImplant < -95>>
 			<<set _woundChance += 1>>
 		<</if>>
 		<<set _woundChance *= random(2,4)>>
 		<<if random(1,100) <= _woundChance>>
 			During one of the assaults your Bodyguard was hit.
-			<<set _woundType = App.SecExp.inflictBattleWound(getSlave($Bodyguard.ID))>>
+			<<set _woundType = App.SecExp.inflictBattleWound(_S.Bodyguard)>>
 			<<if _woundType == "voice">>
 				A splinter pierced $his throat, severing $his vocal cords.
 			<<elseif _woundType == "eyes">>
@@ -718,50 +718,50 @@
 		<<else>>
 			Fortunately you managed to avoid injury.
 		<</if>>
-		<<if $Concubine != 0>>
-			<<setLocalPronouns $Concubine>>
+		<<if _S.Concubine>>
+			<<setLocalPronouns _S.Concubine>>
 			<<set _woundChance = 0>>
-			<<if $Concubine.skill.combat == 1>>
+			<<if _S.Concubine.skill.combat == 1>>
 				<<set _woundChance -= 2>>
 			<</if>>
-			<<set _woundChance -= 0.25 * (getLimbCount($Concubine, 105))>>
-			<<if $Concubine.health.condition >= 50>>
+			<<set _woundChance -= 0.25 * (getLimbCount(_S.Concubine, 105))>>
+			<<if _S.Concubine.health.condition >= 50>>
 				<<set _woundChance -= 1>>
 			<</if>>
-			<<if $Concubine.weight > 130>>
+			<<if _S.Concubine.weight > 130>>
 				<<set _woundChance += 1>>
 			<</if>>
-			<<if $Concubine.muscles < -30>>
+			<<if _S.Concubine.muscles < -30>>
 				<<set _woundChance += 1>>
 			<</if>>
-			<<if getBestVision($Concubine) === 0>>
+			<<if getBestVision(_S.Concubine) === 0>>
 				<<set _woundChance += 1>>
 			<</if>>
-			<<if $Concubine.heels == 1>>
+			<<if _S.Concubine.heels == 1>>
 				<<set _woundChance += 1>>
 			<</if>>
-			<<if $Concubine.boobs >= 1400>>
+			<<if _S.Concubine.boobs >= 1400>>
 				<<set _woundChance += 1>>
 			<</if>>
-			<<if $Concubine.butt >= 6>>
+			<<if _S.Concubine.butt >= 6>>
 				<<set _woundChance += 1>>
 			<</if>>
-			<<if $Concubine.belly >= 10000>>
+			<<if _S.Concubine.belly >= 10000>>
 				<<set _woundChance += 1>>
 			<</if>>
-			<<if $Concubine.dick >= 8>>
+			<<if _S.Concubine.dick >= 8>>
 				<<set _woundChance += 1>>
 			<</if>>
-			<<if $Concubine.balls >= 8>>
+			<<if _S.Concubine.balls >= 8>>
 				<<set _woundChance += 1>>
 			<</if>>
-			<<if $Concubine.intelligence+$Concubine.intelligenceImplant < -95>>
+			<<if _S.Concubine.intelligence+_S.Concubine.intelligenceImplant < -95>>
 				<<set _woundChance += 1>>
 			<</if>>
 			<<set _woundChance *= random(2,4)>>
 			<<if random(1,100) <= _woundChance>>
 				Your Concubine was unfortunately caught in the crossfire and
-				<<set _woundType = App.SecExp.inflictBattleWound(getSlave($Concubine.ID))>>
+				<<set _woundType = App.SecExp.inflictBattleWound(_S.Concubine)>>
 				<<if _woundType == "voice">>
 					a splinter pierced $his throat, severing $his vocal cords.
 				<<elseif _woundType == "eyes">>
@@ -821,50 +821,50 @@
 		<<else>>
 			Fortunately you managed to avoid injury.
 		<</if>>
-		<<if $Concubine != 0>>
-			<<setLocalPronouns $Concubine>>
+		<<if _S.Concubine>>
+			<<setLocalPronouns _S.Concubine>>
 			<<set _woundChance = 0>>
-			<<if $Concubine.skill.combat == 1>>
+			<<if _S.Concubine.skill.combat == 1>>
 				<<set _woundChance -= 2>>
 			<</if>>
-			<<set _woundChance -= 0.25 * (getLimbCount($Concubine, 105))>>
-			<<if $Concubine.health.condition >= 50>>
+			<<set _woundChance -= 0.25 * (getLimbCount(_S.Concubine, 105))>>
+			<<if _S.Concubine.health.condition >= 50>>
 				<<set _woundChance -= 1>>
 			<</if>>
-			<<if $Concubine.weight > 130>>
+			<<if _S.Concubine.weight > 130>>
 				<<set _woundChance += 1>>
 			<</if>>
-			<<if $Concubine.muscles < -30>>
+			<<if _S.Concubine.muscles < -30>>
 				<<set _woundChance += 1>>
 			<</if>>
-			<<if getBestVision($Concubine) === 0>>
+			<<if getBestVision(_S.Concubine) === 0>>
 				<<set _woundChance += 1>>
 			<</if>>
-			<<if $Concubine.heels == 1>>
+			<<if _S.Concubine.heels == 1>>
 				<<set _woundChance += 1>>
 			<</if>>
-			<<if $Concubine.boobs >= 1400>>
+			<<if _S.Concubine.boobs >= 1400>>
 				<<set _woundChance += 1>>
 			<</if>>
-			<<if $Concubine.butt >= 6>>
+			<<if _S.Concubine.butt >= 6>>
 				<<set _woundChance += 1>>
 			<</if>>
-			<<if $Concubine.belly >= 10000>>
+			<<if _S.Concubine.belly >= 10000>>
 				<<set _woundChance += 1>>
 			<</if>>
-			<<if $Concubine.dick >= 8>>
+			<<if _S.Concubine.dick >= 8>>
 				<<set _woundChance += 1>>
 			<</if>>
-			<<if $Concubine.balls >= 8>>
+			<<if _S.Concubine.balls >= 8>>
 				<<set _woundChance += 1>>
 			<</if>>
-			<<if $Concubine.intelligence+$Concubine.intelligenceImplant < -95>>
+			<<if _S.Concubine.intelligence+_S.Concubine.intelligenceImplant < -95>>
 				<<set _woundChance += 1>>
 			<</if>>
 			<<set _woundChance *= random(2,4)>>
 			<<if random(1,100) <= _woundChance>>
 				Your Concubine was unfortunately caught in the crossfire and
-				<<set _woundType = App.SecExp.inflictBattleWound(getSlave($Concubine.ID))>>
+				<<set _woundType = App.SecExp.inflictBattleWound(_S.Concubine))>>
 				<<if _woundType == "voice">>
 					a splinter pierced $his throat, severing $his vocal cords.
 				<<elseif _woundType == "eyes">>
diff --git a/src/Mods/SecExp/securityReport.tw b/src/Mods/SecExp/securityReport.tw
index 5b3783426b744e2a6a6a3ae2f096301f60d91484..5fcf0c0e6b0061b23194f0dd79b07d53444a342b 100644
--- a/src/Mods/SecExp/securityReport.tw
+++ b/src/Mods/SecExp/securityReport.tw
@@ -360,19 +360,19 @@ Due to the deterioration of the old world countries, organized crime focuses mor
 	<</if>>
 	<<if $SecExp.buildings.propHub.active > 0>>
 		<<if $SecExp.buildings.propHub.campaign >= 1 && $SecExp.buildings.propHub.focus == "recruitment">>
-			<<if $SecExp.buildings.propHub.recuriterOffice === 0 || $Recruiter == 0>>
+			<<if $SecExp.buildings.propHub.recuriterOffice === 0 || $RecruiterID == 0>>
 				<<if $propCampaignBoost == 1>>
 					<<set _recruitsMultiplier *= 1.1>>
 				<<else>>
 					<<set _recruitsMultiplier *= 1.05>>
 				<</if>>
-			<<elseif $SecExp.buildings.propHub.recuriterOffice > 0 && $Recruiter > 0>>
-				<<setLocalPronouns $Recruiter>>
-				<span class='slave-name'><<= SlaveFullName($Recruiter)>></span> is able to further boost your militia recruitment campaign from $his PR hub office.
+			<<elseif $SecExp.buildings.propHub.recuriterOffice > 0 && $RecruiterID > 0>>
+				<<setLocalPronouns _S.Recruiter>>
+				<span class='slave-name'><<= SlaveFullName(_S.Recruiter)>></span> is able to further boost your militia recruitment campaign from $his PR hub office.
 				<<if $propCampaignBoost == 1>>
-					<<set _recruitsMultiplier *= 1.2 + (($Recruiter.intelligence+$Recruiter.intelligenceImplant)/650)>>
+					<<set _recruitsMultiplier *= 1.2 + ((_S.Recruiter.intelligence+_S.Recruiter.intelligenceImplant)/650)>>
 				<<else>>
-					<<set _recruitsMultiplier *= 1.15 + (($Recruiter.intelligence+$Recruiter.intelligenceImplant)/650)>>
+					<<set _recruitsMultiplier *= 1.15 + ((_S.Recruiter.intelligence+_S.Recruiter.intelligenceImplant)/650)>>
 				<</if>>
 			<</if>>
 		<</if>>
diff --git a/src/Mods/SpecialForce/WeeklyChoices.tw b/src/Mods/SpecialForce/WeeklyChoices.tw
index 8f5291b74c888b550e073325231c90fdb486edc4..c4d22063754f2c5e5f5d8eddf6e8ddfe24c7a929 100644
--- a/src/Mods/SpecialForce/WeeklyChoices.tw
+++ b/src/Mods/SpecialForce/WeeklyChoices.tw
@@ -61,21 +61,21 @@
 			<<set $SF.Colonel.Talk = 1, $SF.Colonel.Status += 2, $SF.FS.Tension -= _colonelTalkTensionRuction>>
 			<br><br>You ask The Colonel if she would like to stretch her legs up on the surface. It doesn't take much effort for her to agree.
 			<<if $PC.skill.warfare >= 100 && $PC.career == "mercenary">>
-				Your mastery of wet work and prior experience in a PMC satisfies The Colonel that between you<<if $Bodyguard != 0>>, $Bodyguard.slaveName,<</if>> and her, there should be little threat to walking around the arcology. Being able to see and interact with the arcology owner directly maintains the false idea that you're just like one of them while also giving them an increased opportunity to try gaining your favor.
+				Your mastery of wet work and prior experience in a PMC satisfies The Colonel that between you<<if _S.Bodyguard>>, _S.Bodyguard.slaveName,<</if>> and her, there should be little threat to walking around the arcology. Being able to see and interact with the arcology owner directly maintains the false idea that you're just like one of them while also giving them an increased opportunity to try gaining your favor.
 				<<run repX(10, "specialForces")>>
 				<<run cashX(_EnvCash2, "specialForces")>>
 			<<elseif $PC.skill.warfare >= 100>>
-				Your mastery of wet work satisfies The Colonel that you only need two soldiers <<if $Bodyguard != 0>> plus $Bodyguard.slaveName<</if>> to walk safely around the arcology. Being able to see and interact with the arcology owner directly maintains the false idea that you're just like one of them while also giving them an increased opportunity to try gaining your favor.
+				Your mastery of wet work satisfies The Colonel that you only need two soldiers <<if _S.Bodyguard>> plus _S.Bodyguard.slaveName<</if>> to walk safely around the arcology. Being able to see and interact with the arcology owner directly maintains the false idea that you're just like one of them while also giving them an increased opportunity to try gaining your favor.
 				<<run repX(5, "specialForces")>>
 				<<run cashX(_EnvCash3, "specialForces")>>
 			<<elseif $PC.skill.warfare >= 60>>
-				With some expertise in warfare, The Colonel believes <<if $Bodyguard != 0>>with $Bodyguard.slaveName <</if>>you only need a squad of armed soldiers for a walk through the arcology.
+				With some expertise in warfare, The Colonel believes <<if _S.Bodyguard>>with _S.Bodyguard.slaveName <</if>>you only need a squad of armed soldiers for a walk through the arcology.
 			<<elseif $PC.skill.warfare >= 30>>
-				As you have some skill in warfare, The Colonel believes<<if $Bodyguard != 0>> with $Bodyguard.slaveName<</if>> you only need two full squads of armed soldiers for a walk around the arcology.
+				As you have some skill in warfare, The Colonel believes<<if _S.Bodyguard>> with _S.Bodyguard.slaveName<</if>> you only need two full squads of armed soldiers for a walk around the arcology.
 			<<elseif $PC.skill.warfare >= 10>>
-				Your minor skill in warfare convinces The Colonel that <<if $Bodyguard != 0>>in addition to $Bodyguard.slaveName, <</if>>you need two full squads of armed soldiers and an armored car escort for a simple walk around the arcology.
+				Your minor skill in warfare convinces The Colonel that <<if _S.Bodyguard>>in addition to _S.Bodyguard.slaveName, <</if>>you need two full squads of armed soldiers and an armored car escort for a simple walk around the arcology.
 			<<else>>
-				Your complete lack of combat skill convinces The Colonel that <<if $Bodyguard != 0>>in addition to $Bodyguard.slaveName, <</if>>you need two full squads of armed soldiers, an armored car escort, and a sniper overwatch for a simple walk around the arcology.
+				Your complete lack of combat skill convinces The Colonel that <<if _S.Bodyguard>>in addition to _S.Bodyguard.slaveName, <</if>>you need two full squads of armed soldiers, an armored car escort, and a sniper overwatch for a simple walk around the arcology.
 			<</if>>
 
 			<br>As you make your way through the arcology you stop at a
diff --git a/src/data/backwardsCompatibility/datatypeCleanup.js b/src/data/backwardsCompatibility/datatypeCleanup.js
index 60a17047a0e5579de773a24678db928f63fc925a..f60622d7e2f84562b55fd716bb2b59465a04073b 100644
--- a/src/data/backwardsCompatibility/datatypeCleanup.js
+++ b/src/data/backwardsCompatibility/datatypeCleanup.js
@@ -1521,7 +1521,7 @@ globalThis.FacilityDatatypeCleanup = (function() {
 
 	/**
 	 * @param {function(App.Entity.SlaveState):boolean} predicate
-	 * @returns {number} ID of the first matched slave or 0 if no match was founds
+	 * @returns {number} ID of the first matched slave or 0 if no match was found
 	 */
 	function findSlaveId(predicate) {
 		const s = V.slaves.find(predicate);
@@ -1547,8 +1547,8 @@ globalThis.FacilityDatatypeCleanup = (function() {
 		HeadGirlSuiteDatatypeCleanup();
 		NurseryDatatypeCleanup();
 
-		V.Recruiter = V.slaves.find(s => s.assignment === Job.RECRUITER) || 0;
-		V.Bodyguard = V.slaves.find(s => s.assignment === Job.BODYGUARD) || 0;
+		V.RecruiterID = findSlaveId(s => s.assignment === Job.RECRUITER);
+		V.BodyguardID = findSlaveId(s => s.assignment === Job.BODYGUARD);
 
 		replaceSlaveStateWithId("Lurcher");
 		replaceSlaveStateWithId("Stud");
@@ -1607,7 +1607,7 @@ globalThis.FacilityDatatypeCleanup = (function() {
 		}
 		V.brothelBoost.eligible = Math.clamp(+V.brothelBoost.eligible, 0, 10) || 0;
 		/* madam */
-		V.Madam = V.slaves.find(s => s.assignment === Job.MADAM) || 0;
+		V.MadamID = findSlaveId(s => s.assignment === Job.MADAM);
 		V.MadamIgnoresFlaws = Math.clamp(+V.MadamIgnoresFlaws, 0, 1) || 0;
 	}
 
@@ -1637,7 +1637,7 @@ globalThis.FacilityDatatypeCleanup = (function() {
 		V.bioreactorsXY = Math.max(+V.bioreactorsXY, 0) || 0;
 		V.bioreactorsBarren = Math.max(+V.bioreactorsBarren, 0) || 0;
 		/* milkmaid */
-		V.Milkmaid = V.slaves.find(s => s.assignment === Job.MILKMAID) || 0;
+		V.MilkmaidID = findSlaveId(s => s.assignment === Job.MILKMAID);
 		V.milkmaidImpregnates = Math.clamp(+V.milkmaidImpregnates, 0, 1) || 0;
 	}
 
@@ -1646,7 +1646,7 @@ globalThis.FacilityDatatypeCleanup = (function() {
 		V.farmyardBreeding = Math.clamp(+V.farmyardBreeding, 0, 1) || 0;
 		V.farmyardShows = Math.clamp(+V.farmyardShows, 0, 1) || 0;
 		/* farmer */
-		V.Farmer = V.slaves.find(s => s.assignment === Job.FARMER) || 0;
+		V.FarmerID = findSlaveId(s => s.assignment === Job.FARMER);
 	}
 
 	function ClubDatatypeCleanup() {
@@ -1735,12 +1735,12 @@ globalThis.FacilityDatatypeCleanup = (function() {
 		V.masterSuitePregnancyFertilityDrugs = Math.clamp(+V.masterSuitePregnancyFertilityDrugs, 0, 1) || 0;
 		V.masterSuiteHyperPregnancy = Math.clamp(+V.masterSuiteHyperPregnancy, 0, 1) || 0;
 		/* concubine */
-		V.Concubine = V.slaves.find(s => s.assignment === Job.CONCUBINE) || 0;
+		V.ConcubineID = findSlaveId(s => s.assignment === Job.CONCUBINE);
 	}
 
 	function HeadGirlSuiteDatatypeCleanup() {
 		/* headgirl */
-		V.HeadGirl = V.slaves.find(s => s.assignment === Job.HEADGIRL) || 0;
+		V.HeadGirlID = findSlaveId(s => s.assignment === Job.HEADGIRL);
 		V.HGSuiteEquality = Math.clamp(+V.HGSuiteEquality, 0, 1) || 0;
 		if (V.HGSuiteSurgery !== 0) {
 			V.HGSuiteSurgery = 1;
@@ -1755,7 +1755,7 @@ globalThis.FacilityDatatypeCleanup = (function() {
 
 	function NurseryDatatypeCleanup() {
 		/* matron */
-		V.Matron = V.slaves.find(s => s.assignment === Job.MATRON) || 0;
+		V.MatronID = findSlaveId(s => s.assignment === Job.MATRON);
 	}
 })();
 
diff --git a/src/endWeek/endWeek.js b/src/endWeek/endWeek.js
index e905a4a5fd2eb3dd55c60f8510de9c84504744c6..f9ea6808a0cc99304682871c05e38d6f3cacb1d2 100644
--- a/src/endWeek/endWeek.js
+++ b/src/endWeek/endWeek.js
@@ -286,18 +286,10 @@ globalThis.endWeek = (function() {
 		V.HGEnergy = 0;
 		V.HGCum = 0;
 		V.HGSlaveSuccess = 0;
-		V.HeadGirl = 0;
-		V.Recruiter = 0;
-		V.Madam = 0;
 		V.unMadam = 0;
 		V.madamCashBonus = 0;
 		V.whorePriceAdjustment = {};
 		V.unDJ = 0;
-		V.Milkmaid = 0;
-		V.Farmer = 0;
-		V.Concubine = 0;
-		V.Matron = 0;
-		V.Bodyguard = 0;
 		V.StudID = 0;
 		V.StudCum = 0;
 		V.fuckSlaves = 0;
diff --git a/src/endWeek/healthFunctions.js b/src/endWeek/healthFunctions.js
index 6b013a041e06b7b387094a7ae8ce2d69bae0d93e..f4361019e9018f716ff6bdca16cc58f19dee718f 100644
--- a/src/endWeek/healthFunctions.js
+++ b/src/endWeek/healthFunctions.js
@@ -340,7 +340,7 @@ globalThis.willWorkToDeath = function(slave) {
 		return true;
 	} else if (slave.fetish === "mindbroken") {
 		return true;
-	} else if (V.Madam !== 0 && (slave.assignment === Job.BROTHEL || (slave.assignment === Job.WHORE && V.brothel > 0 && V.universalRulesFacilityWork === 1 && V.brothelSpots > 0))) {
+	} else if (V.MadamID !== 0 && (slave.assignment === Job.BROTHEL || (slave.assignment === Job.WHORE && V.brothel > 0 && V.universalRulesFacilityWork === 1 && V.brothelSpots > 0))) {
 		return true;
 	} else if (S.DJ && (slave.assignment === Job.CLUB || (slave.assignment === Job.PUBLIC && V.club > 0 && V.universalRulesFacilityWork === 1 && V.clubSpots > 0))) {
 		return true;
diff --git a/src/endWeek/minorInjuryResponse.js b/src/endWeek/minorInjuryResponse.js
index 4b61210ecddc785fbac1043e8d2253a514efbc5b..4abe972651182c5550315914117d07cc869d816a 100644
--- a/src/endWeek/minorInjuryResponse.js
+++ b/src/endWeek/minorInjuryResponse.js
@@ -10,22 +10,22 @@ globalThis.minorInjuryResponse = function(slave) {
 	let trackedCategory = "";
 
 	switch (slave.assignment) {
-		case window.Job.WHORE:
+		case Job.WHORE:
 			trackedCategory = "slaveAssignmentWhore";
 			break;
-		case window.Job.MADAM:
+		case Job.MADAM:
 			trackedCategory = "slaveAssignmentMadam";
 			break;
-		case window.Job.BROTHEL:
+		case Job.BROTHEL:
 			trackedCategory = "slaveAssignmentBrothel";
 			break;
-		case window.Job.PUBLIC:
+		case Job.PUBLIC:
 			trackedCategory = "slaveAssignmentPublic";
 			break;
-		case window.Job.DJ:
+		case Job.DJ:
 			trackedCategory = "slaveAssignmentDj";
 			break;
-		case window.Job.CLUB:
+		case Job.CLUB:
 			trackedCategory = "slaveAssignmentClub";
 			break;
 		default:
diff --git a/src/endWeek/saBeYourHeadGirl.js b/src/endWeek/saBeYourHeadGirl.js
index 4c8c5b992b3445546339a1bb1bd1276e33e98de0..c8778af1a32b93520259ba549c387a42680e601f 100644
--- a/src/endWeek/saBeYourHeadGirl.js
+++ b/src/endWeek/saBeYourHeadGirl.js
@@ -67,20 +67,21 @@ App.SlaveAssignment.beYourHeadGirl = (function() {
 			slave.trust += 1;
 			App.SlaveAssignment.pleaseYou(slave);
 			if (slave.relationship > 4) {
-				if (slave.relationshipTarget === V.Concubine.ID) {
-					if (areRelated(V.Concubine, slave)) {
-						const concubinePronouns = getPronouns(V.Concubine);
-						if (V.Concubine.mother === slave.ID || V.Concubine.father === slave.ID) {
+				if (slave.relationshipTarget === V.ConcubineID) {
+					const concubine = S.Concubine;
+					if (areRelated(concubine, slave)) {
+						const concubinePronouns = getPronouns(concubine);
+						if (concubine.mother === slave.ID || concubine.father === slave.ID) {
 							r.push(`Your Concubine is your Consort's ${concubinePronouns.daughter}-${concubinePronouns.wife}. Truly, ${arcology.name} looks up to you <span class="green">as children to a father.</span>`);
 							repX(1000, "headGirl", slave);
-						} else if (slave.mother === V.Concubine.ID) {
+						} else if (slave.mother === V.ConcubineID) {
 							r.push(`Your Concubine is your Consort's mother-${concubinePronouns.wife}. Truly, ${arcology.name} looks up to you <span class="green">as children to a father.</span>`);
 							repX(1000, "headGirl", slave);
-						} else if (slave.father === V.Concubine.ID) {
+						} else if (slave.father === V.ConcubineID) {
 							r.push(`Your Concubine is your Consort's father-${concubinePronouns.wife}. Truly, ${arcology.name} looks up to you <span class="green">as children to a father.</span>`);
 							repX(1000, "headGirl", slave);
 						} else {
-							switch (areSisters(slave, V.Concubine)) {
+							switch (areSisters(slave, concubine)) {
 								case 1:
 									r.push(`Your Concubine is your Consort's twin-${concubinePronouns.wife}. Truly, ${arcology.name} looks up to you <span class="green">as children to a father.</span>`);
 									repX(1000, "headGirl", slave);
diff --git a/src/endWeek/saGetMilked.js b/src/endWeek/saGetMilked.js
index 818d51a7d9e0e3560e87bed6949803d105e3f8b4..0679e1ea546d1de289c14f736479a137963fab13 100644
--- a/src/endWeek/saGetMilked.js
+++ b/src/endWeek/saGetMilked.js
@@ -119,14 +119,14 @@ App.SlaveAssignment.getMilked = (function() {
 					r += ` Since there's extra space in ${V.dairyName}, ${he} spends most of ${his} milkings there.`;
 					V.dairySpots -= 1; // Would this need to be pulled for statistics gathering?
 				}
-				if (V.Milkmaid !== 0) {
-					r += ` While there, ${he} gets the benefit of ${V.Milkmaid.slaveName}'s `;
-					if (V.Milkmaid.physicalAge < 21) {
+				if (V.MilkmaidID !== 0) {
+					r += ` While there, ${he} gets the benefit of ${S.Milkmaid.slaveName}'s `;
+					if (S.Milkmaid.physicalAge < 21) {
 						r += `youthful energy`;
 					} else {
 						r += `care`;
 					}
-					if (V.Milkmaid.skill.oral >= 100) {
+					if (S.Milkmaid.skill.oral >= 100) {
 						r += ` and talented tongue`;
 					}
 					r += `.`;
@@ -589,10 +589,10 @@ App.SlaveAssignment.getMilked = (function() {
 		/* Dairy rework cum half here */
 		if (slave.assignment === Job.DAIRY) {
 			if (V.dairyStimulatorsUpgrade !== 1) {
-				if (V.Milkmaid !== 0) {
-					if (V.Milkmaid.dick > 4 && canAchieveErection(V.Milkmaid)) {
-						const milkmaidPronouns = getPronouns(V.Milkmaid);
-						r += ` ${V.Milkmaid.slaveName} sometimes stands in for the machines, which is a polite way of saying ${milkmaidPronouns.he} sometimes fucks ${slave.slaveName}'s ass to help ${him} cum.`;
+				if (V.MilkmaidID !== 0) {
+					if (S.Milkmaid.dick > 4 && canAchieveErection(S.Milkmaid)) {
+						const milkmaidPronouns = getPronouns(S.Milkmaid);
+						r += ` ${S.Milkmaid.slaveName} sometimes stands in for the machines, which is a polite way of saying ${milkmaidPronouns.he} sometimes fucks ${slave.slaveName}'s ass to help ${him} cum.`;
 					}
 				}
 			}
@@ -629,8 +629,8 @@ App.SlaveAssignment.getMilked = (function() {
 				} else if (slave.chem > 100) {
 					cum *= ((600 - slave.chem) / 600);
 				}
-			} else if (V.Milkmaid !== 0) {
-				if (V.Milkmaid.dick > 4 && canAchieveErection(V.Milkmaid)) {
+			} else if (V.MilkmaidID !== 0) {
+				if (S.Milkmaid.dick > 4 && canAchieveErection(S.Milkmaid)) {
 					cum *= 1.2;
 				}
 			}
diff --git a/src/endWeek/saGuardYou.js b/src/endWeek/saGuardYou.js
index c4e5f84ec8d0edda580657e5e361f6e3f5e114dc..41040672cef920539ae2fadd5a3ce2b78f159423 100644
--- a/src/endWeek/saGuardYou.js
+++ b/src/endWeek/saGuardYou.js
@@ -282,19 +282,19 @@ App.SlaveAssignment.guardYou = (function() {
 					}
 				}
 				if (!candidate) {
-					if (V.HeadGirl !== 0 && V.HeadGirl.skill.combat === 0 && bodyguardSuccessorEligible(V.HeadGirl)) {
-						r.push(`${He} does ${his} best to train ${V.HeadGirl.slaveName} whenever ${he} can, hoping that your Head Girl can be made capable of stepping into ${his} place.`);
-						candidate = V.HeadGirl;
+					if (V.HeadGirlID !== 0 && S.HeadGirl.skill.combat === 0 && bodyguardSuccessorEligible(S.HeadGirl)) {
+						r.push(`${He} does ${his} best to train ${S.HeadGirl.slaveName} whenever ${he} can, hoping that your Head Girl can be made capable of stepping into ${his} place.`);
+						candidate = S.HeadGirl;
 					}
 				}
 				if (!candidate) {
-					if (V.Concubine !== 0 && V.Concubine.skill.combat === 0 && V.Concubine.devotion > 50 && V.Concubine.muscles >= -30 && V.Concubine.weight < 150 && V.Concubine.butt < 10 && V.Concubine.boobs < 25000 && V.Concubine.belly < 5000 && V.Concubine.balls < 20 && V.Concubine.dick < 15 && V.Concubine.fuckdoll === 0 && V.Concubine.fetish !== "mindbroken" && canWalk(V.Concubine)) {
-						r.push(`${He} does ${his} best to train ${V.Concubine.slaveName} whenever ${he} can, hoping that your Concubine can be made capable of stepping into ${his} place.`);
-						if (V.Concubine.boobs >= 8000 || V.Concubine.butt >= 10 || V.Concubine.belly >= 5000 || V.Concubine.balls >= 10 || V.Concubine.dick >= 10 || V.Concubine.muscles < 0 || V.Concubine.weight >= 100) {
+					if (V.ConcubineID !== 0 && S.Concubine.skill.combat === 0 && S.Concubine.devotion > 50 && S.Concubine.muscles >= -30 && S.Concubine.weight < 150 && S.Concubine.butt < 10 && S.Concubine.boobs < 25000 && S.Concubine.belly < 5000 && S.Concubine.balls < 20 && S.Concubine.dick < 15 && S.Concubine.fuckdoll === 0 && S.Concubine.fetish !== "mindbroken" && canWalk(S.Concubine)) {
+						r.push(`${He} does ${his} best to train ${S.Concubine.slaveName} whenever ${he} can, hoping that your Concubine can be made capable of stepping into ${his} place.`);
+						if (S.Concubine.boobs >= 8000 || S.Concubine.butt >= 10 || S.Concubine.belly >= 5000 || S.Concubine.balls >= 10 || S.Concubine.dick >= 10 || S.Concubine.muscles < 0 || S.Concubine.weight >= 100) {
 							r.push(`${His} body is poorly suited for combat, but ${he} can learn to work around it with enough effort.`);
 							flawedTrainee = jsRandom(0, 50);
 						}
-						candidate = V.Concubine;
+						candidate = S.Concubine;
 					}
 				}
 				if (!candidate) {
diff --git a/src/endWeek/saNanny.js b/src/endWeek/saNanny.js
index 9b95fc3d0e2728f2ecd9aa76985d210ed648308c..d4604ea3708eaaf867c55317ba4bed78b83d4ef0 100644
--- a/src/endWeek/saNanny.js
+++ b/src/endWeek/saNanny.js
@@ -254,14 +254,14 @@ App.SlaveAssignment.nanny = function(slave) {
 	function matronEffects(slave) {
 		let t = '';
 
-		if (V.Matron) {
-			t += `While there, ${he} benefits from ${V.Matron.slaveName}'s `;
-			if (V.Matron.physicalAge < 21) {
+		if (V.MatronID) {
+			t += `While there, ${he} benefits from ${S.Matron.slaveName}'s `;
+			if (S.Matron.physicalAge < 21) {
 				t += `youthful energy`;
 			} else {
 				t += `care`;
 			}
-			if (V.Matron.skill.oral) { // TODO: keep this? replace with something else?
+			if (S.Matron.skill.oral) { // TODO: keep this? replace with something else?
 				t += ` and talented tongue`;
 			}
 			t += `. `;
diff --git a/src/endWeek/saPleaseYou.js b/src/endWeek/saPleaseYou.js
index 835972b037a1c1f0750595b42e182ba09a108e01..a8c967605d30bf73aa81a92ecfe6f3c3ff69a46a 100644
--- a/src/endWeek/saPleaseYou.js
+++ b/src/endWeek/saPleaseYou.js
@@ -1712,9 +1712,9 @@ App.SlaveAssignment.pleaseYou = (function() {
 				multiplier += 0.04;
 			}
 		}
-		if (slave.ID === V.Concubine.ID) {
+		if (slave.ID === V.ConcubineID) {
 			multiplier += 0.05;
-		} else if ((slave.ID === V.HeadGirl.ID) && (V.arcologies[0].FSEgyptianRevivalistLaw === 1)) {
+		} else if ((slave.ID === V.HeadGirlID) && (V.arcologies[0].FSEgyptianRevivalistLaw === 1)) {
 			multiplier += 0.05;
 		}
 
diff --git a/src/endWeek/saRules_old.js b/src/endWeek/saRules_old.js
index 67e08787a5d6a30a82ec9920b53301ec5c4af568..98cc22ed1c79e18a697c6caf9871a7219b4ccd74 100644
--- a/src/endWeek/saRules_old.js
+++ b/src/endWeek/saRules_old.js
@@ -49,9 +49,9 @@
 						} else if (slave.energy <= 20) {
 							r += `is frigid and has little interest in getting off. `;
 							slave.need = 0;
-						} else if (V.Matron) {
-							r += `is routinely relieved of any built up tension by ${V.Matron.slaveName} and ${his}`;
-							if (canPenetrate(slave) && V.Matron.boobs >= 500) {
+						} else if (S.Matron) {
+							r += `is routinely relieved of any built up tension by ${S.Matron.slaveName} and ${his}`;
+							if (canPenetrate(slave) && S.Matron.boobs >= 500) {
 								r += `luscious breasts. `;
 								actX(slave, "mammary", 14);
 							} else {
@@ -310,20 +310,20 @@
 									if (App.Entity.facilities.nursery.employeesIDs().size > 2) {
 										r += `Under the rules, ${he}'s allowed to demand that other slaves get ${him} off, and ${he} <span class="hotpink">adores</span> you for providing plentiful outlets for ${his} nymphomania. `;
 									} else {
-										r += `Under the rules, ${he}'s allowed to demand that other slaves get ${him} off, and ${he} <span class="hotpink">eagerly awaits</span> the day ${V.Matron ? `more of your slaves join ${him} in ${V.nurseryName} ` : `you assign more nurses to ${V.nurseryName} to help ${him} relieve ${his} ${slave.balls ? `swollen balls` : `tension`}`}. `;	// TODO:
+										r += `Under the rules, ${he}'s allowed to demand that other slaves get ${him} off, and ${he} <span class="hotpink">eagerly awaits</span> the day ${S.Matron ? `more of your slaves join ${him} in ${V.nurseryName} ` : `you assign more nurses to ${V.nurseryName} to help ${him} relieve ${his} ${slave.balls ? `swollen balls` : `tension`}`}. `;	// TODO:
 									}
 								} else if (slave.fetishKnown && slave.fetishStrength > 60) {
 									if (slave.fetish === "sadist") {
 										if (App.Entity.facilities.nursery.employeesIDs().size > 2) {
 											r += `Under the rules, ${he}'s allowed to sexually abuse other slaves, and ${he} <span class="hotpink">adores</span> you for providing a whole nursery of slaves for ${him} to rape. `;
 										} else {
-											r += `Under the rules, ${he}'s allowed to sexually abuse other slaves, and ${he} <span class="hotpink">eagerly awaits</span> the day ${V.Matron ? `more of your slaves join ${him} in ${V.nurseryName}` : `you assign more nurses to ${V.nurseryName} to help ${him} unwind`}. `;
+											r += `Under the rules, ${he}'s allowed to sexually abuse other slaves, and ${he} <span class="hotpink">eagerly awaits</span> the day ${S.Matron ? `more of your slaves join ${him} in ${V.nurseryName}` : `you assign more nurses to ${V.nurseryName} to help ${him} unwind`}. `;
 										}
 									} else if (slave.fetish === "dom") {
 										if (App.Entity.facilities.nursery.employeesIDs().size > 2) {
 											r += `Under the rules, ${he}'s allowed to force other slaves to have sex with ${him}, and ${he} <span class="hotpink">adores</span> you for providing a whole nursery of slaves for ${him} to dominate. `;
 										} else {
-											r += `Under the rules, ${he}'s allowed to force other slaves to have sex with ${him}, and ${he} <span class="hotpink">eagerly awaits</span> the day ${V.Matron ? `more of your slaves join ${him} in ${V.nurseryName}` : `you assign more nurses to ${V.nurseryName} to help ${him} unwind`}. `;
+											r += `Under the rules, ${he}'s allowed to force other slaves to have sex with ${him}, and ${he} <span class="hotpink">eagerly awaits</span> the day ${S.Matron ? `more of your slaves join ${him} in ${V.nurseryName}` : `you assign more nurses to ${V.nurseryName} to help ${him} unwind`}. `;
 										}
 									}
 								}
@@ -334,7 +334,7 @@
 								if (App.Entity.facilities.nursery.employeesIDs().size > 2) {
 									r += `Since ${he}'s low in the slave hierarchy, <span class="mediumaquamarine">${he} knows</span> that the rule that slaves must get consent before having sex with ${him} are all that protect ${him} from abuse. `;
 								} else {
-									r += `Since ${he}'s low in the slave hierarchy, <span class="mediumaquamarine">${he} knows</span> that the rule that slaves must get consent before having sex with ${him} are all that protect ${him} from abuse. Well, that and the fact ${V.nurseryName} is ${V.Matron ? `mostly frequented by other slaveowners' stock` : `${his} little private sanctuary`}. `;
+									r += `Since ${he}'s low in the slave hierarchy, <span class="mediumaquamarine">${he} knows</span> that the rule that slaves must get consent before having sex with ${him} are all that protect ${him} from abuse. Well, that and the fact ${V.nurseryName} is ${S.Matron ? `mostly frequented by other slaveowners' stock` : `${his} little private sanctuary`}. `;
 								}
 								slave.trust++;
 							}
diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js
index a41161a612a3dd3b0b31280a91161744b4707e0d..c1023af381a80d51b3ccb479e8ac55903e7cbd53 100644
--- a/src/endWeek/saWhore.js
+++ b/src/endWeek/saWhore.js
@@ -174,15 +174,16 @@ App.SlaveAssignment.whore = (function() {
 						r += ` Almost everyone who comes to ${V.brothelName} is looking to pound a ${girl} who cums when buttfucked.`;
 					}
 				}
-				if (V.Madam !== 0) {
-					const madamPronouns = getPronouns(V.Madam);
+				if (V.MadamID !== 0) {
+					const madam = S.Madam;
+					const madamPronouns = getPronouns(madam);
 					if (V.madamCashBonus > 0) {
 						if (slave.assignment === Job.WHORE) {
 							r += ` Working`;
 						} else {
 							r += ` Living and working`;
 						}
-						r += ` out of the brothel, ${he} comes under ${SlaveFullName(V.Madam)}'s `;
+						r += ` out of the brothel, ${he} comes under ${SlaveFullName(madam)}'s `;
 						if (V.madamCashBonus < 0.1) {
 							r += `completely inept`;
 						} else if (V.madamCashBonus < 0.2) {
@@ -193,7 +194,7 @@ App.SlaveAssignment.whore = (function() {
 							r += `masterful`;
 						}
 						r += ` leadership.`;
-						if (V.Madam.dick > 2 && canAchieveErection(V.Madam)) {
+						if (madam.dick > 2 && canAchieveErection(madam)) {
 							if (slave.devotion <= 20) {
 								r += ` The Madam rapes ${him} when ${he} fails to meet standards.`;
 							} else {
@@ -201,14 +202,14 @@ App.SlaveAssignment.whore = (function() {
 							}
 						}
 						if (!canHear(slave)) {
-							r += ` Unfortunately, ${his} inability to hear wastes most of ${V.Madam.slaveName}'s advice.`;
+							r += ` Unfortunately, ${his} inability to hear wastes most of ${madam.slaveName}'s advice.`;
 						}
 						if (V.MadamIgnoresFlaws !== 1) {
 							if (!["abusive", "anal addict", "attention whore", "breast growth", "breeder", "cum addict", "malicious", "neglectful", "none", "self hating"].includes(slave.sexualFlaw) && jsRandom(1, 100) > 90) {
-								r += ` ${SlaveFullName(V.Madam)} manages to <span class="flaw break">break</span> ${slave.slaveName} of ${his} sexual flaws.`;
+								r += ` ${SlaveFullName(madam)} manages to <span class="flaw break">break</span> ${slave.slaveName} of ${his} sexual flaws.`;
 								slave.sexualFlaw = "none";
 							} else if (slave.behavioralFlaw !== "none" && jsRandom(1, 100) > 90) {
-								r += ` ${SlaveFullName(V.Madam)} manages to <span class="flaw break">break</span> ${slave.slaveName} of ${his} flaws.`;
+								r += ` ${SlaveFullName(madam)} manages to <span class="flaw break">break</span> ${slave.slaveName} of ${his} flaws.`;
 								slave.behavioralFlaw = "none";
 							}
 						}
@@ -348,8 +349,8 @@ App.SlaveAssignment.whore = (function() {
 				r += ` ${He} spends reduced hours working ${V.brothelName} in order to <span class="green">offset ${his} lack of rest.</span>`;
 			} else if (slave.health.tired + 15 >= 90 && !willWorkToDeath(slave)) {
 				r += ` ${He} attempts to refuse customers due to ${his} exhaustion, but can do little to stop it or the resulting `;
-				if (V.Madam !== 0) {
-					r += `<span class="trust dec">severe punishment</span> by ${V.Madam.slaveName}. ${His} <span class="devotion dec">outbursts</span> are kept in check by your watchful Madam, preventing the customers from ever becoming aware of them while keeping ${him} productive.`;
+				if (V.MadamID !== 0) {
+					r += `<span class="trust dec">severe punishment</span> by ${S.Madam.slaveName}. ${His} <span class="devotion dec">outbursts</span> are kept in check by your watchful Madam, preventing the customers from ever becoming aware of them while keeping ${him} productive.`;
 				} else {
 					r += `<span class="trust dec">severe punishment.</span> ${He} <span class="devotion dec">purposefully underperforms,</span> choosing ${his} overall well-being over the consequences, <span class="reputation dec">aggravating customers and damaging the establishment's image.</span>`;
 					repX(forceNeg(50), "disobedience", slave);
@@ -365,8 +366,8 @@ App.SlaveAssignment.whore = (function() {
 				r += ` ${He} spends reduced hours plying ${his} trade in order to <span class="green">offset ${his} lack of rest.</span>`;
 			} else if (slave.health.tired + 15 >= 90 && !willWorkToDeath(slave)) {
 				r += ` ${He} attempts to refuse to whore due to ${his} exhaustion, but can do little to avoid it or the resulting `;
-				if (V.brothel > 0 && V.universalRulesFacilityWork === 1 && V.brothelSpots > 0 && V.Madam !== 0) {
-					r += `<span class="trust dec">severe punishment</span> by ${V.Madam.slaveName}. ${His} <span class="devotion dec">outbursts</span> are kept in check by your watchful Madam, preventing the customers from ever becoming aware of them and keeping ${him} productive.`;
+				if (V.brothel > 0 && V.universalRulesFacilityWork === 1 && V.brothelSpots > 0 && V.MadamID !== 0) {
+					r += `<span class="trust dec">severe punishment</span> by ${S.Madam.slaveName}. ${His} <span class="devotion dec">outbursts</span> are kept in check by your watchful Madam, preventing the customers from ever becoming aware of them and keeping ${him} productive.`;
 				} else {
 					r += `<span class="trust dec">severe punishment.</span> ${He} <span class="devotion dec">purposefully underperforms,</span> choosing ${his} overall well-being over the consequences, <span class="reputation dec">causing a scene and damaging the image of your whores.</span>`;
 					repX(forceNeg(100), "disobedience", slave);
diff --git a/src/endWeek/slaveAssignmentReport.js b/src/endWeek/slaveAssignmentReport.js
index 4fa4fce42e4cebccf09fdc6c7a370406c61fa905..4ff9b0c3e5b20f8ed8f1d239b2f18ff82e850414 100644
--- a/src/endWeek/slaveAssignmentReport.js
+++ b/src/endWeek/slaveAssignmentReport.js
@@ -72,7 +72,6 @@ App.EndWeek.slaveAssignmentReport = function() {
 				}
 				break;
 			case Job.CONCUBINE:
-				V.Concubine = slave;
 				V.fuckSlaves++;
 				break;
 			case Job.MASTERSUITE:
@@ -167,9 +166,9 @@ App.EndWeek.slaveAssignmentReport = function() {
 		}
 	} // for (const slave of V.slaves)
 
-	if (V.HeadGirl !== 0) {
+	if (V.HeadGirlID !== 0) {
 		V.HGEnergy++;
-		const slave = slaveStateById(V.HeadGirl.ID);
+		const slave = slaveStateById(V.HeadGirlID);
 		if (V.personalAttention === PersonalAttention.SUPPORTHG) {
 			V.HGEnergy++;
 			if (slave.trust > 95) {
@@ -231,7 +230,7 @@ App.EndWeek.slaveAssignmentReport = function() {
 	if (S.HeadGirl) {
 		const HGPossibleSlaves = [[], [], [], [], [], []];
 		for (const slave of V.slaves) {
-			if (!assignmentVisible(slave) || slave.fuckdoll === 1 || slave.ID === V.Bodyguard.ID || slave.ID === V.HeadGirl.ID || slave.fetish === "mindbroken") {
+			if (!assignmentVisible(slave) || slave.fuckdoll === 1 || slave.ID === V.BodyguardID || slave.ID === V.HeadGirlID || slave.fetish === "mindbroken") {
 				continue;
 			} else if (Array.isArray(V.personalAttention) && V.personalAttention.some(p => p.ID === slave.ID)) {
 				continue;
@@ -428,58 +427,57 @@ App.EndWeek.slaveAssignmentReport = function() {
 	function _ensureEmployeeMeetsJobRequirements(slave) {
 		switch (slave.assignment) {
 			case Job.HEADGIRL:
-				V.HeadGirl = slave;
-				if (V.HeadGirl.fetish === "mindbroken") {
+				if (slave.fetish === "mindbroken") {
 					_printSlaveUnassignedNote(slave, "is mindbroken");
-					V.HeadGirl = 0;
-				} else if (!canTalk(V.HeadGirl)) {
+					V.HeadGirlID = 0;
+				} else if (!canTalk(slave)) {
 					_printSlaveUnassignedNote(slave, "can't give slaves verbal orders");
-					V.HeadGirl = 0;
-				} else if (!canWalk(V.HeadGirl)) {
+					V.HeadGirlID = 0;
+				} else if (!canWalk(slave)) {
 					_printSlaveUnassignedNote(slave, "is no longer independently mobile");
-					V.HeadGirl = 0;
-				} else if (!canHold(V.HeadGirl)) {
+					V.HeadGirlID = 0;
+				} else if (!canHold(slave)) {
 					_printSlaveUnassignedNote(slave, "is no longer able to handle your slaves");
-					V.HeadGirl = 0;
-				} else if (!canSee(V.HeadGirl)) {
+					V.HeadGirlID = 0;
+				} else if (!canSee(slave)) {
 					_printSlaveUnassignedNote(slave, "can no longer see");
-					V.HeadGirl = 0;
-				} else if (!canHear(V.HeadGirl)) {
+					V.HeadGirlID = 0;
+				} else if (!canHear(slave)) {
 					_printSlaveUnassignedNote(slave, "can no longer hear");
-					V.HeadGirl = 0;
-				} else if (V.HeadGirl.preg > 37 && V.HeadGirl.broodmother === 2) {
+					V.HeadGirlID = 0;
+				} else if (slave.preg > 37 && slave.broodmother === 2) {
 					_printSlaveUnassignedNote(slave, "spends so much time giving birth and laboring that", `${getPronouns(slave).he} cannot effectively serve as your Head Girl any longer`);
-					V.HeadGirl = 0;
-				} else if (V.HeadGirl.devotion <= 20) {
+					V.HeadGirlID = 0;
+				} else if (slave.devotion <= 20) {
 					_printSlaveUnassignedNote(slave, "is no longer even accepting of you");
-					V.HeadGirl = 0;
+					V.HeadGirlID = 0;
 				}
-				if (V.HeadGirl === 0) {
+				if (V.HeadGirlID === 0) {
 					removeJob(slave, Job.HEADGIRL);
 				}
 				break;
 			case Job.RECRUITER:
-				V.Recruiter = slave;
+				V.RecruiterID = slave.ID;
 				if (slave.fetish === "mindbroken") {
 					_printSlaveUnassignedNote(slave, "is mindbroken");
-					V.Recruiter = 0;
+					V.RecruiterID = 0;
 				} else if (!canTalk(slave)) {
 					_printSlaveUnassignedNote(slave, "can't verbally entice marks");
-					V.Recruiter = 0;
+					V.RecruiterID = 0;
 				} else if (slave.preg > 37 && slave.broodmother === 2) {
 					_printSlaveUnassignedNote(slave, "spends so much time giving birth and laboring that", `${getPronouns(slave).he} cannot effectively serve as your recruiter any longer`);
-					V.Recruiter = 0;
+					V.RecruiterID = 0;
 				} else if (!canWalk(slave)) {
 					_printSlaveUnassignedNote(slave, "is no longer independently mobile");
-					V.Recruiter = 0;
+					V.RecruiterID = 0;
 				} else if (!canSee(slave)) {
 					_printSlaveUnassignedNote(slave, "can no longer see");
-					V.Recruiter = 0;
-				} else if (!canHear(V.Recruiter)) {
+					V.RecruiterID = 0;
+				} else if (!canHear(S.Recruiter)) {
 					_printSlaveUnassignedNote(slave, "an no longer hear");
-					V.Recruiter = 0;
+					V.RecruiterID = 0;
 				}
-				if (V.Recruiter === 0) {
+				if (V.RecruiterID === 0) {
 					removeJob(slave, Job.RECRUITER);
 				}
 				break;
@@ -499,7 +497,7 @@ App.EndWeek.slaveAssignmentReport = function() {
 				} else if (V.unMadam === 7) {
 					_printSlaveUnassignedNote(slave, `can no longer handle ${getPronouns(slave).his} underlings`);
 				}
-				if (V.Madam === 0) {
+				if (V.MadamID === 0) {
 					removeJob(slave, Job.MADAM);
 				}
 				break;
@@ -520,52 +518,50 @@ App.EndWeek.slaveAssignmentReport = function() {
 				}
 				break;
 			case Job.MILKMAID:
-				V.Milkmaid = slave;
-				if (V.Milkmaid.fetish === "mindbroken") {
+				if (slave.fetish === "mindbroken") {
 					_printSlaveUnassignedNote(slave, "is mindbroken");
-					V.Milkmaid = 0;
-				} else if (V.Milkmaid.preg > 37 && V.Milkmaid.broodmother === 2) {
+					V.MilkmaidID = 0;
+				} else if (slave.preg > 37 && slave.broodmother === 2) {
 					_printSlaveUnassignedNote(slave, "spends so much time giving birth and laboring that", `${getPronouns(slave).he} cannot effectively serve as your Milkmaid any longer`);
-					V.Milkmaid = 0;
-				} else if (!canWalk(V.Milkmaid)) {
+					V.MilkmaidID = 0;
+				} else if (!canWalk(slave)) {
 					_printSlaveUnassignedNote(slave, "is no longer independently mobile");
-					V.Milkmaid = 0;
-				} else if (!canHold(V.Milkmaid)) {
+					V.MilkmaidID = 0;
+				} else if (!canHold(slave)) {
 					_printSlaveUnassignedNote(slave, "can no longer handle nor milk your slaves");
-					V.Milkmaid = 0;
-				} else if (!canSee(V.Milkmaid)) {
+					V.MilkmaidID = 0;
+				} else if (!canSee(slave)) {
 					_printSlaveUnassignedNote(slave, "can no longer see");
-					V.Milkmaid = 0;
-				} else if (!canHear(V.Milkmaid)) {
+					V.MilkmaidID = 0;
+				} else if (!canHear(slave)) {
 					_printSlaveUnassignedNote(slave, "can no longer hear");
-					V.Milkmaid = 0;
+					V.MilkmaidID = 0;
 				}
-				if (V.Milkmaid === 0) {
+				if (V.MilkmaidID === 0) {
 					removeJob(slave, Job.MILKMAID);
 				}
 				break;
 			case Job.FARMER:
-				V.Farmer = slave;
-				if (V.Farmer.fetish === "mindbroken") {
+				if (S.Farmer.fetish === "mindbroken") {
 					_printSlaveUnassignedNote(slave, "is mindbroken");
-					V.Farmer = 0;
-				} else if (V.Farmer.preg > 37 && V.Farmer.broodmother === 2) {
+					V.FarmerID = 0;
+				} else if (S.Farmer.preg > 37 && S.Farmer.broodmother === 2) {
 					_printSlaveUnassignedNote(slave, "spends so much time giving birth and laboring that", `${getPronouns(slave).he} cannot effectively serve as your Farmer any longer`);
-					V.Farmer = 0;
-				} else if (!canWalk(V.Farmer)) {
+					V.FarmerID = 0;
+				} else if (!canWalk(S.Farmer)) {
 					_printSlaveUnassignedNote(slave, "is no longer independently mobile");
-					V.Farmer = 0;
-				} else if (!canHold(V.Farmer)) {
+					V.FarmerID = 0;
+				} else if (!canHold(S.Farmer)) {
 					_printSlaveUnassignedNote(slave, "can no longer grip things");
-					V.Farmer = 0;
-				} else if (!canSee(V.Farmer)) {
+					V.FarmerID = 0;
+				} else if (!canSee(S.Farmer)) {
 					_printSlaveUnassignedNote(slave, "can no longer see");
-					V.Farmer = 0;
-				} else if (!canHear(V.Farmer)) {
+					V.FarmerID = 0;
+				} else if (!canHear(S.Farmer)) {
 					_printSlaveUnassignedNote(slave, "can no longer hear");
-					V.Farmer = 0;
+					V.FarmerID = 0;
 				}
-				if (V.Farmer === 0) {
+				if (V.FarmerID === 0) {
 					removeJob(slave, Job.FARMER);
 				}
 				break;
@@ -660,27 +656,26 @@ App.EndWeek.slaveAssignmentReport = function() {
 				}
 				break;
 			case Job.MATRON:
-				V.Matron = slave;
 				if (slave.fetish === "mindbroken") {
 					_printSlaveUnassignedNote(slave, "is mindbroken");
-					V.Matron = 0;
+					V.MatronID = 0;
 				} else if (slave.preg > 37 && slave.broodmother === 2) {
 					_printSlaveUnassignedNote(slave, "spends so much time giving birth and laboring that", `${getPronouns(slave).he} cannot effectively serve as your Matron any longer`);
-					V.Matron = 0;
+					V.MatronID = 0;
 				} else if (!canWalk(slave)) {
 					_printSlaveUnassignedNote(slave, "is no longer independently mobile");
-					V.Matron = 0;
+					V.MatronID = 0;
 				} else if (!canHold(slave)) {
 					_printSlaveUnassignedNote(slave, "can no longer hold infants");
-					V.Matron = 0;
+					V.MatronID = 0;
 				} else if (!canHear(slave)) {
 					_printSlaveUnassignedNote(slave, "can no longer hear");
-					V.Matron = 0;
+					V.MatronID = 0;
 				} else if (!canSee(slave)) {
 					_printSlaveUnassignedNote(slave, "can no longer see");
-					V.Matron = 0;
+					V.MatronID = 0;
 				}
-				if (V.Matron === 0) {
+				if (V.MatronID === 0) {
 					removeJob(slave, Job.MATRON);
 				}
 				break;
@@ -709,27 +704,26 @@ App.EndWeek.slaveAssignmentReport = function() {
 				}
 				break;
 			case Job.BODYGUARD:
-				V.Bodyguard = slave;
 				if (slave.fetish === "mindbroken") {
 					_printSlaveUnassignedNote(slave, "is mindbroken");
-					V.Bodyguard = 0;
+					V.BodyguardID = 0;
 				} else if (!canWalk(slave)) {
 					_printSlaveUnassignedNote(slave, "is no longer independently mobile");
-					V.Bodyguard = 0;
+					V.BodyguardID = 0;
 				} else if (!canHold(slave)) {
 					_printSlaveUnassignedNote(slave, "is no longer able to hold a weapon");
-					V.Bodyguard = 0;
+					V.BodyguardID = 0;
 				} else if (slave.preg > 37 && slave.broodmother === 2) {
 					_printSlaveUnassignedNote(slave, "spends so much time giving birth and laboring that", `${getPronouns(slave).he} cannot effectively serve as your bodyguard any longer`);
-					V.Bodyguard = 0;
+					V.BodyguardID = 0;
 				} else if (!canSee(slave)) {
 					_printSlaveUnassignedNote(slave, "can no longer see");
-					V.Bodyguard = 0;
+					V.BodyguardID = 0;
 				} else if (!canHear(slave)) {
 					_printSlaveUnassignedNote(slave, "can no longer hear");
-					V.Bodyguard = 0;
+					V.BodyguardID = 0;
 				}
-				if (V.Bodyguard === 0) {
+				if (V.BodyguardID === 0) {
 					removeJob(slave, Job.BODYGUARD);
 				}
 				break;
diff --git a/src/events/RECI/butthole.js b/src/events/RECI/butthole.js
index 33030cbed80a983621d66eb014c0eb1a1ca4011e..f797aaf8ab36d24816c040243ff3622c22f964fa 100644
--- a/src/events/RECI/butthole.js
+++ b/src/events/RECI/butthole.js
@@ -233,13 +233,13 @@ App.Events.RECIButthole = class RECIButthole extends App.Events.BaseEvent {
 			(eventSlave.chastityAnus)
 				? new App.Events.Result(`Remind ${him} of ${his} chastity`, chaste)
 				: new App.Events.Result(),
-			(V.HeadGirl !== 0 && eventSlave.ID !== V.HeadGirl.ID)
+			(eventSlave.ID !== V.HeadGirlID)
 				? new App.Events.Result(`Double anal with the Head Girl`, () => DoubleTeam(S.HeadGirl))
 				: new App.Events.Result(),
-			(V.Concubine !== 0 && eventSlave.ID !== V.Concubine.ID && hasAnyLegs(S.Concubine) && hasAnyArms(S.Concubine) && S.Concubine.fetish !== "mindbroken")
+			(eventSlave.ID !== V.ConcubineID && hasAnyLegs(S.Concubine) && hasAnyArms(S.Concubine) && S.Concubine.fetish !== "mindbroken")
 				? new App.Events.Result(`Double anal with your Concubine`, () => DoubleTeam(S.Concubine))
 				: new App.Events.Result(),
-			(V.Bodyguard !== 0 && eventSlave.ID !== V.Bodyguard.ID)
+			(eventSlave.ID !== V.BodyguardID)
 				? new App.Events.Result(`Double anal with your Body Guard`, () => DoubleTeam(S.Bodyguard))
 				: new App.Events.Result(),
 			new App.Events.Result(`Chat about ${his} ass`, talk),
diff --git a/src/events/RESS/comfortableSeat.js b/src/events/RESS/comfortableSeat.js
index 30b7b5be276103467e6d24287187dcd2e8e2626e..b297b0a69f9b5a11cebe701b001b4e42eee3597e 100644
--- a/src/events/RESS/comfortableSeat.js
+++ b/src/events/RESS/comfortableSeat.js
@@ -77,7 +77,7 @@ App.Events.RESSComfortableSeat = class RESSComfortableSeat extends App.Events.Ba
 		App.Events.addParagraph(node, t);
 		t = [];
 
-		t.push(`You're nude, a consequence of ${V.Concubine !== 0 && V.Concubine.ID !== eventSlave.ID ? `recent activities involving ${V.Concubine.slaveName}` : "recent unrelated activities"}. ${PC.dick !== 0 ? "Your formidable dick is three quarters hard," : "Nude, that is, all except for the strap-on you were just using and haven't taken off yet,"} and ${eventSlave.slaveName} is pointing right at it. ${He} knows exactly what ${he}'s asking for and gives ${his}`);
+		t.push(`You're nude, a consequence of ${V.ConcubineID !== 0 && V.ConcubineID !== eventSlave.ID ? `recent activities involving ${S.Concubine.slaveName}` : "recent unrelated activities"}. ${PC.dick !== 0 ? "Your formidable dick is three quarters hard," : "Nude, that is, all except for the strap-on you were just using and haven't taken off yet,"} and ${eventSlave.slaveName} is pointing right at it. ${He} knows exactly what ${he}'s asking for and gives ${his}`);
 		if (eventSlave.hips > 0) {
 			t.push("broad");
 		} else if (eventSlave.hips > -1) {
diff --git a/src/events/gameover.tw b/src/events/gameover.tw
index 23b4ae536f42b7c31a43dd7fe99e9a7748ec019c..70975838ca93e6bb3184caf2ba74b874984c3431 100644
--- a/src/events/gameover.tw
+++ b/src/events/gameover.tw
@@ -10,8 +10,8 @@
 		The implanted bomb is small, and went off too far ahead to do anything more than stun. Three other assailants run at you from where they were waiting in the confusion, wielding improvised weapons that apparently did not set off the security scanners. Without a bodyguard, decent security systems, or any other means of personal defense, you meet your ignominious death at the end of a bludgeon fashioned from a maintenance tool.
 
 	<<case "idiot ball">>
-		<<setLocalPronouns $Bodyguard>>
-		You quickly move to deal $Bodyguard.slaveName a slap across the face. You have an instant to realize the depth of your folly as $his combat training kicks into gear: before $he realizes what $he's doing, $he has drawn $his sword, blocked your slap (and incidentally, removed your hand in doing so), and buried the sword in your chest on the riposte. $His devotion returns to $him as $his combat instincts subside. As you fade, you see $his eyes cloud with terrible, unhealable guilt; in one sure movement, $he draws $his weapon, sets it to semi-automatic, places it under $his chin, and fires a single round.
+		<<setLocalPronouns _S.Bodyguard>>
+		You quickly move to deal _S.Bodyguard.slaveName a slap across the face. You have an instant to realize the depth of your folly as $his combat training kicks into gear: before $he realizes what $he's doing, $he has drawn $his sword, blocked your slap (and incidentally, removed your hand in doing so), and buried the sword in your chest on the riposte. $His devotion returns to $him as $his combat instincts subside. As you fade, you see $his eyes cloud with terrible, unhealable guilt; in one sure movement, $he draws $his weapon, sets it to semi-automatic, places it under $his chin, and fires a single round.
 
 	<<case "debt">>
 		You have fallen so far into debt that it is mere child's play for another slaveowner to purchase your debt, call it in, and enslave you. The story of your remaining years may be worth telling, but it must be told elsewhere.
@@ -69,4 +69,4 @@
 
 <</switch>>
 <br><br>
-''GAME OVER''
\ No newline at end of file
+''GAME OVER''
diff --git a/src/facilities/brothel/brothelAssignmentScene.tw b/src/facilities/brothel/brothelAssignmentScene.tw
index ef292aaf2caba44d3d185fb70f2ae000eae1c53f..05ef134da658c2691b2284113353603f1d30b486 100644
--- a/src/facilities/brothel/brothelAssignmentScene.tw
+++ b/src/facilities/brothel/brothelAssignmentScene.tw
@@ -30,7 +30,7 @@ You could direct $assistant.name to relay your orders to $activeSlave.slaveName,
 <<else>>
 	rebellious slave <<if hasAnyLegs($activeSlave)>>comes in slowly, having decided that $he can always decide to resist once $he hears what you want<<else>>comes in as soon as you order another slave to carry $him in, since $he can't exactly resist this without <<if isAmputee($activeSlave)>>limbs<<else>>legs<</if>><</if>>.
 <</if>>
-You tell $him $he's to report to <<if $Madam != 0>>$Madam.slaveName immediately, to serve in $brothelName<<else>>$brothelName immediately, to serve there<</if>> until further notice.
+You tell $him $he's to report to <<if $MadamID != 0>>_S.Madam.slaveName immediately, to serve in $brothelName<<else>>$brothelName immediately, to serve there<</if>> until further notice.
 
 <br><br>
 <<if $activeSlave.devotion > 50>>
@@ -52,7 +52,7 @@ You tell $him $he's to report to <<if $Madam != 0>>$Madam.slaveName immediately,
 					"the blowjob<<s>>. Ju<<s>>t, the blowjob<<s>>. That'<<s>> all."
 				<</if>>
 			<<case "humiliation">>
-				There'<<s>> a window that fa<<c>>e<<s>> the hallway there, right? <<if $Madam != 0>>Do you think $Madam.slaveName would let me<<else>>Could I<</if>> get fucked there? Where everyone could <<s>>ee me being fucked for money?"
+				There'<<s>> a window that fa<<c>>e<<s>> the hallway there, right? <<if $MadamID != 0>>Do you think _S.Madam.slaveName would let me<<else>>Could I<</if>> get fucked there? Where everyone could <<s>>ee me being fucked for money?"
 			<<case "buttslut">>
 				I mean," and $he shifts $his weight, $his mind obviously on $his backdoor,
 				<<if $activeSlave.attrXX > $activeSlave.attrXY>>
@@ -166,7 +166,7 @@ You tell $him $he's to report to <<if $Madam != 0>>$Madam.slaveName immediately,
 					"the blowjob<<s>>. Ju<<s>>t, the blowjob<<s>>. That'<<s>> all."
 				<</if>>
 			<<case "humiliation">>
-				there'<<s>> a window that fa<<c>>e<<s>> the hallway there, right? <<if $Madam != 0>>Do you think $Madam.slaveName would let me<<else>>Could I<</if>> get fucked there? Where everyone could <<s>>ee me being fucked for money?"
+				there'<<s>> a window that fa<<c>>e<<s>> the hallway there, right? <<if $MadamID != 0>>Do you think _S.Madam.slaveName would let me<<else>>Could I<</if>> get fucked there? Where everyone could <<s>>ee me being fucked for money?"
 			<<case "buttslut">>
 
 				uh," and $he shifts $his weight, $his mind obviously on $his backdoor,
@@ -373,6 +373,6 @@ You tell $him $he's to report to <<if $Madam != 0>>$Madam.slaveName immediately,
 	<<else>>
 		get an incredibly rude gesture out
 	<</if>>
-	before the compliance systems activate and $he's poleaxed to the ground. Anticipating this, you had <<if $Madam != 0>>$Madam.slaveName <<else>>another, more obedient slave<</if>> standing by to haul $him away. It'll take a couple of hundred customers, but being sold in a brothel for rape should knock the resistance out of $him.
+	before the compliance systems activate and $he's poleaxed to the ground. Anticipating this, you had <<if $MadamID != 0>>_S.Madam.slaveName <<else>>another, more obedient slave<</if>> standing by to haul $him away. It'll take a couple of hundred customers, but being sold in a brothel for rape should knock the resistance out of $him.
 
 <</if>> /* CLOSES DEVOTION */
diff --git a/src/facilities/farmyard/farmerSelect.tw b/src/facilities/farmyard/farmerSelect.tw
index 2c66982b707aa3e92ba7e53540ddbfb5a36cd695..dfaadbb1a96df02ad478825766207ce21efd0ea8 100644
--- a/src/facilities/farmyard/farmerSelect.tw
+++ b/src/facilities/farmyard/farmerSelect.tw
@@ -1,15 +1,14 @@
 :: Farmer Select [nobr jump-to-safe jump-hidden jump-from-safe]
 
 <<set $nextButton = "Back", $nextLink = "Farmyard", $encyclopedia = "Farmer">>
-<<if ($Farmer != 0)>>
-	<<set $Farmer = getSlave($Farmer.ID)>>
-	<<setLocalPronouns $Farmer>>
-	<span class='slave-name'><<= SlaveFullName($Farmer)>></span> is serving as your Farmer.<br><br>$He will tend to your crops and animals.
+<<if ($FarmerID != 0)>>
+	<<setLocalPronouns _S.Farmer>>
+	<span class='slave-name'><<= SlaveFullName(_S.Farmer)>></span> is serving as your Farmer.<br><br>$He will tend to your crops and animals.
 <<else>>
 	You have not selected a Farmer.
 <</if>>
 
 <br><br>''Appoint a Farmer from your obedient slaves:''
-<br><br>[[None|Farmyard][removeJob($Farmer, "be the Farmer")]]
+<br><br>[[None|Farmyard][removeJob(_S.Farmer, Job.FARMER)]]
 <br><br>
 <<includeDOM App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.farmyard, "Farmyard")>>
diff --git a/src/facilities/farmyard/farmyard.tw b/src/facilities/farmyard/farmyard.tw
index f86e94f17325ec1f3aa2b260f6012bea1daa9c6b..37ff37354abdf92b884465e29bb8a400b8b86bef 100644
--- a/src/facilities/farmyard/farmyard.tw
+++ b/src/facilities/farmyard/farmyard.tw
@@ -70,8 +70,8 @@
 		$farmyardNameCaps is bustling with activity. Farmhands are hurrying about, on their way to feed animals and maintain farming equipment.
 	<<elseif _FyL > 0>>
 		$farmyardNameCaps is working steadily. Farmhands are moving about, looking after the animals and crops.
-	<<elseif $Farmer != 0>>
-		$Farmer.slaveName is alone in $farmyardName, and has nothing to do but look after the animals and crops.
+	<<elseif $FarmerID != 0>>
+		_S.Farmer.slaveName is alone in $farmyardName, and has nothing to do but look after the animals and crops.
 	<<else>>
 		$farmyardNameCaps is empty and quiet.
 		<div class="choices" style="font-style:normal">
diff --git a/src/facilities/nursery/matronSelect.tw b/src/facilities/nursery/matronSelect.tw
index 70531aff189aa069180438c3e283ddcd1e3a943a..1f00599be61f945e66b825c517dc574407accc5f 100644
--- a/src/facilities/nursery/matronSelect.tw
+++ b/src/facilities/nursery/matronSelect.tw
@@ -1,15 +1,14 @@
 :: Matron Select [nobr jump-to-safe jump-hidden jump-from-safe]
 
 <<set $nextButton = "Back", $nextLink = "Nursery", $encyclopedia = "Matron">>
-<<if ($Matron != 0)>>
-	<<set $Matron = getSlave($Matron.ID)>>
-	<<setLocalPronouns $Matron>>
-	<span class='slave-name'><<= SlaveFullName($Matron)>></span> is serving as your Matron.<br><br>$He will manage the nursery.
+<<if ($MatronID != 0)>>
+	<<setLocalPronouns _S.Matron>>
+	<span class='slave-name'><<= SlaveFullName(_S.Matron)>></span> is serving as your Matron.<br><br>$He will manage the nursery.
 <<else>>
 	You have not selected a Matron.
 <</if>>
 
 <br><br>''Appoint a Matron from your devoted slaves:''
-<br><br>[[None|Nursery][removeJob($Matron, "be the Matron")]]
+<br><br>[[None|Nursery][removeJob(_S.Matron, Job.MATRON)]]
 <br><br>
 <<includeDOM App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.nursery, "Nursery")>>
diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index 00445ff9cbd6b2ae6fd8118bbb858d55f3e10b88..577151882dc763ed73ef36aba149c34d7751a094 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -72,8 +72,8 @@
 			is as comfortable and child-friendly as it needs to be. They have everything they need to grow into a proper slave.
 	<</switch>>
 
-	<<if $Matron>>
-		<<setLocalPronouns $Matron>>
+	<<if $MatronID>>
+		<<setLocalPronouns _S.Matron>>
 	<</if>>
 
 	<<if _NL > 2>>
@@ -81,8 +81,8 @@
 	<<elseif _NL > 0>>
 		$nurseryNameCaps is working steadily. Nannies are moving about, cleaning up and feeding hungry children.
 		<<set $nannyInfluence = 1>>
-	<<elseif $Matron>>
-		$Matron.slaveName is alone in $nurseryName, and keeps the place clean and looks after the children $himself.
+	<<elseif $MatronID>>
+		_S.Matron.slaveName is alone in $nurseryName, and keeps the place clean and looks after the children $himself.
 		<<set $MatronInfluence = 1>>
 	<<elseif (_NL <= 0) && ($nurseryBabies <= 0)>>
 		$nurseryNameCaps is empty and quiet.
@@ -110,7 +110,7 @@
 		<<set _Tmult0 = Math.trunc($nurseryNannies*1000*$upgradeMultiplierArcology)>>
 		<br>It can support $nurseryNannies nann<<if $nurseryNannies != 1>>ies<<else>>y<</if>>.
 		There <<if _NL == 1>>is<<else>>are<</if>> _NL nann<<if _NL != 1>>ies<<else>>y<</if>> in $nurseryName.
-		<<if $nurseryBabies > 0 && _NL < 1 && (!$Matron)>>
+		<<if $nurseryBabies > 0 && _NL < 1 && (!_S.Matron)>>
 			<div class="note">
 				You must have a Matron or at least one nanny to be able to influence the children's upbringing
 			</div>
@@ -135,14 +135,14 @@
 		</div>
 
 		<div>
-			<<if $Matron>>
+			<<if _S.Matron>>
 				<<if $MatronIgnoresFlaws != 1>>
-					$Matron.slaveName will attempt to fix flaws in nannies serving under $him.
+					_S.Matron.slaveName will attempt to fix flaws in nannies serving under $him.
 					<div class="choices">
 						[[Ignore flaws|Nursery][$MatronIgnoresFlaws = 1]]
 					</div>
 				<<else>>
-					$Matron.slaveName has been instructed to ignore flaws in the nannies serving under $him.
+					_S.Matron.slaveName has been instructed to ignore flaws in the nannies serving under $him.
 					<div class="choices">
 						[[Fix flaws|Nursery][$MatronIgnoresFlaws = 0]]
 					</div>
diff --git a/src/facilities/nursery/widgets/reports/childrenReport.js b/src/facilities/nursery/widgets/reports/childrenReport.js
index 5dc0bf6c3f5ea815a138b2e52014f64e7ca4e9ee..9b7517a753796630b4ffffbcdeb9d8566d3308ac 100644
--- a/src/facilities/nursery/widgets/reports/childrenReport.js
+++ b/src/facilities/nursery/widgets/reports/childrenReport.js
@@ -6,7 +6,7 @@ App.Facilities.Nursery.childrenReport = function childrenReport() {
 	"use strict";
 
 	const
-		Matron = V.Matron,
+		Matron = S.Matron,
 		NL = App.Entity.facilities.nursery.employeesIDs().size,
 		CL = V.cribs.length;
 
diff --git a/src/facilities/nursery/widgets/utils/nurseryUtils.js b/src/facilities/nursery/widgets/utils/nurseryUtils.js
index b05e16a745919abfa1c026517b99d2afe15fc224..3e636c107c5a2f9f544c1e061fefb529bc4db0f9 100644
--- a/src/facilities/nursery/widgets/utils/nurseryUtils.js
+++ b/src/facilities/nursery/widgets/utils/nurseryUtils.js
@@ -516,7 +516,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
 	}
 	if (mother !== PC && mother !== 0) {
 		App.Utils.setLocalPronouns(mother, 2);
-		if (jsDef(V.Concubine) && mother.ID === V.Concubine.ID) {
+		if (mother.ID === V.ConcubineID) {
 			r += `<br>
 			<<link "Permit your Concubine to name _his2 daughter">>
 				<<replace "#naming">>`;
@@ -534,7 +534,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
 			r += `After some careful consideration, ${mother.slaveName} picks a name suitable for your daughter; from now on ${he2} will be known as "${child.slaveName}".
 				<</replace>>
 			<</link>>`;
-		} else if (jsDef(V.Bodyguard) && mother.ID === V.Bodyguard.ID) {
+		} else if (mother.ID === V.BodyguardID) {
 			r += `<br>
 			<<link "Permit your bodyguard to name ${his2} daughter">>
 				<<replace "#naming">>`;
@@ -543,7 +543,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
 			r += `After some careful consideration, ${mother.slaveName} decides on "${child.slaveName}" for ${his2} daughter. ${He2} hopes you'll find it fitting ${his} station.
 				<</replace>>
 			<</link>>`;
-		} else if (jsDef(V.Headgirl) && mother.ID === V.Headgirl.ID) {
+		} else if (mother.ID === V.HeadgirlID) {
 			r += `<br>
 			<<link "Permit your Head Girl to name ${his2} daughter">>
 				<<replace "#naming">>`;
@@ -565,7 +565,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
 	}
 	if (father !== PC && father !== 0 && father !== mother) {
 		App.Utils.setLocalPronouns(father, 2);
-		if (jsDef(V.Concubine) && father.ID === V.Concubine.ID) {
+		if (father.ID === V.ConcubineID) {
 			r += `<br>
 			<<link "Permit your Concubine to name ${his2} daughter">>
 				<<replace "#naming">>`;
@@ -583,7 +583,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
 			r += `After some careful consideration, ${father.slaveName} picks a name suitable for your daughter; from now on ${he} will be known as "${child.slaveName}".
 				<</replace>>
 			<</link>>`;
-		} else if (jsDef(V.Bodyguard) && father.ID === V.Bodyguard.ID) {
+		} else if (father.ID === V.BodyguardID) {
 			r += `<br>
 			<<link "Permit your bodyguard to name ${his2} daughter">>
 				<<replace "#naming">>`;
@@ -592,7 +592,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
 			r += `After some careful consideration, ${father.slaveName} decides on "${child.slaveName}" for ${his2} daughter. ${He2} hopes you'll find it fitting ${his} station.
 				<</replace>>
 			<</link>>`;
-		} else if (jsDef(V.Headgirl) && father.ID === V.Headgirl.ID) {
+		} else if (father.ID === V.HeadgirlID) {
 			r += `<br>
 			<<link "Permit your Head Girl to name ${his2} daughter">>
 				<<replace "#naming">>`;
diff --git a/src/interaction/main/mainLinks.js b/src/interaction/main/mainLinks.js
index d2be8893bee20de2008b2bc227d5a8d62731d11f..44ea3bca163ebed56cef9ef3faad8001125541a6 100644
--- a/src/interaction/main/mainLinks.js
+++ b/src/interaction/main/mainLinks.js
@@ -30,8 +30,8 @@ App.UI.View.mainLinks = function() {
 				break;
 			case "HG":
 				fragment.append(`You plan to support your Head Girl this week, `);
-				if (V.HeadGirl) {
-					const {he, his} = getPronouns(V.HeadGirl);
+				if (S.HeadGirl) {
+					const {he, his} = getPronouns(S.HeadGirl);
 					fragment.append(`so ${he} can give more slaves ${his} attention.`);
 				} else {
 					fragment.append(`should you assign one.`);
@@ -90,8 +90,8 @@ App.UI.View.mainLinks = function() {
 
 	if (V.useSlaveSummaryOverviewTab === 0) {
 		let div = document.createElement("div");
-		if (typeof V.slaveIndices[V.HeadGirl.ID] !== 'undefined') {
-			div.append(App.UI.DOM.makeElement("span", SlaveFullName(V.HeadGirl), "slave-name"), " is serving as your Head Girl");
+		if (typeof V.slaveIndices[V.HeadGirlID] !== 'undefined') {
+			div.append(App.UI.DOM.makeElement("span", SlaveFullName(S.HeadGirl), "slave-name"), " is serving as your Head Girl");
 			if (V.arcologies[0].FSEgyptianRevivalistLaw === 1) {
 				div.append(` and Consort`);
 			}
@@ -114,8 +114,8 @@ App.UI.View.mainLinks = function() {
 		fragment.append(div);
 
 		div = document.createElement("div");
-		if (typeof V.slaveIndices[V.Recruiter.ID] !== 'undefined') {
-			div.append(App.UI.DOM.makeElement("span", SlaveFullName(V.Recruiter), "slave-name"), " is working to recruit girls. ",
+		if (V.RecruiterID) {
+			div.append(App.UI.DOM.makeElement("span", SlaveFullName(S.Recruiter), "slave-name"), " is working to recruit girls. ",
 				App.UI.DOM.makeElement("span", App.UI.DOM.passageLink("Manage Recruiter", "Recruiter Select"), "major-link"));
 		} else {
 			div.append("You have not selected a Recruiter. ",
@@ -127,8 +127,8 @@ App.UI.View.mainLinks = function() {
 
 		if (V.dojo) {
 			div = document.createElement("div");
-			if (typeof V.slaveIndices[V.Bodyguard.ID] !== 'undefined') {
-				div.append(App.UI.DOM.makeElement("span", SlaveFullName(V.Bodyguard), "slave-name"), " is serving as your bodyguard. ",
+			if (V.BodyguardID !== 0) {
+				div.append(App.UI.DOM.makeElement("span", SlaveFullName(S.Bodyguard), "slave-name"), " is serving as your bodyguard. ",
 					App.UI.DOM.makeElement("span", App.UI.DOM.passageLink("Manage Bodyguard", "BG Select"), "major-link"));
 			} else {
 				div.append("You have not selected a Bodyguard. ",
diff --git a/src/interaction/main/walkPast.js b/src/interaction/main/walkPast.js
index d12cd289cfaf93b0ed9bea9b31bbf1c08be0fc0e..b32bc92467675163c6426e848f72d6ac258b4475 100644
--- a/src/interaction/main/walkPast.js
+++ b/src/interaction/main/walkPast.js
@@ -232,8 +232,8 @@ globalThis.walkPast = (function() {
 					t += `trying their best to maintain their relationship with ${partnerName} being nothing more than a hole in ${V.arcadeName}.`;
 				}
 			} else if (seed >= 66) { /* SEXY TIMES */
-				let fuckSpot;
-				if (partnerSlave.ID === V.HeadGirl.ID && V.HGSuite === 1) {
+				let fuckSpot = "";
+				if (partnerSlave.ID === V.HeadGirlID && V.HGSuite === 1) {
 					fuckSpot = `in ${partnerName}'s suite`;
 				} else if (activeSlave.rules.living === "luxurious") {
 					fuckSpot = `in the nice little room they share`;
@@ -668,7 +668,7 @@ globalThis.walkPast = (function() {
 							t += `having open and visible sex `;
 							if (activeSlave.rules.living === "luxurious") {
 								t += `in the doorway of the nice little room they share.`;
-							} else if (activeSlave.ID === V.HeadGirl.ID && V.HGSuite === 1) {
+							} else if (activeSlave.ID === V.HeadGirlID && V.HGSuite === 1) {
 								t += `in ${name}'s suite.`;
 							} else {
 								t += `out in the hallway near the slave dormitory.`;
@@ -1004,7 +1004,7 @@ globalThis.walkPast = (function() {
 					}
 					t += `${partnerName} understands that what ${he} really wants from ${him2} is emotional intimacy. They're cuddling quietly, offering each other silent comfort and companionship.`;
 				} else if (canPenetrate(activeSlave) && (partnerSlave.vagina > 0) && canDoVaginal(partnerSlave) && hasAllLimbs(partnerSlave) && (activeSlave.belly + partnerSlave.belly < 10000)) {
-					if (partnerSlave.ID === V.HeadGirl.ID && V.HGSuite === 1) {
+					if (partnerSlave.ID === V.HeadGirlID && V.HGSuite === 1) {
 						t += `in bed `;
 					} else if (activeSlave.rules.living === "luxurious") {
 						t += `in bed `;
@@ -1019,7 +1019,7 @@ globalThis.walkPast = (function() {
 					}
 					t += `as ${he2} enjoys the wonderful feeling of ${his2} ${activeSlaveRel}'s cock in ${his2} womanhood.`;
 				} else if (activeSlave.clit > 2 && canDoVaginal(activeSlave) && partnerSlave.vagina > 0 && canDoVaginal(partnerSlave) && hasAllLimbs(partnerSlave) && (activeSlave.belly + partnerSlave.belly < 10000)) {
-					if (partnerSlave.ID === V.HeadGirl.ID && V.HGSuite === 1) {
+					if (partnerSlave.ID === V.HeadGirlID && V.HGSuite === 1) {
 						t += `in bed `;
 					} else if (activeSlave.rules.living === "luxurious") {
 						t += `in bed `;
@@ -1034,7 +1034,7 @@ globalThis.walkPast = (function() {
 					}
 					t += `as ${he2} enjoys the wonderful feeling of ${his2} ${activeSlaveRel}'s huge clit in ${his2} womanhood.`;
 				} else if (activeSlave.dick > 1 && canPenetrate(activeSlave) && canDoAnal(partnerSlave) && partnerSlave.anus > 0 && hasBothArms(activeSlave) && activeSlave.belly < 10000) {
-					if (partnerSlave.ID === V.HeadGirl.ID && V.HGSuite === 1) {
+					if (partnerSlave.ID === V.HeadGirlID && V.HGSuite === 1) {
 						t += `in bed `;
 					} else if (activeSlave.rules.living === "luxurious") {
 						t += `in bed `;
@@ -1047,7 +1047,7 @@ globalThis.walkPast = (function() {
 					}
 					t += `neck, cupping a breast with one hand, and lightly stimulating ${him2} with the other.`;
 				} else if (activeSlave.clit > 2 && canDoAnal(partnerSlave) && partnerSlave.anus > 0 && hasAnyArms(partnerSlave) && hasAnyLegs(activeSlave)) {
-					if (partnerSlave.ID === V.HeadGirl.ID && V.HGSuite === 1) {
+					if (partnerSlave.ID === V.HeadGirlID && V.HGSuite === 1) {
 						t += `in bed `;
 					} else if (activeSlave.rules.living === "luxurious") {
 						t += `in bed `;
@@ -1056,7 +1056,7 @@ globalThis.walkPast = (function() {
 					}
 					t += `${fuckSpot}, managing to have clitoral-anal sex. ${partnerName} is face-down with ${his2} ass up, spreading ${his2} buttocks as wide as possible, giving ${his2} ${activeSlaveRel} the opportunity to squat over ${him2} and penetrate it with ${his} huge, erect clit. ${name} can't thrust much, but the shocking lewdness of the act is enough for both of them.`;
 				} else if (canPenetrate(activeSlave) && hasBothLegs(partnerSlave) && hasBothArms(activeSlave) && activeSlave.belly < 10000) {
-					if (partnerSlave.ID === V.HeadGirl.ID && V.HGSuite === 1) {
+					if (partnerSlave.ID === V.HeadGirlID && V.HGSuite === 1) {
 						t += `in bed `;
 					} else if (activeSlave.rules.living === "luxurious") {
 						t += `in bed `;
@@ -1069,7 +1069,7 @@ globalThis.walkPast = (function() {
 					}
 					t += `neck, cupping a breast with one hand, and lightly stimulating ${him2} with the other.`;
 				} else if (activeSlave.clit > 2 && canDoVaginal(activeSlave) && hasBothLegs(partnerSlave)) {
-					if (partnerSlave.ID === V.HeadGirl.ID && V.HGSuite === 1) {
+					if (partnerSlave.ID === V.HeadGirlID && V.HGSuite === 1) {
 						t += `in bed `;
 					} else if (activeSlave.rules.living === "luxurious") {
 						t += `in bed `;
@@ -1078,7 +1078,7 @@ globalThis.walkPast = (function() {
 					}
 					t += `${fuckSpot}, with ${partnerName} down on ${his2} knees in front of ${name}. From behind ${partnerName} it looks like ${he2}'s giving ${his2} ${activeSlaveRel} a conventional, if enthusiastic, blowjob. Only on closer inspection does it become clear how unusual the oral is: ${name} has such a huge clit that ${his} ${partnerSlaveRel} can suck ${him} off just like it were a penis.`;
 				} else if (partnerSlave.vagina > 0 && canDoVaginal(partnerSlave) && hasAllLimbs(partnerSlave) && (activeSlave.belly + partnerSlave.belly < 10000)) {
-					if (partnerSlave.ID === V.HeadGirl.ID && V.HGSuite === 1) {
+					if (partnerSlave.ID === V.HeadGirlID && V.HGSuite === 1) {
 						t += `in bed `;
 					} else if (activeSlave.rules.living === "luxurious") {
 						t += `in bed `;
@@ -1093,7 +1093,7 @@ globalThis.walkPast = (function() {
 					}
 					t += `as ${he2} enjoys the feeling of ${his2} ${activeSlaveRel} fucking ${him2} with a strap-on.`;
 				} else if (partnerSlave.anus > 0 && canDoAnal(partnerSlave) && hasBothArms(activeSlave) && activeSlave.belly < 10000) {
-					if (partnerSlave.ID === V.HeadGirl.ID && V.HGSuite === 1) {
+					if (partnerSlave.ID === V.HeadGirlID && V.HGSuite === 1) {
 						t += `in bed `;
 					} else if (activeSlave.rules.living === "luxurious") {
 						t += `in bed `;
@@ -1106,7 +1106,7 @@ globalThis.walkPast = (function() {
 					}
 					t += `neck, cupping a breast with one hand, and lightly stimulating ${him} with the other.`;
 				} else if (hasAnyArms(partnerSlave) && hasAnyArms(activeSlave)) {
-					if (partnerSlave.ID === V.HeadGirl.ID && V.HGSuite === 1) {
+					if (partnerSlave.ID === V.HeadGirlID && V.HGSuite === 1) {
 						t += `in bed `;
 					} else if (activeSlave.rules.living === "luxurious") {
 						t += `in bed `;
@@ -1116,7 +1116,7 @@ globalThis.walkPast = (function() {
 					t += `${fuckSpot}, enjoying some mutual masturbation.`;
 				} else if (isAmputee(partnerSlave)) {
 					t += `just cuddling `;
-					if (partnerSlave.ID === V.HeadGirl.ID && V.HGSuite === 1) {
+					if (partnerSlave.ID === V.HeadGirlID && V.HGSuite === 1) {
 						t += `in bed `;
 					} else if (activeSlave.rules.living === "luxurious") {
 						t += `in bed `;
@@ -1126,7 +1126,7 @@ globalThis.walkPast = (function() {
 					t += `${fuckSpot}. ${name} is using ${partnerName}'s limbless torso as a pillow, which ${partnerName} seems to be enjoying, by ${his2} contented expression.`;
 				} else {
 					t += `just cuddling `;
-					if (partnerSlave.ID === V.HeadGirl.ID && V.HGSuite === 1) {
+					if (partnerSlave.ID === V.HeadGirlID && V.HGSuite === 1) {
 						t += `in bed `;
 					} else if (activeSlave.rules.living === "luxurious") {
 						t += `in bed `;
@@ -1842,8 +1842,8 @@ globalThis.walkPast = (function() {
 				}
 				break;
 			case Job.HEADGIRLSUITE:
-				if (V.HeadGirl !== 0) {
-					t += `is getting the Head Girl's suite cleaned up while ${V.HeadGirl.slaveName} is out working.`;
+				if (V.HeadGirlID !== 0) {
+					t += `is getting the Head Girl's suite cleaned up while ${S.HeadGirl.slaveName} is out working.`;
 				} else {
 					t += `is making sure the Head Girl's suite is in order for your next Head Girl.`;
 				}
diff --git a/src/interaction/policies/policies.tw b/src/interaction/policies/policies.tw
index ff3d3266a215f775eddfc9670018c8785bc1cdcf..6ad5c559d24774528d2e0fb8ecec334823927807 100644
--- a/src/interaction/policies/policies.tw
+++ b/src/interaction/policies/policies.tw
@@ -101,7 +101,7 @@
 			policy("RetirementPolicies");
 		</script>
 		<h1>Menials</h1>
-		
+
 		<span id="MenialRetirementPolicies"></span>
 		<script>
 			policy("MenialRetirementPolicies");
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index 7e78cef8ba5171088bbdc4ec2e9006f26e4a546f..3fdb77c704a0a599b54747caaeca5d0150dac7d4 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -77,10 +77,9 @@ globalThis.inferiorRaceP = function(slave) {
  * @returns {boolean}
  */
 globalThis.isLeaderP = function(slave) {
-	/** @type {FC.SlaveStateOrZero[]} */
-	const leaders = [V.HeadGirl, V.Bodyguard, V.Recruiter, V.Concubine, S.Nurse, S.Attendant, V.Matron, V.Madam, S.DJ, V.Milkmaid, V.Farmer, S.Stewardess, S.Schoolteacher, S.Wardeness];
+	const leaders = [S.HeadGirl, S.Bodyguard, S.Recruiter, S.Concubine, S.Nurse, S.Attendant, S.Matron, S.Madam, S.DJ, S.Milkmaid, S.Farmer, S.Stewardess, S.Schoolteacher, S.Wardeness];
 
-	return leaders.some(leader => leader && leader.ID && leader.ID === slave.ID);
+	return leaders.some(leader => leader && leader.ID === slave.ID);
 };
 
 /**
diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index d6c1560cf9e1eb742cced3ce31f2956cdf01d00b..16eeef675674422bd8919f312995716c9230dd62 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -29,7 +29,7 @@ globalThis.assignJob = function(slave, job) {
 	const idx = V.slaveIndices[slave.ID];
 
 	/**
-	 * this helper makes sure global references ($HeadGirl, etc) or global IDs ($AttendantID, etc) are set correctly
+	 * this helper makes sure global references global IDs ($HeadGirlID, $AttendantID, etc) are set correctly
 	 * @param {string} propName
 	 */
 	function uniqueJob(propName) {
@@ -88,7 +88,7 @@ globalThis.assignJob = function(slave, job) {
 			}
 			slave.shoes = "none";
 			slave.collar = "none";
-			slave.rules.living = "spare";
+			slave.rules.living = LivingRule.SPARE;
 			break;
 
 		case Job.BROTHEL.toLowerCase():
@@ -97,10 +97,10 @@ globalThis.assignJob = function(slave, job) {
 			switch (V.brothelDecoration) {
 				case "Degradationist":
 				case "standard":
-					slave.rules.living = "spare";
+					slave.rules.living = LivingRule.SPARE;
 					break;
 				default:
-					slave.rules.living = "normal";
+					slave.rules.living = LivingRule.NORMAL;
 					break;
 			}
 			break;
@@ -110,10 +110,10 @@ globalThis.assignJob = function(slave, job) {
 			slave.assignment = Job.CELLBLOCK;
 			switch (V.cellblockDecoration) {
 				case "Paternalist":
-					slave.rules.living = "normal";
+					slave.rules.living = LivingRule.NORMAL;
 					break;
 				default:
-					slave.rules.living = "spare";
+					slave.rules.living = LivingRule.SPARE;
 					break;
 			}
 			break;
@@ -134,7 +134,7 @@ globalThis.assignJob = function(slave, job) {
 				case "Intellectual Dependency":
 				case "Petite Admiration":
 				case "Statuesque Glorification":
-					slave.rules.living = "luxurious";
+					slave.rules.living = LivingRule.LUXURIOUS;
 					break;
 
 				case "Roman Revivalist":
@@ -144,11 +144,11 @@ globalThis.assignJob = function(slave, job) {
 				case "Chinese Revivalist":
 				case "Chattel Religionist":
 				case "Edo Revivalist":
-					slave.rules.living = "normal";
+					slave.rules.living = LivingRule.NORMAL;
 					break;
 
 				default:
-					slave.rules.living = "spare";
+					slave.rules.living = LivingRule.SPARE;
 					break;
 			}
 			break;
@@ -156,7 +156,7 @@ globalThis.assignJob = function(slave, job) {
 		case Job.CLUB.toLowerCase():
 		case "club":
 			slave.assignment = Job.CLUB;
-			slave.rules.living = "normal";
+			slave.rules.living = LivingRule.NORMAL;
 			break;
 
 		case Job.DAIRY.toLowerCase():
@@ -173,10 +173,10 @@ globalThis.assignJob = function(slave, job) {
 				case "Supremacist":
 				case "Subjugationist":
 				case "Degradationist":
-					slave.rules.living = "spare";
+					slave.rules.living = LivingRule.SPARE;
 					break;
 				default:
-					slave.rules.living = "normal";
+					slave.rules.living = LivingRule.NORMAL;
 					break;
 			}
 			break;
@@ -194,13 +194,13 @@ globalThis.assignJob = function(slave, job) {
 				case "Supremacist":
 				case "Subjugationist":
 				case "Degradationist":
-					slave.rules.living = "spare";
+					slave.rules.living = LivingRule.SPARE;
 					break;
 				case "Roman Revivalist":
-					slave.rules.living = "luxurious";
+					slave.rules.living = LivingRule.LUXURIOUS;
 					break;
 				default:
-					slave.rules.living = "normal";
+					slave.rules.living = LivingRule.SPARE;
 					break;
 			}
 			break;
@@ -209,7 +209,7 @@ globalThis.assignJob = function(slave, job) {
 		case "head girl suite":
 		case "hgsuite":
 			slave.assignment = Job.HEADGIRLSUITE;
-			slave.rules.living = "luxurious";
+			slave.rules.living = LivingRule.LUXURIOUS;
 			break;
 
 		case Job.MASTERSUITE.toLowerCase():
@@ -217,16 +217,16 @@ globalThis.assignJob = function(slave, job) {
 		case "mastersuite":
 			slave.assignment = Job.MASTERSUITE;
 			if (V.masterSuiteUpgradeLuxury > 0) {
-				slave.rules.living = "luxurious";
+				slave.rules.living = LivingRule.LUXURIOUS;
 			} else {
-				slave.rules.living = "normal";
+				slave.rules.living = LivingRule.NORMAL;
 			}
 			break;
 
 		case Job.SCHOOL.toLowerCase():
 		case "schoolroom":
 			slave.assignment = Job.SCHOOL;
-			slave.rules.living = "normal";
+			slave.rules.living = LivingRule.NORMAL;
 			break;
 
 		case Job.QUARTER.toLowerCase():
@@ -244,25 +244,25 @@ globalThis.assignJob = function(slave, job) {
 				case "Degradationist":
 				case "Arabian Revivalist":
 				case "Egyptian Revivalist":
-					slave.rules.living = "spare";
+					slave.rules.living = LivingRule.SPARE;
 					break;
 				case "Slave Professionalism":
 					if (slave.intelligence + slave.intelligenceImplant > 15) {
-						slave.rules.living = "normal";
+						slave.rules.living = LivingRule.NORMAL;
 					} else {
-						slave.rules.living = "spare";
+						slave.rules.living = LivingRule.SPARE;
 					}
 					break;
 				case "Petite Admiration":
 				case "Statuesque Glorification":
 					if (heightPass(slave)) {
-						slave.rules.living = "normal";
+						slave.rules.living = LivingRule.NORMAL;
 					} else {
-						slave.rules.living = "spare";
+						slave.rules.living = LivingRule.SPARE;
 					}
 					break;
 				default:
-					slave.rules.living = "normal";
+					slave.rules.living = LivingRule.NORMAL;
 					break;
 			}
 			break;
@@ -273,13 +273,13 @@ globalThis.assignJob = function(slave, job) {
 			switch (V.spaDecoration) {
 				case "Chattel Religionist":
 				case "Chinese Revivalist":
-					slave.rules.living = "normal";
+					slave.rules.living = LivingRule.NORMAL;
 					break;
 				case "Degradationist":
-					slave.rules.living = "spare";
+					slave.rules.living = LivingRule.SPARE;
 					break;
 				default:
-					slave.rules.living = "luxurious";
+					slave.rules.living = LivingRule.LUXURIOUS;
 					break;
 			}
 			break;
@@ -287,67 +287,67 @@ globalThis.assignJob = function(slave, job) {
 		case Job.NURSERY.toLowerCase():
 		case "nursery":
 			slave.assignment = Job.NURSERY;
-			slave.rules.living = "normal";
+			slave.rules.living = LivingRule.NORMAL;
 			break;
 
 		case Job.ATTENDANT.toLowerCase():
 			uniqueJob("Attendant");
 			slave.assignment = Job.ATTENDANT;
-			slave.rules.living = "luxurious";
+			slave.rules.living = LivingRule.LUXURIOUS;
 			break;
 
 		case Job.MATRON.toLowerCase():
 			uniqueJob("Matron");
 			slave.assignment = Job.MATRON;
-			slave.rules.living = "luxurious";
+			slave.rules.living = LivingRule.LUXURIOUS;
 			break;
 
 		case Job.DJ.toLowerCase():
 			uniqueJob("dj");
 			slave.assignment = Job.DJ;
-			slave.rules.living = "luxurious";
+			slave.rules.living = LivingRule.LUXURIOUS;
 			break;
 
 		case Job.MADAM.toLowerCase():
 			uniqueJob("Madam");
 			slave.assignment = Job.MADAM;
-			slave.rules.living = "luxurious";
+			slave.rules.living = LivingRule.LUXURIOUS;
 			break;
 
 		case Job.MILKMAID.toLowerCase():
 			uniqueJob("Milkmaid");
 			slave.assignment = Job.MILKMAID;
-			slave.rules.living = "luxurious";
+			slave.rules.living = LivingRule.LUXURIOUS;
 			break;
 
 		case Job.FARMER.toLowerCase():
 			uniqueJob("Farmer");
 			slave.assignment = Job.FARMER;
-			slave.rules.living = "luxurious";
+			slave.rules.living = LivingRule.LUXURIOUS;
 			break;
 
 		case Job.NURSE.toLowerCase():
 			uniqueJob("Nurse");
 			slave.assignment = Job.NURSE;
-			slave.rules.living = "luxurious";
+			slave.rules.living = LivingRule.LUXURIOUS;
 			break;
 
 		case Job.TEACHER.toLowerCase():
 			uniqueJob("Schoolteacher");
 			slave.assignment = Job.TEACHER;
-			slave.rules.living = "luxurious";
+			slave.rules.living = LivingRule.LUXURIOUS;
 			break;
 
 		case Job.STEWARD.toLowerCase():
 			uniqueJob("Stewardess");
 			slave.assignment = Job.STEWARD;
-			slave.rules.living = "luxurious";
+			slave.rules.living = LivingRule.LUXURIOUS;
 			break;
 
 		case Job.WARDEN.toLowerCase():
 			uniqueJob("Wardeness");
 			slave.assignment = Job.WARDEN;
-			slave.rules.living = "luxurious";
+			slave.rules.living = LivingRule.LUXURIOUS;
 			break;
 
 		case Job.RECRUITER:
@@ -358,18 +358,14 @@ globalThis.assignJob = function(slave, job) {
 		case Job.CONCUBINE.toLowerCase():
 			uniqueJob("Concubine");
 			slave.assignment = Job.CONCUBINE;
-			if (V.masterSuiteUpgradeLuxury > 0) {
-				slave.rules.living = "luxurious";
-			} else {
-				slave.rules.living = "normal";
-			}
+			slave.rules.living = V.masterSuiteUpgradeLuxury > 0 ? LivingRule.LUXURIOUS : LivingRule.NORMAL;
 			break;
 
 		case Job.HEADGIRL.toLowerCase():
 			uniqueJob("HeadGirl");
 			slave.assignment = Job.HEADGIRL;
 			if (V.HGSuite === 1) {
-				slave.rules.living = "luxurious";
+				slave.rules.living = LivingRule.LUXURIOUS;
 			}
 			V.HGTimeInGrade = 0;
 			break;
@@ -378,7 +374,7 @@ globalThis.assignJob = function(slave, job) {
 			uniqueJob("Bodyguard");
 			slave.assignment = Job.BODYGUARD;
 			if (V.dojo > 1) {
-				slave.rules.living = "luxurious";
+				slave.rules.living = LivingRule.LUXURIOUS;
 			}
 			if (V.pitBG === 1 && V.fighterIDs.includes(slave.ID)) { V.fighterIDs.delete(slave.ID); }
 			break;
@@ -471,8 +467,8 @@ globalThis.assignJobSafely = function(slave, assignmentStr) {
 globalThis.removeJob = function(slave, assignment, saveRecord = false) {
 	if (!slave) {
 		// it is well-formed, but does nothing, to remove an assignment from nobody.
-		// this lets us call <<run removeJob($HeadGirl, Job.HEADGIRL)>> and similar,
-		// without first checking to see whether a slave is really assigned to $HeadGirl or not.
+		// this lets us call <<run removeJob(_S.HeadGirl, Job.HEADGIRL)>> and similar,
+		// without first checking to see whether a slave is really assigned to _S.HeadGirl or not.
 		return '';
 	}
 
@@ -499,35 +495,35 @@ globalThis.removeJob = function(slave, assignment, saveRecord = false) {
 			V.JobIDMap[slave.assignment].delete(slave.ID);
 		}
 
-		if (V.HeadGirl !== 0 && slave.ID === V.HeadGirl.ID) {
-			V.HeadGirl = 0;
-		} else if (V.Recruiter !== 0 && slave.ID === V.Recruiter.ID) {
-			V.Recruiter = 0;
+		if (slave.ID === V.HeadGirlID) {
+			V.HeadGirlID = 0;
+		} else if (slave.ID === V.RecruiterID) {
+			V.RecruiterID = 0;
 			V.recruiterIOUs = 0;
-		} else if (V.Bodyguard !== 0 && slave.ID === V.Bodyguard.ID) {
-			V.Bodyguard = 0;
-		} else if (V.Madam !== 0 && slave.ID === V.Madam.ID) {
-			V.Madam = 0;
-		} else if (V.djID === slave.ID) {
+		} else if (slave.ID === V.BodyguardID) {
+			V.BodyguardID = 0;
+		} else if (slave.ID === V.MadamID) {
+			V.MadamID = 0;
+		} else if (slave.ID === V.djID) {
 			V.djID = 0;
-		} else if (V.Milkmaid !== 0 && slave.ID === V.Milkmaid.ID) {
-			V.Milkmaid = 0;
-		} else if (V.Farmer !== 0 && slave.ID === V.Farmer.ID) {
-			V.Farmer = 0;
-		} else if (V.SchoolteacherID === slave.ID) {
+		} else if (slave.ID === V.MilkmaidID) {
+			V.MilkmaidID = 0;
+		} else if (slave.ID === V.FarmerID) {
+			V.FarmerID = 0;
+		} else if (slave.ID === V.SchoolteacherID) {
 			V.SchoolteacherID = 0;
 		} else if (V.AttendantID === slave.ID) {
 			V.AttendantID = 0;
-		} else if (V.Matron !== 0 && slave.ID === V.Matron.ID) {
-			V.Matron = 0;
-		} else if (V.NurseID === slave.ID) {
+		} else if (slave.ID === V.MatronID) {
+			V.MatronID = 0;
+		} else if (slave.ID === V.NurseID) {
 			V.NurseID = 0;
-		} else if (V.StewardessID === slave.ID) {
+		} else if (slave.ID === V.StewardessID) {
 			V.StewardessID = 0;
-		} else if (V.WardenessID === slave.ID) {
+		} else if (slave.ID === V.WardenessID) {
 			V.WardenessID = 0;
-		} else if (V.Concubine !== 0 && slave.ID === V.Concubine.ID) {
-			V.Concubine = 0;
+		} else if (slave.ID === V.ConcubineID) {
+			V.ConcubineID = 0;
 		} else if (slave.ID === V.StudID) {
 			V.StudID = 0;
 		}
@@ -608,20 +604,14 @@ globalThis.removeJob = function(slave, assignment, saveRecord = false) {
 			case "be your head girl":
 				let attentionCheck = 1;
 				slave.assignment = Job.REST;
-				const HGSlave = V.slaves.findIndex(s => s.assignment === Job.HEADGIRLSUITE);
-				if (HGSlave !== -1) {
-					if (V.HGSuiteEquality === 1) {
-						if (V.slaves[HGSlave].devotion > 50) {
-							removeJob(V.slaves[HGSlave], Job.HEADGIRLSUITE);
-							assignJob(V.slaves[HGSlave], Job.HEADGIRL);
-							V.HeadGirl = V.slaves[HGSlave];
-							V.slaves[HGSlave].diet = "healthy";
-							attentionCheck = 0;
-						} else {
-							removeJob(V.slaves[HGSlave], Job.HEADGIRLSUITE);
-						}
-					} else {
-						removeJob(V.slaves[HGSlave], Job.HEADGIRLSUITE);
+				const HGSlave = V.slaves.find(s => s.assignment === Job.HEADGIRLSUITE);
+				if (HGSlave) {
+					removeJob(HGSlave, Job.HEADGIRLSUITE);
+					if (V.HGSuiteEquality === 1 && HGSlave.devotion > 50) {
+						assignJob(HGSlave, Job.HEADGIRL);
+						V.HeadGirlID = HGSlave.ID;
+						HGSlave.diet = "healthy";
+						attentionCheck = 0;
 					}
 				}
 				if (V.personalAttention === "HG" && attentionCheck === 1) {
@@ -664,8 +654,8 @@ globalThis.removeJob = function(slave, assignment, saveRecord = false) {
 
 		V.JobIDMap[slave.assignment].add(slave.ID);
 
-		if (slave.rules.living === "luxurious" && !assignmentVisible(slave)) {
-			slave.rules.living = "normal";
+		if (slave.rules.living === LivingRule.LUXURIOUS && !assignmentVisible(slave)) {
+			slave.rules.living = LivingRule.NORMAL;
 		}
 
 		slave.choosesOwnAssignment = 0;
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index f3627cce627dba083f81d4546cd29ed5ef60a6d0..ee4ba8d664214871c9e32e9c1d394954683a426a 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -711,7 +711,7 @@ globalThis.calculateCosts = (function() {
 
 	// policy and other expenses
 	function getRecruiterCosts() {
-		return (V.Recruiter !== 0) ? 250 : 0;
+		return V.RecruiterID ? 250 : 0;
 	}
 
 	function getSchoolCosts() {
@@ -1504,80 +1504,79 @@ globalThis.slaveJobValues = function(lowerClassSexDemandRef, middleClassSexDeman
 	}
 
 	// Accounting for the Madam
-	V.Madam = V.slaves.find(s => {
-		return s.assignment === Job.MADAM;
-	});
-	if (V.Madam !== 0) {
-		if (!canTalk(V.Madam)) {
-			V.Madam = 0;
+	if (V.MadamID !== 0) {
+		const madam = S.Madam;
+		if (!canTalk(madam)) {
+			V.MadamID = 0;
 			V.unMadam = 1;
-		} else if (V.Madam.preg > 37 && V.Madam.broodmother === 2) {
-			V.Madam = 0;
+		} else if (madam.preg > 37 && madam.broodmother === 2) {
+			V.MadamID = 0;
 			V.unMadam = 2;
-		} else if (V.Madam.fetish === "mindbroken") {
-			V.Madam = 0;
+		} else if (madam.fetish === "mindbroken") {
+			V.MadamID = 0;
 			V.unMadam = 3;
-		} else if (!canWalk(V.Madam)) {
-			V.Madam = 0;
+		} else if (!canWalk(madam)) {
+			V.MadamID = 0;
 			V.unMadam = 4;
-		} else if (!canSee(V.Madam)) {
-			V.Madam = 0;
+		} else if (!canSee(madam)) {
+			V.MadamID = 0;
 			V.unMadam = 5;
-		} else if (!canHear(V.Madam)) {
-			V.Madam = 0;
+		} else if (!canHear(madam)) {
+			V.MadamID = 0;
 			V.unMadam = 6;
-		} else if (!canHold(V.Madam)) {
-			V.Madam = 0;
+		} else if (!canHold(madam)) {
+			V.MadamID = 0;
 			V.unMadam = 7;
 		}
 	}
-	if (V.Madam !== 0) {
-		const madamIntel = V.Madam.intelligence + V.Madam.intelligenceImplant;
+	if (V.MadamID !== 0) {
+		const madam = S.Madam;
+		const madamIntel = madam.intelligence + madam.intelligenceImplant;
 		V.madamCashBonus = 0;
-		if (V.Madam.relationship === -3 && V.Madam.devotion > 50) {
+		if (madam.relationship === -3 && madam.devotion > 50) {
 		// As your loving $wife, $he does $his best to attract attention to your brothel.
 			V.madamCashBonus += 0.25;
 		}
-		if (V.Madam.skill.whoring > 10 && V.Madam.skill.whoring <= 30) {
-			// V.Madam.slaveName's basic skills marginally yellowgreen;improve business at $brothelName.
+		if (madam.skill.whoring > 10 && madam.skill.whoring <= 30) {
+			// S.Madam.slaveName's basic skills marginally yellowgreen;improve business at $brothelName.
 			V.madamCashBonus += 0.05;
-		} else if (V.Madam.skill.whoring <= 60) {
-			// V.Madam.slaveName's skills yellowgreen;improve business at $brothelName.
+		} else if (madam.skill.whoring <= 60) {
+			// S.Madam.slaveName's skills yellowgreen;improve business at $brothelName.
 			V.madamCashBonus += 0.1;
-		} else if (V.Madam.skill.whoring < 100) {
-			// V.Madam.slaveName's skills greatly yellowgreen;improve business at $brothelName.
+		} else if (madam.skill.whoring < 100) {
+			// S.Madam.slaveName's skills greatly yellowgreen;improve business at $brothelName.
 			V.madamCashBonus += 0.15;
 		} else {
-			// V.Madam.slaveName's mastery immensely yellowgreen;improves business at $brothelName.
+			// S.Madam.slaveName's mastery immensely yellowgreen;improves business at $brothelName.
 			V.madamCashBonus += 0.20;
 		}
-		if (V.Madam.actualAge > 35) {
+		if (madam.actualAge > 35) {
 			// $His age and experience also contribute.
 			V.madamCashBonus += 0.05;
 		} else if (V.AgePenalty === 0) {
 			V.madamCashBonus += 0.05;
 		}
-		if (setup.madamCareers.includes(V.Madam.career)) {
+		if (setup.madamCareers.includes(madam.career)) {
 			// $He has experience from $his life before $he was a slave that helps $him in the seedy business of selling other people's bodies for sex.
 			V.madamCashBonus += 0.05;
-		} else if (V.Madam.skill.madam >= V.masteredXP) {
+		} else if (madam.skill.madam >= V.masteredXP) {
 			// $He has experience from working for you that helps $him in the seedy business of selling other people's bodies for sex.
 			V.madamCashBonus += 0.05;
 		} else {
-			V.Madam.skill.madam += jsRandom(1, Math.ceil((madamIntel) / 15) + 8);
+			madam.skill.madam += jsRandom(1, Math.ceil((madamIntel) / 15) + 8);
 		}
 		if (madamIntel > 15) {
 			// $He is a clever manager.
 			V.madamCashBonus += 0.05 * Math.floor((-0.00008 * madamIntel * madamIntel) + (0.0337 * madamIntel) + 0.5);
 		}
-		if (V.Madam.dick > 2 && canPenetrate(V.Madam)) {
+		if (madam.dick > 2 && canPenetrate(madam)) {
 			// $His turgid dick helps $him manage the bitches.
 			V.madamCashBonus += 0.05;
 		}
 		for (const slave of App.Entity.facilities.brothel.employees()) {
-			if (V.Madam.relationshipTarget === slave.ID) {
+			if (madam.relationshipTarget === slave.ID) {
 				V.madamCashBonus -= 0.05;
-			} else if (areRelated(V.Madam, slave)) {
+			} else if (areRelated(madam, slave)) {
 				V.madamCashBonus += 0.05;
 			}
 			if (slave.prestigeDesc === "$He is a famed Free Cities whore, and commands top prices.") {
@@ -1610,7 +1609,7 @@ globalThis.slaveJobValues = function(lowerClassSexDemandRef, middleClassSexDeman
 		}
 
 		// The Madam adding to 'brothel'
-		SJVBrothel(V.slaves[V.slaveIndices[V.Madam.ID]], lowerClassSexDemandRef, middleClassSexDemandRef, upperClassSexDemandRef, topClassSexDemandRef);
+		SJVBrothel(S.Madam, lowerClassSexDemandRef, middleClassSexDemandRef, upperClassSexDemandRef, topClassSexDemandRef);
 	}
 
 
@@ -1818,7 +1817,7 @@ globalThis.slaveJobValues = function(lowerClassSexDemandRef, middleClassSexDeman
 				if (V.brothelAdsSpending !== 0) {
 					beautyMultiplier += 0.05 * App.Ads.getMatchedCategoryCount(s, "brothel");
 				}
-				if (V.Madam !== 0) {
+				if (V.MadamID !== 0) {
 					if (V.madamCashBonus > 0) {
 						if (!canHear(s)) {
 							beautyMultiplier += V.madamCashBonus * 0.5;
diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index e24e3bccc44de172f246f61f02250a2ecdf360e8..d972693b3ab52aca7c57e2d6f1eb8cb3410f19b4 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -112,7 +112,7 @@ globalThis.generateRandomEventPoolStandard = function(eventSlave) {
 					}
 				}
 
-				if (V.HeadGirl !== 0) {
+				if (V.HeadGirlID !== 0) {
 					if (eventSlave.devotion <= 50) {
 						if (eventSlave.anus !== 0 && canDoAnal(eventSlave)) {
 							if (V.HGSeverity >= 0) {
@@ -121,19 +121,19 @@ globalThis.generateRandomEventPoolStandard = function(eventSlave) {
 							V.events.push("RE shower punishment");
 						}
 					}
-					if (eventSlave.ID === V.HeadGirl.ID) {
+					if (eventSlave.ID === V.HeadGirlID) {
 						if (eventSlave.trust > 50) {
 							V.RESSevent.push("trusting HG");
 						}
 					}
-					if (eventSlave.ID !== V.HeadGirl.ID) {
+					if (eventSlave.ID !== V.HeadGirlID) {
 						if (canSee(eventSlave) && canWalk(eventSlave)) {
 							if (eventSlave.rules.speech !== "restrictive") {
 								if (eventSlave.trust > 75) {
 									if (eventSlave.devotion > 50) {
 										if (eventSlave.skill.oral > 30) {
-											if (eventSlave.intelligence + eventSlave.intelligenceImplant >= V.HeadGirl.intelligence + V.HeadGirl.intelligenceImplant) {
-												if (eventSlave.skill.oral > V.HeadGirl.skill.oral) {
+											if (eventSlave.intelligence + eventSlave.intelligenceImplant >= S.HeadGirl.intelligence + S.HeadGirl.intelligenceImplant) {
+												if (eventSlave.skill.oral > S.HeadGirl.skill.oral) {
 													V.events.push("RE HG replacement");
 												}
 											}
@@ -287,9 +287,9 @@ globalThis.generateRandomEventPoolStandard = function(eventSlave) {
 				if (eventSlave.devotion > 50) {
 					if (eventSlave.trust > 50) {
 						let giver = 0;
-						if (V.HeadGirl === 0) {
+						if (V.HeadGirlID === 0) {
 							giver = 1;
-						} else if (V.HeadGirl.ID !== eventSlave.ID) {
+						} else if (V.HeadGirlID !== eventSlave.ID) {
 							giver = 1;
 						}
 						if (giver === 1) {
@@ -674,7 +674,7 @@ globalThis.generateRandomEventPoolStandard = function(eventSlave) {
 								if (eventSlave.health.condition > 20) {
 									if (eventSlave.energy > 50) {
 										if (canPenetrate(eventSlave)) {
-											if (V.Bodyguard === 0) {
+											if (V.BodyguardID === 0) {
 												V.RESSevent.push("mutinery attempt");
 											}
 										}
@@ -800,8 +800,8 @@ globalThis.generateRandomEventPoolStandard = function(eventSlave) {
 			if (canWalk(eventSlave)) {
 				if (eventSlave.devotion > 20) {
 					if (eventSlave.trust > -10) {
-						if (eventSlave.ID !== V.HeadGirl.ID) {
-							if (eventSlave.ID !== V.Concubine.ID) {
+						if (eventSlave.ID !== V.HeadGirlID) {
+							if (eventSlave.ID !== V.ConcubineID) {
 								V.RESSevent.push("refreshment delivery");
 							}
 						}
@@ -1602,7 +1602,7 @@ globalThis.generateRandomEventPoolServant = function(eventSlave) {
 					}
 				}
 
-				if (V.HeadGirl !== 0) {
+				if (V.HeadGirlID !== 0) {
 					if (eventSlave.devotion <= 50) {
 						if (eventSlave.anus !== 0 && canDoAnal(eventSlave)) {
 							if (V.HGSeverity >= 0) {
@@ -1663,9 +1663,9 @@ globalThis.generateRandomEventPoolServant = function(eventSlave) {
 				if (eventSlave.devotion > 50) {
 					if (eventSlave.trust > 50) {
 						let giver = 0;
-						if (V.HeadGirl === 0) {
+						if (V.HeadGirlID === 0) {
 							giver = 1;
-						} else if (V.HeadGirl.ID !== eventSlave.ID) {
+						} else if (V.HeadGirlID !== eventSlave.ID) {
 							giver = 1;
 						}
 						if (giver === 1) {
@@ -1895,7 +1895,7 @@ globalThis.generateRandomEventPoolServant = function(eventSlave) {
 								if (eventSlave.health.condition > 20) {
 									if (eventSlave.energy > 50) {
 										if (canPenetrate(eventSlave)) {
-											if (V.Bodyguard === 0) {
+											if (V.BodyguardID === 0) {
 												V.RESSevent.push("mutinery attempt");
 											}
 										}
@@ -1973,8 +1973,8 @@ globalThis.generateRandomEventPoolServant = function(eventSlave) {
 			if (canWalk(eventSlave)) {
 				if (eventSlave.devotion > 20) {
 					if (eventSlave.trust > -10) {
-						if (eventSlave.ID !== V.HeadGirl.ID) {
-							if (eventSlave.ID !== V.Concubine.ID) {
+						if (eventSlave.ID !== V.HeadGirlID) {
+							if (eventSlave.ID !== V.ConcubineID) {
 								V.RESSevent.push("refreshment delivery");
 							}
 						}
diff --git a/src/js/main.js b/src/js/main.js
index 4fb77bb5a0503e30817abcf1d99534990f79b714..0a96871e591df887d8f751d5387f8df04d550723 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -166,7 +166,7 @@ App.MainView.useGuard = function() {
 
 	const outerDiv = document.createElement("div");
 
-	if (!guard || guard.assignment !== "guard you") {
+	if (!guard || guard.assignment !== Job.BODYGUARD) {
 		return outerDiv;
 	}
 
diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js
index f700147b1aa4c0beaa218f5a5ba5b1411a9c3b9f..8052c5bd80847693811a8fe70788bb23d958ffcb 100644
--- a/src/js/slaveListing.js
+++ b/src/js/slaveListing.js
@@ -317,7 +317,7 @@ App.UI.SlaveList.render = function() {
 		}
 		res.appendChild(document.createTextNode(' '));
 
-		if ((V.displayAssignments === 1) && (passageName === "Main") && (slave.ID !== V.HeadGirl.ID) && (slave.ID !== V.Recruiter.ID) && (slave.ID !== V.Bodyguard.ID)) {
+		if ((V.displayAssignments === 1) && (passageName === "Main") && (slave.ID !== V.HeadGirlID) && (slave.ID !== V.RecruiterID) && (slave.ID !== V.BodyguardID)) {
 			res.appendChild(App.UI.jobLinks.assignmentsFragment(slave.ID, "Main", (slave, assignment) => { App.UI.SlaveList.ScrollPosition.record(); assignJob(slave, assignment); }));
 		}
 		if (showTransfers) {
@@ -796,9 +796,8 @@ App.UI.SlaveList.penthousePage = function() {
 		const A = V.arcologies[0];
 
 		let slaveWrapper = document.createElement("div"); // first is a div so we have no space between slave and buttons
-		if (V.HeadGirl) {
-			/** @type {App.Entity.SlaveState} */
-			const HG = V.HeadGirl;
+		if (V.HeadGirlID) {
+			const HG = S.HeadGirl;
 			slaveWrapper.append(App.UI.DOM.makeElement("span", SlaveFullName(HG), "slave-name"),
 				" is serving as your Head Girl");
 			if (A.FSEgyptianRevivalistLaw === 1) {
@@ -830,9 +829,9 @@ App.UI.SlaveList.penthousePage = function() {
 		fragment.append(slaveWrapper);
 
 		slaveWrapper = document.createElement("p");
-		if (V.Recruiter) {
+		if (V.RecruiterID) {
 			/** @type {App.Entity.SlaveState} */
-			const RC = V.Recruiter;
+			const RC = S.Recruiter;
 			const {he} = getPronouns(RC);
 			slaveWrapper.append(App.UI.DOM.makeElement("span", SlaveFullName(RC), "slave-name"),
 				" is working");
@@ -866,8 +865,7 @@ App.UI.SlaveList.penthousePage = function() {
 
 		if (V.dojo) {
 			slaveWrapper = document.createElement("p");
-			/** @type {App.Entity.SlaveState} */
-			const BG = V.Bodyguard;
+			const BG = S.Bodyguard;
 			if (BG) {
 				slaveWrapper.append(App.UI.DOM.makeElement("span", SlaveFullName(BG), "slave-name"),
 					" is serving as your bodyguard. ");
diff --git a/src/js/vignettes.js b/src/js/vignettes.js
index 5940f773f52d3e2321638a280114bbefba8ee42d..4c8c856db9d17302d27f16db2efbdaf44ebad21e 100644
--- a/src/js/vignettes.js
+++ b/src/js/vignettes.js
@@ -1977,7 +1977,7 @@ globalThis.GetVignette = function (slave) {
 			type: "trust",
 			effect: -1,
 		});
-	} else if (slave.assignment === window.Job.PUBLIC || slave.assignment === window.Job.CLUB || slave.assignment === window.Job.DJ) {
+	} else if (slave.assignment === Job.PUBLIC || slave.assignment === Job.CLUB || slave.assignment === Job.DJ) {
 		let seed = jsRandom(1, 10);
 		switch (seed) {
 			case 1:
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index 59d74203b7f14caa28fdeefecbd4318be3e3abd2..6c34e73a825c689d24d30f11189818767ce23f5a 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -472,7 +472,7 @@ The previous owner seems to have left in something of a hurry.
 			<<set $activeSlave.behavioralFlaw = "none", $activeSlave.behavioralQuirk = "fitness">>
 			<<set $activeSlave.behavioralFlaw = "none">>
 			<<set $activeSlave.clothes = "a toga", $activeSlave.collar = "pretty jewelry", $activeSlave.shoes = "flats">>
-			<<set $activeSlave.assignment = "guard you", $Bodyguard = $activeSlave>>
+			<<set $activeSlave.assignment = "guard you", $BodyguardID = $activeSlave.ID>>
 		<<case "AztecRevivalist">>
 			<<set $oneTimeDisableDisability = 1>>
 			<<set $fixedRace = "latina">>
@@ -485,7 +485,7 @@ The previous owner seems to have left in something of a hurry.
 			<<set $activeSlave.skill.combat = 1>>
 			<<set $activeSlave.behavioralFlaw = "malicious", $activeSlave.behavioralQuirk = "none">>
 			<<set $activeSlave.clothes = "a huipil", $activeSlave.collar = "pretty jewelry", $activeSlave.shoes = "none">>
-			<<set $activeSlave.assignment = "be your Head Girl", $HeadGirl = $activeSlave>>
+			<<set $activeSlave.assignment = "be your Head Girl", $HeadGirlID = $activeSlave.ID>>
 		<<case "EgyptianRevivalist">>
 			<<set $oneTimeDisableDisability = 1>>
 			<<set $activeSlave = GenerateNewSlave()>>
@@ -545,7 +545,7 @@ The previous owner seems to have left in something of a hurry.
 			<<run SoftenBehavioralFlaw($activeSlave)>>
 			<<run SoftenSexualFlaw($activeSlave)>>
 			<<set $activeSlave.clothes = "a slutty qipao", $activeSlave.collar = "pretty jewelry", $activeSlave.shoes = "heels">>
-			<<set $activeSlave.assignment = "be your Head Girl", $HeadGirl = $activeSlave>>
+			<<set $activeSlave.assignment = "be your Head Girl", $HeadGirlID = $activeSlave.ID>>
 		<<case "Eugenics">>
 			<<set $oneTimeDisableDisability = 1>>
 			<<set $activeSlave = GenerateNewSlave()>>
@@ -634,7 +634,7 @@ The previous owner seems to have left in something of a hurry.
 			<<run SoftenBehavioralFlaw($activeSlave)>>
 			<<run SoftenSexualFlaw($activeSlave)>>
 			<<set $activeSlave.clothes = "a nice maid outfit", $activeSlave.collar = "pretty jewelry">>
-			<<set $activeSlave.assignment = "be your Head Girl", $HeadGirl = $activeSlave>>
+			<<set $activeSlave.assignment = "be your Head Girl", $HeadGirlID = $activeSlave.ID>>
 		<<case "PetiteAdmiration">>
 			<<set $activeSlaveOneTimeMinAge = 14>>
 			<<set $activeSlaveOneTimeMaxAge = 18>>
diff --git a/src/npc/agent/agentCompany.tw b/src/npc/agent/agentCompany.tw
index 9abdbd28f152a9dd15bc694ce4f7fcafbf4690f5..cf96a70df8e3d79911930a909669014df7c7090f 100644
--- a/src/npc/agent/agentCompany.tw
+++ b/src/npc/agent/agentCompany.tw
@@ -21,7 +21,7 @@
 
 <<setLocalPronouns $subSlave 2>>
 
-Working in _neighborArcology.name's penthouse office, $subSlave.slaveName gets a video call from you. Naturally, _his2 personal assistant program has been instructed to give these the highest priority, and your face appears in front of _him2 immediately. _He2 greets you properly, and asks you what _he2 can do to serve you. You tell _him2 you're planning to send one of your slaves over to _his2 arcology to assist _him2. Exchanges of this kind are neither unusual nor particularly interesting, so a slight look of perplexity clouds $subSlave.slaveName's face as _he2 wonders why this merits a personal call. Normally, <<if $HeadGirl != 0>>$HeadGirl.slaveName<<else>>$assistant.name<</if>> would handle it with _him2 directly.
+Working in _neighborArcology.name's penthouse office, $subSlave.slaveName gets a video call from you. Naturally, _his2 personal assistant program has been instructed to give these the highest priority, and your face appears in front of _him2 immediately. _He2 greets you properly, and asks you what _he2 can do to serve you. You tell _him2 you're planning to send one of your slaves over to _his2 arcology to assist _him2. Exchanges of this kind are neither unusual nor particularly interesting, so a slight look of perplexity clouds $subSlave.slaveName's face as _he2 wonders why this merits a personal call. Normally, <<if $HeadGirlID>>_S.HeadGirl.slaveName<<else>>$assistant.name<</if>> would handle it with _him2 directly.
 
 <br><br>
 
@@ -61,4 +61,4 @@ $subSlave.slaveName smiles back at $him, glowing with pleasure, and responds wit
 <<default>>
 	"Babe, I can't wait to <<if hasAnyArms($subSlave)>>give you a hug and <</if>>tell you about _neighborArcology.name," the loving
 <</switch>>
-leader of an entire arcology <<say>>s.
\ No newline at end of file
+leader of an entire arcology <<say>>s.
diff --git a/src/npc/bodyguard/bgDescription.js b/src/npc/bodyguard/bgDescription.js
index 429868280875d7e71fa6fc97313544f3299d535e..3526467c4ab8433e8bc6c3bb3cc54083b9a187e2 100644
--- a/src/npc/bodyguard/bgDescription.js
+++ b/src/npc/bodyguard/bgDescription.js
@@ -7,7 +7,7 @@ App.Desc.bodyguard = function(slave) {
 	const {
 		his, He, he
 	} = getPronouns(slave);
-	if (slave.fuckdoll !== 0 || slave.ID !== V.Bodyguard.ID) {
+	if (slave.fuckdoll !== 0 || slave.ID !== V.BodyguardID) {
 		return;
 	}
 	r.push(`${He} is your bodyguard.`);
diff --git a/src/npc/databases/cheatmodeDatabase.tw b/src/npc/databases/cheatmodeDatabase.tw
index fd3571b09d0151f82f39af59a847d8fe044c9f62..479591222ef956ff5d20910bdadb75f973705405 100644
--- a/src/npc/databases/cheatmodeDatabase.tw
+++ b/src/npc/databases/cheatmodeDatabase.tw
@@ -58,7 +58,7 @@
 	<<set _HS.genes = "XY", _HS.vagina = -1, _HS.dick = 4, _HS.balls = 4, _HS.scrotum = 4, _HS.foreskin = 4, _HS.prostate = 1, _HS.pubertyXY = 1>>
 <</if>>
 <<run newSlave(_HS)>>
-<<set $HeadGirl = clone(_HS)>>
+<<set $HeadGirlID = _HS.ID>>
 //There are quite a few left; their names are _HS.slaveName,//
 
 <<set _HS = clone($activeSlave)>>
@@ -99,7 +99,7 @@
 	<<set _HS.genes = "XY", _HS.vagina = -1, _HS.dick = 4, _HS.balls = 4, _HS.scrotum = 4, _HS.foreskin = 4, _HS.prostate = 1, _HS.pubertyXY = 1>>
 <</if>>
 <<run newSlave(_HS)>>
-<<set $Bodyguard = clone(_HS)>>
+<<set $BodyguardID = _HS.ID>>
 //_HS.slaveName,//
 
 <<set _HS = clone($activeSlave)>>
diff --git a/src/npc/descriptions/longSlave.js b/src/npc/descriptions/longSlave.js
index 9569c7e4b6abe59f4cc807c10ccb96f7944685f1..dc9cbb95dcfac55469775ac2fc92a077fcaf96e6 100644
--- a/src/npc/descriptions/longSlave.js
+++ b/src/npc/descriptions/longSlave.js
@@ -439,10 +439,10 @@ App.Desc.longSlave = function(slave = V.activeSlave, {market = 0, eventDescripti
 
 	let scarCounter = 0;
 	for (let scarName in slave.scar) {
-		if (slave.ID === V.Bodyguard.ID && scarCounter > 1) {
+		if (slave.ID === V.BodyguardID && scarCounter > 1) {
 			r.push(`${His} scars make ${him} look even more menacing than ${he} actually is. `);
 			break;
-		} else if ((slave.ID === V.Bodyguard.ID) && slave.scar[scarName].menacing > 0) {
+		} else if ((slave.ID === V.BodyguardID) && slave.scar[scarName].menacing > 0) {
 			r.push(`${His} menacing scar makes ${him} look terrifying. `);
 			break;
 		} else if ((slave.ID === V.WardenessID) && scarCounter > 1) {
@@ -786,4 +786,3 @@ App.Desc.longSlave = function(slave = V.activeSlave, {market = 0, eventDescripti
 
 	return el;
 };
-
diff --git a/src/npc/descriptions/sceneIntro.js b/src/npc/descriptions/sceneIntro.js
index 4ceea4159e9140afb998fb2836de19c039bf7c6c..a069b6a4426157f5ce00c33c9007e5729f39a778 100644
--- a/src/npc/descriptions/sceneIntro.js
+++ b/src/npc/descriptions/sceneIntro.js
@@ -272,9 +272,9 @@ App.Desc.sceneIntro = function(slave, {market, eventDescription} = {}) {
 	function sleepLoc() {
 		const r = [];
 
-		if (slave.ID === V.HeadGirl.ID && V.HGSuite === 1) {
+		if (slave.ID === V.HeadGirlID && V.HGSuite === 1) {
 			r.push(`${He} lives in ${his} own suite within your penthouse,`);
-		} else if ((slave.ID === V.Bodyguard.ID) && (V.dojo > 1)) {
+		} else if ((slave.ID === V.BodyguardID) && (V.dojo > 1)) {
 			r.push(`${He} lives in ${his} own room within the armory,`);
 		} else if ((slave.assignment === "work in the dairy") && (V.dairyRestraintsSetting > 1)) {
 			r.push(`${He} sleeps attached to a milking machine,`);
diff --git a/src/npc/descriptions/style/clothing.js b/src/npc/descriptions/style/clothing.js
index 21b118bd427eeab4fa4fbcb16a98663710f18ad6..231e14bf1b0e51833bd3cf95c0791b7060f5c153 100644
--- a/src/npc/descriptions/style/clothing.js
+++ b/src/npc/descriptions/style/clothing.js
@@ -785,9 +785,9 @@ App.Desc.clothing = function(slave, {market, eventDescription} = {}) {
 					r.push(`tunic, and matching skirt.`);
 				}
 				r.push(`${His} uniform is pinned with the`);
-				if (slave.ID === V.Bodyguard.ID || slave.ID === V.HeadGirl.ID || slave.ID === V.Recruiter.ID || slave.ID === V.Concubine.ID) {
+				if (slave.ID === V.BodyguardID || slave.ID === V.HeadGirlID || slave.ID === V.RecruiterID || slave.ID === V.ConcubineID) {
 					r.push(`golden whip and manacles insignia of a senior slave officer,`);
-				} else if ((slave.ID === V.Madam.ID) || (slave.ID === V.NurseID) || (slave.ID === V.AttendantID) || (slave.ID === V.Matron.ID) || (slave.ID === V.djID) || (slave.ID === V.Milkmaid.ID) || (slave.ID === V.Farmer.ID) || (slave.ID === V.StewardessID) || (slave.ID === V.SchoolteacherID) || (slave.ID === V.WardenessID)) {
+				} else if ((slave.ID === V.MadamID) || (slave.ID === V.NurseID) || (slave.ID === V.AttendantID) || (slave.ID === V.MatronID) || (slave.ID === V.djID) || (slave.ID === V.MilkmaidID) || (slave.ID === V.FarmerID) || (slave.ID === V.StewardessID) || (slave.ID === V.SchoolteacherID) || (slave.ID === V.WardenessID)) {
 					r.push(`golden manacles insignia of a junior slave officer,`);
 				} else if ((slave.skill.combat > 0) && getLimbCount(slave, 105) > 0) {
 					r.push(`silver spear and manacles insignia of an augmented slave soldier,`);
@@ -807,9 +807,9 @@ App.Desc.clothing = function(slave, {market, eventDescription} = {}) {
 					r.push(`tunic, and matching trousers.`);
 				}
 				r.push(`${His} uniform is pinned with the`);
-				if (slave.ID === V.Bodyguard.ID || slave.ID === V.HeadGirl.ID || slave.ID === V.Recruiter.ID || slave.ID === V.Concubine.ID) {
+				if (slave.ID === V.BodyguardID || slave.ID === V.HeadGirlID || slave.ID === V.RecruiterID || slave.ID === V.ConcubineID) {
 					r.push(`golden whip and manacles insignia of a senior slave officer,`);
-				} else if ((slave.ID === V.Madam.ID) || (slave.ID === V.NurseID) || (slave.ID === V.AttendantID) || (slave.ID === V.Matron.ID) || (slave.ID === V.djID) || (slave.ID === V.Milkmaid.ID) || (slave.ID === V.Farmer.ID) || (slave.ID === V.StewardessID) || (slave.ID === V.SchoolteacherID) || (slave.ID === V.WardenessID)) {
+				} else if ((slave.ID === V.MadamID) || (slave.ID === V.NurseID) || (slave.ID === V.AttendantID) || (slave.ID === V.MatronID) || (slave.ID === V.djID) || (slave.ID === V.MilkmaidID) || (slave.ID === V.FarmerID) || (slave.ID === V.StewardessID) || (slave.ID === V.SchoolteacherID) || (slave.ID === V.WardenessID)) {
 					r.push(`golden manacles insignia of a junior slave officer,`);
 				} else if ((slave.skill.combat > 0) && getLimbCount(slave, 105)) {
 					r.push(`silver spear and manacles insignia of an augmented slave soldier,`);
@@ -829,9 +829,9 @@ App.Desc.clothing = function(slave, {market, eventDescription} = {}) {
 					r.push(`tunic, and matching miniskirt.`);
 				}
 				r.push(`${His} uniform is pinned with the`);
-				if ((slave.ID === V.Bodyguard.ID) || (slave.ID === V.HeadGirl.ID) || (slave.ID === V.Recruiter.ID) || (slave.ID === V.Concubine.ID)) {
+				if ((slave.ID === V.BodyguardID) || (slave.ID === V.HeadGirlID) || (slave.ID === V.RecruiterID) || (slave.ID === V.ConcubineID)) {
 					r.push(`golden whip and manacles insignia of a senior slave officer,`);
-				} else if ((slave.ID === V.Madam.ID) || (slave.ID === V.NurseID) || (slave.ID === V.AttendantID) || (slave.ID === V.Matron.ID) || (slave.ID === V.djID) || (slave.ID === V.Milkmaid.ID) || (slave.ID === V.Farmer.ID) || (slave.ID === V.StewardessID) || (slave.ID === V.SchoolteacherID) || (slave.ID === V.WardenessID)) {
+				} else if ((slave.ID === V.MadamID) || (slave.ID === V.NurseID) || (slave.ID === V.AttendantID) || (slave.ID === V.MatronID) || (slave.ID === V.djID) || (slave.ID === V.MilkmaidID) || (slave.ID === V.FarmerID) || (slave.ID === V.StewardessID) || (slave.ID === V.SchoolteacherID) || (slave.ID === V.WardenessID)) {
 					r.push(`golden manacles insignia of a junior slave officer,`);
 				} else if ((slave.skill.combat > 0) && getLimbCount(slave, 105)) {
 					r.push(`silver spear and manacles insignia of an augmented slave soldier,`);
@@ -851,9 +851,9 @@ App.Desc.clothing = function(slave, {market, eventDescription} = {}) {
 					r.push(`tunic, and matching skirt.`);
 				}
 				r.push(`${His} uniform is pinned with the`);
-				if ((slave.ID === V.Bodyguard.ID) || (slave.ID === V.HeadGirl.ID) || (slave.ID === V.Recruiter.ID) || (slave.ID === V.Concubine.ID)) {
+				if ((slave.ID === V.BodyguardID) || (slave.ID === V.HeadGirlID) || (slave.ID === V.RecruiterID) || (slave.ID === V.ConcubineID)) {
 					r.push(`golden whip and manacles insignia of a senior slave officer,`);
-				} else if ((slave.ID === V.Madam.ID) || (slave.ID === V.NurseID) || (slave.ID === V.AttendantID) || (slave.ID === V.Matron.ID) || (slave.ID === V.djID) || (slave.ID === V.Milkmaid.ID) || (slave.ID === V.Farmer.ID) || (slave.ID === V.StewardessID) || (slave.ID === V.SchoolteacherID) || (slave.ID === V.WardenessID)) {
+				} else if ((slave.ID === V.MadamID) || (slave.ID === V.NurseID) || (slave.ID === V.AttendantID) || (slave.ID === V.MatronID) || (slave.ID === V.djID) || (slave.ID === V.MilkmaidID) || (slave.ID === V.FarmerID) || (slave.ID === V.StewardessID) || (slave.ID === V.SchoolteacherID) || (slave.ID === V.WardenessID)) {
 					r.push(`golden manacles insignia of a junior slave officer,`);
 				} else if ((slave.skill.combat > 0) && getLimbCount(slave, 105)) {
 					r.push(`silver spear and manacles insignia of an augmented slave soldier,`);
diff --git a/src/npc/interaction/fAbuse.tw b/src/npc/interaction/fAbuse.tw
index 8ca0f3933661cc7f6182cbf2e30f2e57ee0ca269..b764505c3566b13972d92eec0f0da9a12080b9c6 100644
--- a/src/npc/interaction/fAbuse.tw
+++ b/src/npc/interaction/fAbuse.tw
@@ -3,7 +3,7 @@
 <<set $AS = $activeSlave.ID>>
 <<setLocalPronouns $activeSlave>>
 
-<<if (getSlave($AS).ID == $Bodyguard.ID)>>
+<<if (getSlave($AS).ID == $BodyguardID)>>
 	<<if (getSlave($AS).fetish == "masochist") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 95)>>
 		Knowing how much your bodyguard likes being hurt, you decide to reward $him in $his own particular way.
 	<<elseif (getSlave($AS).muscles < -5) && (getSlave($AS).skill.combat == 0)>>
@@ -416,15 +416,15 @@ from your victim.
 	$He's got no special physical targets for abuse, so you just rape $him hard and fast, raining stinging slaps down on $him as you do. $He cries and whimpers; you finish.
 	<<= VCheck.Both()>>
 <</if>>
-<<if (getSlave($AS).ID !== $Bodyguard.ID)>>
+<<if (getSlave($AS).ID !== $BodyguardID)>>
 	This leaves $him sobbing on the floor <<if ($PC.dick == 0)>>as you shuck off the strap-on and drop it on $his face<<else>>with cum dripping out of $him<</if>>.
-<<elseif (getSlave($AS).ID == $Bodyguard.ID) && (getSlave($AS).fetish == "masochist") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 95)>>
+<<elseif (getSlave($AS).ID == $BodyguardID) && (getSlave($AS).fetish == "masochist") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 95)>>
 	$He thanks you rapidly, trying to break away from the pleasure of your reward. $He quickly gets back to $his feet and stumbles towards the shower, to make sure you won't stay unprotected too long.
 <<else>>
 	Even though $he's in a somewhat bad shape, $he still jumps back to $his feet and stumbles towards the shower, to make sure you won't stay unprotected too long.
 <</if>>
 
-<<if (getSlave($AS).ID !== $Bodyguard.ID)>>
+<<if (getSlave($AS).ID !== $BodyguardID)>>
 	<<if getSlave($AS).minorInjury == 0>>
 		<<if _asspain == 1>>
 			The anal rape leaves $him with a sore butthole.
@@ -440,7 +440,7 @@ from your victim.
 	<<run healthDamage(getSlave($AS), 40)>>
 <</if>>
 
-<<if (getSlave($AS).ID == $Bodyguard.ID)>>
+<<if (getSlave($AS).ID == $BodyguardID)>>
 	<<if (getSlave($AS).muscles <= 5) && (getSlave($AS).skill.combat == 0)>>
 		Your bodyguard accepts this as a punishment for $his uselessness.
 	<<elseif (getSlave($AS).muscles <= 5) && (getSlave($AS).skill.combat != 0)>>
@@ -477,7 +477,7 @@ from your victim.
 <</if>>
 
 <<if (random(1,100) > (20+getSlave($AS).devotion+getSlave($AS).trust))>>
-	<<if (getSlave($AS).fetish !== "submissive") && (getSlave($AS).fetish !== "masochist") && (getSlave($AS).ID != $Bodyguard.ID)>>
+	<<if (getSlave($AS).fetish !== "submissive") && (getSlave($AS).fetish !== "masochist") && (getSlave($AS).ID != $BodyguardID)>>
 		<<set _seed = random(1,8)>>
 		Brutal abuse has left $him
 		<<if (_seed == 1) && (getSlave($AS).behavioralFlaw !== "odd")>>
@@ -510,7 +510,7 @@ from your victim.
 		<</if>>
 	<</if>>
 <</if>>
-<<if (random(1,100) > (50+getSlave($AS).devotion+getSlave($AS).trust)) && (getSlave($AS).ID !== $Bodyguard.ID)>>
+<<if (random(1,100) > (50+getSlave($AS).devotion+getSlave($AS).trust)) && (getSlave($AS).ID !== $BodyguardID)>>
 	<<if (getSlave($AS).fetish !== "mindbroken") && (getSlave($AS).fetishKnown == 0) && (getSlave($AS).clitSetting !== getSlave($AS).fetish)>>
 		$His acceptance of your abuse has twisted $his
 		<<if (random(1,2) == 1) && (getSlave($AS).fetish !== "submissive")>>
diff --git a/src/pregmod/FCTV/seFCTVremote.tw b/src/pregmod/FCTV/seFCTVremote.tw
index 2efbd595339dcb710546f8bc99e79b456f3eca97..e1851f7280e1b438b3bb74855985f93e9c3ed0b1 100644
--- a/src/pregmod/FCTV/seFCTVremote.tw
+++ b/src/pregmod/FCTV/seFCTVremote.tw
@@ -58,10 +58,10 @@
 
 <p>
 	You have a gap in your schedule in the morning, and decide to watch some FCTV
-	<<if $Concubine != 0>>
+	<<if _S.Concubine>>
 		FCTV with your concubine,
 		<span class="slave name simple">
-			$Concubine.slaveName.
+			_S.Concubine.slaveName.
 		</span>
 	<<else>>
 	FCTV.
@@ -340,4 +340,4 @@
 			</p>
 		<</replace>>
 	<</link>>
-</p>
\ No newline at end of file
+</p>
diff --git a/src/pregmod/FCTV/seFCTVshows.tw b/src/pregmod/FCTV/seFCTVshows.tw
index 9992c931caa1efe0fdb39fd570d627bb003ba39b..82341bb4ee36fac8a1c8d06ad0880f25b352fa12 100644
--- a/src/pregmod/FCTV/seFCTVshows.tw
+++ b/src/pregmod/FCTV/seFCTVshows.tw
@@ -148,13 +148,13 @@
 	And here in Canadia, there are no restrictions on fertility drugs for the winner, so the competition this season is fierce! $FCTV.channel.two ladies have already been sent packing, who will be Canadia's... Next Top Breeder!?" The title finally pops up, redundantly labeling the show as 'Next Top Breeder: Canadia'.
 	<<if _MSL >= 1>>
 		<br><br>You don't spend very much time actually watching the show; the randy opening, perverted competitions, and constant talk of creampies quickly has
-		<<if _MSL >= 1 && $Concubine != 0>>
-			<<setLocalPronouns $Concubine 2>>
-			@@.pink;$Concubine.slaveName@@ eager for some attention from _his2 own arcology owner. Of course, the same could be said for the other eager slaves living in your bedroom, and the situation quickly devolves into a lust-filled <<if _MSL > 1>>orgy<<else>>threesome<</if>>.
-		<<elseif _MSL == 0 && $Concubine != 0>>
-			<<setLocalPronouns $Concubine 2>>
-			@@.pink;$Concubine.slaveName@@ eager for some attention from _his2 own arcology owner. You've trained _him2 well, and _he2 knows exactly how to please you. You spend the rest of the evening doing something a lot more fun than watching reality TV.
-		<<elseif _MSL >= 1 && $Concubine == 0>>
+		<<if _MSL >= 1 && _S.Concubine>>
+			<<setLocalPronouns _S.Concubine 2>>
+			@@.pink;_S.Concubine.slaveName@@ eager for some attention from _his2 own arcology owner. Of course, the same could be said for the other eager slaves living in your bedroom, and the situation quickly devolves into a lust-filled <<if _MSL > 1>>orgy<<else>>threesome<</if>>.
+		<<elseif _MSL == 0 && _S.Concubine>>
+			<<setLocalPronouns _S.Concubine 2>>
+			@@.pink;_S.Concubine.slaveName@@ eager for some attention from _his2 own arcology owner. You've trained _him2 well, and _he2 knows exactly how to please you. You spend the rest of the evening doing something a lot more fun than watching reality TV.
+		<<elseif _MSL >= 1 && $ConcubineID == 0>>
 			the pleasure slaves in your bed eager for some attention from their own arcology owner. You spend the rest of the evening doing something a lot more fun than watching reality TV.
 		<</if>>
 	<</if>>
@@ -909,10 +909,10 @@
 	<br><br>
 	<<if $purchasedSagBGone == 1>>
 		You've already made the mistake of ordering the sham of a product. While it gave you a great excuse to fondle breasts, it's not like you needed one in the first place.
-		<<if $Concubine != 0 && canTalk($Concubine)>>
-			<<run Enunciate($Concubine)>>
-			<<setLocalPronouns $Concubine>>
-			"I told you it wouldn't work, <<Master>>. Plu<<s>> you know you can touch the<<s>>e anytime!" $Concubine.slaveName shakes $his chest at you.
+		<<if _S.Concubine && canTalk(_S.Concubine)>>
+			<<run Enunciate(_S.Concubine)>>
+			<<setLocalPronouns _S.Concubine>>
+			"I told you it wouldn't work, <<Master>>. Plu<<s>> you know you can touch the<<s>>e anytime!" _S.Concubine.slaveName shakes $his chest at you.
 		<</if>>
 	<<elseif FCTV.channelCount(1, 'gt')>>
 		You could always order a crate to play around with. Who knows, maybe it'll actually work?<<if $PC.dick != 0>> At the very least it should make for some decent lubricant for a titfuck.<</if>>
@@ -928,18 +928,18 @@
 		</span>
 	<<else>>
 		You could always order a crate to play around with. Who knows, maybe it'll actually work?<<if $PC.dick != 0>> At the very least it should make for some decent lubricant for a titfuck.<</if>>
-		<<if $Concubine != 0>>
-			<<run Enunciate($Concubine)>>
-			<<setLocalPronouns $Concubine>>
-			<<if $Concubine.boobs > 2000 && $Concubine.boobShape == "saggy">>
-				$Concubine.slaveName <<if hasAnyArms($Concubine)>>hefts<<else>>shakes<</if>> $his breasts and lets them flop back into their usual saggy position. <<if canTalk($Concubine)>>"Far too late for the<<s>>e ladie<<s>>. I doubt it will work though, product<<s>> like that never do."<<else>>$He sighs doubtfully.<</if>>
-			<<elseif $Concubine.boobs > 2000>>
-				$Concubine.slaveName massages $his big breasts. <<if canTalk($Concubine)>>"I doubt it will work, but if you're looking for an e<<x>>cu<<s>>e, you don't need one!"<<else>>$He scoffs at the commercial and clearly expresses $his doubt before puffing out $his chest at you.<</if>> $He leans into you so $his bust flops into your lap.
+		<<if _S.Concubine>>
+			<<run Enunciate(_S.Concubine)>>
+			<<setLocalPronouns _S.Concubine>>
+			<<if _S.Concubine.boobs > 2000 && _S.Concubine.boobShape == "saggy">>
+				_S.Concubine.slaveName <<if hasAnyArms(_S.Concubine)>>hefts<<else>>shakes<</if>> $his breasts and lets them flop back into their usual saggy position. <<if canTalk(_S.Concubine)>>"Far too late for the<<s>>e ladie<<s>>. I doubt it will work though, product<<s>> like that never do."<<else>>$He sighs doubtfully.<</if>>
+			<<elseif _S.Concubine.boobs > 2000>>
+				_S.Concubine.slaveName massages $his big breasts. <<if canTalk(_S.Concubine)>>"I doubt it will work, but if you're looking for an e<<x>>cu<<s>>e, you don't need one!"<<else>>$He scoffs at the commercial and clearly expresses $his doubt before puffing out $his chest at you.<</if>> $He leans into you so $his bust flops into your lap.
 			<<else>>
-				$Concubine.slaveName <<if hasAnyArms($Concubine)>>cups<<else>>considers<</if>> $his breasts. <<if canTalk($Concubine)>>"What a joke. I'm <<s>>ure it doe<<s>>n't work, plu<<s>> don't you think they are lovely enough already, <<Master>>?"<<else>>$He scoffs with doubt before proudly sticking out $his chest.<</if>> $He bounces $his tits for you. You'll have to agree with $him; not a bit of sag to them.
+				_S.Concubine.slaveName <<if hasAnyArms(_S.Concubine)>>cups<<else>>considers<</if>> $his breasts. <<if canTalk(_S.Concubine)>>"What a joke. I'm <<s>>ure it doe<<s>>n't work, plu<<s>> don't you think they are lovely enough already, <<Master>>?"<<else>>$He scoffs with doubt before proudly sticking out $his chest.<</if>> $He bounces $his tits for you. You'll have to agree with $him; not a bit of sag to them.
 			<</if>>
 			<<if $PC.boobs >= 1400 && $PC.boobsImplant == 0>>
-				$He slides closer to you, <<if hasAnyArms($Concubine)>>wraps <<if hasBothArms($Concubine)>>an<<else>>$his<</if>> arm around your back, and grabs<<else>>pushing $his head against<</if>> your huge breasts. <<if canTalk($Concubine)>>"Oh <<Master>>! It feel<<s>> like YOU might need it!" $He <<if hasAnyArms($Concubine)>>jiggles your boobs in $his hand<<if hasBothArms($Concubine)>>s<</if>><<else>>nuzzles further into your rack<</if>>.<<else>>$He <<if hasAnyArms($Concubine)>>jiggles your huge boobs in $his hand<<if hasBothArms($Concubine)>>s<</if>><<else>>nuzzles into your huge rack<</if>>. $He's calling you saggy!<</if>> You take that as an open invitation and throw the covers over the two of you so you can have a little fun before bed.
+				$He slides closer to you, <<if hasAnyArms(_S.Concubine)>>wraps <<if hasBothArms(_S.Concubine)>>an<<else>>$his<</if>> arm around your back, and grabs<<else>>pushing $his head against<</if>> your huge breasts. <<if canTalk(_S.Concubine)>>"Oh <<Master>>! It feel<<s>> like YOU might need it!" $He <<if hasAnyArms(_S.Concubine)>>jiggles your boobs in $his hand<<if hasBothArms(_S.Concubine)>>s<</if>><<else>>nuzzles further into your rack<</if>>.<<else>>$He <<if hasAnyArms(_S.Concubine)>>jiggles your huge boobs in $his hand<<if hasBothArms(_S.Concubine)>>s<</if>><<else>>nuzzles into your huge rack<</if>>. $He's calling you saggy!<</if>> You take that as an open invitation and throw the covers over the two of you so you can have a little fun before bed.
 			<</if>>
 		<<elseif $PC.boobs >= 1400 && $PC.boobsImplant == 0>>
 			You cup your huge breasts. They're pretty large and you swear they've been drooping a little lately; maybe you could benefit from this cream...
@@ -1320,13 +1320,12 @@
 			appreciating the life growing within you and what future prospects may await it.
 		<<elseif $PC.dick >= 1>>
 			Stunned and fully erect, you inexplicably feel the urge to creampie a pussy, so you
-			<<if $Concubine != 0 && $Concubine.vagina > 0 && canDoVaginal($Concubine)>>
-				<<setLocalPronouns $Concubine>>
-				grab $Concubine.slaveName and recreate the entire ending with $him.
-				<<set _fctvs = $slaveIndices[$Concubine.ID]>>
-				<<set $slaves[_fctvs].counter.vaginal++, $vaginalTotal++>>
-				<<if canImpreg($Concubine, $PC)>>
-					<<= knockMeUp($slaves[_fctvs], 10, 0, -1, 1)>>
+			<<if _S.Concubine && _S.Concubine.vagina > 0 && canDoVaginal(_S.Concubine)>>
+				<<setLocalPronouns _S.Concubine>>
+				grab _S.Concubine.slaveName and recreate the entire ending with $him.
+				<<set _S.Concubine.counter.vaginal++, $vaginalTotal++>>
+				<<if canImpreg(_S.Concubine, $PC)>>
+					<<= knockMeUp(_S.Concubine, 10, 0, -1, 1)>>
 				<</if>>
 			<<elseif $fuckSlaves > 0>>
 				grab the nearest slave watching with you, who is overjoyed to recreate the entire ending with you.
@@ -1336,11 +1335,11 @@
 			You've never had a more hope-filled orgasm.
 		<<elseif $PC.vagina >= 1>>
 			Stunned and soaking wet, you hurry to
-			<<if $Concubine != 0 && canPenetrate($Concubine) && canImpreg($PC, $Concubine) && ($policies.sexualOpeness == 1 || $Concubine.toyHole == "dick")>>
-				<<setLocalPronouns $Concubine>>
-				get $Concubine.slaveName nice and hard before recreating the entire ending with $him. You've never had a more hope-filled orgasm.
-				<<= knockMeUp($PC, 10, 0, $Concubine.ID, 1)>>
-				<<set _fctvs = $slaveIndices[$Concubine.ID]>>
+			<<if _S.Concubine != 0 && canPenetrate(_S.Concubine) && canImpreg($PC, _S.Concubine) && ($policies.sexualOpeness == 1 || _S.Concubine.toyHole == "dick")>>
+				<<setLocalPronouns _S.Concubine>>
+				get _S.Concubine.slaveName nice and hard before recreating the entire ending with $him. You've never had a more hope-filled orgasm.
+				<<= knockMeUp($PC, 10, 0, $ConcubineID, 1)>>
+				<<set _fctvs = $slaveIndices[$ConcubineID]>>
 				<<set $slaves[_fctvs].counter.penetrative++, $penetrativeTotal++>>
 			<<elseif $policies.sexualOpeness == 1>>
 				find your favorite cock to get a creampie from. You've never had a more lust-filled orgasm.
@@ -1515,7 +1514,7 @@
 
 	/* All actors are at least 18 */
 	<p>
-		As you snuggle in for the night<<if $Concubine != 0>> with your concubine<</if>>, you <<if $usedRemote == 1>>tune to<<else>>begin watching<</if>> the <i>Age of Slavery</i> channel. With so many new types of arcologies emerging, it's sometimes difficult to tell if you are watching events unfolding on a set or in a real arcology with a historical society.
+		As you snuggle in for the night<<if _S.Concubine>> with your concubine<</if>>, you <<if $usedRemote == 1>>tune to<<else>>begin watching<</if>> the <i>Age of Slavery</i> channel. With so many new types of arcologies emerging, it's sometimes difficult to tell if you are watching events unfolding on a set or in a real arcology with a historical society.
 	</p>
 	<<if FCTV.channelCount(1)>>
 		"Well, you did well to win the 'cleanest urchin' contest."
@@ -1573,9 +1572,9 @@
 		<br> The others pause for a moment, then start to laugh. "Ahh, I see where this is going. We could teach her. Yes, let's 'help her out'."
 		<br> Kate pulls out a large makeup kit. "Ordered from Sears and Roebuck by my husband, as a 'makeup' present for his dalliances. For all the times I used it I never got his attention. But you know, maybe I just never used <i>enough</i>."
 		<br> The camera pans away and when it returns, the Indian girl's face is positively caked with the most absurdly overdone makeup you have ever seen. It's both hot and hilarious in the same way.
-		<<if $Concubine.makeup > 0>>
+		<<if _S.Concubine.makeup > 0>>
 			You look at your own concubine's face.
-			<<= App.Desc.makeup($Concubine)>>
+			<<= App.Desc.makeup(_S.Concubine)>>
 			It's just the way you like it, but it's nowhere near as messy and overdone as the girl in the show.
 		<</if>>
 		<br> "Mmmm, good but now the rest of her seems a little plain," Annie frowns. "Don't loose girls wear big boots?"
diff --git a/src/pregmod/FCTV/seFCTVwatch.tw b/src/pregmod/FCTV/seFCTVwatch.tw
index d7306297854d8d108abb66b7e97c9d6430dac1d7..ae22f2b4c656480fd721fce2e8cf3f9a943a7605 100644
--- a/src/pregmod/FCTV/seFCTVwatch.tw
+++ b/src/pregmod/FCTV/seFCTVwatch.tw
@@ -3,7 +3,7 @@
 <<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $encyclopedia = "FCTV">>
 <<set $FCTV.pcViewership.count++, _possibleChannels = [0].concat(FCTV.channels())>>
 
-Tired after a long day, you tell <<if $Concubine>>your concubine: @@.pink;$Concubine.slaveName@@<<else>>$assistant.name<</if>> to turn on the TV and
+Tired after a long day, you tell <<if _S.Concubine>>your concubine: @@.pink;_S.Concubine.slaveName@@<<else>>$assistant.name<</if>> to turn on the TV and
 <<if !$usedRemote>>
 	set FCTV to find a random show. Your larger-than-life screen flashes on, and is soon playing content from the popular streaming service.
 	<<if $cheatMode > 0 || $debugMode > 0 || $FCTV.remote>>
@@ -72,4 +72,4 @@ Tired after a long day, you tell <<if $Concubine>>your concubine: @@.pink;$Concu
 	</center>
 <</if>>
 
-<<if $FCTV.channel.selected >= -1>> <<include "SE FCTV Shows">> <</if>>
\ No newline at end of file
+<<if $FCTV.channel.selected >= -1>> <<include "SE FCTV Shows">> <</if>>
diff --git a/src/pregmod/beastFucked.tw b/src/pregmod/beastFucked.tw
index 18d07cf11af32b178263e4fc4a714172e2bc1404..95b4fc565194c783cb4914c9a313ba55f5e95c23 100644
--- a/src/pregmod/beastFucked.tw
+++ b/src/pregmod/beastFucked.tw
@@ -144,7 +144,7 @@
 		<</if>>
 			You have $him <<if ($activeSlave.clothes != "no clothing") && (_sexAct != "oral")>>take off $his clothing, then <</if>><<if _sexAct == "oral">>lay <<else>>kneel <</if>>down on the floor <<if _sexAct != "oral">>with $his ass in the air<<else>>on $his back<</if>>
 	<<else>>
-		and $Bodyguard.slaveName has to physically prevent $him from running out of the room<<if random(1,100) > 75>><<set $activeSlave.minorInjury = either("black eye", "bruise", "split lip")>>, resulting in a $activeSlave.minorInjury. <<else>>. <</if>>You <<if ($activeSlave.clothes != "no clothing")>>force $him to take off $his $activeSlave.clothes and <</if>>restrain $him on the floor <<if _sexAct != "oral">>with $his ass in the air<<else>>with a ring gag in $his mouth<</if>> — all the while ignoring $his screams and pleas for mercy —
+		and _S.Bodyguard.slaveName has to physically prevent $him from running out of the room<<if random(1,100) > 75>><<set $activeSlave.minorInjury = either("black eye", "bruise", "split lip")>>, resulting in a $activeSlave.minorInjury. <<else>>. <</if>>You <<if ($activeSlave.clothes != "no clothing")>>force $him to take off $his $activeSlave.clothes and <</if>>restrain $him on the floor <<if _sexAct != "oral">>with $his ass in the air<<else>>with a ring gag in $his mouth<</if>> — all the while ignoring $his screams and pleas for mercy —
 	<</if>>
 <<else>>
 	but $he knows $he is powerless to stop you. You <<if ($activeSlave.clothes != "no clothing")>>take off $his clothes and <</if>><<if _sexAct == "oral">>place a ring gag in $his mouth, then<</if>>place $him on the ground with a cushion under $his hips <<if _sexAct != "oral">>, $his ass in the air,<</if>>
diff --git a/src/pregmod/eliteTakeOver.tw b/src/pregmod/eliteTakeOver.tw
index ae81330e42b6956afa232de5a58b241bc2eedaa8..9cdc8a8314e91d2d1c2a5bf2dd8d39548ffee2db 100644
--- a/src/pregmod/eliteTakeOver.tw
+++ b/src/pregmod/eliteTakeOver.tw
@@ -6,7 +6,7 @@
 /* preg/lobotomization check */
 You knew this day would come. Surrounding yourself with powerful people has its boons, but also poses a distinct threat. You've heard them murmuring when you enter the room, you've seen them excuse themselves from your presence, and lately they've been overtly hostile. The Societal Elite have turned on you.
 <br>
-You look up from your desk as the locked door to your office unseals, and a dozen individuals brazenly walk into your view.<<if $Bodyguard != 0>><<setLocalPronouns $Bodyguard>> $Bodyguard.slaveName stands between you and them. A single glare from the leader of the bunch and $he backs off, eyes to the ground.<</if>>
+You look up from your desk as the locked door to your office unseals, and a dozen individuals brazenly walk into your view.<<if _S.Bodyguard>><<setLocalPronouns _S.Bodyguard>> _S.Bodyguard.slaveName stands between you and them. A single glare from the leader of the bunch and $he backs off, eyes to the ground.<</if>>
 <br>
 <<if $PC.pregSource == -1 || $PC.pregSource == -6>>
 	<<if $PC.refreshmentType == 0>>
@@ -30,8 +30,8 @@ You look up from your desk as the locked door to your office unseals, and a doze
 	<br>
 	What was that last thing he said? It's getting hard to think right. The $PC.refreshment... Drugged... You collapse onto your desk, unconscious.
 	<br>
-	<<if $Bodyguard != 0>>
-		A sharp pain and a rush of adrenaline drags you back to your senses. Sneaking a peak, you witness $Bodyguard.slaveName valiantly trying to protect you, despite <<if hasAnyProstheticLimbs($Bodyguard)>>$his cybernetics being locked down<<else>>the overwhelming odds<</if>>. As $he and their leader struggle closer to your desk, his revolver and a syringe are dislodged onto your desk. It seems drugging you wasn't their first thought. With $Bodyguard.slaveName's risky gamble, your fate has fallen back into your hands.
+	<<if _S.Bodyguard>>
+		A sharp pain and a rush of adrenaline drags you back to your senses. Sneaking a peak, you witness _S.Bodyguard.slaveName valiantly trying to protect you, despite <<if hasAnyProstheticLimbs(_S.Bodyguard)>>$his cybernetics being locked down<<else>>the overwhelming odds<</if>>. As $he and their leader struggle closer to your desk, his revolver and a syringe are dislodged onto your desk. It seems drugging you wasn't their first thought. With _S.Bodyguard.slaveName's risky gamble, your fate has fallen back into your hands.
 	<<else>>
 		You'll spend the rest of your life a breeder to the Societal Elite; blinded and muted. More than a slave, but still less than your master. Life isn't so bad, your two most devoted slaves were taken along to keep you happy, and you are treated quite well, possibilities considered. Though once your eggs dry up, odds are your little remaining usefulness will be at an end. Best not to think too much into it.
 		<<set _pregSurrender = 1>>
@@ -52,15 +52,15 @@ You look up from your desk as the locked door to your office unseals, and a doze
 	<br>
 	You decide to <span id="fate">make a final stand.</span>
 	<br>
-	<<if $Bodyguard != 0>>
+	<<if _S.Bodyguard>>
 		<br>
 		<<if $PC.pregSource == -1 || $PC.pregSource == -6>>
-			$Bodyguard.slaveName is already doing everything in $his power to save you.
+			_S.Bodyguard.slaveName is already doing everything in $his power to save you.
 		<<else>>
-			<<link "Attempt to signal $Bodyguard.slaveName, your bodyguard">>
+			<<link "Attempt to signal _S.Bodyguard.slaveName, your bodyguard">>
 				<<set $finalChoice = "bodyguard">>
 				<<replace "#fate">>
-					attempt to signal $Bodyguard.slaveName, your bodyguard.
+					attempt to signal _S.Bodyguard.slaveName, your bodyguard.
 				<</replace>>
 			<</link>>
 		<</if>>
diff --git a/src/pregmod/eliteTakeOverFight.tw b/src/pregmod/eliteTakeOverFight.tw
index dda107b70bfac4308d353a796ede2180759df7fc..1d8d9c1062fc875783ba19e43a629ca68061633e 100644
--- a/src/pregmod/eliteTakeOverFight.tw
+++ b/src/pregmod/eliteTakeOverFight.tw
@@ -5,22 +5,22 @@
 <<case "bodyguard">>
 	<<set _roll = random(0,100)>>
 	<<if $career == "mercenary">>
-		As a result of your prior experience as a mercenary you were able to successfully signal $Bodyguard.slaveName without the Elites noticing.
+		As a result of your prior experience as a mercenary you were able to successfully signal _S.Bodyguard.slaveName without the Elites noticing.
 		<<set $BodyguardHasSucessfullyRecivedSignal = 1>>
 	<<elseif $PC.skill.warfare >= 100 && _roll > 20>>
-		As a result of your mastery of warfare you were able to successfully signal $Bodyguard.slaveName without the Elites noticing.
+		As a result of your mastery of warfare you were able to successfully signal _S.Bodyguard.slaveName without the Elites noticing.
 		<<set $BodyguardHasSucessfullyRecivedSignal = 1>>
 	<<elseif $PC.skill.warfare >= 60 && _roll > 30>>
-		As a result of your expertness of warfare you were able to successfully signal $Bodyguard.slaveName without the Elites noticing.
+		As a result of your expertness of warfare you were able to successfully signal _S.Bodyguard.slaveName without the Elites noticing.
 		<<set $BodyguardHasSucessfullyRecivedSignal = 1>>
 	<<elseif $PC.skill.warfare >= 30 && _roll > 40>>
-		As a result of having some skill in warfare you were able to successfully signal $Bodyguard.slaveName without the elites noticing.
+		As a result of having some skill in warfare you were able to successfully signal _S.Bodyguard.slaveName without the elites noticing.
 		<<set $BodyguardHasSucessfullyRecivedSignal = 1>>
 	<<elseif $PC.skill.warfare >= 10 && _roll > 50>>
-		As a result of having a small amount of skill in warfare you were able to successfully signal $Bodyguard.slaveName without the Elites noticing.
+		As a result of having a small amount of skill in warfare you were able to successfully signal _S.Bodyguard.slaveName without the Elites noticing.
 		<<set $BodyguardHasSucessfullyRecivedSignal = 1>>
 	<<elseif $PC.skill.warfare < 10 && _roll > 60>>
-		By blind luck and what little you remember of your lessons in warfare are were able to successfully signal $Bodyguard.slaveName without the Elites noticing.
+		By blind luck and what little you remember of your lessons in warfare are were able to successfully signal _S.Bodyguard.slaveName without the Elites noticing.
 		<<set $BodyguardHasSucessfullyRecivedSignal = 1>>
 	<<else>>
 		One of the Elites shouts "What the fuck are you trying to do?" Well, there goes that option.
@@ -210,9 +210,9 @@
 /*		enslaved = 1				*/
 /*		had fun (and enslaved) = 2	*/
 <<if $BodyguardHasSucessfullyRecivedSignal == 1>>
-	<<setLocalPronouns $Bodyguard>>
-	<<run Enunciate($Bodyguard)>>
-	$Bodyguard.slaveName asks, "<<Master>>, what <<sh>>ould I do with the <<if $eliteLeft < $eliteTotal>>remaining<</if>> 'Elite' left?"
+	<<setLocalPronouns _S.Bodyguard>>
+	<<run Enunciate(_S.Bodyguard)>>
+	_S.Bodyguard.slaveName asks, "<<Master>>, what <<sh>>ould I do with the <<if $eliteLeft < $eliteTotal>>remaining<</if>> 'Elite' left?"
 	<br>
 	<<link "Open fire">>
 		<<set $eliteFate = 0>>
@@ -261,10 +261,10 @@
 		<<set $eliteFate = 2>>
 		<<goto "eliteTakeOverResult">>
 	<</link>>
-<<elseif $Bodyguard != 0>>
-	<<setLocalPronouns $Bodyguard>>
-	<<run Enunciate($Bodyguard)>>
-	It is now that $Bodyguard.slaveName makes $his entrance, pointing $his guns at the <<if $eliteLeft < $eliteTotal>>remaining<</if>> Elite.
+<<elseif $BodyguardID != 0>>
+	<<setLocalPronouns _S.Bodyguard>>
+	<<run Enunciate(_S.Bodyguard)>>
+	It is now that _S.Bodyguard.slaveName makes $his entrance, pointing $his guns at the <<if $eliteLeft < $eliteTotal>>remaining<</if>> Elite.
 	$He then asks "<<Master>>, what <<sh>>ould I do with the <<if $eliteLeft < $eliteTotal>>remaining<</if>> 'Elite' left?"
 	<br>
 	<<link "Open fire">>
diff --git a/src/pregmod/eliteTakeOverResult.tw b/src/pregmod/eliteTakeOverResult.tw
index dfd398604c6ef006b027e5a5120fefdf8c601e4a..2aeb5002fcb9ff3cfa80a277f155d1d20b52df1c 100644
--- a/src/pregmod/eliteTakeOverResult.tw
+++ b/src/pregmod/eliteTakeOverResult.tw
@@ -2,8 +2,8 @@
 
 <<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
 
-<<if $Bodyguard != 0>>
-	<<setLocalPronouns $Bodyguard>>
+<<if _S.Bodyguard>>
+	<<setLocalPronouns _S.Bodyguard>>
 <</if>>
 <<setNonlocalPronouns $seeDicks>>
 
@@ -109,7 +109,7 @@
 			While some citizens respectfully step out, some join you in the fun. The impromptu festivities will go on for hours, getting more and more depraved.
 		<</if>>
 	<<else>>
-		<<if $Bodyguard.fetish == "sadist">>$Bodyguard.slaveName gets out $his melee weapon and starts to give them many small cuts, the look of pleasure on $his face is evident.<<else>>$Bodyguard.slaveName ties them and then gets out $his melee weapon and starts to abuse them; $his face is blank.<</if>>
+		<<if _S.Bodyguard.fetish == "sadist">>_S.Bodyguard.slaveName gets out $his melee weapon and starts to give them many small cuts, the look of pleasure on $his face is evident.<<else>>_S.Bodyguard.slaveName ties them and then gets out $his melee weapon and starts to abuse them; $his face is blank.<</if>>
 		<br>Shortly after, the terrified <<if $eliteLeft < $eliteTotal>>remaining<</if>> Elite are quickly brought away to be officially enslaved.
 	<</if>>
 <</switch>>
diff --git a/src/pregmod/killSlave.tw b/src/pregmod/killSlave.tw
index 79161249e9934f79eef68a671c11ea63e2040de5..9711d44f9beaf40c6edc4561cde107b93fa20503 100644
--- a/src/pregmod/killSlave.tw
+++ b/src/pregmod/killSlave.tw
@@ -86,8 +86,8 @@ you <<if canHear($activeSlave)>>quietly <</if>>reach behind your desk and pull o
 	<span id="killScene">
 	<br><<link "Kill $him">><<set $killChoice = 0>>
 	<<replace "#killScene">>
-		<<if $Bodyguard>>
-			<<setLocalPronouns $Bodyguard 2>>
+		<<if _S.Bodyguard>>
+			<<setLocalPronouns _S.Bodyguard 2>>
 		<</if>>
 
 		<<set _qualifiedFS = []>>
@@ -226,11 +226,11 @@ you <<if canHear($activeSlave)>>quietly <</if>>reach behind your desk and pull o
 		<</if>>
 		<<set $killChoice = -1>>
 	<</replace>><</link>>
-	<<if $activeSlave.assignment != "guard you" && $pit && $Bodyguard && $activeSlave.fuckdoll <= 0 && $activeSlave.fetish != "mindbroken">>
+	<<if $activeSlave.assignment != "guard you" && $pit && _S.Bodyguard && $activeSlave.fuckdoll <= 0 && $activeSlave.fetish != "mindbroken">>
 		<<if ($pitLethal == 1)>>
 			<br><<link "Let $him win $his life in combat">><<set $killChoice = 2>>
 			<<replace "#killScene">>
-				&nbsp;&nbsp;&nbsp;&nbsp;You tell $him that you'll let your bodyguard $Bodyguard.slaveName decide $his fate — if $he wants to live, $he'll have to beat _him2 in hand-to-hand combat in $pitName.
+				&nbsp;&nbsp;&nbsp;&nbsp;You tell $him that you'll let your bodyguard _S.Bodyguard.slaveName decide $his fate — if $he wants to live, $he'll have to beat _him2 in hand-to-hand combat in $pitName.
 				<<if $activeSlave.skill.combat == 0>>
 					The fear on $his face is palpable, though $he nods slowly and agrees, not seeing another choice.
 				<<else>>
@@ -250,5 +250,5 @@ you <<if canHear($activeSlave)>>quietly <</if>>reach behind your desk and pull o
 	<<else>>
 		You change your mind as you suddenly
 	<</if>>
-	realize $slaveFightingBG.slaveName is already fighting your bodyguard $Bodyguard.slaveName for $his life this week. [[Cancel the fight|KillSlave][$killChoice = -1]]
-<</if>>
\ No newline at end of file
+	realize $slaveFightingBG.slaveName is already fighting your bodyguard _S.Bodyguard.slaveName for $his life this week. [[Cancel the fight|KillSlave][$killChoice = -1]]
+<</if>>
diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw
index 4606fa1f12d5626c7cf55941964bcc04d63308cf..c7aa40b21d10208250bfe81790345fedb679d673 100644
--- a/src/pregmod/newChildIntro.tw
+++ b/src/pregmod/newChildIntro.tw
@@ -144,7 +144,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 <</if>>
 <<if _tempMom != 0>>
 	<<setLocalPronouns _tempMom 2>>
-	<<if _tempMom.ID == $Concubine.ID>>
+	<<if _tempMom.ID == $ConcubineID>>
 		<br><<link "Permit your Concubine to name _his2 $daughter">>
 			<<replace "#naming">>
 				<<ParentNames _tempMom $activeSlave>>
@@ -166,7 +166,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 				<span class='slave-name'>$activeSlave.slaveName</span>
 			<</replace>>
 		<</link>>
-	<<elseif _tempMom.ID == $Bodyguard.ID>>
+	<<elseif _tempMom.ID == $BodyguardID>>
 		<br><<link "Permit your bodyguard to name _his2 $daughter">>
 			<<replace "#naming">>
 				<<ParentNames _tempMom $activeSlave>>
@@ -177,7 +177,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 				<span class='slave-name'>$activeSlave.slaveName</span>
 			<</replace>>
 		<</link>>
-	<<elseif _tempMom.ID == $HeadGirl.ID>>
+	<<elseif _tempMom.ID == $HeadGirlID>>
 		<br><<link "Permit your Head Girl to name _his2 $daughter">>
 			<<replace "#naming">>
 				<<ParentNames _tempMom $activeSlave>>
@@ -203,7 +203,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 <</if>>
 <<if _tempDad != 0 && $activeSlave.father != $activeSlave.mother>>
 	<<setLocalPronouns _tempDad 2>>
-	<<if _tempDad.ID == $Concubine.ID>>
+	<<if _tempDad.ID == $ConcubineID>>
 		<br><<link "Permit your Concubine to name _his2 $daughter">>
 			<<replace "#naming">>
 				<<ParentNames _tempDad $activeSlave>>
@@ -225,7 +225,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 				<span class='slave-name'>$activeSlave.slaveName</span>
 			<</replace>>
 		<</link>>
-	<<elseif _tempDad.ID == $Bodyguard.ID>>
+	<<elseif _tempDad.ID == $BodyguardID>>
 		<br><<link "Permit your bodyguard to name _his2 $daughter">>
 			<<replace "#naming">>
 				<<ParentNames _tempDad $activeSlave>>
@@ -236,7 +236,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 				<span class='slave-name'>$activeSlave.slaveName</span>
 			<</replace>>
 		<</link>>
-	<<elseif _tempDad.ID == $HeadGirl.ID>>
+	<<elseif _tempDad.ID == $HeadGirlID>>
 		<br><<link "Permit your Head Girl to name _his2 $daughter">>
 			<<replace "#naming">>
 				<<ParentNames _tempDad $activeSlave>>
@@ -317,16 +317,16 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 			and @@.hotpink;notices how obedient@@ the look on _his2 face is. _tempMom.slaveName is eagerly awaiting your reaction to <<if $activeSlave.father == -1>>the result of your union<<else>>_his2 addition to your harem<</if>>.
 			<<set $activeSlave.trust += 25, $activeSlave.devotion += 25>>
 		<</if>>
-	<<elseif _tempMom.ID == $Concubine.ID>>
-		and notices @@.hotpink;how happy@@ the look on _his2 face is. $Concubine.slaveName is positively beaming with pride at _his2 addition to your harem.
+	<<elseif _tempMom.ID == $ConcubineID>>
+		and notices @@.hotpink;how happy@@ the look on _his2 face is. _S.Concubine.slaveName is positively beaming with pride at _his2 addition to your harem.
 		<<set $activeSlave.trust += 30>>
 		<<set $activeSlave.devotion += 30>>
-	<<elseif _tempMom.ID == $Bodyguard.ID>>
-		and @@.mediumaquamarine;notices how _he2 focuses more on you than _himself2.@@ $Bodyguard.slaveName's dedication to your life has @@.hotpink;certainly influenced $him.@@
+	<<elseif _tempMom.ID == $BodyguardID>>
+		and @@.mediumaquamarine;notices how _he2 focuses more on you than _himself2.@@ _S.Bodyguard.slaveName's dedication to your life has @@.hotpink;certainly influenced $him.@@
 		<<set $activeSlave.trust += 40>>
 		<<set $activeSlave.devotion += 20>>
-	<<elseif _tempMom.ID == $HeadGirl.ID>>
-		and notices how much _his2 look takes after your own. $HeadGirl.slaveName's dedication to you has @@.hotpink;certainly influenced $him.@@
+	<<elseif _tempMom.ID == $HeadGirlID>>
+		and notices how much _his2 look takes after your own. _S.HeadGirl.slaveName's dedication to you has @@.hotpink;certainly influenced $him.@@
 		<<set $activeSlave.trust += 20>>
 		<<set $activeSlave.devotion += 20>>
 	<<elseif _tempMom.devotion < -50>>
@@ -402,16 +402,16 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 			and @@.hotpink;notices how obedient@@ the look on _his2 face is. _tempDad.slaveName is eagerly awaiting your reaction to <<if $activeSlave.mother == -1>>the result of your union<<else>>_his2 addition to your harem<</if>>.
 			<<set $activeSlave.trust += 25, $activeSlave.devotion += 25>>
 		<</if>>
-	<<elseif _tempDad.ID == $Concubine.ID>>
-		and notices @@.hotpink;how happy@@ the look on _his2 face is. $Concubine.slaveName is positively beaming with pride at _his2 addition to your harem.
+	<<elseif _tempDad.ID == $ConcubineID>>
+		and notices @@.hotpink;how happy@@ the look on _his2 face is. _S.Concubine.slaveName is positively beaming with pride at _his2 addition to your harem.
 		<<set $activeSlave.trust += 30>>
 		<<set $activeSlave.devotion += 30>>
-	<<elseif _tempDad.ID == $Bodyguard.ID>>
-		and @@.mediumaquamarine;notices how _he2 focuses more on you than _himself2.@@ $Bodyguard.slaveName's dedication to your life has @@.hotpink;certainly influenced $him.@@
+	<<elseif _tempDad.ID == $BodyguardID>>
+		and @@.mediumaquamarine;notices how _he2 focuses more on you than _himself2.@@ _S.Bodyguard.slaveName's dedication to your life has @@.hotpink;certainly influenced $him.@@
 		<<set $activeSlave.trust += 40>>
 		<<set $activeSlave.devotion += 20>>
-	<<elseif _tempDad.ID == $HeadGirl.ID>>
-		and notices how much _his2 look takes after your own. $HeadGirl.slaveName's dedication to you has @@.hotpink;certainly influenced $him.@@
+	<<elseif _tempDad.ID == $HeadGirlID>>
+		and notices how much _his2 look takes after your own. _S.HeadGirl.slaveName's dedication to you has @@.hotpink;certainly influenced $him.@@
 		<<set $activeSlave.trust += 20>>
 		<<set $activeSlave.devotion += 20>>
 	<<elseif _tempDad.devotion < -50>>
@@ -1083,7 +1083,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
 				<<set $activeSlave.counter.anal += 10, $analTotal += 10>>
 				<<= assignJob($activeSlave, "dairy")>>
 				<<replace "#result">>
-					You order <<if $HeadGirl == 0>>another slave<<else>>$HeadGirl.slaveName<</if>> to get $activeSlave.slaveName set up in $dairyName. The new slave does not know what $dairyName is, not really, and $he doesn't know what being set up there means, either. If $he knew that you are able to send $him there so blithely only because it is equipped with a special preparatory raper that will seize $him, <<if $activeSlave.vagina > -1>>mercilessly fuck $his pussy and ass until both are gaped<<else>>ream $his anus until it's cavernously gaped<</if>>, and then consign $him to constant fucking by gargantuan machine phalli, $he might resist. But $he doesn't, so $he does not.
+					You order <<if $HeadGirlID == 0>>another slave<<else>>_S.HeadGirl.slaveName<</if>> to get $activeSlave.slaveName set up in $dairyName. The new slave does not know what $dairyName is, not really, and $he doesn't know what being set up there means, either. If $he knew that you are able to send $him there so blithely only because it is equipped with a special preparatory raper that will seize $him, <<if $activeSlave.vagina > -1>>mercilessly fuck $his pussy and ass until both are gaped<<else>>ream $his anus until it's cavernously gaped<</if>>, and then consign $him to constant fucking by gargantuan machine phalli, $he might resist. But $he doesn't, so $he does not.
 				<</replace>>
 				<</link>>
 			<</if>>
@@ -1128,7 +1128,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
 		<<= assignJob($activeSlave, "be confined in the arcade")>>
 		<<set $activeSlave.choosesOwnAssignment = 0>>
 		<<replace "#result">>
-			You order <<if $HeadGirl == 0>>another slave<<else>>$HeadGirl.slaveName<</if>> to get $activeSlave.slaveName set up in $arcadeName. The new slave does not know what $arcadeName is, not really, and $he doesn't know what being set up there means, either. $He'll be confined inside a small space, not too different from the tube $he was grown in. It's only when the restraints lock into place that $he'll understand $his doom. $His mouth will be forced open and presented at one wall of $arcadeName, and $his ass will protrude from its other side, $his holes available for public relief at both ends. $He'll probably refuse to believe the truth, until the first cockhead enters $his mouth<<if $activeSlave.vagina > -1>>, parts $his pussylips,<</if>> or presses against $his poor anus.
+			You order <<if $HeadGirlID == 0>>another slave<<else>>_S.HeadGirl.slaveName<</if>> to get $activeSlave.slaveName set up in $arcadeName. The new slave does not know what $arcadeName is, not really, and $he doesn't know what being set up there means, either. $He'll be confined inside a small space, not too different from the tube $he was grown in. It's only when the restraints lock into place that $he'll understand $his doom. $His mouth will be forced open and presented at one wall of $arcadeName, and $his ass will protrude from its other side, $his holes available for public relief at both ends. $He'll probably refuse to believe the truth, until the first cockhead enters $his mouth<<if $activeSlave.vagina > -1>>, parts $his pussylips,<</if>> or presses against $his poor anus.
 			<<if ($arcade <= App.Entity.facilities.arcade.employeesIDs().size)>>Mere <<if $showInches == 2>>yards<<else>>meters<</if>> away, preparations to convert the least appealing Arcade slave into a Fuckdoll begin. As $activeSlave.slaveName is broken in by $his first customers, $he's blissfully unaware that $he's $arcade new slaves away from the same fate.<</if>>
 		<</replace>>
 		<</link>>
diff --git a/src/pregmod/reMaleCitizenHookup.tw b/src/pregmod/reMaleCitizenHookup.tw
index 1e98d3871f96f0e16cae5ca729a9abae2c57ce9e..9e8cef1467eb8ae3bf8c37b9d8cc6a4d2b1b7eb1 100644
--- a/src/pregmod/reMaleCitizenHookup.tw
+++ b/src/pregmod/reMaleCitizenHookup.tw
@@ -222,9 +222,9 @@ He's clearly attracted to you; even the most consummate actor would have difficu
 		You pull his arm around your waist.
 	<</if>>
 	You hear a slight gasp from him as he realizes that his gambit has succeeded with more immediate effect than he expected. He shivers with anticipation as you steer him back through a side door, grabbing a pair of glasses of <<if $PC.refreshmentType == 1>>$PC.refreshment<<else>>liquor<</if>> on the way, and making a discreet exit towards your private suite.
-	<<if $Concubine != 0 && $Concubine.intelligence+$Concubine.intelligenceImplant > 50>>
-		<<setLocalPronouns $Concubine>>
-		$Concubine.slaveName is there, of course, and $he instantly <<if canSee($Concubine)>>sees<<else>>realizes<</if>> that $his continued presence for a ménage à trois is wanted by both you and your guest.
+	<<if _S.Concubine && _S.Concubine.intelligence+_S.Concubine.intelligenceImplant > 50>>
+		<<setLocalPronouns _S.Concubine>>
+		_S.Concubine.slaveName is there, of course, and $he instantly <<if canSee(_S.Concubine)>>sees<<else>>realizes<</if>> that $his continued presence for a ménage à trois is wanted by both you and your guest.
 	<</if>>
 	Your guest restrains his eager praise now that you're in private, but his wide-eyed appreciation of your domain is compliment enough. Once in your suite, you undress him, revealing
 	<<switch _FS>>
@@ -327,13 +327,13 @@ He's clearly attracted to you; even the most consummate actor would have difficu
 		a hot young body, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, fully taking its length, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
 	<</switch>>
 	<<if _FS == "Asset Expansionist">>
-		<<if $Concubine != 0 && !isAmputee($Concubine)>>
-			$Concubine.slaveName eagerly joins the two of you to help clean the massive cumshot up.
+		<<if _S.Concubine && !isAmputee(_S.Concubine)>>
+			_S.Concubine.slaveName eagerly joins the two of you to help clean the massive cumshot up.
 		<</if>>
 	<<elseif _FS != "Youth Preferentialist">>
-		<<if $Concubine != 0 && !isAmputee($Concubine)>>
-			<<setLocalPronouns $Concubine>>
-			The <<if canSee($Concubine)>>view of your bouncing tits<<elseif canHear($activeSlave)>>sound of lusty sex<<else>>vibrations from your bed bouncing up and down<</if>> is too much for $Concubine.slaveName to resist and so $he crawls over to kiss and caress you as your lover finishes.
+		<<if _S.Concubine && !isAmputee(_S.Concubine)>>
+			<<setLocalPronouns _S.Concubine>>
+			The <<if canSee(_S.Concubine)>>view of your bouncing tits<<elseif canHear($activeSlave)>>sound of lusty sex<<else>>vibrations from your bed bouncing up and down<</if>> is too much for _S.Concubine.slaveName to resist and so $he crawls over to kiss and caress you as your lover finishes.
 		<</if>>
 	<</if>>
 	Sometimes society overlooks that you are a woman and have certain needs, but your lover tonight knows exactly how to treat you. When your guest <<if _FS != "Youth Preferentialist">>is finally spent<<else>>wakes up from against your body<</if>>, he showers, dresses, and leaves discreetly, offering you a proper thank you. This is the kind of thing that @@.green;builds a lasting reputation@@ in the Free Cities.
diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw
index 73a46245798295dc62fdf107a4c65fc983042a47..42b0e6d0c6cf4a32504938834e8d485835fd77fb 100644
--- a/src/pregmod/sePlayerBirth.tw
+++ b/src/pregmod/sePlayerBirth.tw
@@ -106,46 +106,46 @@ While sitting at your desk planning your day, @@.lime;your water breaks,@@ thoro
 <</if>>
 <br><br>
 <<if $PC.belly < 100000>>
-	<<if $Concubine != 0>><<set _concubinePresent = 1>><<setLocalPronouns $Concubine 2>><</if>>
+	<<if _S.Concubine>><<set _concubinePresent = 1>><<setLocalPronouns _S.Concubine 2>><</if>>
 	After what feels like a <<if $showInches == 2>>mile<<else>>kilometer<</if>> run, you finally waddle into your destination finding
 	<<if _S.Nurse>>
 		<<setLocalPronouns _S.Nurse>>
-		@@.pink;_S.Nurse.slaveName@@ waiting for you with everything $he needs to be a capable midwife to you.<<if _concubinePresent == 1>> @@.pink;$Concubine.slaveName@@ <<if hasAnyArms($Concubine)>>wraps _his2 arm<<if hasBothArms($Concubine)>>s<</if>> around<<else>>leans into<</if>> you from behind, letting you know _he2'll be here to comfort you while you labor.<</if>>
-	<<elseif $Bodyguard != 0>>
-		<<setLocalPronouns $Bodyguard>>
-		@@.pink;$Bodyguard.slaveName@@ waiting for you. Ever since $he realized $he was protecting for <<if $PC.pregType > 1>>many<<else>>two<</if>>, $he made sure to hone $his skills as a midwife to make sure $he could protect you and your unborn child<<if $PC.pregType > 1>>ren<</if>> from any dangers.<<if _concubinePresent == 1>> @@.pink;$Concubine.slaveName@@ <<if hasAnyArms($Concubine)>>wraps _his2 arm<<if hasBothArms($Concubine)>>s<</if>> around<<else>>leans into<</if>> you from behind, letting you know _he2'll be here to comfort you while you labor.<</if>>
-	<<elseif $HeadGirl != 0>>
-		<<setLocalPronouns $HeadGirl>>
-		@@.pink;$HeadGirl.slaveName@@ is waiting for you. $He promises to do everything $he can to help you.<<if _concubinePresent == 1>> @@.pink;$Concubine.slaveName@@ <<if hasAnyArms($Concubine)>>wraps _his2 arm<<if hasBothArms($Concubine)>>s<</if>> around<<else>>leans into<</if>> you from behind, letting you know _he2'll be here to comfort you while you labor.<</if>>
+		@@.pink;_S.Nurse.slaveName@@ waiting for you with everything $he needs to be a capable midwife to you.<<if _concubinePresent == 1>> @@.pink;_S.Concubine.slaveName@@ <<if hasAnyArms(_S.Concubine)>>wraps _his2 arm<<if hasBothArms(_S.Concubine)>>s<</if>> around<<else>>leans into<</if>> you from behind, letting you know _he2'll be here to comfort you while you labor.<</if>>
+	<<elseif $BodyguardID != 0>>
+		<<setLocalPronouns _S.Bodyguard>>
+		@@.pink;_S.Bodyguard.slaveName@@ waiting for you. Ever since $he realized $he was protecting for <<if $PC.pregType > 1>>many<<else>>two<</if>>, $he made sure to hone $his skills as a midwife to make sure $he could protect you and your unborn child<<if $PC.pregType > 1>>ren<</if>> from any dangers.<<if _concubinePresent == 1>> @@.pink;_S.Concubine.slaveName@@ <<if hasAnyArms(_S.Concubine)>>wraps _his2 arm<<if hasBothArms(_S.Concubine)>>s<</if>> around<<else>>leans into<</if>> you from behind, letting you know _he2'll be here to comfort you while you labor.<</if>>
+	<<elseif $HeadGirlID != 0>>
+		<<setLocalPronouns _S.HeadGirl>>
+		@@.pink;_S.HeadGirl.slaveName@@ is waiting for you. $He promises to do everything $he can to help you.<<if _concubinePresent == 1>> @@.pink;_S.Concubine.slaveName@@ <<if hasAnyArms(_S.Concubine)>>wraps _his2 arm<<if hasBothArms(_S.Concubine)>>s<</if>> around<<else>>leans into<</if>> you from behind, letting you know _he2'll be here to comfort you while you labor.<</if>>
 	<<elseif _concubinePresent == 1>>
-		@@.pink;$Concubine.slaveName@@ is waiting for you. _He2 believes, if anything, that _he2 could at least comfort you while you give birth.
+		@@.pink;_S.Concubine.slaveName@@ is waiting for you. _He2 believes, if anything, that _he2 could at least comfort you while you give birth.
 	<<else>>
 		it quite empty. At least $assistant.name knows where you are should anything go wrong.
 	<</if>>
 <<else>>
-	<<if $Concubine != 0>><<setLocalPronouns $Concubine 2>><<if !canWalk($Concubine)>><<set _concubinePresent = 2>><<else>><<set _concubinePresent = 1>><</if>><</if>>
+	<<if _S.Concubine>><<setLocalPronouns _S.Concubine 2>><<if !canWalk(_S.Concubine)>><<set _concubinePresent = 2>><<else>><<set _concubinePresent = 1>><</if>><</if>>
 	You barely make it half-way down the hall before you feel the first of your many children drop into position at the entrance to your birth canal. You try to keep going, but as it forces its way through your pelvis, spreading it wider, you're forced to the ground. Fortunately the penthouse is littered with supply rooms and closets, so you drag your laboring body into the nearest one instead. Fortunately, $assistant.name discretely directs
 	<<if _S.Nurse>>
 		<<setLocalPronouns _S.Nurse>>
-		@@.pink;_S.Nurse.slaveName@@ to you with everything $he'll need to deliver your child<<if $PC.pregType > 1>>ren<</if>>.<<if _concubinePresent == 1>> @@.pink;$Concubine.slaveName@@ bursts in after $him and circles around behind you before <<if hasAnyArms($Concubine)>>wrapping _his2 arm<<if hasBothArms($Concubine)>>s<</if>> around<<else>>nuzzling against<</if>> your contraction wracked middle. _He2'll be here to comfort you while you labor.<</if>>
-	<<elseif $Bodyguard != 0>>
-		<<setLocalPronouns $Bodyguard>>
-		@@.pink;$Bodyguard.slaveName@@ to your location. Ever since $he realized $he was protecting for not only you, but the lives you bear too, $he made sure to hone $his skills as a midwife to make sure $he could protect you and your unborn child<<if $PC.pregType > 1>>ren<</if>> from any dangers. $He apologizes profusely for not being there when you needed $him most; $he wanted to make sure everything was ready for your arrival.<<if _concubinePresent == 1>> @@.pink;$Concubine.slaveName@@ bursts in after $him and circles around behind you before <<if hasAnyArms($Concubine)>>wrapping _his2 arm<<if hasBothArms($Concubine)>>s<</if>> around<<else>>nuzzling against<</if>> your contraction wracked middle. _He2'll be here to comfort you while you labor.<</if>>
-	<<elseif $HeadGirl != 0>>
-		<<setLocalPronouns $HeadGirl>>
-		@@.pink;$HeadGirl.slaveName@@ to your location. $He promises to do everything $he can to help you.<<if _concubinePresent == 1>> @@.pink;$Concubine.slaveName@@ bursts in after $him and circles around behind you before <<if hasAnyArms($Concubine)>>wrapping _his2 arm<<if hasBothArms($Concubine)>>s<</if>> around<<else>>nuzzling against<</if>> your contraction wracked middle. _He2'll be here to comfort you while you labor.<</if>>
+		@@.pink;_S.Nurse.slaveName@@ to you with everything $he'll need to deliver your child<<if $PC.pregType > 1>>ren<</if>>.<<if _concubinePresent == 1>> @@.pink;_S.Concubine.slaveName@@ bursts in after $him and circles around behind you before <<if hasAnyArms(_S.Concubine)>>wrapping _his2 arm<<if hasBothArms(_S.Concubine)>>s<</if>> around<<else>>nuzzling against<</if>> your contraction wracked middle. _He2'll be here to comfort you while you labor.<</if>>
+	<<elseif $BodyguardID != 0>>
+		<<setLocalPronouns _S.Bodyguard>>
+		@@.pink;_S.Bodyguard.slaveName@@ to your location. Ever since $he realized $he was protecting for not only you, but the lives you bear too, $he made sure to hone $his skills as a midwife to make sure $he could protect you and your unborn child<<if $PC.pregType > 1>>ren<</if>> from any dangers. $He apologizes profusely for not being there when you needed $him most; $he wanted to make sure everything was ready for your arrival.<<if _concubinePresent == 1>> @@.pink;_S.Concubine.slaveName@@ bursts in after $him and circles around behind you before <<if hasAnyArms(_S.Concubine)>>wrapping _his2 arm<<if hasBothArms(_S.Concubine)>>s<</if>> around<<else>>nuzzling against<</if>> your contraction wracked middle. _He2'll be here to comfort you while you labor.<</if>>
+	<<elseif $HeadGirlID != 0>>
+		<<setLocalPronouns _S.HeadGirl>>
+		@@.pink;_S.HeadGirl.slaveName@@ to your location. $He promises to do everything $he can to help you.<<if _concubinePresent == 1>> @@.pink;_S.Concubine.slaveName@@ bursts in after $him and circles around behind you before <<if hasAnyArms(_S.Concubine)>>wrapping _his2 arm<<if hasBothArms(_S.Concubine)>>s<</if>> around<<else>>nuzzling against<</if>> your contraction wracked middle. _He2'll be here to comfort you while you labor.<</if>>
 	<<elseif _concubinePresent == 1>>
-		@@.pink;$Concubine.slaveName@@ to your location. _He2 believes, if anything, that _he2 could at least comfort you while you give birth.
+		@@.pink;_S.Concubine.slaveName@@ to your location. _He2 believes, if anything, that _he2 could at least comfort you while you give birth.
 	<<else>>
 		a camera on the room you crawled into. At least $assistant.name knows where you are should anything go wrong.
 	<</if>>
 <</if>>
 <br><br>
-You arrange yourself to give birth, relaxing until your body urges you to begin bearing down and pushing your child into the world.<<if _concubinePresent == 1>>$Concubine.slaveName settles in beside you, one hand soothing your contraction wracked middle and the other <<if $PC.dick != 0>>stroking your hardening dick<<else>>teasing your stiffening clit<</if>>.<</if>>
+You arrange yourself to give birth, relaxing until your body urges you to begin bearing down and pushing your child into the world.<<if _concubinePresent == 1>>_S.Concubine.slaveName settles in beside you, one hand soothing your contraction wracked middle and the other <<if $PC.dick != 0>>stroking your hardening dick<<else>>teasing your stiffening clit<</if>>.<</if>>
 <<if _badBirth > random(1,100)>> /* shits going wrong */
 	<<if _S.Nurse>>
 		<<setLocalPronouns _S.Nurse>>
-		You keep pushing and pushing, but your child is not coming out.<<if _concubinePresent == 1>> $Concubine.slaveName shifts to massaging your gravid middle<<if canTalk($Concubine)>>, while whispering words of encouragement into your ear<</if>>. Until _S.Nurse.slaveName shoos _him2 away so $he can take over and get this baby out of you.<</if>> _S.Nurse.slaveName was prepared for this possibility, adjusts your position and timings, and before long is holding your @@.lime;new baby <<if _gender == "XX">>girl<<else>>boy<</if>>@@ in $his arms.
+		You keep pushing and pushing, but your child is not coming out.<<if _concubinePresent == 1>> _S.Concubine.slaveName shifts to massaging your gravid middle<<if canTalk(_S.Concubine)>>, while whispering words of encouragement into your ear<</if>>. Until _S.Nurse.slaveName shoos _him2 away so $he can take over and get this baby out of you.<</if>> _S.Nurse.slaveName was prepared for this possibility, adjusts your position and timings, and before long is holding your @@.lime;new baby <<if _gender == "XX">>girl<<else>>boy<</if>>@@ in $his arms.
 		<<if $PC.pregType >= 8>>
 			But you're far from done; your taut dome of a belly still houses another <<print num($PC.pregType - 1)>> infants. You moan as the next child begins its descent; you'll be at this for awhile. If _S.Nurse.slaveName weren't here, you and your children would likely have perished.
 		<<elseif $PC.pregType >= 4>>
@@ -155,11 +155,11 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
 		<<elseif $PC.pregType == 2>>
 			But you aren't done; your rounded belly still houses another infant. You moan as they begin their decent; if _S.Nurse.slaveName weren't here, you and your children would likely have perished.
 		<</if>>
-	<<elseif $Bodyguard != 0>>
-		<<setLocalPronouns $Bodyguard>>
-		You keep pushing and pushing, but your child is not coming out.<<if _concubinePresent == 1>> $Concubine.slaveName shifts to massaging your gravid middle<<if canTalk($Concubine)>>, while whispering words of encouragement into your ear<</if>>. _He2 begins to worry as _his2 lover weakens in front of _him2. $Bodyguard.slaveName quickly pulls _him2 away from you, fearing the worst.<</if>> $Bodyguard.slaveName read about this possibility and tries everything $he can to coax your child out. As time passes, $he notices your consciousness begin to fade as exhaustion kicks in. Fearing for your lives, and desperate to save you, $he draws $his sword from its sheath, hands unsteady from what $he is about to do. Carefully, $he slits your lower abdomen, allowing your baby-<<if $PC.pregType < 3>>filled<<elseif $PC.pregType < 5>>stuffed<<elseif $PC.pregType < 8>>packed<<else>>bursting<</if>> womb to pop out through the incision. Doing $his best, $he cuts open your uterus, pulls your child<<if $PC.pregType > 1>>ren<</if>> from you and severs the umbilical cord<<if $PC.pregType > 1>>s all at once<</if>>.
+	<<elseif $BodyguardID != 0>>
+		<<setLocalPronouns _S.Bodyguard>>
+		You keep pushing and pushing, but your child is not coming out.<<if _concubinePresent == 1>> _S.Concubine.slaveName shifts to massaging your gravid middle<<if canTalk(_S.Concubine)>>, while whispering words of encouragement into your ear<</if>>. _He2 begins to worry as _his2 lover weakens in front of _him2. _S.Bodyguard.slaveName quickly pulls _him2 away from you, fearing the worst.<</if>> _S.Bodyguard.slaveName read about this possibility and tries everything $he can to coax your child out. As time passes, $he notices your consciousness begin to fade as exhaustion kicks in. Fearing for your lives, and desperate to save you, $he draws $his sword from its sheath, hands unsteady from what $he is about to do. Carefully, $he slits your lower abdomen, allowing your baby-<<if $PC.pregType < 3>>filled<<elseif $PC.pregType < 5>>stuffed<<elseif $PC.pregType < 8>>packed<<else>>bursting<</if>> womb to pop out through the incision. Doing $his best, $he cuts open your uterus, pulls your child<<if $PC.pregType > 1>>ren<</if>> from you and severs the umbilical cord<<if $PC.pregType > 1>>s all at once<</if>>.
 		<br><br>
-		You awake some time later in the remote surgery, your stomach extremely sore; you quickly realize you're no longer round with child. As you try to rise, $Bodyguard.slaveName stops you; $he hefts you into a bridal carry and takes you to a recovery room, before gently placing you into a warm bed, tucking you in, and hurrying out of the room. Before you can call out, $he returns carrying
+		You awake some time later in the remote surgery, your stomach extremely sore; you quickly realize you're no longer round with child. As you try to rise, _S.Bodyguard.slaveName stops you; $he hefts you into a bridal carry and takes you to a recovery room, before gently placing you into a warm bed, tucking you in, and hurrying out of the room. Before you can call out, $he returns carrying
 		<<if _curBabies == 1>>
 			@@.lime;your baby <<if _gender == "XX">>girl<<else>>boy<</if>>@@
 		<<elseif _curBabies < 6>>
@@ -169,46 +169,46 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
 		<</if>>
 		in $his arms.
 		<<set _wounded = 1>>
-	<<elseif $HeadGirl != 0>>
-		<<setLocalPronouns $HeadGirl>>
+	<<elseif $HeadGirlID != 0>>
+		<<setLocalPronouns _S.HeadGirl>>
 		You keep pushing and pushing, but your child is not coming out.
 		<<if _concubinePresent == 1>>
-			$Concubine.slaveName shifts to massaging your gravid middle<<if canTalk($Concubine)>>, while whispering words of encouragement into your ear<</if>>. _He2 begins to worry as _his2 lover weakens in front of _him2. $HeadGirl.slaveName quickly pulls _him2 to <<if hasBothLegs($Concubine)>>_his2 feet<<else>>upright<</if>> and orders _him2 to help $him carry you to the remote surgery<<if !canWalk($Concubine)>>; in $his rush, $he completely forgot <<if tooBigBreasts($Concubine)>>$Concubine.slaveName's breasts have _him2 pinned to the bed<<elseif tooBigBelly($Concubine)>>$Concubine.slaveName's pregnancy renders _him2 immobile<<elseif tooBigDick($Concubine)>>$Concubine.slaveName can't walk with a dick that big<<elseif tooBigButt($Concubine)>>$Concubine.slaveName's butt pins _him2 to the bed<<elseif tooBigBalls($Concubine)>>$Concubine.slaveName's balls act as a giant anchor<<elseif tooFatSlave($Concubine)>>$Concubine.slaveName is so fat, the bed is _his2 home now<<else>>$Concubine.slaveName can't walk<</if>><</if>>.
+			_S.Concubine.slaveName shifts to massaging your gravid middle<<if canTalk(_S.Concubine)>>, while whispering words of encouragement into your ear<</if>>. _He2 begins to worry as _his2 lover weakens in front of _him2. _S.HeadGirl.slaveName quickly pulls _him2 to <<if hasBothLegs(_S.Concubine)>>_his2 feet<<else>>upright<</if>> and orders _him2 to help $him carry you to the remote surgery<<if !canWalk(_S.Concubine)>>; in $his rush, $he completely forgot <<if tooBigBreasts(_S.Concubine)>>_S.Concubine.slaveName's breasts have _him2 pinned to the bed<<elseif tooBigBelly(_S.Concubine)>>_S.Concubine.slaveName's pregnancy renders _him2 immobile<<elseif tooBigDick(_S.Concubine)>>_S.Concubine.slaveName can't walk with a dick that big<<elseif tooBigButt(_S.Concubine)>>_S.Concubine.slaveName's butt pins _him2 to the bed<<elseif tooBigBalls(_S.Concubine)>>_S.Concubine.slaveName's balls act as a giant anchor<<elseif tooFatSlave(_S.Concubine)>>_S.Concubine.slaveName is so fat, the bed is _his2 home now<<else>>_S.Concubine.slaveName can't walk<</if>><</if>>.
 		<<else>>
-			$HeadGirl.slaveName notices your distress and carries you to the remote surgery<<if $PC.pregType >= 8>>, a daunting task given your extreme gravidity<</if>>.
+			_S.HeadGirl.slaveName notices your distress and carries you to the remote surgery<<if $PC.pregType >= 8>>, a daunting task given your extreme gravidity<</if>>.
 		<</if>>
 		<br><br>
-		You awake some time later in a recovery room<<if _concubinePresent > 0>>, $Concubine.slaveName beside you<</if>>, your stomach extremely sore; a quick glance at the prominent scar tells you everything you need to know. Seeing you're awake, $HeadGirl.slaveName catches your attention. In $his arms
+		You awake some time later in a recovery room<<if _concubinePresent > 0>>, _S.Concubine.slaveName beside you<</if>>, your stomach extremely sore; a quick glance at the prominent scar tells you everything you need to know. Seeing you're awake, _S.HeadGirl.slaveName catches your attention. In $his arms
 		<<if _curBabies == 1>>
-			is @@.lime;your baby <<if _gender == "XX">>girl<<else>>boy<</if>>,@@ <<if $HeadGirl.lactation > 0>>happily nursing from $his breast,<</if>>
+			is @@.lime;your baby <<if _gender == "XX">>girl<<else>>boy<</if>>,@@ <<if _S.HeadGirl.lactation > 0>>happily nursing from $his breast,<</if>>
 		<<else>>
-			are @@.lime;your newborn <<print pregNumberName(_curBabies, 2)>>,@@ <<if $HeadGirl.lactation > 0>>happily nursing from $his breasts,<</if>>
+			are @@.lime;your newborn <<print pregNumberName(_curBabies, 2)>>,@@ <<if _S.HeadGirl.lactation > 0>>happily nursing from $his breasts,<</if>>
 		<</if>>
 		alive and well.
 		<<set _wounded = 1>>
 	<<elseif _concubinePresent == 1>>
-		You keep pushing and pushing, but your child is not coming out. <<if canWalk($Concubine)>>In a panic, $Concubine.slaveName carries you to the remote surgery<<else>>The last thing you remember as you fade is $Concubine.slaveName's look of panic<</if>>.
+		You keep pushing and pushing, but your child is not coming out. <<if canWalk(_S.Concubine)>>In a panic, _S.Concubine.slaveName carries you to the remote surgery<<else>>The last thing you remember as you fade is _S.Concubine.slaveName's look of panic<</if>>.
 		<br><br>
-		You awake some time later in a recovery room, your stomach extremely sore; a quick glance at the prominent scar tells you everything you need to know. A content sigh comes from beside you; $Concubine.slaveName is snuggled next to you, snoozing with
+		You awake some time later in a recovery room, your stomach extremely sore; a quick glance at the prominent scar tells you everything you need to know. A content sigh comes from beside you; _S.Concubine.slaveName is snuggled next to you, snoozing with
 		<<if _curBabies == 1>>
-			@@.lime;your baby <<if _gender == "XX">>girl<<else>>boy<</if>>@@ in _his2 arms.<<if $Concubine.lactation > 0>> Your child has managed to free one of $Concubine.slaveName's breasts and is eagerly suckling from its milky nipple.<</if>>
+			@@.lime;your baby <<if _gender == "XX">>girl<<else>>boy<</if>>@@ in _his2 arms.<<if _S.Concubine.lactation > 0>> Your child has managed to free one of _S.Concubine.slaveName's breasts and is eagerly suckling from its milky nipple.<</if>>
 		<<else>>
-			@@.lime;your newborn <<print pregNumberName(_curBabies, 2)>>@@ in _his2 arms.<<if $Concubine.lactation > 0>> Your children have managed to free $Concubine.slaveName's breasts and are eagerly suckling from their milky nipples.<</if>>
+			@@.lime;your newborn <<print pregNumberName(_curBabies, 2)>>@@ in _his2 arms.<<if _S.Concubine.lactation > 0>> Your children have managed to free _S.Concubine.slaveName's breasts and are eagerly suckling from their milky nipples.<</if>>
 		<</if>>
-		<<if !canWalk($Concubine)>>
-			<<if tooBigBreasts($Concubine)>>
+		<<if !canWalk(_S.Concubine)>>
+			<<if tooBigBreasts(_S.Concubine)>>
 				You don't know how _he2 managed to get you here when _his2 breasts prevent _him2 from walking<<if $PC.pregType >= 8>>, especially with how heavy your pregnancy was<</if>>, but you give the pair a gentle caress as thanks.
-			<<elseif tooBigBelly($Concubine)>>
+			<<elseif tooBigBelly(_S.Concubine)e)>>
 				You don't know how _he2 managed to get you here when _he2's so gravid _he2 can't walk<<if $PC.pregType >= 8>>, especially with how heavy your pregnancy was<</if>>, but you give the taut dome a gentle caress as thanks.
-			<<elseif tooBigDick($Concubine)>>
+			<<elseif tooBigDick(_S.Concubine)>>
 				You don't know how _he2 managed to get you here when _his2 dick prevents _him2 from walking<<if $PC.pregType >= 8>>, especially with how heavy your pregnancy was<</if>>, but you give the serpent a gentle caress as thanks.
-			<<elseif tooBigButt($Concubine)>>
+			<<elseif tooBigButt(_S.Concubine)>>
 				You don't know how _he2 managed to get you here when _his2 ass prevent _him2 from walking<<if $PC.pregType >= 8>>, especially with how heavy your pregnancy was<</if>>, but you give the jiggling giant a gentle caress as thanks.
-			<<elseif tooBigBalls($Concubine)>>
+			<<elseif tooBigBalls(_S.Concubine)>>
 				You don't know how _he2 managed to get you here when _his2 balls prevent _him2 from walking<<if $PC.pregType >= 8>>, especially with how heavy your pregnancy was<</if>>, but you give the pair a gentle caress as thanks. _He2 returns the kindness with a shudder and a large wet spot forming over _his2 crotch.
-			<<elseif tooFatSlave($Concubine)>>
+			<<elseif tooFatSlave(_S.Concubine)>>
 				You don't know how _he2 managed to get you here when _he2's so fat _he2 can't walk<<if $PC.pregType >= 8>>, especially with how heavy your pregnancy was<</if>>, but you give _his2 soft body a gentle caress as thanks.
-			<<elseif !hasAnyLegs($Concubine)>>
+			<<elseif !hasAnyLegs(_S.Concubine)>>
 				You don't know how _he2 managed to get you here when _he2 has no legs to walk on<<if $PC.pregType >= 8>>, especially with how heavy your pregnancy was<</if>>, but you give _his2 stumps a gentle caress as thanks.
 			<<else>>
 				You don't know how _he2 managed to get you here, since _he2 can't walk<<if $PC.pregType >= 8>>, especially with how heavy your pregnancy was<</if>>, but you're thankful either way.
@@ -225,10 +225,10 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
 		<<setLocalPronouns _S.Nurse>>
 		Under _S.Nurse.slaveName's guidance, childbirth is a breeze for you.
 		<<if $PC.pregType == 1>>
-			<<if _concubinePresent == 1>> Or it would have been, had $Concubine.slaveName not driven you to an intense orgasm right as your child entered the world.<<if $PC.balls >= 9>> An orgasm that resulted in $Concubine.slaveName, _S.Nurse.slaveName, and your newborn getting sprayed with cum.<</if>><</if>> _S.Nurse.slaveName cuts the cord, swaddles your child, and hands you @@.lime;your new baby <<if _gender == "XX">>girl<<else>>boy<</if>>.@@
+			<<if _concubinePresent == 1>> Or it would have been, had _S.Concubine.slaveName not driven you to an intense orgasm right as your child entered the world.<<if $PC.balls >= 9>> An orgasm that resulted in _S.Concubine.slaveName, _S.Nurse.slaveName, and your newborn getting sprayed with cum.<</if>><</if>> _S.Nurse.slaveName cuts the cord, swaddles your child, and hands you @@.lime;your new baby <<if _gender == "XX">>girl<<else>>boy<</if>>.@@
 		<<else>>
 			<<if _concubinePresent == 1>>
-				Or it would have been, had $Concubine.slaveName not driven you to an intense orgasm right as your first child entered the world.<<if $PC.balls >= 9>> An orgasm that resulted in $Concubine.slaveName, _S.Nurse.slaveName, and your newborn getting sprayed with cum.<</if>> But it isn't over: before you've even had a chance to come down from your climax, the next infant slips into your birth canal<<if $PC.pregType >= 3>>, followed closely by the <<if $PC.pregType == 3>>last<<else>>next<</if>>,<</if>> and immediately pushes you back over the edge. In minutes, after <<print num(_curBabies)>> children and <<print num(_curBabies)>> intense orgasms, you're barely conscious. $Concubine.slaveName slides in behind you to snuggle with you as you return to your senses.
+				Or it would have been, had _S.Concubine.slaveName not driven you to an intense orgasm right as your first child entered the world.<<if $PC.balls >= 9>> An orgasm that resulted in _S.Concubine.slaveName, _S.Nurse.slaveName, and your newborn getting sprayed with cum.<</if>> But it isn't over: before you've even had a chance to come down from your climax, the next infant slips into your birth canal<<if $PC.pregType >= 3>>, followed closely by the <<if $PC.pregType == 3>>last<<else>>next<</if>>,<</if>> and immediately pushes you back over the edge. In minutes, after <<print num(_curBabies)>> children and <<print num(_curBabies)>> intense orgasms, you're barely conscious. _S.Concubine.slaveName slides in behind you to snuggle with you as you return to your senses.
 			<<else>>
 				With one out, you realize
 				<<if $PC.pregType >= 6>>
@@ -252,17 +252,17 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
 			<</if>>
 			_S.Nurse.slaveName cuts the cords, swaddles your children, and hands you @@.lime;your new <<print pregNumberName(_curBabies, 2)>>.@@
 		<</if>>
-	<<elseif $Bodyguard != 0>>
-		<<setLocalPronouns $Bodyguard>>
-		With $Bodyguard.slaveName watching over you, you feel safe enough to let your guard down and focus on giving birth. Once you are relaxed, you feel your child begin to inch down your birth canal. Before long you've completed the job without any trouble.
+	<<elseif $BodyguardID != 0>>
+		<<setLocalPronouns _S.Bodyguard>>
+		With _S.Bodyguard.slaveName watching over you, you feel safe enough to let your guard down and focus on giving birth. Once you are relaxed, you feel your child begin to inch down your birth canal. Before long you've completed the job without any trouble.
 		<<if $PC.pregType == 1>>
 			<<if _concubinePresent == 1>>
-				Or it would have, had $Concubine.slaveName not driven you to an intense orgasm right as your child entered the world.<<if $PC.balls >= 9>> An orgasm that resulted in $Concubine.slaveName, $Bodyguard.slaveName, and your newborn getting sprayed with cum.<</if>>
+				Or it would have, had _S.Concubine.slaveName not driven you to an intense orgasm right as your child entered the world.<<if $PC.balls >= 9>> An orgasm that resulted in _S.Concubine.slaveName, _S.Bodyguard.slaveName, and your newborn getting sprayed with cum.<</if>>
 			<</if>>
-			$Bodyguard.slaveName cuts the cord with $his blade, and hands you @@.lime;your new baby <<if _gender == "XX">>girl<<else>>boy<</if>>.@@
+			_S.Bodyguard.slaveName cuts the cord with $his blade, and hands you @@.lime;your new baby <<if _gender == "XX">>girl<<else>>boy<</if>>.@@
 		<<else>>
 			<<if _concubinePresent == 1>>
-				Or you would have, had $Concubine.slaveName not driven you to an intense orgasm right as your child entered the world.<<if $PC.balls >= 9>> An orgasm that resulted in $Concubine.slaveName, $Bodyguard.slaveName, and your newborn getting sprayed with cum.<</if>> But it isn't over; before you've even had a chance to come down from your climax, the next infant slips into your birth canal<<if $PC.pregType >= 3>>, followed closely by the <<if $PC.pregType == 3>>last<<else>>next<</if>>,<</if>> and immediately pushes you back over the edge. In minutes, after <<print num(_curBabies)>> children and <<print num(_curBabies)>> intense orgasms, you're barely conscious, nearly panicking $Bodyguard.slaveName. $Concubine.slaveName slides in behind you to snuggle with you as you return to your senses.
+				Or you would have, had _S.Concubine.slaveName not driven you to an intense orgasm right as your child entered the world.<<if $PC.balls >= 9>> An orgasm that resulted in _S.Concubine.slaveName, _S.Bodyguard.slaveName, and your newborn getting sprayed with cum.<</if>> But it isn't over; before you've even had a chance to come down from your climax, the next infant slips into your birth canal<<if $PC.pregType >= 3>>, followed closely by the <<if $PC.pregType == 3>>last<<else>>next<</if>>,<</if>> and immediately pushes you back over the edge. In minutes, after <<print num(_curBabies)>> children and <<print num(_curBabies)>> intense orgasms, you're barely conscious, nearly panicking _S.Bodyguard.slaveName. _S.Concubine.slaveName slides in behind you to snuggle with you as you return to your senses.
 			<<else>>
 				With one out, you realize
 				<<if $PC.pregType >= 6>>
@@ -282,17 +282,17 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
 				<<else>>
 					they begin their
 				<</if>>
-				descent; you'll be at this for awhile. With $Bodyguard.slaveName around, you feel completely safe.
+				descent; you'll be at this for awhile. With _S.Bodyguard.slaveName around, you feel completely safe.
 			<</if>>
-			$Bodyguard.slaveName cuts the cords with $his blade, and hands you @@.lime;your new <<print pregNumberName(_curBabies, 2)>>.@@
+			_S.Bodyguard.slaveName cuts the cords with $his blade, and hands you @@.lime;your new <<print pregNumberName(_curBabies, 2)>>.@@
 		<</if>>
-	<<elseif $HeadGirl != 0>>
-		With $HeadGirl.slaveName waiting with everything you need, childbirth goes by without a hitch.
+	<<elseif $HeadGirlID != 0>>
+		With _S.HeadGirl.slaveName waiting with everything you need, childbirth goes by without a hitch.
 		<<if $PC.pregType == 1>>
-			<<if _concubinePresent == 1>> Or it would have been, had $Concubine.slaveName not driven you to an intense orgasm right as your child entered the world.<<if $PC.balls >= 9>> An orgasm that resulted in $Concubine.slaveName, $HeadGirl.slaveName, and your newborn getting sprayed with cum.<</if>><</if>> $HeadGirl.slaveName cuts the cord, swaddles your child, and hands you @@.lime;your new baby <<if _gender == "XX">>girl<<else>>boy<</if>>.@@
+			<<if _concubinePresent == 1>> Or it would have been, had _S.Concubine.slaveName not driven you to an intense orgasm right as your child entered the world.<<if $PC.balls >= 9>> An orgasm that resulted in _S.Concubine.slaveName, _S.HeadGirl.slaveName, and your newborn getting sprayed with cum.<</if>><</if>> _S.HeadGirl.slaveName cuts the cord, swaddles your child, and hands you @@.lime;your new baby <<if _gender == "XX">>girl<<else>>boy<</if>>.@@
 		<<else>>
 			<<if _concubinePresent == 1>>
-				Or it would have been, had $Concubine.slaveName not driven you to an intense orgasm right as your first child entered the world.<<if $PC.balls >= 9>> An orgasm that resulted in $Concubine.slaveName, $HeadGirl.slaveName, and your newborn getting sprayed with cum.<</if>> But it isn't over: before you've even had a chance to come down from your climax, the next infant slips into your birth canal<<if $PC.pregType >= 3>>, followed closely by the <<if $PC.pregType == 3>>last<<else>>next<</if>>,<</if>> and immediately pushes you back over the edge. In minutes, after <<print num(_curBabies)>> children and <<print num(_curBabies)>> intense orgasms, you're barely conscious. $Concubine.slaveName slides in behind you to snuggle with you as you return to your senses.
+				Or it would have been, had _S.Concubine.slaveName not driven you to an intense orgasm right as your first child entered the world.<<if $PC.balls >= 9>> An orgasm that resulted in _S.Concubine.slaveName, _S.HeadGirl.slaveName, and your newborn getting sprayed with cum.<</if>> But it isn't over: before you've even had a chance to come down from your climax, the next infant slips into your birth canal<<if $PC.pregType >= 3>>, followed closely by the <<if $PC.pregType == 3>>last<<else>>next<</if>>,<</if>> and immediately pushes you back over the edge. In minutes, after <<print num(_curBabies)>> children and <<print num(_curBabies)>> intense orgasms, you're barely conscious. _S.Concubine.slaveName slides in behind you to snuggle with you as you return to your senses.
 			<<else>>
 				With one out, you realize
 				<<if $PC.pregType >= 6>>
@@ -312,12 +312,12 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
 				<<else>>
 					they begin their
 				<</if>>
-				descent; you'll be at this for awhile. With $HeadGirl.slaveName around, you know everything is under control.
+				descent; you'll be at this for awhile. With _S.HeadGirl.slaveName around, you know everything is under control.
 			<</if>>
-			$HeadGirl.slaveName cuts the cords, swaddles your children, and hands you @@.lime;your new <<print pregNumberName(_curBabies, 2)>>.@@
+			_S.HeadGirl.slaveName cuts the cords, swaddles your children, and hands you @@.lime;your new <<print pregNumberName(_curBabies, 2)>>.@@
 		<</if>>
 	<<elseif _concubinePresent == 1>>
-		$Concubine.slaveName alternates between calming your nerves and driving your to orgasm. It works fairly well, as your child rapidly enters the world alongside a particularly powerful climax. You reach down and draw @@.lime;your new baby <<if _gender == "XX">>girl<<else>>boy<</if>>@@ into your arms, while $Concubine.slaveName shifts to eagerly "clean" your crotch with _his2 tongue.<<if $PC.pregType > 1>> _His2 over-stimulation of you quickly has _him2 licking the crowning head of your second child. _He2 diligently works you over until all of your children are born, making sure you are thoroughly exhausted; both from the birth and from _his2 ministrations.<<if canPenetrate($Concubine) && canImpreg($PC, $Concubine)>> $Concubine.slaveName <<if canSee($Concubine)>>eyes<<else>>faces<</if>> your spread pussy hungrily as _his2 erection bobs with anticipation. But you're too tired right now and _he2 realizes it.<</if>> _He2 helps gather your child<<if $PC.pregType > 1>>ren<</if>> to<<if $Concubine.lactation > 0>> _his2 and <</if>> your breasts with the hope that you'll reward _him2 when you recover.<</if>>
+		_S.Concubine.slaveName alternates between calming your nerves and driving your to orgasm. It works fairly well, as your child rapidly enters the world alongside a particularly powerful climax. You reach down and draw @@.lime;your new baby <<if _gender == "XX">>girl<<else>>boy<</if>>@@ into your arms, while _S.Concubine.slaveName shifts to eagerly "clean" your crotch with _his2 tongue.<<if $PC.pregType > 1>> _His2 over-stimulation of you quickly has _him2 licking the crowning head of your second child. _He2 diligently works you over until all of your children are born, making sure you are thoroughly exhausted; both from the birth and from _his2 ministrations.<<if canPenetrate(_S.Concubine) && canImpreg($PC, _S.Concubine)>> _S.Concubine.slaveName <<if canSee(_S.Concubine)>>eyes<<else>>faces<</if>> your spread pussy hungrily as _his2 erection bobs with anticipation. But you're too tired right now and _he2 realizes it.<</if>> _He2 helps gather your child<<if $PC.pregType > 1>>ren<</if>> to<<if _S.Concubine.lactation > 0>> _his2 and <</if>> your breasts with the hope that you'll reward _him2 when you recover.<</if>>
 	<<else>>
 		You keep pushing and pushing, your child slowly working its way from your body. With the last of your strength, you bear down, freeing your child from your body at last. Panting, you gather @@.lime;your new baby <<if _gender == "XX">>girl<<else>>boy<</if>>@@ <<if $PC.pregType > 1>>as another contraction ushers your next child into your birth canal<<else>>and drift off into a much deserved rest<</if>>.
 		<<if $PC.pregType >= 2>>
diff --git a/src/pregmod/theBlackMarket.tw b/src/pregmod/theBlackMarket.tw
index f0113cd964357e4ab05158b66ea8a718463cb101..aa035b107c3c5f868e4dc07aa9e4b6b1c93340b5 100644
--- a/src/pregmod/theBlackMarket.tw
+++ b/src/pregmod/theBlackMarket.tw
@@ -2,12 +2,12 @@
 
 <<set $nextButton = "Back", $nextLink = "Main", $returnTo = "Main", $encyclopedia = "The Black Market">>
 
-<<if $Bodyguard != 0>>
-	<<setLocalPronouns $Bodyguard>>
+<<if _S.Bodyguard>>
+	<<setLocalPronouns _S.Bodyguard>>
 <</if>>
 <<setPlayerPronouns>>
 
-You board your VTOL bird for the trip to the current location of the particularly exclusive, and quite lucrative, Black Market knowing full well that the trip may take far longer than anticipated; the market frequently relocates to shake the unwanted attention it inevitably gains. It's far easier than paying off authorities, especially with how outrageous their demands have become with the decline of the old world. You're greeted by a gruff bouncer, already fully aware of just who you are and your permission to be there. "Check your weapons — no firearms allowed inside.<<if $Bodyguard != 0>> $He may keep $his blade," he gestures to $Bodyguard.slaveName, "But keep in mind: if you cause us trouble, you will not be going home in one piece.<<if getLimbCount($Bodyguard, 105) > 0>> Oh, and one more thing." He <<if getArmCount($Bodyguard, 5) + getArmCount($Bodyguard, 6) > 0>> taps $his clearly bionic arm.<<else>> points at $his clearly bionic leg.<</if>> "Disable $his weapons systems. I know what $he is capable of.<</if>><</if>>"
+You board your VTOL bird for the trip to the current location of the particularly exclusive, and quite lucrative, Black Market knowing full well that the trip may take far longer than anticipated; the market frequently relocates to shake the unwanted attention it inevitably gains. It's far easier than paying off authorities, especially with how outrageous their demands have become with the decline of the old world. You're greeted by a gruff bouncer, already fully aware of just who you are and your permission to be there. "Check your weapons — no firearms allowed inside.<<if _S.Bodyguard>> $He may keep $his blade," he gestures to _S.Bodyguard.slaveName, "But keep in mind: if you cause us trouble, you will not be going home in one piece.<<if getLimbCount(_S.Bodyguard, 105) > 0>> Oh, and one more thing." He <<if getArmCount(_S.Bodyguard, 5) + getArmCount(_S.Bodyguard, 6) > 0>> taps $his clearly bionic arm.<<else>> points at $his clearly bionic leg.<</if>> "Disable $his weapons systems. I know what $he is capable of.<</if>><</if>>"
 
 <br><br>
 
diff --git a/src/pregmod/widgets/pregmodBirthWidgets.tw b/src/pregmod/widgets/pregmodBirthWidgets.tw
index 399c764a95e788f0c718bea3e4b3b5fd59547660..846f3dbfb7b546818ab1460271c6d72507ab5830 100644
--- a/src/pregmod/widgets/pregmodBirthWidgets.tw
+++ b/src/pregmod/widgets/pregmodBirthWidgets.tw
@@ -381,11 +381,11 @@
 			<<if _birthScene > 50>>
 				While giving a slave oral service, $slaves[$i].slaveName's water breaks. $He disregards this development and continues working.
 				<<ClothingBirth>>
-				The slave gets off quite strongly to the show and shoves $him out of the way, leaving $him to clean up $his mess. Instead, $he draws <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child to $his breast until <<if _S.Stewardess>>_S.Stewardess.slaveName<<elseif $HeadGirl != 0>>$HeadGirl.slaveName<<else>>$assistant.name<</if>> shouts at $him to move $his useless pregnant ass.
+				The slave gets off quite strongly to the show and shoves $him out of the way, leaving $him to clean up $his mess. Instead, $he draws <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child to $his breast until <<if _S.Stewardess>>_S.Stewardess.slaveName<<elseif $HeadGirlID != 0>>_S.HeadGirl.slaveName<<else>>$assistant.name<</if>> shouts at $him to move $his useless pregnant ass.
 			<<else>>
 				While scrubbing the penthouse floor, $slaves[$i].slaveName's water breaks. $He turns to clean this new spill, disregarding what it means.
 				<<ClothingBirth>>
-				Instead of cleaning the fresh mess $he made, $he draws <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child to $his breast until <<if _S.Stewardess>>_S.Stewardess.slaveName<<elseif $HeadGirl != 0>>$HeadGirl.slaveName<<else>>$assistant.name<</if>> shouts at $him to move $his useless pregnant ass.
+				Instead of cleaning the fresh mess $he made, $he draws <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child to $his breast until <<if _S.Stewardess>>_S.Stewardess.slaveName<<elseif HeadGirlID != 0>>_S.HeadGirl.slaveName<<else>>$assistant.name<</if>> shouts at $him to move $his useless pregnant ass.
 			<</if>>
 		<</if>>
 	<<else>>
@@ -396,11 +396,11 @@
 				While giving a slave oral service, $slaves[$i].slaveName's water breaks. $He desperately tries to pull away but they grab $his head and force $him back to their crotch.
 				<<set $humiliation = 1>>
 				<<ClothingBirth>>
-				The slave gets off quite strongly to the show and shoves $him out of the way, leaving $him to clean up $his mess. $He hurriedly tries to mop up the mess and collect <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child before <<if _S.Stewardess>>_S.Stewardess.slaveName<<elseif $HeadGirl != 0>>$HeadGirl.slaveName<<else>><</if>> shouts at $him for dragging $his pregnant ass.
+				The slave gets off quite strongly to the show and shoves $him out of the way, leaving $him to clean up $his mess. $He hurriedly tries to mop up the mess and collect <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child before <<if _S.Stewardess>>_S.Stewardess.slaveName<<elseif $HeadGirlID != 0>>_S.HeadGirl.slaveName<<else>><</if>> shouts at $him for dragging $his pregnant ass.
 			<<else>>
 				While scrubbing the penthouse floor, $slaves[$i].slaveName's water breaks. $He panics at the thought of not cleaning up $his spill but $his worsening contractions force $him to find a secluded place to give birth.
 				<<ClothingBirth>>
-				Collecting <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child, $he carefully exits $his hiding place before coming under the eye of <<if _S.Stewardess>>the glaring _S.Stewardess.slaveName. $His child is promptly taken<<elseif $HeadGirl != 0>>the glaring $HeadGirl.slaveName. $His child is promptly taken <<else>>. $His child is promptly taken by other servants<</if>> following a lecture about priorities and time management given $his constant pregnancy and predictable birth cycle.
+				Collecting <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child, $he carefully exits $his hiding place before coming under the eye of <<if _S.Stewardess>>the glaring _S.Stewardess.slaveName. $His child is promptly taken<<elseif $HeadGirlID != 0>>the glaring _S.HeadGirl.slaveName. $His child is promptly taken <<else>>. $His child is promptly taken by other servants<</if>> following a lecture about priorities and time management given $his constant pregnancy and predictable birth cycle.
 			<</if>>
 		<</if>>
 	<</if>>
@@ -418,13 +418,13 @@
 				<<if $masterSuiteUpgradeLuxury == 1>>
 					While awaiting your return on the big bed in the master suite, $slaves[$i].slaveName's water breaks thoroughly soaking the sheets. Ignoring the mess, $he shifts into a more comfortable position.
 					<<ClothingBirth>>
-					$He struggles to reach <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child around $his still gravid figure before bringing it to $his breast and resuming $his wait. <<if $Concubine != 0>>Concubine.slaveName furiously orders $his child removed and $his still very pregnant ass forcefully ejected from the bed so it can be cleaned before your return.<</if>>
+					$He struggles to reach <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child around $his still gravid figure before bringing it to $his breast and resuming $his wait. <<if _S.Concubine>>_S.Concubine.slaveName furiously orders $his child removed and $his still very pregnant ass forcefully ejected from the bed so it can be cleaned before your return.<</if>>
 				<<elseif $masterSuiteUpgradeLuxury == 2>>
 					While being the bottom of the master suite's fuckpit, $slaves[$i].slaveName's water breaks. While $he doesn't stop having sex, the fucktoys using $him do and drag $him from the pit to give birth. Instinctively, $he begins to push out <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, indifferent to who may be watching $his naked crotch. Without a second thought about $his child, $he slips back into the fuckpit.
 				<<else>>
 					While awaiting your return in the master suite, $slaves[$i].slaveName's water breaks. $He pays it no heed and continues blankly waiting.
 					<<ClothingBirth>>
-					$He struggles to reach <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child around $his still gravid figure before bringing it to $his breast and resuming $his wait <<if $Concubine != 0>>Concubine.slaveName furiously orders $his child removed and $his still very pregnant ass thoroughly cleaned before your return.<</if>>
+					$He struggles to reach <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child around $his still gravid figure before bringing it to $his breast and resuming $his wait <<if _S.Concubine>>_S.Concubine.slaveName furiously orders $his child removed and $his still very pregnant ass thoroughly cleaned before your return.<</if>>
 				<</if>>
 			<</if>>
 		<<else>>
@@ -463,13 +463,13 @@
 				<<if $masterSuiteUpgradeLuxury == 1>>
 					While awaiting your return on the big bed in the master suite, $slaves[$i].slaveName's water breaks thoroughly soaking the sheets. Ignoring the mess, $he shifts into a more comfortable position.
 					<<ClothingBirth>>
-					$He struggles to reach <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child around $his still gravid figure before bringing it to $his breast and resuming $his wait. <<if $Concubine != 0>>Concubine.slaveName furiously orders $his child removed and $his still very pregnant ass forcefully ejected from the bed so it can be cleaned before your return.<</if>>
+					$He struggles to reach <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child around $his still gravid figure before bringing it to $his breast and resuming $his wait. <<if _S.Concubine>>_S.Concubine.slaveName furiously orders $his child removed and $his still very pregnant ass forcefully ejected from the bed so it can be cleaned before your return.<</if>>
 				<<elseif $masterSuiteUpgradeLuxury == 2>>
 					While being the bottom of the master suite's fuckpit, $slaves[$i].slaveName's water breaks. While $he doesn't stop having sex, the fucktoys using $him do and drag $him from the pit to give birth. Instinctively, $he begins to push out <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, indifferent to who may be watching $his naked crotch. Without a second thought about $his child, $he slips back into the fuckpit.
 				<<else>>
 					While awaiting your return in the master suite, $slaves[$i].slaveName's water breaks. $He pays it no heed and continues blankly waiting.
 					<<ClothingBirth>>
-					$He struggles to reach <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child around $his still gravid figure before bringing it to $his breast and resuming $his wait <<if $Concubine != 0>>Concubine.slaveName furiously orders $his child removed and $his still very pregnant ass thoroughly cleaned before your return.<</if>>
+					$He struggles to reach <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child around $his still gravid figure before bringing it to $his breast and resuming $his wait <<if _S.Concubine>>_S.Concubine.slaveName furiously orders $his child removed and $his still very pregnant ass thoroughly cleaned before your return.<</if>>
 				<</if>>
 			<</if>>
 		<<else>>
@@ -623,25 +623,25 @@
 	<</if>>
 
 <<case "work as a nanny">>		/* TODO: this needs a rewrite */
-	<<if ($Matron != 0)>>
-		<<setLocalPronouns $Matron 2>>
+	<<if ($MatronID != 0)>>
+		<<setLocalPronouns _S.Matron 2>>
 	<</if>>
 	<<if $slaves[$i].fetish == "mindbroken">>
 		<<if (random(1,20) > $suddenBirth)>>
-			<<if $Matron != 0>>$Matron.slaveName leads $him to a special pool designed to give birth in. Once $he is safely in the water alongside _him2,<<else>>$He is lead to a special pool designed to give birth in. Once $he is safely in the water alongside $his assistant,<</if>> $he begins to push out <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, indifferent to $his watching caretaker. $His child is promptly taken and, following a cleaning of $his still very gravid body, $he is taken back to the nursery.
+			<<if $MatronID != 0>>_S.Matron.slaveName leads $him to a special pool designed to give birth in. Once $he is safely in the water alongside _him2,<<else>>$He is lead to a special pool designed to give birth in. Once $he is safely in the water alongside $his assistant,<</if>> $he begins to push out <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, indifferent to $his watching caretaker. $His child is promptly taken and, following a cleaning of $his still very gravid body, $he is taken back to the nursery.
 		<<else>>
-			While soaking in the nursery's pool, $slaves[$i].slaveName's water breaks. As $he begins to ready $himself for birth, <<if $Matron != 0>>$Matron.slaveName pulls $him out of the pool and glares at $him<<else>>the other bathers watch curiously<</if>>.
+			While soaking in the nursery's pool, $slaves[$i].slaveName's water breaks. As $he begins to ready $himself for birth, <<if $MatronID != 0>>_S.Matron.slaveName pulls $him out of the pool and glares at $him<<else>>the other bathers watch curiously<</if>>.
 			<<ClothingBirth>>
 			$He and <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child are quickly dried off as $he begins nursing it. A servant soon arrives to take $his child away.
 		<</if>>
 	<<else>>
 		<<if (random(1,20) > $suddenBirth)>>
-			<<if $Matron != 0>>$Matron.slaveName escorts $him to a special pool designed to give birth in. Once $he is safely in the water alongside _him2,<<else>>$He is escorted to a special pool designed to give birth in. Once $he is safely in the water alongside $his assistant,<</if>> $he begins to push out <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby,<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>> convulsing with orgasms in the process and being<</if>> aided by $his caretaker. $His child is promptly taken and, following a cleaning of $his still very gravid body, $he is taken back to the nursery.
+			<<if $MatronID != 0>>_S.Matron.slaveName escorts $him to a special pool designed to give birth in. Once $he is safely in the water alongside _him2,<<else>>$He is escorted to a special pool designed to give birth in. Once $he is safely in the water alongside $his assistant,<</if>> $he begins to push out <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby,<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>> convulsing with orgasms in the process and being<</if>> aided by $his caretaker. $His child is promptly taken and, following a cleaning of $his still very gravid body, $he is taken back to the nursery.
 		<<else>>
 			<<if !canWalk($slaves[$i])>>While changing in the changing room before a nice soak, $slaves[$i].slaveName's water breaks. $He hurries to find someone to help $him but only finds curious onlookers<<else>>While heading for the changing room before a nice soak, $slaves[$i].slaveName's water breaks. $He hurries into the changing room only to find it unusually crowded<</if>>. Without any choice left, $he assumes a birthing position.
 			<<set $humiliation = 1>>
 			<<ClothingBirth>>
-			Several of other slaves present help $him with <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child while the rest finish pleasuring themselves over the show. <<if $Matron != 0>>$Matron.slaveName, lured in by the commotion, shoos the other slaves out and helps the new mother to a private relaxation room to unwind<<else>>Soon a servant arrives to take $his child away and $he is ushered into the bath to clean up and relax<</if>>.
+			Several of other slaves present help $him with <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child while the rest finish pleasuring themselves over the show. <<if $MatronID != 0>>_S.Matron.slaveName, lured in by the commotion, shoos the other slaves out and helps the new mother to a private relaxation room to unwind<<else>>Soon a servant arrives to take $his child away and $he is ushered into the bath to clean up and relax<</if>>.
 		<</if>>
 	<</if>>
 
@@ -855,47 +855,47 @@
 	<</if>>
 
 <<case "live with your Head Girl">>
-	<<setLocalPronouns $HeadGirl 2>>
-	<<if $slaves[$i].pregSource == $HeadGirl.ID>>
+	<<setLocalPronouns _S.HeadGirl 2>>
+	<<if $slaves[$i].pregSource == $HeadGirlID>>
 		<<if (random(1,20) > $suddenBirth)>>
-			$HeadGirl.slaveName makes sure that the mother of _his2 child is happy and comfortable for the upcoming birth, even if they won't be spending much time with their offspring. _He2 carefully undresses $slaves[$i].slaveName, all the while whispering sweet nothings in $his ear. $He begins to push out <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>>, convulsing with orgasms in the process<</if>>, and $his child is carefully collected by their father. Once they are out of the way, $HeadGirl.slaveName moves in to fondle $slaves[$i].slaveName's tired, still very gravid body.
+			_S.HeadGirl.slaveName makes sure that the mother of _his2 child is happy and comfortable for the upcoming birth, even if they won't be spending much time with their offspring. _He2 carefully undresses $slaves[$i].slaveName, all the while whispering sweet nothings in $his ear. $He begins to push out <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>>, convulsing with orgasms in the process<</if>>, and $his child is carefully collected by their father. Once they are out of the way, _S.HeadGirl.slaveName moves in to fondle $slaves[$i].slaveName's tired, still very gravid body.
 		<<else>>
 		<</if>>
 	<<else>>
 		<<if !canWalk($slaves[$i])>>
 			<<if $slaves[$i].fetish == "mindbroken">>
 				<<if (random(1,20) > $suddenBirth)>>
-					$He is aided in finding $HeadGirl.slaveName, who undresses $him as $he instinctively begins to push out <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, indifferent to _his2 wandering hands. $His child is promptly taken and, following a cleaning, a fresh change of clothes, and some private time with your Head Girl, $he is taken back to $HeadGirl.slaveName' room.
+					$He is aided in finding _S.HeadGirl.slaveName, who undresses $him as $he instinctively begins to push out <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, indifferent to _his2 wandering hands. $His child is promptly taken and, following a cleaning, a fresh change of clothes, and some private time with your Head Girl, $he is taken back to _S.HeadGirl.slaveName' room.
 				<<else>>
 					$slaves[$i].slaveName is awoken from $his rest by a strong contraction. $He rolls over and begins to fall back to sleep as another contraction wracks $his body.
 					<<ClothingBirth>>
-					$He fishes around under $his still huge dome of a stomach searching for $his newborn. Once $he finds it, $he draws it to $his breast and resumes resting before $HeadGirl.slaveName returns from _his2 duties.
+					$He fishes around under $his still huge dome of a stomach searching for $his newborn. Once $he finds it, $he draws it to $his breast and resumes resting before _S.HeadGirl.slaveName returns from _his2 duties.
 				<</if>>
 			<<else>>
 				<<if (random(1,20) > $suddenBirth)>>
-					$He is aided in seeking out $HeadGirl.slaveName, who undresses $him as $he dutifully begins to push out, enjoying _his2 wandering hands and attention<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>>, while convulsing with orgasms in the process<</if>>. $His child is promptly taken and, following a cleaning, a fresh change of clothes, and some private time with your Head Girl, $he is helped back to $HeadGirl.slaveName's room.
+					$He is aided in seeking out _S.HeadGirl.slaveName, who undresses $him as $he dutifully begins to push out, enjoying _his2 wandering hands and attention<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>>, while convulsing with orgasms in the process<</if>>. $His child is promptly taken and, following a cleaning, a fresh change of clothes, and some private time with your Head Girl, $he is helped back to _S.HeadGirl.slaveName's room.
 				<<else>>
 					$slaves[$i].slaveName is awoken from $his rest by a moist sensation followed by a contraction. $He rolls over and clutches $his gravid belly as another contraction wracks $his body.
 					<<ClothingBirth>>
-					$He collects <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child and places it in the cradle readied for $him. $He is helped to the shower as your servants clean up and remove $his newborn. Freshened up, $he returns to resting knowing full well that $HeadGirl.slaveName will be eager to play with $his still very pregnant body when _he2 finishes _his2 rounds.
+					$He collects <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child and places it in the cradle readied for $him. $He is helped to the shower as your servants clean up and remove $his newborn. Freshened up, $he returns to resting knowing full well that _S.HeadGirl.slaveName will be eager to play with $his still very pregnant body when _he2 finishes _his2 rounds.
 				<</if>>
 			<</if>>
 		<<else>>
 			<<if $slaves[$i].fetish == "mindbroken">>
 				<<if (random(1,20) > $suddenBirth)>>
-					$He wanders until $he finds $HeadGirl.slaveName, who undresses $him as $he instinctively begins to push out <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, indifferent to _his2 wandering hands. $His child is promptly taken and, following a cleaning, a fresh change of clothes, and some private time with your Head Girl, $he is lead back to $HeadGirl.slaveName' room.
+					$He wanders until $he finds _S.HeadGirl.slaveName, who undresses $him as $he instinctively begins to push out <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, indifferent to _his2 wandering hands. $His child is promptly taken and, following a cleaning, a fresh change of clothes, and some private time with your Head Girl, $he is lead back to _S.HeadGirl.slaveName' room.
 				<<else>>
 					$slaves[$i].slaveName is awoken from $his rest by a strong contraction. $He rolls over and begins to fall back to sleep as another contraction wracks $his body.
 					<<ClothingBirth>>
-					$He fishes around under $his still huge dome of a stomach searching for $his newborn. Once $he finds it, $he draws it to $his breast and resumes resting before $HeadGirl.slaveName returns from _his2 duties.
+					$He fishes around under $his still huge dome of a stomach searching for $his newborn. Once $he finds it, $he draws it to $his breast and resumes resting before _S.HeadGirl.slaveName returns from _his2 duties.
 				<</if>>
 			<<else>>
 				<<if (random(1,20) > $suddenBirth)>>
-					$He seeks out $HeadGirl.slaveName, who undresses $him as $he dutifully begins to push out <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, enjoying _his2 wandering hands and attention<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>>, while convulsing with orgasms in the process<</if>>. $His child is promptly taken and, following a cleaning, a fresh change of clothes, and some private time with your Head Girl, $he returns to $HeadGirl.slaveName's room.
+					$He seeks out _S.HeadGirl.slaveName, who undresses $him as $he dutifully begins to push out <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, enjoying _his2 wandering hands and attention<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>>, while convulsing with orgasms in the process<</if>>. $His child is promptly taken and, following a cleaning, a fresh change of clothes, and some private time with your Head Girl, $he returns to _S.HeadGirl.slaveName's room.
 				<<else>>
 					$slaves[$i].slaveName is awoken from $his rest by a moist sensation followed by a contraction. $He rolls over and clutches $his gravid belly as another contraction wracks $his body.
 					<<ClothingBirth>>
-					$He collects <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child and places it in the cradle readied for $him. $He waddles off to shower as your servants clean up and remove $his newborn. Freshened up, $he returns to resting knowing full well that $HeadGirl.slaveName will be eager to play with $his still very pregnant body when _he2 finishes _his2 rounds.
+					$He collects <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child and places it in the cradle readied for $him. $He waddles off to shower as your servants clean up and remove $his newborn. Freshened up, $he returns to resting knowing full well that _S.HeadGirl.slaveName will be eager to play with $his still very pregnant body when _he2 finishes _his2 rounds.
 				<</if>>
 			<</if>>
 		<</if>>
@@ -1490,18 +1490,18 @@
 		<<if random(0,1) == 1>>
 			While giving a slave oral service, $slaves[$i].slaveName's body begins to birth another of $his brood. $He disregards this development and continues working.
 			<<ClothingBirth>>
-			The slave gets off quite strongly to the show and shoves $him out of the way, leaving $him to clean up $his mess. Instead, $he struggles to bring $his child to $his breast until <<if _S.Stewardess>>_S.Stewardess.slaveName shouts at $him to move $his useless ass<<elseif $HeadGirl != 0>>$HeadGirl.slaveName shouts at $him to move $his useless ass<<else>>shouts at $him to move $his useless ass<</if>>.
+			The slave gets off quite strongly to the show and shoves $him out of the way, leaving $him to clean up $his mess. Instead, $he struggles to bring $his child to $his breast until <<if _S.Stewardess>>_S.Stewardess.slaveName shouts at $him to move $his useless ass<<elseif $HeadGirlID != 0>>_S.HeadGirl.slaveName shouts at $him to move $his useless ass<<else>>shouts at $him to move $his useless ass<</if>>.
 		<<else>>
 			While struggling to scrub the penthouse floor, $slaves[$i].slaveName's body begins to birth another of $his brood. $He carries on trying to clean as $he drags $his belly along the floor.
 			<<ClothingBirth>>
-			Instead of carrying on $his task, $he draws $his child to $his breast until <<if _S.Stewardess>>_S.Stewardess.slaveName shouts at $him to move $his useless ass<<elseif $HeadGirl != 0>>$HeadGirl.slaveName shouts at $him to move $his useless ass<<else>>shouts at $him to move $his useless ass<</if>>.
+			Instead of carrying on $his task, $he draws $his child to $his breast until <<if _S.Stewardess>>_S.Stewardess.slaveName shouts at $him to move $his useless ass<<elseif $HeadGirlID != 0>>_S.HeadGirl.slaveName shouts at $him to move $his useless ass<<else>>shouts at $him to move $his useless ass<</if>>.
 		<</if>>
 	<<else>>
 		<<if random(0,1) == 1>>
 			While giving a slave oral service, $slaves[$i].slaveName's body begins to birth another of $his brood. $He desperately tries to pull away but they grab $his head and force $him back to their crotch.
 			<<set $humiliation = 1>>
 			<<ClothingBirth>>
-			The slave gets off quite strongly to the show and shoves $him to the ground, leaving $him struggling to get up before <<if _S.Stewardess>>_S.Stewardess.slaveName shouts at $him<<elseif $HeadGirl != 0>>$HeadGirl.slaveName shouts at $him <<else>>shouts at $him<</if>>.
+			The slave gets off quite strongly to the show and shoves $him to the ground, leaving $him struggling to get up before <<if _S.Stewardess>>_S.Stewardess.slaveName shouts at $him<<elseif $HeadGirlID != 0>>_S.HeadGirl.slaveName shouts at $him <<else>>shouts at $him<</if>>.
 		<<else>>
 			While using $his bloated belly to scrub the penthouse floor, $slaves[$i].slaveName's body begins to birth another of $his brood. Since this isn't the first time this week this happened, $he readies $himself for the coming birth.
 			<<ClothingBirth>>
@@ -1515,13 +1515,13 @@
 			<<if $masterSuiteUpgradeLuxury == 1>>
 				While awaiting your return on the big bed in the master suite, $slaves[$i].slaveName's body begins to birth another of $his brood. $He struggles to shift into a more comfortable position before giving up.
 				<<ClothingBirth>>
-				Resting in your bed, $he draws $his child to $his breast and resumes waiting for you. <<if $Concubine != 0>>Concubine.slaveName furiously orders $his child<<if $slaves[$i].pregType > 1>>ren<</if>> removed, and $him forcefully ejected from the bed so it can be cleaned before your return.<</if>>
+				Resting in your bed, $he draws $his child to $his breast and resumes waiting for you. <<if _S.Concubine>_S. furiously orders $his child<<if $slaves[$i].pregType > 1>>ren<</if>> removed, and $him forcefully ejected from the bed so it can be cleaned before your return.<</if>>
 			<<elseif $masterSuiteUpgradeLuxury == 2>>
 				While being the bottom of the master suite's fuckpit, $slaves[$i].slaveName's body begins to birth another of $his brood. While $he doesn't stop having sex, the fucktoys using $him do and attempt to drag $him from the pit to give birth. Instinctively $he begins to push out $his baby, indifferent to who may be watching $his naked crotch. The fucktoys give up their efforts to haul $his bloated form out of the pit and allow $him to settle at the bottom. Without a second thought about $his child, $he attempts to coax the other slaves back into an orgy.
 			<<else>>
 				While awaiting your return in the master suite, $slaves[$i].slaveName's body begins to birth another of $his brood. $He pays it no heed and continues blankly waiting.
 				<<ClothingBirth>>
-				Resting on $his belly, $he draws $his child to $his breast and resumes waiting for you. <<if $Concubine != 0>>Concubine.slaveName furiously orders $his child<<if $slaves[$i].pregType > 1>>ren<</if>> removed, and $him thoroughly cleaned before your return.<</if>>
+				Resting on $his belly, $he draws $his child to $his breast and resumes waiting for you. <<if _S.Concubine>>_S.Concubine.slaveName furiously orders $his child<<if $slaves[$i].pregType > 1>>ren<</if>> removed, and $him thoroughly cleaned before your return.<</if>>
 			<</if>>
 		<<else>>
 			<<if $masterSuiteUpgradeLuxury == 1>>
@@ -1544,13 +1544,13 @@
 			<<if $masterSuiteUpgradeLuxury == 1>>
 				While awaiting your return on the big bed in the master suite, $slaves[$i].slaveName's body begins to birth another of $his brood. $He shifts into a more comfortable position.
 				<<ClothingBirth>>
-				Resting in your bed, $he draws $his child to $his breast and resumes waiting for you. <<if $Concubine != 0>>Concubine.slaveName furiously orders $his child<<if $slaves[$i].pregType > 1>>ren<</if>> removed, and $him forcefully ejected from the bed so it can be cleaned before your return.<</if>>
+				Resting in your bed, $he draws $his child to $his breast and resumes waiting for you. <<if _S.Concubine>>_S.Concubine.slaveName furiously orders $his child<<if $slaves[$i].pregType > 1>>ren<</if>> removed, and $him forcefully ejected from the bed so it can be cleaned before your return.<</if>>
 			<<elseif $masterSuiteUpgradeLuxury == 2>>
 				While being the bottom of the master suite's fuckpit, $slaves[$i].slaveName's body begins to birth another of $his brood. While $he doesn't stop having sex, the fucktoys using $him do and attempt to drag $him from the pit to give birth. Instinctively $he begins to push out $his baby, indifferent to who may be watching $his naked crotch. The fucktoys give up their efforts to haul $his bloated form out of the pit and allow $him to settle a the bottom. Without a second thought about $his child, $he attempts to coax the other slaves back into an orgy.
 			<<else>>
 				While awaiting your return in the master suite, $slaves[$i].slaveName's body begins to birth another of $his brood. $He pays it no heed and continues blankly waiting.
 				<<ClothingBirth>>
-				Resting on $his belly, $he draws $his child to $his breast and resumes waiting for you. <<if $Concubine != 0>>Concubine.slaveName furiously orders $his child<<if $slaves[$i].pregType > 1>>ren<</if>> removed, and $him thoroughly cleaned before your return.<</if>>
+				Resting on $his belly, $he draws $his child to $his breast and resumes waiting for you. <<if _S.Concubine>>_S.Concubine.slaveName furiously orders $his child<<if $slaves[$i].pregType > 1>>ren<</if>> removed, and $him thoroughly cleaned before your return.<</if>>
 			<</if>>
 		<<else>>
 			<<if $masterSuiteUpgradeLuxury == 1>>
@@ -1752,26 +1752,26 @@
 	<</if>>
 
 <<case "live with your Head Girl">>
-	<<setLocalPronouns $HeadGirl 2>>
+	<<setLocalPronouns _S.HeadGirl 2>>
 	<<if !canWalk($slaves[$i])>>
 		<<if $slaves[$i].fetish == "mindbroken">>
 			$slaves[$i].slaveName is awoken from $his rest by a strong contraction. $He attempts to roll over, and failing that, begins to fall back to sleep as another contraction wracks $his body. $His body begins to birth another of $his brood.
 			<<ClothingBirth>>
-			$He draws $his child to $his breast and resumes resting before $HeadGirl.slaveName returns from _his2 duties.
+			$He draws $his child to $his breast and resumes resting before _S.HeadGirl.slaveName returns from _his2 duties.
 		<<else>>
 			$slaves[$i].slaveName's body begins to birth another of $his brood. $He attempts to roll over, and failing that, claws at $his massive belly as another contraction wracks $his body.
 			<<ClothingBirth>>
-			$He struggles to collect $his child and brings them to $his breast. $He waits for $HeadGirl.slaveName to return, hoping _he2 will arrive before another baby makes its way out of $him.
+			$He struggles to collect $his child and brings them to $his breast. $He waits for _S.HeadGirl.slaveName to return, hoping _he2 will arrive before another baby makes its way out of $him.
 		<</if>>
 	<<else>>
 		<<if $slaves[$i].fetish == "mindbroken">>
 			$slaves[$i].slaveName is awoken from $his rest by a strong contraction. $He rolls over and begins to fall back to sleep as another contraction wracks $his body. $His body begins to birth another of $his brood.
 			<<ClothingBirth>>
-			$He draws $his child to $his breast and resumes resting before $HeadGirl.slaveName returns from _his2 duties.
+			$He draws $his child to $his breast and resumes resting before _S.HeadGirl.slaveName returns from _his2 duties.
 		<<else>>
 			$slaves[$i].slaveName's body begins to birth another of $his brood. $He rolls over and claws at $his massive belly as another contraction wracks $his body.
 			<<ClothingBirth>>
-			$He struggles to collect $his child and places them in the cradle readied for $him. $He waddles off to take a bath as your servants clean up and remove $his child. Cleaned up, $he returns to resting knowing full well that $HeadGirl.slaveName will be eager to play with $his body upon returning.
+			$He struggles to collect $his child and places them in the cradle readied for $him. $He waddles off to take a bath as your servants clean up and remove $his child. Cleaned up, $he returns to resting knowing full well that _S.HeadGirl.slaveName will be eager to play with $his body upon returning.
 		<</if>>
 	<</if>>
 
diff --git a/src/societies/aztec/slaveSacrifice.tw b/src/societies/aztec/slaveSacrifice.tw
index 3b848493e18a323165e1992f4ad5824e76aaa5a4..6622dd3335baa2579d3977aad6c8eebd522c5b54 100644
--- a/src/societies/aztec/slaveSacrifice.tw
+++ b/src/societies/aztec/slaveSacrifice.tw
@@ -76,11 +76,11 @@
 		<</if>>
 	<<else>>
 		<<if canWalk($activeSlave)>>
-			$He manages to run halfway to your desk before $he's <<if $Bodyguard != 0>>clotheslined by $Bodyguard.slaveName<<elseif $HeadGirl != 0>> restrained by $HeadGirl.slaveName<<else>>restrained by another, more obedient slave<</if>>. $He kicks and struggles as $he's removed from your office. By the end of the week, it won't matter; $he'll be so hungry and horny that resistance will be the last thing on $his mind.
+			$He manages to run halfway to your desk before $he's <<if _S.Bodyguard>>clotheslined by _S.Bodyguard.slaveName<<elseif $HeadGirlID != 0>> restrained by _S.HeadGirl.slaveName<<else>>restrained by another, more obedient slave<</if>>. $He kicks and struggles as $he's removed from your office. By the end of the week, it won't matter; $he'll be so hungry and horny that resistance will be the last thing on $his mind.
 		<<elseif !canTalk($activeSlave)>>
-			A long line of slurs and names are screamed at you, none of them particularly pleasant. Your <<if $HeadGirl != 0>>Head Girl $HeadGirl.slaveName <<else>>another, more obedient slave<</if>> removes $him as $he continues $his rant, spitting and resisting as much as $he can without limbs. By the end of the week, it won't matter; $he'll be so hungry and horny that resistance will be the last thing on $his mind.
+			A long line of slurs and names are screamed at you, none of them particularly pleasant. Your <<if $HeadGirlID != 0>>Head Girl _S.HeadGirl.slaveName <<else>>another, more obedient slave<</if>> removes $him as $he continues $his rant, spitting and resisting as much as $he can without limbs. By the end of the week, it won't matter; $he'll be so hungry and horny that resistance will be the last thing on $his mind.
 		<<else>>
-			$He proceeds to drop into a massive tantrum for the lack of better ways to express $himself. <<if $HeadGirl != 0>>$HeadGirl.slaveName<<else>>Another, more obedient slave<</if>> removes $him as $he continues struggling, spitting and resisting as much as $he can. By the end of the week, it won't matter; $he'll be so hungry and horny that resistance will be the last thing on $his mind.
+			$He proceeds to drop into a massive tantrum for the lack of better ways to express $himself. <<if $HeadGirlID != 0>>_S.HeadGirl.slaveName<<else>>Another, more obedient slave<</if>> removes $him as $he continues struggling, spitting and resisting as much as $he can. By the end of the week, it won't matter; $he'll be so hungry and horny that resistance will be the last thing on $his mind.
 		<</if>>
 	<</if>>
 
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index 6c3762e4ba3e20be09c6d6b62e3c4f9f7a322d19..13aed8a89a93a9205821a774d507eb82f54106ce 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -44,18 +44,18 @@
 /* special leadership events can be rolled on any eventSlave */
 <<switch $PESSevent>>
 	<<case "madam strategy">>
-		<<set $activeSlave = getSlave($Madam.ID)>>
+		<<set $activeSlave = _S.Madam>>
 	<<case "DJ publicity">>
-		<<set $activeSlave = getSlave($djID)>>
+		<<set $activeSlave = _S.DJ>>
 	<<case "tired milkmaid" "tired collectrix">>
-		<<set $activeSlave = getSlave($Milkmaid.ID)>>
+		<<set $activeSlave = _S.Milkmaid>>
 	<<case "loving concubine">>
-		<<set $activeSlave = getSlave($Concubine.ID)>>
+		<<set $activeSlave = _S.Concubine>>
 	<<case "bodyguard bedtime" "bodyguard beatdown">>
-		<<set $activeSlave = getSlave($Bodyguard.ID)>>
+		<<set $activeSlave = _S.Bodyguard>>
 	<<case "loving headgirl" "headgirl dickgirl" "worried headgirl" "worshipful impregnatrix">>
-		<<set $activeSlave = getSlave($HeadGirl.ID)>>
-		<<set $j = $slaves.findIndex(function(s) { return s.ID != $HeadGirl.ID && s.devotion <= 20; })>>
+		<<set $activeSlave = _S.HeadGirl>>
+		<<set $j = $slaves.findIndex(function(s) { return s.ID != $HeadGirlID && s.devotion <= 20; })>>
 <</switch>>
 
 <<set _clothesTemp = $activeSlave.clothes>>
@@ -395,7 +395,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 <<if ($activeSlave.anus > 0)>>
 	<br><<link "It can wait until after some rough sex with the Concubine">>
 		<<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 <<if hasAnyLegs($Concubine)>>pulls $his knee<<if hasBothLegs($Concubine)>>s<</if>> under $himself and <</if>><<if hasAnyArms($Concubine)>>reaches back to pull<<else>>presents<</if>> $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;
+		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 <<if hasAnyLegs(_S.Concubine)>>pulls $his knee<<if hasBothLegs(_S.Concubine)>>s<</if>> under $himself and <</if>><<if hasAnyArms(_S.Concubine)>>reaches back to pull<<else>>presents<</if>> $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)>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 10e19f5afddcd26d16e242004e15cf1f133c94c5..2238562ec72028bd3736a1efc1885272d32c08ec 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -235,12 +235,12 @@ Finishing your work, you lean back for a well-deserved break. Your peace is quic
 		as $he runs $his hand<<if hasBothArms($activeSlave)>>s<</if>> over your body
 	<</if>>
 	in a desperate attempt at taking control.
-	<<if $HeadGirl != 0>>
-		<<setLocalPronouns $HeadGirl 2>>
-		<<setSpokenLocalPronouns $activeSlave $HeadGirl>>
-		<<run Enunciate($HeadGirl)>>
-		You jump in surprise as $HeadGirl.slaveName tackles $him off you and to the floor
-		<<if $HeadGirl.skill.combat > 0>>
+	<<if $HeadGirlID != 0>>
+		<<setLocalPronouns _S.HeadGirl 2>>
+		<<setSpokenLocalPronouns $activeSlave _S.HeadGirl>>
+		<<run Enunciate(_S.HeadGirl)>>
+		You jump in surprise as _S.HeadGirl.slaveName tackles $him off you and to the floor
+		<<if _S.HeadGirl.skill.combat > 0>>
 			where _he2 twists $his arm in an arm hold until the rebellious slave stops struggling.
 		<<else>>
 			where _he2 settles _his2 weight on the struggling rebel, lacking any better idea of what to do.
@@ -603,7 +603,7 @@ down to meet you. $He's nude, having stripped in your office, and meets your gaz
 
 <<case "permitted masturbation">>
 
-Strolling through the penthouse late at night, thinking over a business problem, you pass <<if ($activeSlave.ID == $HeadGirl.ID) && ($HGSuite > 0)>>the door of your Head Girl's suite<<elseif ($activeSlave.rules.living == "luxurious")>>the door to one of the cozy little slave bedrooms<<else>>through the cavernous slave dormitory<</if>> and see <<= App.UI.slaveDescriptionDialog($activeSlave)>>, alone in bed tonight. $He's nude, of course, and has not pulled the sheets up over $himself. $He's lying face-down,
+Strolling through the penthouse late at night, thinking over a business problem, you pass <<if ($activeSlave.ID == $HeadGirlID) && ($HGSuite > 0)>>the door of your Head Girl's suite<<elseif ($activeSlave.rules.living == "luxurious")>>the door to one of the cozy little slave bedrooms<<else>>through the cavernous slave dormitory<</if>> and see <<= App.UI.slaveDescriptionDialog($activeSlave)>>, alone in bed tonight. $He's nude, of course, and has not pulled the sheets up over $himself. $He's lying face-down,
 <<if ($activeSlave.boobs > 10000)>>
 	though $his titanic tits prop $his torso up awkwardly,
 <<elseif ($activeSlave.boobs > 1600)>>
@@ -755,7 +755,7 @@ One night, you see <<= App.UI.slaveDescriptionDialog($activeSlave)>> <<if (!hasA
 
 <<case "shift doorframe">>
 
-Your fucktoys have to eat, sleep, and look after themselves, just like anyone, so they can't spend every moment offering themselves to you. <<if $Concubine != 0>>Your concubine, $Concubine.slaveName<<elseif $HeadGirl != 0>>Your Head Girl, $HeadGirl.slaveName<<elseif $assistant.name == "your personal assistant">>Your personal assistant<<else>>Your personal assistant, <<= capFirstChar($assistant.name)>><</if>> manages a schedule for them, constantly changing it up to keep the sluts from getting predictable. <<= App.UI.slaveDescriptionDialog($activeSlave)>> has just come on shift.
+Your fucktoys have to eat, sleep, and look after themselves, just like anyone, so they can't spend every moment offering themselves to you. <<if _S.Concubine>>Your concubine, _S.Concubine.slaveName<<elseif $HeadGirlID != 0>>Your Head Girl, _S.HeadGirl.slaveName<<elseif $assistant.name == "your personal assistant">>Your personal assistant<<else>>Your personal assistant, <<= capFirstChar($assistant.name)>><</if>> manages a schedule for them, constantly changing it up to keep the sluts from getting predictable. <<= App.UI.slaveDescriptionDialog($activeSlave)>> has just come on shift.
 <br><br>
 You're at your desk as $he arrives; $his predecessor passes $him on the way out. $activeSlave.slaveName pauses for a moment in the doorway, and then decides to give you a show. $He spreads $his legs until $his
 <<if $activeSlave.shoes == "heels">>
@@ -1258,7 +1258,7 @@ naked ass catching your eye as $he goes.
 
 <<case "shift masturbation">>
 
-Your fucktoys have to eat, sleep, and look after themselves, just like anyone, so they can't spend every moment offering themselves to you. <<if $Concubine != 0>>Your concubine, $Concubine.slaveName<<elseif $HeadGirl != 0>>Your Head Girl, $HeadGirl.slaveName<<elseif $assistant.name == "your personal assistant">>Your personal assistant<<else>>Your personal assistant, <<= capFirstChar($assistant.name)>><</if>> manages a schedule for them, constantly changing it up to keep the sluts from getting predictable. <<= App.UI.slaveDescriptionDialog($activeSlave)>> has just come on shift.
+Your fucktoys have to eat, sleep, and look after themselves, just like anyone, so they can't spend every moment offering themselves to you. <<if _S.Concubine>>Your concubine, _S.Concubine.slaveName<<elseif $HeadGirlID != 0>>Your Head Girl, _S.HeadGirl.slaveName<<elseif $assistant.name == "your personal assistant">>Your personal assistant<<else>>Your personal assistant, <<= capFirstChar($assistant.name)>><</if>> manages a schedule for them, constantly changing it up to keep the sluts from getting predictable. <<= App.UI.slaveDescriptionDialog($activeSlave)>> has just come on shift.
 <br><br>
 And has $he ever come on shift. $He enters your office at something not far removed from a run, displaying evident signs of sexual excitation, a blush visible on $his $activeSlave.skin cheeks. Between $his job, the mild drugs in $his food, and $his life, $he's beside $himself with need. $He realizes you're working and tries to compose $himself, but gives up after a short struggle and flings $himself down on the couch. $He scoots down so $his <<if $activeSlave.butt > 5>>enormous<<elseif $activeSlave.butt > 2>>healthy<<else>>trim<</if>> butt is hanging off the edge of the cushion, and spreads $his legs up and back<<if $activeSlave.belly >= 5000>> to either side of $his _belly <<if $activeSlave.bellyPreg >= 3000>>pregnant <</if>>belly<</if>> as wide as they'll go<<if ($activeSlave.boobs > 1000)>>, hurriedly shoving $his tits out of the way<</if>>. $He uses both hands to frantically
 <<if ($activeSlave.dick > 0) && !canAchieveErection($activeSlave)>>
@@ -1290,9 +1290,9 @@ but after a moment $he clearly decides this isn't enough stimulation. $He <<if $
 
 <<case "shift sleep">>
 
-Your fucktoys have to eat, sleep, and look after themselves, just like anyone, so they can't spend every moment offering themselves to you. <<if $Concubine != 0>>Your concubine, $Concubine.slaveName<<elseif $HeadGirl != 0>>Your Head Girl, $HeadGirl.slaveName<<elseif $assistant.name == "your personal assistant">>Your personal assistant<<else>>Your personal assistant, <<= capFirstChar($assistant.name)>><</if>> manages a schedule for them, constantly changing it up to keep the sluts from getting predictable. <<= App.UI.slaveDescriptionDialog($activeSlave)>> has just come on shift.
+Your fucktoys have to eat, sleep, and look after themselves, just like anyone, so they can't spend every moment offering themselves to you. <<if _S.Concubine>>Your concubine, _S.Concubine.slaveName<<elseif $HeadGirlID != 0>>Your Head Girl, _S.HeadGirl.slaveName<<elseif $assistant.name == "your personal assistant">>Your personal assistant<<else>>Your personal assistant, <<= capFirstChar($assistant.name)>><</if>> manages a schedule for them, constantly changing it up to keep the sluts from getting predictable. <<= App.UI.slaveDescriptionDialog($activeSlave)>> has just come on shift.
 <br><br>
-Though it's late, $he's surprised to find the lights in the master suite off. You had an unusually trying day, so you've retired for the night; you're on the point of sleep when $he comes in<<if $Concubine != 0>>, $Concubine.slaveName nestled under your arm<</if>>. After a moment's hesitation, $activeSlave.slaveName strips quietly and
+Though it's late, $he's surprised to find the lights in the master suite off. You had an unusually trying day, so you've retired for the night; you're on the point of sleep when $he comes in<<if _S.Concubine>>, _S.Concubine.slaveName nestled under your arm<</if>>. After a moment's hesitation, $activeSlave.slaveName strips quietly and
 <<if $activeSlave.belly >= 100000>>
 	gently lowers $his extremely gravid body onto
 <<elseif $activeSlave.belly >= 10000>>
@@ -3036,7 +3036,7 @@ in time with $his humming, $he runs $his hand<<if hasBothArms($activeSlave)>>s<<
 <<case "plimb help">>
 
 First thing in the morning,
-<<if $activeSlave.ID == $Bodyguard.ID>>
+<<if $activeSlave.ID == $BodyguardID>>
 	before you've even gotten out of bed, you hear <<= App.UI.slaveDescriptionDialog($activeSlave)>>'s voice coming up from where $he sleeps, on $his own bedroll in your suite. There's a distinctly plaintive note in $his voice, and as soon as you sit up and look in $his direction, it's obvious why. $He sleeps out of $his P-Limbs, since it's good to rest the anchor points implanted into $his torso. They're held in actuators over $his bedroll, which can swing down and attach them to $him the instant $he's awake. Except today, they're staying obstinately up near the ceiling. <<if $assistant.personality != 0>>$assistant.name tells you _heA's<<else>>Your personal assistant informs you _heA's<</if>> troubleshooting the problem, but in the meantime, poor
 <<else>>
 	$assistant.name informs you that there's a minor problem with <<= App.UI.slaveDescriptionDialog($activeSlave)>>, and asks whether you'd like it to be handled without you. $He sleeps out of $his P-Limbs, since it's good to rest the anchor points implanted into $his torso. When $he wakes up, $he usually asks whichever slave is nearest to attach $his dominant arm, at which point $he can do the rest $himself. Due to an unexpected change in the slaves' schedules, though, $he's all alone today. Poor
@@ -3934,7 +3934,7 @@ You are alerted to an issue regarding your
 the poor $girl has gotten lodged in the doorway exiting
 <<if ($activeSlave.rules.living == "luxurious")>>
 	$his room.
-<<elseif ($activeSlave.ID == $HeadGirl.ID) && ($HGSuite == 1)>>
+<<elseif ($activeSlave.ID == $HeadGirlID) && ($HGSuite == 1)>>
 	$his suite.
 <<else>>
 	the dormitory where $he sleeps.
@@ -3958,7 +3958,7 @@ You make a mental note to punish $his caretakers and then set out to see $his pr
 The sight that greets you when you arrive is equal parts incredible and amusing. En route to the baths, the slave attempted to exit
 <<if ($activeSlave.rules.living == "luxurious")>>
 	$his room
-<<elseif ($activeSlave.ID == $HeadGirl.ID) && ($HGSuite == 1)>>
+<<elseif ($activeSlave.ID == $HeadGirlID) && ($HGSuite == 1)>>
 	$his suite
 <<else>>
 	the dorm
@@ -4830,15 +4830,15 @@ brought in to you. This time <<= App.UI.slaveDescriptionDialog($activeSlave)>> h
 <</link>>
 <br><<link "Call out for help">>
 	<<replace "#result">>
-		$He is far stronger than you expected and has you trapped in a compromising position; you shout out for <<if $Bodyguard != 0>>$Bodyguard.slaveName<<elseif $Concubine != 0 && canWalk($Concubine)>>$Concubine.slaveName<<else>>somebody<</if>> to help you. You've seen $activeSlave.slaveName fuck before; $he's a quick shot, only in it to get $his mate pregnant. You question if anyone is coming as $his gigantic dick pokes at your crotch, eager to find the egg at the end of the tunnel. $He lacks even the basic understanding of foreplay, you realize, as $he drives $his cock deep into your pussy. You groan with pain at the sheer size of the rod stretching out your poor hole and struggle to hold back the tears once $he starts thrusting. There is no pleasure for you here as $he batters your cervix; you barely stop yourself from screaming out as $he slams through your final defense
-		<<if $Bodyguard != 0>>
-			<<setLocalPronouns $Bodyguard 2>>
-			and gets tackled off of you by $Bodyguard.slaveName. After a quick tussle, the amorous cow is restrained and leaking cum on your floor. You sigh to yourself, knowing you have nobody to blame but yourself for this. $He's a breeding bull and you a fertile _womanP. $He only did what $he was conditioned for; the fault is on you for ignoring the warning signs and not taking the proper precautions. $Bodyguard.slaveName is visibly disturbed by an assault on you happening within _his2 defensive perimeter and @@.hotpink;vows@@ to not allow it to happen again.
-			<<set $slaves[$slaveIndices[$Bodyguard.ID]].devotion += 2>>
-		<<elseif $Concubine != 0 && canWalk($Concubine)>>
-			and gets tackled off of you by $Concubine.slaveName. After a violent struggle, the amorous cow is restrained and leaking cum on your floor. You sigh to yourself, knowing you have nobody to blame but yourself for this. $He's a breeding bull and you a fertile _womanP. $He only did what $he was conditioned for; the fault is on you for ignoring the warning signs and not taking the proper precautions. $Concubine.slaveName is @@.gold;visibly shaken@@ by the assault and was @@.red;badly beaten@@ by the muscular slave during the fight.
-			<<set $slaves[$slaveIndices[$Concubine.ID]].trust -= 5>>
-			<<run healthDamage($slaves[$slaveIndices[$Concubine.ID]], 40)>>
+		$He is far stronger than you expected and has you trapped in a compromising position; you shout out for <<if _S.Bodyguard>>_S.Bodyguard.slaveName<<elseif _S.Concubine && canWalk(_S.Concubine)>>_S.Concubine.slaveName<<else>>somebody<</if>> to help you. You've seen $activeSlave.slaveName fuck before; $he's a quick shot, only in it to get $his mate pregnant. You question if anyone is coming as $his gigantic dick pokes at your crotch, eager to find the egg at the end of the tunnel. $He lacks even the basic understanding of foreplay, you realize, as $he drives $his cock deep into your pussy. You groan with pain at the sheer size of the rod stretching out your poor hole and struggle to hold back the tears once $he starts thrusting. There is no pleasure for you here as $he batters your cervix; you barely stop yourself from screaming out as $he slams through your final defense
+		<<if _S.Bodyguard>>
+			<<setLocalPronouns _S.Bodyguard 2>>
+			and gets tackled off of you by _S.Bodyguard.slaveName. After a quick tussle, the amorous cow is restrained and leaking cum on your floor. You sigh to yourself, knowing you have nobody to blame but yourself for this. $He's a breeding bull and you a fertile _womanP. $He only did what $he was conditioned for; the fault is on you for ignoring the warning signs and not taking the proper precautions. _S.Bodyguard.slaveName is visibly disturbed by an assault on you happening within _his2 defensive perimeter and @@.hotpink;vows@@ to not allow it to happen again.
+			<<set _S.Bodyguard.devotion += 2>>
+		<<elseif _S.Concubine && canWalk(_S.Concubine)>>
+			and gets tackled off of you by _S.Concubine.slaveName. After a violent struggle, the amorous cow is restrained and leaking cum on your floor. You sigh to yourself, knowing you have nobody to blame but yourself for this. $He's a breeding bull and you a fertile _womanP. $He only did what $he was conditioned for; the fault is on you for ignoring the warning signs and not taking the proper precautions. _S.Concubine.slaveName is @@.gold;visibly shaken@@ by the assault and was @@.red;badly beaten@@ by the muscular slave during the fight.
+			<<set _S.Concubine.trust -= 5>>
+			<<run healthDamage(_S.Concubine, 40)>>
 		<<else>>
 			and cums directly into your exposed womb. $He backs off, possibly startled by the shouting, giving you the chance to slip away to safety. You sigh to yourself, knowing you have nobody to blame but yourself for this. $He's a breeding bull and you a fertile _womanP. $He only did what $he was conditioned for; the fault is on you for ignoring the warning signs and not taking the proper precautions. Still, $he knew you were fertile and went right for the prize; it would be wise to assume $he's done $his job well.
 			<<= knockMeUp($PC, 50, 0, $activeSlave.ID)>>
@@ -4851,21 +4851,21 @@ brought in to you. This time <<= App.UI.slaveDescriptionDialog($activeSlave)>> h
 		$He is far stronger than you expected and has you trapped in a compromising position. You've seen $activeSlave.slaveName fuck before; $he's a quick shot, only in it to get $his mate pregnant. You question what you are thinking as $his gigantic dick pokes at your crotch, eager to find the egg at the end of the tunnel. $He lacks even the basic understanding of foreplay, you realize, as $he drives $his cock deep into your pussy. You groan with pain at the sheer size of the rod stretching out your poor hole and struggle to hold back the tears once $he starts thrusting. There is no pleasure for you here as $he batters your cervix; you barely stop yourself from screaming out as $he slams through your final defense and cums directly into your exposed womb.
 		<br><br>
 		You immediately realize you've made a mistake; you feel full already and $he's still cumming. You watch in horror as your belly steadily swells with seed, unable to flow out thanks to your obstructed cunt. $activeSlave.slaveName grunts as $he pushes out the last of $his load before pulling out and releasing you. You try to get up, but the experience has left you drained, so you are left hoping that $his instincts tell $him $he's done $his job. $He lowers $his <<if canSmell($activeSlave)>>nose to your violated pussy and sniffs<<else>>face to your violated pussy to feel the heat emanating from it<</if>>; unsatisfied, $he moves back into position to properly seed you this time. You black out as $his second load joins the first, only to awaken sometime later
-		<<if $Concubine != 0>>
-			<<setLocalPronouns $Concubine 2>>
-			with $Concubine.slaveName trying _his2 best to drain your swollen belly.
-			<<if canTalk($Concubine)>>
-				<<run Enunciate($Concubine)>>
+		<<if _S.Concubine>>
+			<<setLocalPronouns _S.Concubine 2>>
+			with _S.Concubine.slaveName trying _his2 best to drain your swollen belly.
+			<<if canTalk(_S.Concubine)>>
+				<<run Enunciate(_S.Concubine)>>
 				"I'm <<s>>o <<s>>orry <<Master>>... I <<s>>tepped out for a minute and thi<<s>> happen<<s>>." You ask what happened to $activeSlave.slaveName. "$He'<<s>> bound and gagged now, $he won't hurt you anymore. But what are you going to do with that belly? I won't tell anyone what happened, but we've got to get rid of it."
 			<<else>>
 				_He2 gestures _his2 apologies and points to the bound and gagged $activeSlave.slaveName, before expressing _his2 concerns about your visible state.
 			<</if>>
 			You do your best to calm _him2 down; this is your fault after all. $activeSlave.slaveName's a breeding bull and you a fertile _womanP. $He only did what $he was conditioned for; the blame is on you for ignoring the warning signs and not taking the proper precautions. Still, there is no doubt in your mind that @@.lime;you're pregnant@@ with $his child. As for the belly, it'll go down soon, you're sure.
-		<<elseif $Bodyguard != 0>>
-			<<setLocalPronouns $Bodyguard 2>>
-			with $Bodyguard.slaveName sobbing over your swollen belly.
-			<<if canTalk($Bodyguard)>>
-				<<run Enunciate($Bodyguard)>>
+		<<elseif _S.Bodyguard>>
+			<<setLocalPronouns _S.Bodyguard 2>>
+			with _S.Bodyguard.slaveName sobbing over your swollen belly.
+			<<if canTalk(_S.Bodyguard)>>
+				<<run Enunciate(_S.Bodyguard)>>
 				"I'm <<s>>o <<s>>orry <<Master>>... I <<s>>tepped out for a minute and thi<<s>> happen<<s>>." You ask what happened to $activeSlave.slaveName. "$He'<<s>> bound and gagged now, $he won't hurt you again." _He2 sniffles, "But plea<<s>>e puni<<sh>> me too. Thi<<s>> i<<s>> all my fault."
 			<<else>>
 				_He2 gestures _his2 apologies and points to the bound and gagged $activeSlave.slaveName, before begging you to punish _him2 too for _his2 failures as your guardian.
@@ -5349,9 +5349,9 @@ brought in to you. This time <<= App.UI.slaveDescriptionDialog($activeSlave)>> h
 <br><<link "Bring your good slaves out for a day at the beach">>
 	<<replace "#result">>
 		You direct $assistant.name to bring your slaves who deserve it out for a day at the beach. There might be little sand out on the balcony, but there's plenty of warm sun. And beaches are overrated these days anyway, with the ocean becoming so unpredictable. <<= capFirstChar($assistant.name)>> advises them to get naked, and bring towels and sun lotion appropriate for their individual skin types, so they know they're going to get some sunshine, but they're surprised when they get outside. They're obviously expecting an orgy of some kind, but all they see is you and $activeSlave.slaveName luxuriating on the decking. As they arrive, they take the cue and line up with you one by one. After a long sunbathing session, you send a couple of them inside to bring out cool drinks, a beach ball, and other essentials. The hornier slaves are doubtful for a while, but eventually they all relax and @@.mediumaquamarine;gain confidence@@ from the simple, nonsexual pleasure of a little time in the sun.
-		<<if ($activeSlave.ID != $HeadGirl.ID) && ($HeadGirl != 0)>>
-			<<setLocalPronouns $HeadGirl 2>>
-			Your Head Girl $HeadGirl.slaveName quietly compliments the idea, and asks you how it came to you. You let _him2 know it was $activeSlave.slaveName's idea,
+		<<if ($activeSlave.ID != $HeadGirlID) && ($HeadGirlID != 0)>>
+			<<setLocalPronouns _S.HeadGirl 2>>
+			Your Head Girl _S.HeadGirl.slaveName quietly compliments the idea, and asks you how it came to you. You let _him2 know it was $activeSlave.slaveName's idea,
 		<<else>>
 			Another slave thanks you profusely, and politely asks you what gave you such a wonderful idea. You let them know it was $activeSlave.slaveName,
 		<</if>>
@@ -7577,43 +7577,42 @@ brought in to you. This time <<= App.UI.slaveDescriptionDialog($activeSlave)>> h
 		<<set $activeSlave.trust += 4>>
 	<</replace>>
 <</link>>
-<<if ($HeadGirl != 0) && ($HeadGirl.ID != $activeSlave.ID)>>
+<<if $HeadGirlID != $activeSlave.ID>>
 	<br><<link "Call your Head Girl in for double anal">>
-		<<setLocalPronouns $HeadGirl 2>>
+		<<setLocalPronouns _S.HeadGirl 2>>
 		<<replace "#result">>
-			When $HeadGirl.slaveName comes into your office in response to your summons, _he2 finds $activeSlave.slaveName sitting in your lap with your <<if $PC.dick == 0>>strap-on<<else>>dick<</if>> up $his gaping butt<<if $PC.vagina != -1>><<if $PC.dick != 0>>, your bare pussy very visible at the base of your working cock<</if>><</if>>. $HeadGirl.slaveName's expression softens when _he2 realizes _he2's here for pleasure, not business. $activeSlave.slaveName gasps a little when $he <<if canHear($activeSlave)>>hears you tell $HeadGirl.slaveName to join you up $his asshole,<<else>>feels you pull apart $his asscheeks to make some room for $HeadGirl.slaveName,<</if>> but $he doesn't protest.
+			When _S.HeadGirl.slaveName comes into your office in response to your summons, _he2 finds $activeSlave.slaveName sitting in your lap with your <<if $PC.dick == 0>>strap-on<<else>>dick<</if>> up $his gaping butt<<if $PC.vagina != -1>><<if $PC.dick != 0>>, your bare pussy very visible at the base of your working cock<</if>><</if>>. _S.HeadGirl.slaveName's expression softens when _he2 realizes _he2's here for pleasure, not business. $activeSlave.slaveName gasps a little when $he <<if canHear($activeSlave)>>hears you tell _S.HeadGirl.slaveName to join you up $his asshole,<<else>>feels you pull apart $his asscheeks to make some room for _S.HeadGirl.slaveName,<</if>> but $he doesn't protest.
 			<<if ($activeSlave.chastityPenis == 1)>>
 				Since your poor Head Girl can't use _his2 caged cock, _he2 takes a dildo and shoves it up $activeSlave.slaveName's already-filled butt without further ado.
-			<<elseif canAchieveErection() && $HeadGirl.dick > 7>>
+			<<elseif canAchieveErection() && _S.HeadGirl.dick > 7>>
 				Even though your Head Girl is rock-hard and ready to fuck, _his2 cock is far too large to fit into even the most stretched slave's holes. Sighing, _he2 takes a dildo and shoves it up $activeSlave.slaveName's already-filled butt instead.
-			<<elseif canAchieveErection() && $HeadGirl.dick > 6>>
+			<<elseif canAchieveErection() && _S.HeadGirl.dick > 6>>
 				Your lusty Head Girl is already hard and forces _his2 oversized cock up $activeSlave.slaveName's already-filled butt while <<if $activeSlave.nipples != "fuckable">>tweaking<<else>>fingering<</if>> the moaning slave's nipples.
-			<<elseif ($HeadGirl.dick > 0) && ($HeadGirl.hormoneBalance >= 100)>>
+			<<elseif (_S.HeadGirl.dick > 0) && (_S.HeadGirl.hormoneBalance >= 100)>>
 				Since your poor Head Girl can't get hard due to _his2 hormone therapy, _he2 dons a strap-on over _his2 flaccid penis and shoves it up $activeSlave.slaveName's already-filled butt without further ado.
-			<<elseif ($HeadGirl.dick > 0) && ($HeadGirl.balls > 0) && ($HeadGirl.ballType == "sterile")>>
+			<<elseif (_S.HeadGirl.dick > 0) && (_S.HeadGirl.balls > 0) && (_S.HeadGirl.ballType == "sterile")>>
 				Since your poor Head Girl can't get hard due to _his2 chemical castration, _he2 dons a strap-on over _his2 flaccid penis and shoves it up $activeSlave.slaveName's already-filled butt without further ado
-			<<elseif ($HeadGirl.dick > 0) && ($HeadGirl.balls == 0)>>
+			<<elseif (_S.HeadGirl.dick > 0) && (_S.HeadGirl.balls == 0)>>
 				Since your poor Head Girl can't get hard due to _his2 orchiectomy, _he2 dons a strap-on over _his2 flaccid penis and shoves it up $activeSlave.slaveName's already-filled butt without further ado.
-			<<elseif !canAchieveErection($HeadGirl) && $HeadGirl.dick > 6>>
+			<<elseif !canAchieveErection(_S.HeadGirl) && _S.HeadGirl.dick > 6>>
 				Since your poor Head Girl is far too big to get hard, much to $activeSlave.slaveName's disappointment, _he2 dons a strap-on over _his2 flaccid penis and shoves it up $activeSlave.slaveName's already-filled butt without further ado.
-			<<elseif !canAchieveErection($HeadGirl) && $HeadGirl.dick > 0>>
+			<<elseif !canAchieveErection(_S.HeadGirl) && _S.HeadGirl.dick > 0>>
 				Since your poor Head Girl can't get it up for one reason or another, _he2 dons a strap-on over _his2 flaccid penis and shoves it up $activeSlave.slaveName's already-filled butt without further ado.
-			<<elseif $HeadGirl.dick > 0>>
+			<<elseif _S.HeadGirl.dick > 0>>
 				Your lusty Head Girl is already hard and shoves _himself2 up $activeSlave.slaveName's already-filled butt while <<if $activeSlave.nipples != "fuckable">>tweaking<<else>>fingering<</if>> the writhing slave's nipples.
 			<<else>>
 				_He2 dons a strap-on and shoves it up $activeSlave.slaveName's already-filled butt without further ado.
 			<</if>>
-			The two of you jackhammer in and out of $activeSlave.slaveName's ass without mercy; the poor anal whore does $his best to relax, but two phalli at once is a lot, even for $him. $He's only allowed an anal respite when $his sphincter is really fucked out and there's little butthole fun to be had from $him any longer. $He has become @@.hotpink;more submissive to you,@@ and $HeadGirl.slaveName @@.hotpink;enjoyed@@ taking a break to fuck $him with you.
-			<<set $activeSlave.devotion += 4, $HeadGirl.devotion += 4>>
+			The two of you jackhammer in and out of $activeSlave.slaveName's ass without mercy; the poor anal whore does $his best to relax, but two phalli at once is a lot, even for $him. $He's only allowed an anal respite when $his sphincter is really fucked out and there's little butthole fun to be had from $him any longer. $He has become @@.hotpink;more submissive to you,@@ and _S.HeadGirl.slaveName @@.hotpink;enjoyed@@ taking a break to fuck $him with you.
+			<<set $activeSlave.devotion += 4, _S.HeadGirl.devotion += 4>>
 			<<run seX($activeSlave, "anal", $PC, "penetrative")>>
-			<<run seX($activeSlave, "anal", $HeadGirl, "penetrative")>>
+			<<run seX($activeSlave, "anal", _S.HeadGirl, "penetrative")>>
 			<<if canImpreg($activeSlave, $PC)>>
 				<<= knockMeUp($activeSlave, 5, 0, -1, 1)>>
 			<</if>>
-			<<if canImpreg($activeSlave, $HeadGirl)>>
-				<<= knockMeUp($activeSlave, 5, 0, $HeadGirl.ID, 1)>>
+			<<if canImpreg($activeSlave, _S.HeadGirl)>>
+				<<= knockMeUp($activeSlave, 5, 0, $HeadGirlID, 1)>>
 			<</if>>
-			<<set $slaves[$slaveIndices[$HeadGirl.ID]] = $HeadGirl>>
 		<</replace>>
 	<</link>>
 <</if>>
@@ -8540,14 +8539,14 @@ brought in to you. This time <<= App.UI.slaveDescriptionDialog($activeSlave)>> h
 		<<run improveCondition($activeSlave, 10)>>
 	<</replace>>
 <</link>>
-<<if ($HeadGirl != 0) && ($HeadGirl.ID != $activeSlave.ID)>>
+<<if $HeadGirlID != $activeSlave.ID>>
 	<br><<link "Give $him an afternoon off for some quality time with your Head Girl">>
-		<<setLocalPronouns $HeadGirl 2>>
+		<<setLocalPronouns _S.HeadGirl 2>>
 		<<replace "#result">>
-			$HeadGirl.slaveName understands the situation immediately. _He2 gets _himself2 and $activeSlave.slaveName dressed for a nice, non-sexual 'date' in $clubName, and leads $him out by the hand with a wink over _his2 shoulder to you. Your Head Girl understands just what kind of break from sexual servitude $activeSlave.slaveName really needs. They enjoy a nice meal, take a stroll and talk as friends, and get some inconsequential but relaxing beauty treatments together. They both @@.hotpink;enjoy the relaxation,@@ and $activeSlave.slaveName @@.green;feels much better@@ after the rest, too.
+			_S.HeadGirl.slaveName understands the situation immediately. _He2 gets _himself2 and $activeSlave.slaveName dressed for a nice, non-sexual 'date' in $clubName, and leads $him out by the hand with a wink over _his2 shoulder to you. Your Head Girl understands just what kind of break from sexual servitude $activeSlave.slaveName really needs. They enjoy a nice meal, take a stroll and talk as friends, and get some inconsequential but relaxing beauty treatments together. They both @@.hotpink;enjoy the relaxation,@@ and $activeSlave.slaveName @@.green;feels much better@@ after the rest, too.
 			<<set $activeSlave.devotion += 4>>
 			<<run cashX(forceNeg(500), "event", $activeSlave), improveCondition($activeSlave, 10)>>
-			<<set $slaves[$slaveIndices[$HeadGirl.ID]].devotion += 4>>
+			<<set $slaves[$slaveIndices[$HeadGirlID]].devotion += 4>>
 		<</replace>>
 	<</link>> //This option will cost <<print cashFormat(500)>>//
 <</if>>
@@ -11167,10 +11166,10 @@ brought in to you. This time <<= App.UI.slaveDescriptionDialog($activeSlave)>> h
 <</link>>
 <br><<link "These slaves clearly have too much time on their hands">>
 	<<replace "#result">>
-		<<if $HeadGirl != 0>>
-			<<setLocalPronouns $HeadGirl 2>>
+		<<if $HeadGirlID != 0>>
+			<<setLocalPronouns _S.HeadGirl 2>>
 		<</if>>
-		You thank $him kindly, tell $him to put $his offering on your desk, and go back to your work. $He flees, and once $he's gone, you <<if $HeadGirl != 0>>have $assistant.name pass a note to your Head Girl instructing _him2<<else>>instruct $assistant.name<</if>> to tighten up your slaves' schedules, since you feel that they have too much time on their hands. Then you direct another slave to return the napkin to its proper place. Your slaves find their spare moments occupied by household minutiae during the coming week, @@.yellowgreen;saving you some money@@ on penthouse and slave upkeep.
+		You thank $him kindly, tell $him to put $his offering on your desk, and go back to your work. $He flees, and once $he's gone, you <<if $HeadGirlID != 0>>have $assistant.name pass a note to your Head Girl instructing _him2<<else>>instruct $assistant.name<</if>> to tighten up your slaves' schedules, since you feel that they have too much time on their hands. Then you direct another slave to return the napkin to its proper place. Your slaves find their spare moments occupied by household minutiae during the coming week, @@.yellowgreen;saving you some money@@ on penthouse and slave upkeep.
 		<<run cashX(2000, "event", $activeSlave)>>
 	<</replace>>
 <</link>>
@@ -15650,7 +15649,7 @@ brought in to you. This time <<= App.UI.slaveDescriptionDialog($activeSlave)>> h
 <<link "Help $him into $his P-Limbs">>
 	<<replace "#result">>
 		You decide to help $him yourself rather than having a slave do it.
-		<<if $activeSlave.ID == $Bodyguard.ID>>Swinging your legs out of bed and heading towards $him<<else>>Heading towards $his part of the sleeping area<</if>>, you're struck by how <<if $activeSlave.belly >= 5000>>round<<else>>small<</if>> $he looks without $his prosthetics. Just a little $activeSlave.skin thing, without the
+		<<if $activeSlave.ID == $BodyguardID>>Swinging your legs out of bed and heading towards $him<<else>>Heading towards $his part of the sleeping area<</if>>, you're struck by how <<if $activeSlave.belly >= 5000>>round<<else>>small<</if>> $he looks without $his prosthetics. Just a little $activeSlave.skin thing, without the
 		<<if getLimbCount($activeSlave, 3) > 2>>
 			sexy artificial limbs that let $him delight anyone who fucks $him with vibrating fingertips.
 		<<elseif getLimbCount($activeSlave, 4) > 2>>
@@ -15662,9 +15661,9 @@ brought in to you. This time <<= App.UI.slaveDescriptionDialog($activeSlave)>> h
 		<<else>>
 			artificial limbs that allow $him a semblance of a normal life.
 		<</if>>
-		$He's not frightened, trusting <<if $activeSlave.ID == $Bodyguard.ID>>you to help $him, or detail a slave to do so<<else>>$assistant.name to bring help<</if>>. When $he <<if canSee($activeSlave)>>sees<<else>>notices<</if>> that you mean to assist $him yourself, $he breaks out in a huge grateful smile and thanks you profusely.
+		$He's not frightened, trusting <<if $activeSlave.ID == $BodyguardID>>you to help $him, or detail a slave to do so<<else>>$assistant.name to bring help<</if>>. When $he <<if canSee($activeSlave)>>sees<<else>>notices<</if>> that you mean to assist $him yourself, $he breaks out in a huge grateful smile and thanks you profusely.
 		<br><br>
-		<<if $activeSlave.ID == $Bodyguard.ID>>First, you extricate $his limbs from the malfunctioning machine. <</if>>As you take up $his first arm and kneel down to attach it to $him, $he rolls and hoists that shoulder up towards it, $his
+		<<if $activeSlave.ID == $BodyguardID>>First, you extricate $his limbs from the malfunctioning machine. <</if>>As you take up $his first arm and kneel down to attach it to $him, $he rolls and hoists that shoulder up towards it, $his
 		<<if $activeSlave.belly >= 5000>>
 			<<if $activeSlave.bellyPreg >= 3000>>pregnant<<else>>bloated<</if>> body straining to twist
 		<<elseif $activeSlave.muscles > 30>>
@@ -15690,7 +15689,7 @@ brought in to you. This time <<= App.UI.slaveDescriptionDialog($activeSlave)>> h
 	<br><<link "Fuck $him before you help $him">>
 		<<replace "#result">>
 			You decide to have some fun with the temporarily helpless slave. You
-			<<if $activeSlave.ID == $Bodyguard.ID>>get out of bed<<else>>head to where $he's waiting for help<</if>> and scoop $him up, $his limblessness making it comically easy. With $his torso cradled in your grasp and $his head nestled into the crook of your arm, you carry $his <<if $activeSlave.ID == $Bodyguard.ID>>back towards your bed<<else>>back towards your suite<</if>>. When $he <<if canSee($activeSlave)>>sees<<else>>figures out<</if>> what you're doing, $he turns $his head and gives your <<if $PC.boobs >= 300>>breast on that side<<else>>chest<</if>> an anticipatory kiss. When you set $him down on the bed, $he <<if canSee($activeSlave)>>stares<<else>>smiles<</if>> up at you invitingly and gives $his four P-Limb anchor points a glinting wiggle, a gesture that might mean anything. $His <<if canDoVaginal($activeSlave)>>pussy<<else>>asshole<</if>>, in any case, is presented openly for your use.
+			<<if $activeSlave.ID == $BodyguardID>>get out of bed<<else>>head to where $he's waiting for help<</if>> and scoop $him up, $his limblessness making it comically easy. With $his torso cradled in your grasp and $his head nestled into the crook of your arm, you carry $his <<if $activeSlave.ID == $BodyguardID>>back towards your bed<<else>>back towards your suite<</if>>. When $he <<if canSee($activeSlave)>>sees<<else>>figures out<</if>> what you're doing, $he turns $his head and gives your <<if $PC.boobs >= 300>>breast on that side<<else>>chest<</if>> an anticipatory kiss. When you set $him down on the bed, $he <<if canSee($activeSlave)>>stares<<else>>smiles<</if>> up at you invitingly and gives $his four P-Limb anchor points a glinting wiggle, a gesture that might mean anything. $His <<if canDoVaginal($activeSlave)>>pussy<<else>>asshole<</if>>, in any case, is presented openly for your use.
 			<br><br>
 			After fingering your helpless toy experimentally, you
 			<<if $PC.dick != 0>>
@@ -16489,19 +16488,19 @@ brought in to you. This time <<= App.UI.slaveDescriptionDialog($activeSlave)>> h
 		<<EventFetish $activeSlave "masochist">>
 	<</replace>>
 <</link>>
-<<if $HeadGirl != 0>>
+<<if $HeadGirlID != 0>>
 	<br><<link "Double up on $his ass with your Head Girl">>
-		<<setLocalPronouns $HeadGirl 2>>
+		<<setLocalPronouns _S.HeadGirl 2>>
 		<<replace "#result">>
-			You page $HeadGirl.slaveName for some assistance filling up a loose hole, and _he2 comes quickly, <<if canPenetrate($HeadGirl)>>precum already visible at the tip of _his2 erection<<else>>bringing a strap-on<</if>>. When _he2 arrives, it's to the sight of $activeSlave.slaveName sitting on your lap<<if !canDoAnal($activeSlave)>>, anal chastity discarded<</if>>, with your <<if $PC.dick != 0>>cock<<else>>strap-on<</if>> up $his ridiculous anal gape, waiting for a second phallus while your hands tease $his $activeSlave.nipples nipples. Seeing that backup has arrived, you lean back and shift your grip to the back of the receptacle's lower thighs, pulling $him up and shifting $his hips to offer your Head Girl another berth in $activeSlave.slaveName's ass. This pulls $his loose sphincter up, producing a little gape above the top of your invading shaft, and $HeadGirl.slaveName loses no time in fucking it. _He2 gives $activeSlave.slaveName a kiss, but soon breaks the lip lock, since _he2's more interested in making eyes at you over your mutual anal conquest's shuddering shoulder. As
+			You page _S.HeadGirl.slaveName for some assistance filling up a loose hole, and _he2 comes quickly, <<if canPenetrate(_S.HeadGirl)>>precum already visible at the tip of _his2 erection<<else>>bringing a strap-on<</if>>. When _he2 arrives, it's to the sight of $activeSlave.slaveName sitting on your lap<<if !canDoAnal($activeSlave)>>, anal chastity discarded<</if>>, with your <<if $PC.dick != 0>>cock<<else>>strap-on<</if>> up $his ridiculous anal gape, waiting for a second phallus while your hands tease $his $activeSlave.nipples nipples. Seeing that backup has arrived, you lean back and shift your grip to the back of the receptacle's lower thighs, pulling $him up and shifting $his hips to offer your Head Girl another berth in $activeSlave.slaveName's ass. This pulls $his loose sphincter up, producing a little gape above the top of your invading shaft, and _S.HeadGirl.slaveName loses no time in fucking it. _He2 gives $activeSlave.slaveName a kiss, but soon breaks the lip lock, since _he2's more interested in making eyes at you over your mutual anal conquest's shuddering shoulder. As
 			<<if $PC.dick != 0>>
-				<<if canPenetrate($HeadGirl)>>
+				<<if canPenetrate(_S.HeadGirl)>>
 					your dicks slide against each other,
 				<<else>>
 					your dick slides against _his2 strap-on,
 				<</if>>
 			<<else>>
-				<<if canPenetrate($HeadGirl)>>
+				<<if canPenetrate(_S.HeadGirl)>>
 					your strap-on slides against _his2 dick,
 				<<else>>
 					your strap-ons slide against each other,
@@ -16510,10 +16509,10 @@ brought in to you. This time <<= App.UI.slaveDescriptionDialog($activeSlave)>> h
 			your trusty Head Girl whispers that @@.hotpink;_he2 loves you.@@ $activeSlave.slaveName makes an inarticulate noise of anal distress that probably means @@.hotpink;approximately the same thing.@@
 			<<set $activeSlave.devotion += 4>>
 			<<= VCheck.Anal(2)>>
-			<<if canImpreg($activeSlave, $HeadGirl)>>
-				<<= knockMeUp($activeSlave, 5, 1, $HeadGirl.ID, 1)>>
+			<<if canImpreg($activeSlave, _S.HeadGirl)>>
+				<<= knockMeUp($activeSlave, 5, 1, $HeadGirlID, 1)>>
 			<</if>>
-			<<set $slaves[$slaveIndices[$HeadGirl.ID]].devotion += 4>>
+			<<set $slaves[$slaveIndices[$HeadGirlID]].devotion += 4>>
 			<<EventFetish $activeSlave "buttslut">>
 			<<EventFetish $activeSlave "submissive">>
 		<</replace>>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 444e78514975d567c7a5282dd1c00bc06b78a633..5e14e9a203b64f0ba6e497e61f8e6fd7387c0ddc 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -405,8 +405,8 @@ $He clearly held off on climaxing in case you wanted $his libido undiminished fo
 <<case "boob collision">>
 
 <<set _headGirlPresent = 1>>
-<<if $HeadGirl != 0>>
-	<<if $activeSlave.ID == $HeadGirl.ID>>
+<<if $HeadGirlID != 0>>
+	<<if $activeSlave.ID == $HeadGirlID>>
 		<<set _headGirlPresent = 0>>
 	<</if>>
 <</if>>
@@ -871,7 +871,7 @@ voice. It's <<= contextualIntro($activeSlave, $subSlave, true)>>.
 _His2 objections sound a bit feigned, and _he2's obviously in no hurry to put an end to
 <<if areRelated($activeSlave, $subSlave)>>
 	the unmatched perversion of having _his2 own <<= relativeTerm($subSlave, $activeSlave)>> beg _him2 for sex.
-<<elseif $activeSlave.ID == $HeadGirl.ID>>
+<<elseif $activeSlave.ID == $HeadGirlID>>
 	<<if canHear($subSlave)>>listening to<<else>>having<</if>> the Head Girl beg to be allowed to put $his cock inside _him2. Usually, it's $activeSlave.slaveName giving the orders.
 <<elseif $activeSlave.fetishKnown && ($activeSlave.fetish == "dom" || $activeSlave.fetish == "sadist")>>
 	having a dominant $desc like $activeSlave.slaveName beg _him2 for sex.
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 3c68b30764459450dedecdf1d1ecede97b4bfae5..40ab439b9abf6eb0c7916f93ef96cd7df7770f0c 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -1441,7 +1441,7 @@ You own
 		This week, intense interest in your project to revive Roman values has driven prosperity.
 		<<set _AWeekGrowth++>>
 	<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
-		<<if ($HeadGirl != 0) && ($Recruiter != 0) && ($Bodyguard != 0)>>
+		<<if ($HeadGirlID != 0) && ($RecruiterID != 0) && ($BodyguardID != 0)>>
 			This week, your imperial administration, staffed with a Head Girl, a Recruiter, and a Bodyguard, has improved prosperity.
 			<<set _AWeekGrowth += 2>>
 		<</if>>
diff --git a/src/uncategorized/bgSelect.tw b/src/uncategorized/bgSelect.tw
index 9bf57513c0e30d888007db0f4db4c5e56c85e5e2..a1094cd42992729a37a444d0485d0fe4952b1560 100644
--- a/src/uncategorized/bgSelect.tw
+++ b/src/uncategorized/bgSelect.tw
@@ -6,10 +6,9 @@
 </p>
 
 <p>
-	<<if ($Bodyguard != 0)>>
-		<<set $Bodyguard = getSlave($Bodyguard.ID)>>
-		<<setLocalPronouns $Bodyguard>>
-		<span class="slave-name"><<= SlaveFullName($Bodyguard)>></span>
+	<<if (_S.Bodyguard)>>
+		<<setLocalPronouns _S.Bodyguard>>
+		<span class="slave-name"><<= SlaveFullName(_S.Bodyguard)>></span>
 		is serving as your bodyguard. $He will remain close to you at all times and guard your person.
 	<<else>>
 		You have not selected a bodyguard.
@@ -34,7 +33,7 @@
 	Appoint a bodyguard from your devoted slaves:
 </div>
 <div class="choices">
-	[[None|Main][removeJob($Bodyguard, "guard you")]]
+	[[None|Main][removeJob(_S.Bodyguard, Job.BODYGUARD)]]
 </div>
 <p>
 	<<includeDOM App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.armory, "Main")>>
diff --git a/src/uncategorized/brothel.tw b/src/uncategorized/brothel.tw
index f9fa7e5d7990209a7686a32cc830721acc297f20..cf16b5e47a64c3e6f4b4bd9df059f3f48bb49796 100644
--- a/src/uncategorized/brothel.tw
+++ b/src/uncategorized/brothel.tw
@@ -140,8 +140,8 @@
 		$brothelNameCaps is bustling with activity. Customers are coming and going and slave girls are displaying themselves. When a slave catches a customer's eye, he leads her back into a little cubicle.
 	<<elseif _BL > 0>>
 		$brothelNameCaps is working steadily. Customers are present and slave girls are on offer. When a slave catches a customer's eye, he leads her back into a little cubicle.
-	<<elseif $Madam != 0>>
-		$Madam.slaveName is alone in $brothelName, and has nothing to do but keep the place clean and plan future sales efforts.
+	<<elseif $MadamID != 0>>
+		_S.Madam.slaveName is alone in $brothelName, and has nothing to do but keep the place clean and plan future sales efforts.
 	<<else>>
 		$brothelNameCaps is empty and desolate.
 		<div class="choices" style="font-style:normal">
@@ -178,14 +178,14 @@
 	</div>
 </div>
 
-<<if $Madam != 0>>
+<<if $MadamID != 0>>
 	<div>
-		<<setLocalPronouns $Madam>>
+		<<setLocalPronouns _S.Madam>>
 		<<if $MadamIgnoresFlaws != 1>>
-			$Madam.slaveName will attempt to fix flaws in whores serving under $him.
+			_S.Madam.slaveName will attempt to fix flaws in whores serving under $him.
 			[[Ignore flaws|Brothel][$MadamIgnoresFlaws = 1]]
 		<<else>>
-			$Madam.slaveName has been instructed to ignore flaws in the whores serving under $him.
+			_S.Madam.slaveName has been instructed to ignore flaws in the whores serving under $him.
 			[[Fix flaws|Brothel][$MadamIgnoresFlaws = 0]]
 		<</if>>
 	</div>
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index dd98d3a32e33cc5129f6f4e2c71bd0a06dc623d0..cd8bac89f8f2d4ccd5a3b0eabc0793d2b168bdb6 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -11,44 +11,41 @@
 <!-- Statistics gathering -->
 <<set $facility = $facility || {}, $facility.brothel = initFacilityStatistics($facility.brothel)>>
 
-<<if ($Madam != 0)>>
-	<<set _FLs = $slaveIndices[$Madam.ID]>>
-
-	<<if ($slaves[_FLs].health.condition < -80)>>
-		<<run improveCondition($slaves[_FLs], 20)>>
-	<<elseif $slaves[_FLs].health.condition < -40>>
-		<<run improveCondition($slaves[_FLs], 15)>>
-	<<elseif $slaves[_FLs].health.condition < 0>>
-		<<run improveCondition($slaves[_FLs], 10)>>
-	<<elseif $slaves[_FLs].health.condition < 90>>
-		<<run improveCondition($slaves[_FLs], 7)>>
+<<if ($MadamID != 0)>>
+	<<if (_S.Madam.health.condition < -80)>>
+		<<run improveCondition(_S.Madam, 20)>>
+	<<elseif _S.Madam.health.condition < -40>>
+		<<run improveCondition(_S.Madam, 15)>>
+	<<elseif _S.Madam.health.condition < 0>>
+		<<run improveCondition(_S.Madam, 10)>>
+	<<elseif _S.Madam.health.condition < 90>>
+		<<run improveCondition(_S.Madam, 7)>>
 	<</if>>
-	<<if $slaves[_FLs].devotion <= 45>>
-		<<set $slaves[_FLs].devotion += 5>>
+	<<if _S.Madam.devotion <= 45>>
+		<<set _S.Madam.devotion += 5>>
 	<</if>>
-	<<if $slaves[_FLs].trust < 45>>
-		<<set $slaves[_FLs].trust += 5>>
+	<<if _S.Madam.trust < 45>>
+		<<set _S.Madam.trust += 5>>
 	<</if>>
-	<<if $slaves[_FLs].rules.living != "luxurious">>
-		<<set $slaves[_FLs].rules.living = "luxurious">>
+	<<if _S.Madam.rules.living != "luxurious">>
+		<<set _S.Madam.rules.living = "luxurious">>
 	<</if>>
-	<<if $slaves[_FLs].fetishStrength <= 95>>
-		<<if $slaves[_FLs].fetish != "dom">>
-			<<if fetishChangeChance($slaves[_FLs]) > random(0,100)>>
-				<<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "dom">>
+	<<if _S.Madam.fetishStrength <= 95>>
+		<<if _S.Madam.fetish != "dom">>
+			<<if fetishChangeChance(_S.Madam) > random(0,100)>>
+				<<set _FLsFetish = 1, _S.Madam.fetishKnown = 1, _S.Madam.fetish = "dom">>
 			<</if>>
-		<<elseif $slaves[_FLs].fetishKnown == 0>>
-			<<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1>>
+		<<elseif _S.Madam.fetishKnown == 0>>
+			<<set _FLsFetish = 1, _S.Madam.fetishKnown = 1>>
 		<<else>>
-			<<set _FLsFetish = 2, $slaves[_FLs].fetishStrength += 4>>
+			<<set _FLsFetish = 2, _S.Madam.fetishStrength += 4>>
 		<</if>>
 	<</if>>
 	/% Make sure we have registered living expenses as for any other slave %/
-	<<run getSlaveStatisticData($Madam, $facility.brothel)>>
-	<<set $Madam = $slaves[_FLs]>>
-	<<setLocalPronouns $Madam>>
-	&nbsp;&nbsp;&nbsp;&nbsp;<<= SlaveFullName($Madam)>> is serving as the Madam.
-	<<if $Madam.relationship == -3 && $Madam.devotion > 50>>
+	<<run getSlaveStatisticData(_S.Madam, $facility.brothel)>>
+	<<setLocalPronouns _S.Madam>>
+	&nbsp;&nbsp;&nbsp;&nbsp;<<= SlaveFullName(_S.Madam)>> is serving as the Madam.
+	<<if _S.Madam.relationship == -3 && _S.Madam.devotion > 50>>
 		As your loving $wife, $he does $his best to attract attention to your brothel.
 	<</if>>
 	<<if (_FLsFetish == 1)>>
@@ -56,36 +53,36 @@
 	<<elseif (_FLsFetish == 2)>>
 		$He's careful that all of the whores under $his supervision are all warmed up and ready to get fucked every morning, and $he <span class="fetish inc">becomes more dominant.</span>
 	<</if>>
-	<<if ($Madam.skill.whoring <= 10)>>
-		Though $Madam.slaveName does $his best to manage the brothel, with $his lack of skill $he can do little.
-	<<elseif ($Madam.skill.whoring <= 30)>>
-		$Madam.slaveName's basic skills marginally <span class="cash inc">improve</span> business at $brothelName.
-	<<elseif ($Madam.skill.whoring <= 60)>>
-		$Madam.slaveName's skills <span class="cash inc">improve</span> business at $brothelName.
-	<<elseif ($Madam.skill.whoring < 100)>>
-		$Madam.slaveName's skills greatly <span class="cash inc">improve</span> business at $brothelName.
+	<<if (_S.Madam.skill.whoring <= 10)>>
+		Though _S.Madam.slaveName does $his best to manage the brothel, with $his lack of skill $he can do little.
+	<<elseif (_S.Madam.skill.whoring <= 30)>>
+		_S.Madam.slaveName's basic skills marginally <span class="cash inc">improve</span> business at $brothelName.
+	<<elseif (_S.Madam.skill.whoring <= 60)>>
+		_S.Madam.slaveName's skills <span class="cash inc">improve</span> business at $brothelName.
+	<<elseif (_S.Madam.skill.whoring < 100)>>
+		_S.Madam.slaveName's skills greatly <span class="cash inc">improve</span> business at $brothelName.
 	<<else>>
-		$Madam.slaveName's mastery immensely <span class="cash inc">improves</span> business at $brothelName.
+		_S.Madam.slaveName's mastery immensely <span class="cash inc">improves</span> business at $brothelName.
 	<</if>>
-	<<if ($Madam.actualAge > 35)>>
+	<<if (_S.Madam.actualAge > 35)>>
 		$His age and experience also contribute.
 	<</if>>
-	<<if setup.madamCareers.includes($Madam.career)>>
+	<<if setup.madamCareers.includes(_S.Madam.career)>>
 		$He has experience from $his life before $he was a slave that helps $him in the seedy business of selling other people's bodies for sex.
-	<<elseif $Madam.skill.madam >= $masteredXP>>
+	<<elseif _S.Madam.skill.madam >= $masteredXP>>
 		$He has experience from working for you that helps $him in the seedy business of selling other people's bodies for sex.
 	<</if>>
-	<<if ($Madam.intelligence+$Madam.intelligenceImplant > 15)>>
+	<<if (_S.Madam.intelligence+_S.Madam.intelligenceImplant > 15)>>
 		$He is a clever manager.
 	<</if>>
-	<<if ($Madam.dick > 2) && (canPenetrate($Madam))>>
+	<<if (_S.Madam.dick > 2) && (canPenetrate(_S.Madam))>>
 		$His turgid dick helps $him manage the bitches.
 	<</if>>
 	<<for _slave range _slaves>>
 		<<set $i = $slaveIndices[_slave.ID]>> /% for the included passages %/
 
-		<<if $Madam.rivalryTarget == _slave.ID>>
-			$He forces $his <<print rivalryTerm($Madam)>>, to service all the men in the brothel.
+		<<if _S.Madam.rivalryTarget == _slave.ID>>
+			$He forces $his <<print rivalryTerm(_S.Madam)>>, to service all the men in the brothel.
 			<<set _slave.devotion -= 2, _slave.trust -= 2>>
 			<<if canDoVaginal(_slave)>>
 				<<run seX($activeSlave, "vaginal", "public", "penetrative", 10)>>
@@ -95,15 +92,15 @@
 			<</if>>
 			<<run seX($activeSlave, "anal", "public", "penetrative", 10)>>
 			<<if random(1,100) > 65>>
-				<<set $slaves[_FLs].rivalry++, $Madam.rivalry++, _slave.rivalry++>>
+				<<set _S.Madam.rivalry++, _slave.rivalry++>>
 			<</if>>
-		<<elseif $Madam.relationshipTarget == _slave.ID>>
+		<<elseif _S.Madam.relationshipTarget == _slave.ID>>
 			<<setLocalPronouns _slave 2>>
-			$He dotes over $his <<print relationshipTerm($Madam)>>, _slave.slaveName, making sure _he2 is safe, but unfortunately driving potential customers away from _him2.
+			$He dotes over $his <<print relationshipTerm(_S.Madam)>>, _slave.slaveName, making sure _he2 is safe, but unfortunately driving potential customers away from _him2.
 			<<set _slave.devotion++>>
-		<<elseif areRelated($Madam, _slave)>>
+		<<elseif areRelated(_S.Madam, _slave)>>
 			<<setLocalPronouns _slave 2>>
-			$He pays special attention to $his <<print relativeTerm($Madam,_slave)>>, _slave.slaveName, making sure _he2 is treated well and showing off _his2 skills.
+			$He pays special attention to $his <<print relativeTerm(_S.Madam,_slave)>>, _slave.slaveName, making sure _he2 is treated well and showing off _his2 skills.
 			<<set _slave.trust++>>
 		<</if>>
 		<<if _slave.prestigeDesc == "$He is a famed Free Cities whore, and commands top prices.">>
@@ -118,7 +115,7 @@
 				<<if (_slave.muscles > 60) && (_slave.weight < 30) && (_slave.lactation > 0) && ((_slave.boobs-_slave.boobsImplant) > 6000)>>
 					$He shows off how even a cow like _slave.slaveName can achieve physical perfection.
 				<<else>>
-					A<<if (_slave.muscles < 30)>>n unmuscled,<</if>><<if (_slave.weight > 30)>> fat,<</if>> 'prestigious' <<if (_slave.lactation > 0)>>cow<<elseif ((_slave.boobs-_slave.boobsImplant) > 6000)>>mass of titflesh<<else>>slave<</if>> like _slave.slaveName is woefully out of fashion, so $Madam.slaveName tries to draw attention away from _him2.
+					A<<if (_slave.muscles < 30)>>n unmuscled,<</if>><<if (_slave.weight > 30)>> fat,<</if>> 'prestigious' <<if (_slave.lactation > 0)>>cow<<elseif ((_slave.boobs-_slave.boobsImplant) > 6000)>>mass of titflesh<<else>>slave<</if>> like _slave.slaveName is woefully out of fashion, so _S.Madam.slaveName tries to draw attention away from _him2.
 				<</if>>
 			<<else>>
 				<<if (_slave.lactation > 0) && ((_slave.boobs-_slave.boobsImplant) > 6000)>>
@@ -155,16 +152,15 @@
 	<</for>>
 
 	<<if (_DL+$brothelSlavesGettingHelp < 10)>>
-		<<set $i = _FLs>> /* apply following SA passages to facility leader */
-		<<setLocalPronouns $slaves[$i]>>
+		<<setLocalPronouns _S.Madam>>
 		<<set _oldCash = $cash>>
 		<<if $showEWD != 0>>
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;$He <<= App.SlaveAssignment.whore($slaves[$i])>>
+			<br>&nbsp;&nbsp;&nbsp;&nbsp;$He <<= App.SlaveAssignment.whore(_S.Madam)>>
 		<<else>>
-			<<run App.SlaveAssignment.whore($slaves[$i])>>
+			<<run App.SlaveAssignment.whore(_S.Madam)>>
 		<</if>>
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;
-		$He whores $himself because $he doesn't have enough whores to manage to keep $him busy, and makes <span class="cash inc"><<print cashFormat($Madam.lastWeeksCashIncome)>>.</span> $He can charge more for $his time, since many citizens find it erotic to fuck the Madam.
+		$He whores $himself because $he doesn't have enough whores to manage to keep $him busy, and makes <span class="cash inc"><<print cashFormat(_S.Madam.lastWeeksCashIncome)>>.</span> $He can charge more for $his time, since many citizens find it erotic to fuck the Madam.
 		<<set _profits += $cash - _oldCash, _oldCash = $cash>>
 	<</if>>
 	<<if (_DL > 0)>><br><br><</if>>
@@ -180,42 +176,41 @@
 	</div>
 <</if>>
 
-<<if $Madam != 0>>
-	<<set $i = _FLs>> /* apply following SA passages to facility leader */
+<<if $MadamID != 0>>
+	<<set $i = $slaveIndices[$MadamID]>> /* apply following SA passages to facility leader */
 	<<if $showEWD != 0>>
 		<br><br>
 		/* 000-250-006 */
 		<<if $seeImages && $seeReportImages>>
 		<div class="imageRef tinyImg">
-			<<= SlaveArt($slaves[_FLs], 0, 0)>>
+			<<= SlaveArt(_S.Madam 0, 0)>>
 		</div>
 		<</if>>
 		/* 000-250-006 */
-		<span class="slave-name"><<= SlaveFullName($slaves[_FLs])>></span> is serving as the Madam.
+		<span class="slave-name"><<= SlaveFullName(_S.Madam)>></span> is serving as the Madam.
 		<br>&nbsp;&nbsp;&nbsp;
-		<<= App.SlaveAssignment.choosesOwnClothes($slaves[$i])>>
-		<<run tired($slaves[$i])>>
+		<<= App.SlaveAssignment.choosesOwnClothes(_S.Madam)>>
+		<<run tired(_S.Madam)>>
 		<<include "SA rules">>
 		<<include "SA diet">>
 		<<include "SA long term effects">>
-		<<= App.SlaveAssignment.drugs($slaves[$i])>>
+		<<= App.SlaveAssignment.drugs(_S.Madam)>>
 		<<include "SA relationships">>
 		<<include "SA rivalries">>
 		<br><<include "SA devotion">>
 	<<else>>
 		<<silently>>
-		<<run App.SlaveAssignment.choosesOwnClothes($slaves[$i])>>
-		<<run tired($slaves[$i])>>
+		<<run App.SlaveAssignment.choosesOwnClothes(_S.Madam)>>
+		<<run tired(_S.Madam)>>
 		<<include "SA rules">>
 		<<include "SA diet">>
 		<<include "SA long term effects">>
-		<<run App.SlaveAssignment.drugs($slaves[$i])>>
+		<<run App.SlaveAssignment.drugs(_S.Madam)>>
 		<<include "SA relationships">>
 		<<include "SA rivalries">>
 		<<include "SA devotion">>
 		<</silently>>
 	<</if>>
-	<<set $Madam = $slaves[_FLs]>>
 <</if>>
 
 <<if (_DL > 0)>>
@@ -356,6 +351,6 @@
 	<</timed>>
 <</if>>
 
-<<if _DL > 0 || $Madam != 0>>
+<<if _DL > 0 || $MadamID != 0>>
 	<br><br>
 <</if>>
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index ed03beb20a3cbab86779f808cc56f54867e68cb1..99fa96743ea377d628a76bbbc50f678af533ad79 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -114,23 +114,23 @@
 		/* 000-250-006 */
 		<span class='slave-name'><<= SlaveFullName(_S.DJ)>></span> is performing as the DJ in $clubName.
 		<br>&nbsp;&nbsp;&nbsp;
-		<<= App.SlaveAssignment.choosesOwnClothes($slaves[$i])>>
-		<<run tired($slaves[$i])>>
+		<<= App.SlaveAssignment.choosesOwnClothes(_S.DJ)>>
+		<<run tired(_S.DJ)>>
 		<<include "SA rules">>
 		<<include "SA diet">>
 		<<include "SA long term effects">>
-		<<= App.SlaveAssignment.drugs($slaves[$i])>>
+		<<= App.SlaveAssignment.drugs(_S.DJ)>>
 		<<include "SA relationships">>
 		<<include "SA rivalries">>
 		<br><<include "SA devotion">>
 	<<else>>
 		<<silently>>
-		<<run App.SlaveAssignment.choosesOwnClothes($slaves[$i])>>
-		<<run tired($slaves[$i])>>
+		<<run App.SlaveAssignment.choosesOwnClothes(_S.DJ)>>
+		<<run tired(_S.DJ)>>
 		<<include "SA rules">>
 		<<include "SA diet">>
 		<<include "SA long term effects">>
-		<<run App.SlaveAssignment.drugs($slaves[$i])>>
+		<<run App.SlaveAssignment.drugs(_S.DJ)>>
 		<<include "SA relationships">>
 		<<include "SA rivalries">>
 		<<include "SA devotion">>
diff --git a/src/uncategorized/concubineSelect.tw b/src/uncategorized/concubineSelect.tw
index f41a0edbcfa9ca3c76b8dea9685dc4a4758e1f68..bc2b520e072bc93718c5252d550861726e49ff40 100644
--- a/src/uncategorized/concubineSelect.tw
+++ b/src/uncategorized/concubineSelect.tw
@@ -1,15 +1,14 @@
 :: Concubine Select [nobr jump-to-safe jump-hidden jump-from-safe]
 
 <<set $nextButton = "Back", $nextLink = "Master Suite", $encyclopedia = "Concubine">>
-<<if ($Concubine != 0)>>
-	<<set $Concubine = getSlave($Concubine.ID)>>
-	<<setLocalPronouns $Concubine>>
-	<span class='slave-name'><<= SlaveFullName($Concubine)>></span> is serving as your Concubine.<br><br>$He will take the lead in seeing to your pleasure.
+<<if ($ConcubineID != 0)>>
+	<<setLocalPronouns _S.Concubine>>
+	<span class='slave-name'><<= SlaveFullName(_S.Concubine)>></span> is serving as your Concubine.<br><br>$He will take the lead in seeing to your pleasure.
 <<else>>
 	You have not selected a Concubine.
 <</if>>
 
 <br><br>''Appoint a Concubine from your devoted slaves:''
-<br><br>[[None|Master Suite][removeJob($Concubine, "be your Concubine")]]
+<br><br>[[None|Master Suite][removeJob(_S.Concubine, Job.CONCUBINE)]]
 <br><br>
 <<includeDOM App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.masterSuite, "Master Suite")>>
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index 17f817d179fa90ec35a62eac0bb05f81e68dfd89..7bf27efa140cfff8db1aa32b2728155b0604d024 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -295,7 +295,7 @@ $researchLab.level > 0>>
 	<br>__Society Shaping Expenses__: @@.yellowgreen;<<print cashFormat($FSSpending)>>@@
 	<<set _arcologyCosts += $FSSpending>>
 <</if>>
-<<if $Recruiter != 0>>
+<<if $RecruiterID != 0>>
 	<br>__Recruiting Expenses__: @@.yellowgreen;<<print cashFormat(250)>>@@
 	<<set _arcologyCosts += 250>>
 <</if>>
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index 8000aeccd8b2ac77311f935dd3c298f4c8526a3c..e3747483292ca12c0c085a5954c10e3bf266c578 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -20,10 +20,10 @@
 <</if>>
 
 <p>
-	<<if ($Milkmaid != 0) && ($dairyRestraintsSetting == 2)>>
-		<<setLocalPronouns $Milkmaid>>
-		$Milkmaid.slaveName has been removed from $his position as Milkmaid, since an industrialized dairy automates $his duties.
-		<<= removeJob($Milkmaid, "be the Milkmaid")>>
+	<<if ($MilkmaidID != 0) && ($dairyRestraintsSetting == 2)>>
+		<<setLocalPronouns _S.Milkmaid>>
+		_S.Milkmaid.slaveName has been removed from $his position as Milkmaid, since an industrialized dairy automates $his duties.
+		<<= removeJob(_S.Milkmaid, "be the Milkmaid")>>
 	<</if>>
 </p>
 
@@ -328,8 +328,8 @@
 		$dairyNameCaps is quiet and calm. The only sounds are faint sucking and gushing noises.
 	<<elseif _DL > 0>>
 		$dairyNameCaps is sparsely populated.
-	<<elseif $Milkmaid != 0>>
-		$Milkmaid.slaveName is alone in $dairyName, and has nothing to do but clean and maintain the equipment.
+	<<elseif $MilkmaidID != 0>>
+		_S.Milkmaid.slaveName is alone in $dairyName, and has nothing to do but clean and maintain the equipment.
 	<<else>>
 		$dairyNameCaps is empty and desolate.
 		<div class="choices" style="font-style:normal">
@@ -719,10 +719,10 @@
 
 <p>
 	<<set _facility = App.Entity.facilities.dairy>>
-	<<if ($Milkmaid != 0)>>
+	<<if (_S.Milkmaid)>>
 		<<includeDOM App.UI.SlaveList.displayManager(_facility)>>
-		<<if canAchieveErection($Milkmaid) && $Milkmaid.pubertyXY == 1>>
-			<<setLocalPronouns $Milkmaid>>
+		<<if canAchieveErection(_S.Milkmaid) && _S.Milkmaid.pubertyXY == 1>>
+			<<setLocalPronouns _S.Milkmaid>>
 			<<if $milkmaidImpregnates == 1>>
 				Keeping the cows pregnant is part of $his job.
 				<div class="choices">
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index c5b32164e1197cef02bb9a8e63729140053f1c3a..a204ff92eb1979b930301ec36adf8bdd1739f440 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -11,8 +11,8 @@
 <!-- Statistics gathering -->
 <<set $facility = $facility || {}, $facility.dairy = initFacilityStatistics($facility.dairy)>>
 
-<<if ($Milkmaid != 0)>>
-	<<set _FLs = $slaveIndices[$Milkmaid.ID]>>
+<<if ($MilkmaidID != 0)>>
+	<<set _FLs = $slaveIndices[$MilkmaidID]>>
 	<<set _milkmaidImpregnated = 0, _milkers = 0, _cummers = 0, _breeders = 0, _prostateStim = 0>>
 
 	<<if (_DL > 0)>>
@@ -26,16 +26,16 @@
 			<<if (_slave.bellyPreg >= 500 && $dairyPregSetting > 0)>>
 				<<set _breeders++>>
 			<</if>>
-			<<if ($milkmaidImpregnates == 1) && (canPenetrate($Milkmaid)) && $Milkmaid.pubertyXY == 1>>
-				<<if (canImpreg(_slave, $Milkmaid))>>
-					<<set _slave.preg = 1, _slave.pregSource = $Milkmaid.ID, _slave.pregKnown = 1, _slave.pregWeek = 1, _milkmaidImpregnated++>>
+			<<if ($milkmaidImpregnates == 1) && (canPenetrate(_S.Milkmaid)) && _S.Milkmaid.pubertyXY == 1>>
+				<<if (canImpreg(_slave, _S.Milkmaid))>>
+					<<set _slave.preg = 1, _slave.pregSource = $MilkmaidID, _slave.pregKnown = 1, _slave.pregWeek = 1, _milkmaidImpregnated++>>
 					<<if _slave.mpreg == 1>>
 						<<set _slave.counter.anal += 10, $analTotal += 10>>
 					<<else>>
 						<<set _slave.counter.vaginal += 10, $vaginalTotal += 10>>
 					<</if>>
 					<<set _slave.pregType = setPregType(_slave)>>
-					<<set WombImpregnate(_slave, _slave.pregType, $Milkmaid.ID, 1)>>
+					<<set WombImpregnate(_slave, _slave.pregType, $MilkmaidID, 1)>>
 				<</if>>
 			<</if>>
 			/* how much effort the MM must take to force a slave into a stall */
@@ -96,7 +96,7 @@
 					<<set _MMWorkout += 1>>
 				<</if>>
 			<</if>>
-			<<if ($dairyStimulatorsSetting < 2) && ($Milkmaid.dick > 4) && (canPenetrate($Milkmaid)) && _prostateStim != 1>>
+			<<if ($dairyStimulatorsSetting < 2) && (_S.Milkmaid.dick > 4) && (canPenetrate(_S.Milkmaid)) && _prostateStim != 1>>
 				<<if (_slave.balls > 0) && (_slave.prostate > 0)>>
 					<<set _prostateStim = 1>>
 				<</if>>
@@ -104,67 +104,67 @@
 		<</for>>
 	<</if>>
 
-	<<if $slaves[_FLs].health.condition < 90>>
-		<<set $slaves[_FLs].curatives = 2>>
+	<<if _S.Milkmaid.health.condition < 90>>
+		<<set _S.Milkmaid.curatives = 2>>
 	<<else>>
-		<<set $slaves[_FLs].curatives = 0>>
+		<<set _S.Milkmaid.curatives = 0>>
 	<</if>>
-	<<if ($slaves[_FLs].diet != "healthy")>>
-		<<set ($slaves[_FLs].diet = "healthy")>>
+	<<if (_S.Milkmaid.diet != "healthy")>>
+		<<set (_S.Milkmaid.diet = "healthy")>>
 	<</if>>
-	<<if $slaves[_FLs].devotion <= 60>>
-		<<set $slaves[_FLs].devotion += 5>>
+	<<if _S.Milkmaid.devotion <= 60>>
+		<<set _S.Milkmaid.devotion += 5>>
 	<</if>>
-	<<if $slaves[_FLs].trust < 60>>
-		<<set $slaves[_FLs].trust += 5>>
+	<<if _S.Milkmaid.trust < 60>>
+		<<set _S.Milkmaid.trust += 5>>
 	<</if>>
-	<<if ($slaves[_FLs].skill.oral > 0)>>
-		<<set $milkmaidDevotionBonus += Math.trunc($slaves[_FLs].skill.oral/30)>>
+	<<if (_S.Milkmaid.skill.oral > 0)>>
+		<<set $milkmaidDevotionBonus += Math.trunc(_S.Milkmaid.skill.oral/30)>>
 	<</if>>
-	<<if ($slaves[_FLs].health.condition >= 80)>>
+	<<if (_S.Milkmaid.health.condition >= 80)>>
 		<<set $milkmaidHealthBonus++>>
 	<</if>>
-	<<if $slaves[_FLs].rules.living != "luxurious">>
-		<<set $slaves[_FLs].rules.living = "luxurious">>
+	<<if _S.Milkmaid.rules.living != "luxurious">>
+		<<set _S.Milkmaid.rules.living = "luxurious">>
 	<</if>>
-	<<if $slaves[_FLs].fetishStrength <= 95>>
+	<<if _S.Milkmaid.fetishStrength <= 95>>
 		<<if _milkers >= _cummers && _milkers >= _breeders>>
-			<<if $slaves[_FLs].fetish != "boobs">>
-				<<if fetishChangeChance($slaves[_FLs]) > random(0,100)>>
-					<<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "boobs">>
+			<<if _S.Milkmaid.fetish != "boobs">>
+				<<if fetishChangeChance(_S.Milkmaid) > random(0,100)>>
+					<<set _FLsFetish = 1, _S.Milkmaid.fetishKnown = 1, _S.Milkmaid.fetish = "boobs">>
 				<</if>>
-			<<elseif $slaves[_FLs].fetishKnown == 0>>
-				<<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1>>
+			<<elseif _S.Milkmaid.fetishKnown == 0>>
+				<<set _FLsFetish = 1, _S.Milkmaid.fetishKnown = 1>>
 			<<else>>
-				<<set _FLsFetish = 2, $slaves[_FLs].fetishStrength += 4>>
+				<<set _FLsFetish = 2, _S.Milkmaid.fetishStrength += 4>>
 			<</if>>
 		<<elseif _cummers >= _breeders>>
-			<<if $slaves[_FLs].fetish != "cumslut">>
-				<<if fetishChangeChance($slaves[_FLs]) > random(0,100)>>
-					<<set _FLsFetish = 3, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "cumslut">>
+			<<if _S.Milkmaid.fetish != "cumslut">>
+				<<if fetishChangeChance(_S.Milkmaid) > random(0,100)>>
+					<<set _FLsFetish = 3, _S.Milkmaid.fetishKnown = 1, _S.Milkmaid.fetish = "cumslut">>
 				<</if>>
-			<<elseif $slaves[_FLs].fetishKnown == 0>>
-				<<set _FLsFetish = 3, $slaves[_FLs].fetishKnown = 1>>
+			<<elseif _S.Milkmaid.fetishKnown == 0>>
+				<<set _FLsFetish = 3, _S.Milkmaid.fetishKnown = 1>>
 			<<else>>
-				<<set _FLsFetish = 4, $slaves[_FLs].fetishStrength += 4>>
+				<<set _FLsFetish = 4, _S.Milkmaid.fetishStrength += 4>>
 			<</if>>
 		<<else>>
-			<<if $slaves[_FLs].fetish != "pregnancy">>
-				<<if fetishChangeChance($slaves[_FLs]) > random(0,100)>>
-					<<set _FLsFetish = 5, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "pregnancy">>
+			<<if _S.Milkmaid.fetish != "pregnancy">>
+				<<if fetishChangeChance(_S.Milkmaid) > random(0,100)>>
+					<<set _FLsFetish = 5, _S.Milkmaid.fetishKnown = 1, _S.Milkmaid.fetish = "pregnancy">>
 				<</if>>
-			<<elseif $slaves[_FLs].fetishKnown == 0>>
-				<<set _FLsFetish = 5, $slaves[_FLs].fetishKnown = 1>>
+			<<elseif _S.Milkmaid.fetishKnown == 0>>
+				<<set _FLsFetish = 5, _S.Milkmaid.fetishKnown = 1>>
 			<<else>>
-				<<set _FLsFetish = 6, $slaves[_FLs].fetishStrength += 4>>
+				<<set _FLsFetish = 6, _S.Milkmaid.fetishStrength += 4>>
 			<</if>>
 		<</if>>
 	<</if>>
-	<<run getSlaveStatisticData($Milkmaid, $facility.dairy)>>
-	<<set $Milkmaid = $slaves[_FLs], $i = _FLs>>
-	<<setLocalPronouns $Milkmaid>>
-	&nbsp;&nbsp;&nbsp;&nbsp;<<= SlaveFullName($Milkmaid)>> is serving as your Milkmaid.
-	<<if $Milkmaid.relationship == -3 && $Milkmaid.devotion > 50>>
+	<<run getSlaveStatisticData(_S.Milkmaid, $facility.dairy)>>
+	<<set $i = _FLs>>
+	<<setLocalPronouns _S.Milkmaid>>
+	&nbsp;&nbsp;&nbsp;&nbsp;<<= SlaveFullName(_S.Milkmaid)>> is serving as your Milkmaid.
+	<<if _S.Milkmaid.relationship == -3 && _S.Milkmaid.devotion > 50>>
 		<<set $milkmaidDevotionBonus += 2, $milkmaidTrustBonus += 2>>
 		$He tries $his best to be your perfect farm<<= $wife>>.
 	<</if>>
@@ -175,16 +175,16 @@
 		<<else>>
 			fills the _milkmaidImpregnated cows' cunts with $his cum.
 		<</if>>
-		<<if $Milkmaid.career == "a breeding bull">>
+		<<if _S.Milkmaid.career == "a breeding bull">>
 			$He was conditioned to fill empty wombs, so $he takes a @@.hotpink;deep pleasure@@ in $his job.
-			<<set $slaves[_FLs].devotion++>>
-		<<elseif ($Milkmaid.fetish == "pregnancy" && $Milkmaid.fetishKnown == 1)>>
+			<<set _S.Milkmaid.devotion++>>
+		<<elseif (_S.Milkmaid.fetish == "pregnancy" && _S.Milkmaid.fetishKnown == 1)>>
 			$He has a pregnancy fetish, so $he finds $his job @@.hotpink;quite enjoyable,@@ especially when $he gets to watch the cows swell with $his children.
-			<<set $slaves[_FLs].devotion += Math.ceil($slaves[_FLs].fetishStrength/25)>>
-			<<set $slaves[_FLs].fetishStrength += 2>>
+			<<set _S.Milkmaid.devotion += Math.ceil(_S.Milkmaid.fetishStrength/25)>>
+			<<set _S.Milkmaid.fetishStrength += 2>>
 		<</if>>
-		<<set _Tmult = (_milkmaidImpregnated * 10), $slaves[_FLs].counter.penetrative += _Tmult, $Milkmaid.counter.penetrative += _Tmult, $penetrativeTotal += _Tmult>>
-		<<set $slaves[_FLs].need = 0>>
+		<<set _Tmult = (_milkmaidImpregnated * 10), _S.Milkmaid.counter.penetrative += _Tmult, $penetrativeTotal += _Tmult>>
+		<<set _S.Milkmaid.need = 0>>
 	<</if>>
 	<<if (_FLsFetish == 1)>>
 		In $his line of work, $he touches more breasts than even you do. $He lives in an atmosphere of quivering, heaving, milky breastflesh; of girls who shudder and moan when $he touches their creamy nipples. $He has @@.lightcoral;become more of a breast $girl.@@
@@ -199,58 +199,58 @@
 	<<elseif (_FLsFetish == 6)>>
 		It's a hard life, washing bellies and inspecting pussies, but it does @@.lightsalmon;make $him more of a pregnancy fetishist.@@
 	<</if>>
-	<<if ($Milkmaid.muscles > 30)>>
+	<<if (_S.Milkmaid.muscles > 30)>>
 		<<set $milkmaidHealthBonus++>>
 		$His muscles help $him handle the fattest or most reluctant cow.
 	<</if>>
-	<<if (_MMWorkout > random(1,30-$Milkmaid.geneticQuirks.mLoss+$Milkmaid.geneticQuirks.mGain)) && $Milkmaid.muscles < 60>>
+	<<if (_MMWorkout > random(1,30-_S.Milkmaid.geneticQuirks.mLoss+_S.Milkmaid.geneticQuirks.mGain)) && _S.Milkmaid.muscles < 60>>
 		Constantly having to wrestle unruly or aiding heavy cows into their stalls forces $him to @@.lime;build muscle.@@
-		<<set $slaves[_FLs].muscles++>>
+		<<set _S.Milkmaid.muscles++>>
 	<</if>>
-	<<if ($Milkmaid.skill.oral > 30)>>
+	<<if (_S.Milkmaid.skill.oral > 30)>>
 		$His skilled tongue helps $him keep $his cattle happy.
 	<</if>>
-	<<if ($Milkmaid.skill.oral < 90)>>
-		<<= SkillIncrease.Oral($slaves[_FLs], 3)>>
+	<<if (_S.Milkmaid.skill.oral < 90)>>
+		<<= SkillIncrease.Oral(_S.Milkmaid, 3)>>
 	<</if>>
-	<<if ($Milkmaid.sexualQuirk == "caring")>>
+	<<if (_S.Milkmaid.sexualQuirk == "caring")>>
 		<<set $milkmaidTrustBonus++>>
 		$He's very caring, and does $his best to get the cows to trust $him.
 	<</if>>
-	<<if ($Milkmaid.behavioralQuirk == "funny")>>
+	<<if (_S.Milkmaid.behavioralQuirk == "funny")>>
 		<<set $milkmaidTrustBonus++>>
 		$He's funny, and does $his best to get the cows to trust $him by keeping them laughing.
 	<</if>>
-	<<if setup.milkmaidCareers.includes($Milkmaid.career)>>
+	<<if setup.milkmaidCareers.includes(_S.Milkmaid.career)>>
 		<<set $milkmaidHealthBonus++>>
 		$He has career experience dealing with milk animals.
-	<<elseif $Milkmaid.skill.milkmaid >= $masteredXP>>
+	<<elseif _S.Milkmaid.skill.milkmaid >= $masteredXP>>
 		<<set $milkmaidHealthBonus++>>
 		$He has experience harvesting slave products from working for you.
 	<<else>>
-		<<set $slaves[_FLs].skill.milkmaid += random(1,Math.ceil(($Milkmaid.intelligence+$Milkmaid.intelligenceImplant)/15) + 8)>>
+		<<set _S.Milkmaid.skill.milkmaid += random(1,Math.ceil((_S.Milkmaid.intelligence+_S.Milkmaid.intelligenceImplant)/15) + 8)>>
 	<</if>>
 	<<if _prostateStim == 1>>
 		$He uses $his turgid cock to give prostate stimulation to slaves that need help ejaculating.
-		<<set $slaves[_FLs].need -= 50>>
+		<<set _S.Milkmaid.need -= 50>>
 	<</if>>
 	<<set $milkmaidDevotionThreshold += (5*$milkmaidDevotionBonus), $milkmaidTrustThreshold += (5*$milkmaidTrustBonus)>>
 	<<for _slave range _slaves>>
 		<<set $i = $slaveIndices[_slave.ID]>>
-		<<if $Milkmaid.rivalryTarget == _slave.ID>>
+		<<if _S.Milkmaid.rivalryTarget == _slave.ID>>
 			<<setLocalPronouns _slave 2>>
-			$He either neglects or harasses $his <<print rivalryTerm($Milkmaid)>>, _slave.slaveName, making sure _he2 is unhappy and uncomfortable.
+			$He either neglects or harasses $his <<print rivalryTerm(_S.Milkmaid)>>, _slave.slaveName, making sure _he2 is unhappy and uncomfortable.
 			<<set _slave.devotion -= 3, _slave.trust -= 3>>
 			<<if random(1,100) > 65>>
-				<<set $Milkmaid.rivalry++, $slaves[_FLs].rivalry++, _slave.rivalry++>>
+				<<set _S.Milkmaid.rivalry++, _slave.rivalry++>>
 			<</if>>
-		<<elseif $Milkmaid.relationshipTarget == _slave.ID>>
+		<<elseif _S.Milkmaid.relationshipTarget == _slave.ID>>
 			<<setLocalPronouns _slave 2>>
-			$He dotes over $his <<print relationshipTerm($Milkmaid)>>, _slave.slaveName, making sure _he2 is happy and comfortable.
+			$He dotes over $his <<print relationshipTerm(_S.Milkmaid)>>, _slave.slaveName, making sure _he2 is happy and comfortable.
 			<<set _slave.devotion++, _slave.trust++>>
-		<<elseif areRelated($Milkmaid, _slave)>>
+		<<elseif areRelated(_S.Milkmaid, _slave)>>
 			<<setLocalPronouns _slave 2>>
-			$He pays special attention to $his <<print relativeTerm($Milkmaid,_slave)>>, _slave.slaveName, making sure _he2 is well kept and happy.
+			$He pays special attention to $his <<print relativeTerm(_S.Milkmaid,_slave)>>, _slave.slaveName, making sure _he2 is well kept and happy.
 			<<set _slave.trust++>>
 		<</if>>
 		<<if _slave.prestigeDesc == "$He is remembered for winning best in show as a dairy cow.">>
@@ -271,7 +271,7 @@
 		<</if>>
 		<<if _slave.prestigeDesc == "$He is remembered for winning best in show as a breeder." && _slave.bellyPreg >= 1500>>
 			<<setLocalPronouns _slave 2>>
-			$He spends extra time with _slave.slaveName, the well-known breeder. $Milkmaid.slaveName is fascinated by _his2 growing pregnancy and popular womb. $He makes sure _his2 belly and its occupants are nice and comfortable.
+			$He spends extra time with _slave.slaveName, the well-known breeder. _S.Milkmaid.slaveName is fascinated by _his2 growing pregnancy and popular womb. $He makes sure _his2 belly and its occupants are nice and comfortable.
 			<<set _slave.devotion += 3, _slave.trust += 3>>
 		<</if>>
 	<</for>>
@@ -279,7 +279,7 @@
 
 <<set _Tadd = ($bioreactorsXY + $bioreactorsXX + $bioreactorsHerm + $bioreactorsBarren)>>
 <<if (_DL + _Tadd > 0)>>
-	<<if ($Milkmaid != 0)>><br><br><</if>>
+	<<if ($MilkmaidID != 0)>><br><br><</if>>
 	&nbsp;&nbsp;&nbsp;&nbsp;<<if (_DL != 1)>>''There are _DL cows in $dairyName.''<<else>>''There is one cow in $dairyName.''<</if>>
 	<<if ($dairyRestraintsSetting > 1)>>
 		The facility functions as an industrial slave products factory.
@@ -289,32 +289,32 @@
 	<</if>>
 <</if>>
 
-<<if ($Milkmaid != 0)>>
+<<if ($MilkmaidID != 0)>>
 	<<set $i = _FLs>> /* apply following SA passages to facility leader */
 	<<if $showEWD != 0>>
 		<br><br>
 		/* 000-250-006 */
 		<<if $seeImages && $seeReportImages>>
 		<div class="imageRef tinyImg">
-			<<= SlaveArt($slaves[_FLs], 0, 0)>>
+			<<= SlaveArt(_S.Milkmaid, 0, 0)>>
 		</div>
 		<</if>>
 		/* 000-250-006 */
-		<span class='slave-name'><<= SlaveFullName($slaves[_FLs])>></span> is serving as your Milkmaid.
+		<span class='slave-name'><<= SlaveFullName(_S.Milkmaid)>></span> is serving as your Milkmaid.
 		<br>&nbsp;&nbsp;&nbsp;
 		<<= App.SlaveAssignment.choosesOwnClothes($slaves[$i])>>
-		<<run tired($slaves[$i])>>
+		<<run tired(_S.Milkmaid)>>
 		<<include "SA rules">>
 		<<include "SA diet">>
 		<<include "SA long term effects">>
-		<<= App.SlaveAssignment.drugs($slaves[$i])>>
+		<<= App.SlaveAssignment.drugs(_S.Milkmaid)>>
 		<<include "SA relationships">>
 		<<include "SA rivalries">>
 		<br><<include "SA devotion">>
 	<<else>>
 		<<silently>>
-		<<run App.SlaveAssignment.choosesOwnClothes($slaves[$i])>>
-		<<run tired($slaves[$i])>>
+		<<run App.SlaveAssignment.choosesOwnClothes(_S.Milkmaid)>>
+		<<run tired(_S.Milkmaid)>>
 		<<include "SA rules">>
 		<<include "SA diet">>
 		<<include "SA long term effects">>
@@ -324,7 +324,6 @@
 		<<include "SA devotion">>
 		<</silently>>
 	<</if>>
-	<<set $Milkmaid = $slaves[_FLs]>>
 <</if>>
 
 <<set _oldCash = $cash>>
@@ -1092,7 +1091,7 @@ $dairyNameCaps produced <<print _milkWeek+_outputMilk>> liters of milk<<if _cumW
 		<<set $failedElite += 5>>
 	<</if>>
 	<<if _milkmaidImpregnates == 1>>
-		The Societal Elite know you've ordered $Milkmaid.slaveName to impregnate your cows. @@.red;They are not amused by your disinterest in eugenics.@@
+		The Societal Elite know you've ordered _S.Milkmaid.slaveName to impregnate your cows. @@.red;They are not amused by your disinterest in eugenics.@@
 		<<set $failedElite += 10>>
 	<</if>>
 <</if>>
@@ -1201,6 +1200,6 @@ $dairyNameCaps produced <<print _milkWeek+_outputMilk>> liters of milk<<if _cumW
 		<</replace>>
 	<</timed>>
 <</if>>
-<<if (_DL + _Tadd) > 0 || $Milkmaid != 0>>
+<<if (_DL + _Tadd) > 0 || $MilkmaidID != 0>>
 	<br><br>
 <</if>>
diff --git a/src/uncategorized/freeRangeDairyAssignmentScene.tw b/src/uncategorized/freeRangeDairyAssignmentScene.tw
index 91b07256059868e1de973e85924d63848c95fc51..9eb607a17169b4682b578bbeae9ee13d3cdb0cf1 100644
--- a/src/uncategorized/freeRangeDairyAssignmentScene.tw
+++ b/src/uncategorized/freeRangeDairyAssignmentScene.tw
@@ -75,8 +75,8 @@
 					<<else>>
 						_He2 lacks a prostate, so the automatic sodomizer is forced to pound _him2 mercilessly to make _him2 cum.
 					<</if>>
-				<<elseif ($Milkmaid.dick > 4) && (canPenetrate($Milkmaid))>>
-					$Milkmaid.slaveName quickly steps in and penetrates _his2 rear to push _him2 powerfully over the edge.
+				<<elseif (_S.Milkmaid.dick > 4) && (canPenetrate(_S.Milkmaid))>>
+					_S.Milkmaid.slaveName quickly steps in and penetrates _his2 rear to push _him2 powerfully over the edge.
 				<<else>>
 					_His2 butthole opens and closes.
 				<</if>>
@@ -152,17 +152,17 @@
 	</div>
 
 	<div style="clear:both">
-		<<if $Milkmaid && $seeImages == 1>>
+		<<if _S.Milkmaid && $seeImages == 1>>
 			<div class="imageRef medImg">
-				<<= SlaveArt($Milkmaid, 2, 0)>>
+				<<= SlaveArt(_S.Milkmaid, 2, 0)>>
 			</div>
 		<</if>>
 		<div>
 		The only "furniture" in the stall looks like a dentist's chair. Despite the medical appearance, when $he <<if $activeSlave.devotion > 90>>eagerly<<elseif $activeSlave.slaveName < 40>>hesitantly<</if>> gets into the chair it turns out to be quite comfortable.
-		<<if $Milkmaid == 0>>
+		<<if _S.Milkmaid == 0>>
 			Automated machinery springs to life, preparing $him for milking.
 		<<else>>
-			Your appointed milkmaid $Milkmaid.slaveName helps $activeSlave.slaveName with installing the milking devices.
+			Your appointed milkmaid _S.Milkmaid.slaveName helps $activeSlave.slaveName with installing the milking devices.
 		<</if>>
 		<<if $activeSlave.lactation > 0 >>
 		Suction cups are attached <<if $activeSlave.nipples == "fuckable">>over<<else>>to<</if>> $his nipples.
@@ -238,19 +238,19 @@
 
 <p>
 	Sexual stimulation increases product output.
-	<<if $Milkmaid == 0 && $dairyStimulatorsSetting == 0>>
+	<<if _S.Milkmaid == 0 && $dairyStimulatorsSetting == 0>>
 		Unfortunately, there is neither a milkmaid providing personal assistance nor automatic sodomizers installed in your dairy.<br>
 	<<else>>
-		<<if $Milkmaid != 0>>
-			<<setLocalPronouns $Milkmaid 2>>
-			Your milkmaid $Milkmaid.slaveName is working in the dairy. Whenever a cow needs _his2 assistance, _he2 is happy to help.
-			<<if $Milkmaid.dick > 1 && canPenetrate($Milkmaid)>>
+		<<if $MilkmaidID != 0>>
+			<<setLocalPronouns _S.Milkmaid 2>>
+			Your milkmaid _S.Milkmaid.slaveName is working in the dairy. Whenever a cow needs _his2 assistance, _he2 is happy to help.
+			<<if _S.Milkmaid.dick > 1 && canPenetrate(_S.Milkmaid)>>
 				Most often, _he2 uses _his2 cock to penetrate the cows.
 			<<else>>
 				Lacking penile equipment of appropriate size, _he2 relies on _his2 tongue to stimulate the cow's sexual organs.
 			<</if>>
 			_He2 is quite skilled in giving mammary massages and handjobs, too.
-			<<if $milkmaidImpregnates == 1 && canPenetrate($Milkmaid) && $Milkmaid.pubertyXY == 1 && $Milkmaid.ballType == "human">>
+			<<if $milkmaidImpregnates == 1 && canPenetrate(_S.Milkmaid) && _S.Milkmaid.pubertyXY == 1 && _S.Milkmaid.ballType == "human">>
 				If at all possible, it is _his2 duty to thoroughly knock up _his2 charges.
 			<</if>>
 			<br>
diff --git a/src/uncategorized/fsDevelopments.tw b/src/uncategorized/fsDevelopments.tw
index e5b0d7399b3cd1db4646bc22917488ed97f51fb2..ce6e951d44804928066a6c78b620c23d7828f70d 100644
--- a/src/uncategorized/fsDevelopments.tw
+++ b/src/uncategorized/fsDevelopments.tw
@@ -76,19 +76,19 @@
 <<if $secExpEnabled == 1>>
 	<<if $SecExp.buildings.propHub.active > 0 && $SecExp.buildings.propHub.campaign >= 1 && $SecExp.buildings.propHub.focus == "social engineering">>
 		Your propaganda campaign helps further your societal engineering efforts.
-		<<if $SecExp.buildings.propHub.recuriterOffice == 0 || $Recruiter == 0>>
+		<<if $SecExp.buildings.propHub.recuriterOffice == 0 || $RecruiterID == 0>>
 			<<if $propCampaignBoost == 1>>
 				<<set _broadProgress += 2>>
 			<<else>>
 				<<set _broadProgress += 1>>
 			<</if>>
-		<<elseif $SecExp.buildings.propHub.recuriterOffice && $Recruiter > 0>>
-			<<setLocalPronouns $Recruiter>>
-			<span class='slave-name'><<= SlaveFullName($Recruiter)>></span> is able to further boost your societal engineering campaign from $his PR hub office.
+		<<elseif $SecExp.buildings.propHub.recuriterOffice && $RecruiterID > 0>>
+			<<setLocalPronouns _S.Recruiter>>
+			<span class='slave-name'><<= SlaveFullName(_S.Recruiter)>></span> is able to further boost your societal engineering campaign from $his PR hub office.
 			<<if $propCampaignBoost == 1>>
-				<<set _broadProgress += $SecExp.buildings.propHub.campaign + Math.floor(($Recruiter.intelligence+$Recruiter.intelligenceImplant)/32)>>
+				<<set _broadProgress += $SecExp.buildings.propHub.campaign + Math.floor((_S.Recruiter.intelligence+_S.Recruiter.intelligenceImplant)/32)>>
 			<<else>>
-				<<set _broadProgress += 1 + Math.floor(($Recruiter.intelligence+$Recruiter.intelligenceImplant)/32)>>
+				<<set _broadProgress += 1 + Math.floor((_S.Recruiter.intelligence+_S.Recruiter.intelligenceImplant)/32)>>
 			<</if>>
 		<</if>>
 	<</if>>
diff --git a/src/uncategorized/headGirlSuite.tw b/src/uncategorized/headGirlSuite.tw
index 3e1d5f0c8850c6fff477df0ad3761786bcd983df..d9c0f55a06568459c9f292e2dc1365de8733b25d 100644
--- a/src/uncategorized/headGirlSuite.tw
+++ b/src/uncategorized/headGirlSuite.tw
@@ -10,20 +10,20 @@
 <p class="scene-intro">
 </p>
 
-<<if $HeadGirl == 0>>
+<<if $HeadGirlID == 0>>
 	You have no Head Girl appointed to live in $HGSuiteName.
 	<<link "Select Head Girl">><<goto "HG Select">><</link>>
 <<elseif App.Entity.facilities.headGirlSuite.hasEmployees>>
-	<<setLocalPronouns $HeadGirl>>
-	Your Head Girl $HeadGirl.slaveName has $slaves[_i].slaveName living in $HGSuiteName with $him, as $his servant, assistant, and sexual appliance.
+	<<setLocalPronouns _S.HeadGirl>>
+	Your Head Girl _S.HeadGirl.slaveName has $slaves[_i].slaveName living in $HGSuiteName with $him, as $his servant, assistant, and sexual appliance.
 	<<link "Manage Head Girl">><<goto "HG Select">><</link>>
 <<else>>
-	<<setLocalPronouns $HeadGirl>>
-	Your Head Girl $HeadGirl.slaveName lives alone in $his handsome suite.
+	<<setLocalPronouns _S.HeadGirl>>
+	Your Head Girl _S.HeadGirl.slaveName lives alone in $his handsome suite.
 	<<link "Manage Head Girl">><<goto "HG Select">><</link>>
 <</if>>
 
-<<if $HeadGirl != 0>>
+<<if $HeadGirlID != 0>>
 	<div class="note">
 		Any slave assigned to live with your Head Girl will become, for most practical purposes, $his slave.
 	</div>
diff --git a/src/uncategorized/hgApplication.tw b/src/uncategorized/hgApplication.tw
index 23da3ec0b84cafaddb6bad2124974a1614e6307f..a1dfb4a7131a5ad700fba76d5b924cb8cc4c29b5 100644
--- a/src/uncategorized/hgApplication.tw
+++ b/src/uncategorized/hgApplication.tw
@@ -1,6 +1,6 @@
 :: HG Application [nobr]
 
-<<setLocalPronouns $HeadGirl>>
+<<setLocalPronouns _S.HeadGirl>>
 <<setLocalPronouns $activeSlave 2>>
 
 <<if ndef $HGSeverity>>
@@ -8,18 +8,18 @@
 <</if>>
 
 <<set $activeSlave.training = Math.clamp($activeSlave.training, 0, 150)>>
-<<set _effectiveness = $HeadGirl.actualAge+(($HeadGirl.intelligence+$HeadGirl.intelligenceImplant)/3)-($HeadGirl.accent*5)+($HGSeverity*10)+(($activeSlave.intelligence+$activeSlave.intelligenceImplant)/4)-($activeSlave.accent*5)>>
+<<set _effectiveness = _S.HeadGirl.actualAge+((_S.HeadGirl.intelligence+_S.HeadGirl.intelligenceImplant)/3)-(_S.HeadGirl.accent*5)+($HGSeverity*10)+(($activeSlave.intelligence+$activeSlave.intelligenceImplant)/4)-($activeSlave.accent*5)>>
 <<if $AgePenalty == 0>>
-	<<set _effectiveness += Math.max(0,(30-$HeadGirl.actualAge))>>
+	<<set _effectiveness += Math.max(0,(30-_S.HeadGirl.actualAge))>>
 <</if>>
-<<if $HeadGirl.sexualFlaw == "abusive" && $HGSeverity >= 0>>
+<<if _S.HeadGirl.sexualFlaw == "abusive" && $HGSeverity >= 0>>
 	<<set _effectiveness += 10>>
 <</if>>
 <<if $HGtraining != "health">>
 	<<set $activeSlave.health.tired += 25>>
 <</if>>
 
-&nbsp;&nbsp;&nbsp;&nbsp;<span style="font-weight: bold">Your Head Girl</span> <span class='slave-name'>$HeadGirl.slaveName</span> notices that <span class='slave-name'>$activeSlave.slaveName</span>
+&nbsp;&nbsp;&nbsp;&nbsp;<span style="font-weight: bold">Your Head Girl</span> <span class='slave-name'>_S.HeadGirl.slaveName</span> notices that <span class='slave-name'>$activeSlave.slaveName</span>
 <<switch $HGtraining>>
 <<case "health">>
 	is unwell.
@@ -52,31 +52,31 @@ $He helps $activeSlave.slaveName however $he can. The tender care has @@.green;i
 
 <<else>>
 
-<<if $HeadGirl.career == "an arcology owner">>
+<<if _S.HeadGirl.career == "an arcology owner">>
 	$He was once an arcology owner $himself, making $him truly peerless as a Head Girl.
 	<<set _effectiveness += 50>>
-<<elseif setup.HGCareers.includes($HeadGirl.career)>>
+<<elseif setup.HGCareers.includes(_S.HeadGirl.career)>>
 	$He was used to giving commands and being obeyed in $his life before $he was a slave, experience $he can call on now.
 	<<set _effectiveness += 5>>
-<<elseif $HeadGirl.skill.headGirl >= $masteredXP>>
+<<elseif _S.HeadGirl.skill.headGirl >= $masteredXP>>
 	$He is used to giving commands and being obeyed through experience, rendering $him more effective.
 	<<set _effectiveness += 5>>
 <</if>>
 
-<<if $HeadGirl.actualAge > 30>>
+<<if _S.HeadGirl.actualAge > 30>>
 	$His age and experience help $him as $he works with $activeSlave.slaveName.
-<<elseif $HeadGirl.actualAge < 25 && $AgePenalty > 0>>
+<<elseif _S.HeadGirl.actualAge < 25 && $AgePenalty > 0>>
 	$His youth and inexperience impede $him as $he works with $activeSlave.slaveName.
 <</if>>
 
-<<if $HeadGirl.accent >= 3>>
+<<if _S.HeadGirl.accent >= 3>>
 	$He does $his best to give orders in $language, but has to resort to a lot of unseemly gesticulation and shouting, making $him much less effective.
-<<elseif $HeadGirl.accent == 2>>
-	$His heavy <<print aNational($HeadGirl.nationality)>> accent impedes $his clarity in $language, making $him somewhat less effective.
+<<elseif _S.HeadGirl.accent == 2>>
+	$His heavy <<print aNational(_S.HeadGirl.nationality)>> accent impedes $his clarity in $language, making $him somewhat less effective.
 <</if>>
 
 <<if ($HGtraining == "obedience") || ($HGtraining == "flaw") || ($HGtraining == "soften")>>
-	<<if $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 50>>
+	<<if _S.HeadGirl.intelligence+_S.HeadGirl.intelligenceImplant > 50>>
 		<<if $activeSlave.intelligence+$activeSlave.intelligenceImplant > 50>>
 			$He needs $his wits about $him to mold $activeSlave.slaveName, who's quite intelligent _himself2.
 		<<elseif $activeSlave.intelligence+$activeSlave.intelligenceImplant >= -50>>
@@ -86,7 +86,7 @@ $He helps $activeSlave.slaveName however $he can. The tender care has @@.green;i
 		<</if>>
 	<</if>>
 <<else>>
-	<<if $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 50>>
+	<<if _S.HeadGirl.intelligence+_S.HeadGirl.intelligenceImplant > 50>>
 		<<if $activeSlave.intelligence+$activeSlave.intelligenceImplant > 50>>
 			Both slaves are quite intelligent, making $his job much easier.
 		<<elseif $activeSlave.intelligence+$activeSlave.intelligenceImplant >= -50>>
@@ -99,15 +99,15 @@ $He helps $activeSlave.slaveName however $he can. The tender care has @@.green;i
 
 <<if $HGSeverity > 0>>
 	Your directives encourage $him to rape any slave that fails in the slightest way, a task $he approaches
-	<<if $HeadGirl.sexualFlaw == "abusive">>
+	<<if _S.HeadGirl.sexualFlaw == "abusive">>
 		eagerly, since $he prefers to take $his pleasure without consent.
-	<<elseif $HeadGirl.fetish == "sadist">>
+	<<elseif _S.HeadGirl.fetish == "sadist">>
 		with sadistic enthusiasm.
-	<<elseif $HeadGirl.fetish == "dom">>
+	<<elseif _S.HeadGirl.fetish == "dom">>
 		with confidence.
-	<<elseif $HeadGirl.energy > 95>>
+	<<elseif _S.HeadGirl.energy > 95>>
 		as a convenient way to
-		<<if ($HeadGirl.balls > 0)>>
+		<<if (_S.HeadGirl.balls > 0)>>
 			drain $his perpetually overfilled balls into a series of spasming holes.
 		<<else>>
 			sate $his excess sexual appetite.
@@ -132,18 +132,18 @@ $He helps $activeSlave.slaveName however $he can. The tender care has @@.green;i
 		<<set $activeSlave.trust -= 1>>
 		<<set $activeSlave.devotion -= 1>>
 	<</if>>
-	$HeadGirl.slaveName makes sure $his victim hates it, every time, and $activeSlave.slaveName can't help but do _his2 very best to avoid this treatment.
+	_S.HeadGirl.slaveName makes sure $his victim hates it, every time, and $activeSlave.slaveName can't help but do _his2 very best to avoid this treatment.
 <<elseif $HGSeverity == 0>>
 	You allow $him to use $his own judgment when punishing failures,
-	<<if $HeadGirl.sexualFlaw == "abusive">>
+	<<if _S.HeadGirl.sexualFlaw == "abusive">>
 		and $he usually decides in favor of forcing misbehaving slaves to get $him off.
-	<<elseif $HeadGirl.fetish == "sadist">>
+	<<elseif _S.HeadGirl.fetish == "sadist">>
 		permission the sadist uses for $his own gratification.
-	<<elseif $HeadGirl.fetish == "dom">>
+	<<elseif _S.HeadGirl.fetish == "dom">>
 		which the dominant $girl uses confidently.
-	<<elseif $HeadGirl.energy > 95>>
+	<<elseif _S.HeadGirl.energy > 95>>
 		which $he uses to
-		<<if ($HeadGirl.balls > 0)>>
+		<<if (_S.HeadGirl.balls > 0)>>
 			force $his subordinates to keep $his balls drained.
 		<<else>>
 			extract the constant sexual favors $his libido demands.
@@ -187,7 +187,7 @@ $He helps $activeSlave.slaveName however $he can. The tender care has @@.green;i
 
 <<set _effectiveness -= ($activeSlave.intelligence+$activeSlave.intelligenceImplant)/3>>
 <<set $activeSlave.training += _effectiveness>>
-$HeadGirl.slaveName does $his best to get $activeSlave.slaveName past it with punishments and rewards,
+_S.HeadGirl.slaveName does $his best to get $activeSlave.slaveName past it with punishments and rewards,
 <<if $activeSlave.training > 100>>
 	and @@.green;resolves $activeSlave.slaveName's paraphilia.@@
 	<<set $activeSlave.training = 0>>
@@ -200,7 +200,7 @@ $HeadGirl.slaveName does $his best to get $activeSlave.slaveName past it with pu
 
 <<set _effectiveness -= ($activeSlave.intelligence+$activeSlave.intelligenceImplant)/3>>
 <<set $activeSlave.training += _effectiveness>>
-$HeadGirl.slaveName punishes $activeSlave.slaveName whenever $he catches _him2 indulging in _his2 bad habits,
+_S.HeadGirl.slaveName punishes $activeSlave.slaveName whenever $he catches _him2 indulging in _his2 bad habits,
 <<if $activeSlave.training > 100>>
 	and @@.green;fixes $activeSlave.slaveName's flaw.@@
 	<<set $activeSlave.training = 0>>
@@ -233,13 +233,13 @@ $He punishes $activeSlave.slaveName whenever $he sees _him2 breaking the rules y
 <<elseif $HGtraining == "oral skill">>
 
 <<set $activeSlave.training = 0>>
-<<if ($HeadGirl.fetish == "cumslut") && ($HeadGirl.fetishStrength > 60)>>
+<<if (_S.HeadGirl.fetish == "cumslut") && (_S.HeadGirl.fetishStrength > 60)>>
 	In spare moments $he teaches $activeSlave.slaveName how to suck cocks, cunts, and assholes. $His enthusiasm for oral sex is infectious. $activeSlave.slaveName's @@.green;oral skills have improved.@@
 	<<= SkillIncrease.Oral($activeSlave, random(5,10))>>
-<<elseif ($HeadGirl.dick > 0) && canPenetrate($HeadGirl)>>
+<<elseif (_S.HeadGirl.dick > 0) && canPenetrate(_S.HeadGirl)>>
 	In spare moments $he teaches $activeSlave.slaveName how to suck cocks, cunts, and assholes. Your Head Girl uses $his penis as an effective teaching tool. $activeSlave.slaveName's @@.green;oral skills have improved.@@
 	<<= SkillIncrease.Oral($activeSlave, random(5,10))>>
-<<elseif ($HeadGirl.clit > 2)>>
+<<elseif (_S.HeadGirl.clit > 2)>>
 	In spare moments $he teaches $activeSlave.slaveName how to suck cocks, cunts, and assholes. Your Head Girl uses $his pseudophallus-sized clit as an effective teaching tool. $activeSlave.slaveName's @@.green;oral skills have improved.@@
 	<<= SkillIncrease.Oral($activeSlave, random(5,10))>>
 <<else>>
@@ -250,13 +250,13 @@ $He punishes $activeSlave.slaveName whenever $he sees _him2 breaking the rules y
 <<elseif $HGtraining == "anal skill">>
 
 <<set $activeSlave.training = 0>>
-<<if ($HeadGirl.fetish == "buttslut") && ($HeadGirl.fetishStrength > 60)>>
+<<if (_S.HeadGirl.fetish == "buttslut") && (_S.HeadGirl.fetishStrength > 60)>>
 	In spare moments $he teaches $activeSlave.slaveName how to take it up the ass. Your Head Girl's enthusiasm for backdoor loving is infectious. $activeSlave.slaveName's @@.green;anal skills have improved.@@
 	<<= SkillIncrease.Anal($activeSlave, random(5,10))>>
-<<elseif ($HeadGirl.dick > 0) && canPenetrate($HeadGirl)>>
+<<elseif (_S.HeadGirl.dick > 0) && canPenetrate(_S.HeadGirl)>>
 	In spare moments $he teaches $activeSlave.slaveName how to take a dick up the butt. Your Head Girl uses $his penis as an effective teaching tool. $activeSlave.slaveName's @@.green;anal skills have improved.@@
 	<<= SkillIncrease.Anal($activeSlave, random(5,10))>>
-<<elseif ($HeadGirl.clit > 2)>>
+<<elseif (_S.HeadGirl.clit > 2)>>
 	In spare moments $he teaches $activeSlave.slaveName how to take a phallus up the butt. Your Head Girl uses $his pseudophallus-sized clit as an effective teaching tool. $activeSlave.slaveName's @@.green;anal skills have improved.@@
 	<<= SkillIncrease.Anal($activeSlave, random(5,10))>>
 <<else>>
@@ -267,13 +267,13 @@ $He punishes $activeSlave.slaveName whenever $he sees _him2 breaking the rules y
 <<elseif $HGtraining == "fuck skill">>
 
 <<set $activeSlave.training = 0>>
-<<if ($HeadGirl.energy > 95)>>
+<<if (_S.HeadGirl.energy > 95)>>
 	In spare moments $he teaches $activeSlave.slaveName how to take a dick. Your Head Girl's enthusiasm for sex is infectious. $activeSlave.slaveName's @@.green;vanilla sex skills have improved.@@
 	<<= SkillIncrease.Vaginal($activeSlave, random(5,10))>>
-<<elseif ($HeadGirl.dick > 0) && canPenetrate($HeadGirl)>>
+<<elseif (_S.HeadGirl.dick > 0) && canPenetrate(_S.HeadGirl)>>
 	In spare moments $he teaches $activeSlave.slaveName how to take a dick. Your Head Girl uses $his penis as an effective teaching tool. $activeSlave.slaveName's @@.green;vanilla sex skills have improved.@@
 	<<= SkillIncrease.Vaginal($activeSlave, random(5,10))>>
-<<elseif ($HeadGirl.clit > 2)>>
+<<elseif (_S.HeadGirl.clit > 2)>>
 	In spare moments $he teaches $activeSlave.slaveName how to take a phallus. Your Head Girl uses $his pseudophallus-sized clit as an effective teaching tool. $activeSlave.slaveName's @@.green;vanilla sex skills have improved.@@
 	<<= SkillIncrease.Vaginal($activeSlave, random(5,10))>>
 <<else>>
@@ -290,7 +290,7 @@ In spare moments $he teaches $activeSlave.slaveName how to prostitute _himself2.
 <<elseif $HGtraining == "entertain skill">>
 
 <<set $activeSlave.training = 0>>
-<<if ($HeadGirl.fetish == "humiliation") && ($HeadGirl.fetishStrength > 60)>>
+<<if (_S.HeadGirl.fetish == "humiliation") && (_S.HeadGirl.fetishStrength > 60)>>
 	In spare moments $he teaches $activeSlave.slaveName how to entertain. Your Head Girl's enthusiasm for public display is infectious. $activeSlave.slaveName's @@.green;entertainment skills have improved.@@
 	<<= SkillIncrease.Entertain($activeSlave, random(5,10))>>
 <<else>>
@@ -304,7 +304,7 @@ In spare moments $he teaches $activeSlave.slaveName how to prostitute _himself2.
 <<if ($activeSlave.devotion >= -20)>>
 <<if ($activeSlave.attrKnown == 0)>>
 	<<set $activeSlave.attrKnown = 1>>
-	$HeadGirl.slaveName also investigates the slave's basic sexual orientation, finding that _he2 is
+	_S.HeadGirl.slaveName also investigates the slave's basic sexual orientation, finding that _he2 is
 	<<if ($activeSlave.attrXY <= 40)>>
 		@@.red;disgusted by men@@
 	<<elseif ($activeSlave.attrXY <= 60)>>
@@ -342,9 +342,9 @@ In spare moments $he teaches $activeSlave.slaveName how to prostitute _himself2.
 					<<set _piercingForbidden = 1, $activeSlave.earPiercing = 0>>
 				<<else>>
 					<<if $arcologies[0].FSDegradationist != "unset">>
-						$HeadGirl.slaveName knows that $activeSlave.slaveName needs to adjust to life as a slave _girl2, so $he has the slave's ears pierced. This will be a constant reminder that _he2 is simply a sexual object here.
+						_S.HeadGirl.slaveName knows that $activeSlave.slaveName needs to adjust to life as a slave _girl2, so $he has the slave's ears pierced. This will be a constant reminder that _he2 is simply a sexual object here.
 					<<else>>
-						$HeadGirl.slaveName knows that $activeSlave.slaveName needs help adjusting to life as a slave _girl2, so $he has the slave's ears pierced. A little feminine touch can make a big difference.
+						_S.HeadGirl.slaveName knows that $activeSlave.slaveName needs help adjusting to life as a slave _girl2, so $he has the slave's ears pierced. A little feminine touch can make a big difference.
 					<</if>>
 					<<run cashX(forceNeg($modCost), "slaveMod", $activeSlave)>>
 					<<break>>
@@ -361,9 +361,9 @@ In spare moments $he teaches $activeSlave.slaveName how to prostitute _himself2.
 					<<set _piercingForbidden = 1, $activeSlave.nosePiercing = 0>>
 				<<else>>
 					<<if $arcologies[0].FSDegradationist != "unset">>
-						$HeadGirl.slaveName knows that $activeSlave.slaveName needs to adjust to life as a slave _girl2, so $he gives the slave nasal studs and a large septum ring. It should push $activeSlave.slaveName to see _himself2 as a sexual object for others to use.
+						_S.HeadGirl.slaveName knows that $activeSlave.slaveName needs to adjust to life as a slave _girl2, so $he gives the slave nasal studs and a large septum ring. It should push $activeSlave.slaveName to see _himself2 as a sexual object for others to use.
 					<<else>>
-						$HeadGirl.slaveName knows that $activeSlave.slaveName needs help adjusting to life as a slave _girl2, so $he gives the slave a cute little nose piercing. It should help $activeSlave.slaveName see _himself2 as a bit more feminine.
+						_S.HeadGirl.slaveName knows that $activeSlave.slaveName needs help adjusting to life as a slave _girl2, so $he gives the slave a cute little nose piercing. It should help $activeSlave.slaveName see _himself2 as a bit more feminine.
 					<</if>>
 					<<run cashX(forceNeg($modCost), "slaveMod", $activeSlave)>>
 					<<break>>
@@ -380,9 +380,9 @@ In spare moments $he teaches $activeSlave.slaveName how to prostitute _himself2.
 					<<set _piercingForbidden = 1, $activeSlave.eyebrowPiercing = 0>>
 				<<else>>
 					<<if $arcologies[0].FSDegradationist != "unset">>
-						$HeadGirl.slaveName knows that $activeSlave.slaveName needs to adjust to life as a slave _girl2, so $he gives the slave multiple eyebrow piercings. A slutty touch for a slave _girl2 should help _him2 feel a little hungrier for cock.
+						_S.HeadGirl.slaveName knows that $activeSlave.slaveName needs to adjust to life as a slave _girl2, so $he gives the slave multiple eyebrow piercings. A slutty touch for a slave _girl2 should help _him2 feel a little hungrier for cock.
 					<<else>>
-						$HeadGirl.slaveName knows that $activeSlave.slaveName needs help adjusting to life as a slave _girl2, so $he gives the slave a cute little eyebrow piercing. A slutty touch for a slave _girl2 should help _him2 feel a little hungrier for cock.
+						_S.HeadGirl.slaveName knows that $activeSlave.slaveName needs help adjusting to life as a slave _girl2, so $he gives the slave a cute little eyebrow piercing. A slutty touch for a slave _girl2 should help _him2 feel a little hungrier for cock.
 					<</if>>
 					<<run cashX(forceNeg($modCost), "slaveMod", $activeSlave)>>
 					<<break>>
@@ -399,9 +399,9 @@ In spare moments $he teaches $activeSlave.slaveName how to prostitute _himself2.
 					<<set _piercingForbidden = 1, $activeSlave.lipsPiercing = 0>>
 				<<else>>
 					<<if $arcologies[0].FSDegradationist != "unset">>
-						$HeadGirl.slaveName knows that $activeSlave.slaveName needs to adjust to life as a slave _girl2, so $he has the slave's lower lip pierced. _His2 mouth is for pleasing penises now, so it'll help _him2 if it looks like it.
+						_S.HeadGirl.slaveName knows that $activeSlave.slaveName needs to adjust to life as a slave _girl2, so $he has the slave's lower lip pierced. _His2 mouth is for pleasing penises now, so it'll help _him2 if it looks like it.
 					<<else>>
-						$HeadGirl.slaveName knows that $activeSlave.slaveName needs help adjusting to life as a slave _girl2, so $he has the slave's lower lip pierced. _His2 mouth is for pleasing penises now, so it'll help _him2 if it looks like it.
+						_S.HeadGirl.slaveName knows that $activeSlave.slaveName needs help adjusting to life as a slave _girl2, so $he has the slave's lower lip pierced. _His2 mouth is for pleasing penises now, so it'll help _him2 if it looks like it.
 					<</if>>
 					<<run cashX(forceNeg($modCost), "slaveMod", $activeSlave)>>
 					<<break>>
@@ -418,9 +418,9 @@ In spare moments $he teaches $activeSlave.slaveName how to prostitute _himself2.
 					<<set _piercingForbidden = 1, $activeSlave.navelPiercing = 0>>
 				<<else>>
 					<<if $arcologies[0].FSDegradationist != "unset">>
-						$HeadGirl.slaveName knows that $activeSlave.slaveName needs help adjusting to life as a slave _girl2, so $he has the slave's navel pierced with a big ring. Whatever _he2 thinks in _his2 mind, $HeadGirl.slaveName makes clear to _him2 that _his2 body belongs to you.
+						_S.HeadGirl.slaveName knows that $activeSlave.slaveName needs help adjusting to life as a slave _girl2, so $he has the slave's navel pierced with a big ring. Whatever _he2 thinks in _his2 mind, _S.HeadGirl.slaveName makes clear to _him2 that _his2 body belongs to you.
 					<<else>>
-						$HeadGirl.slaveName knows that $activeSlave.slaveName needs help adjusting to life as a slave _girl2, so $he has the slave's navel pierced. The prettier _his2 lower half looks, the less reluctant _he2 should feel to take it up the butt.
+						_S.HeadGirl.slaveName knows that $activeSlave.slaveName needs help adjusting to life as a slave _girl2, so $he has the slave's navel pierced. The prettier _his2 lower half looks, the less reluctant _he2 should feel to take it up the butt.
 					<</if>>
 					<<run cashX(forceNeg($modCost), "slaveMod", $activeSlave)>>
 					<<break>>
@@ -430,9 +430,9 @@ In spare moments $he teaches $activeSlave.slaveName how to prostitute _himself2.
 		<</for>>
 		<<if _piercingForbidden>>
 			<<if $arcologies[0].FSDegradationist != "unset">>
-				$HeadGirl.slaveName thinks some piercings might push $activeSlave.slaveName to adjust to life as a slave _girl2, but $he also knows you have rules applied to this slave that forbid it.
+				_S.HeadGirl.slaveName thinks some piercings might push $activeSlave.slaveName to adjust to life as a slave _girl2, but $he also knows you have rules applied to this slave that forbid it.
 			<<else>>
-				$HeadGirl.slaveName thinks some cute piercings might help $activeSlave.slaveName adjust to life as a slave _girl2, but $he also knows you have rules applied to this slave that forbid it.
+				_S.HeadGirl.slaveName thinks some cute piercings might help $activeSlave.slaveName adjust to life as a slave _girl2, but $he also knows you have rules applied to this slave that forbid it.
 			<</if>>
 		<</if>>
 	<</if>>
diff --git a/src/uncategorized/hgSelect.tw b/src/uncategorized/hgSelect.tw
index 9b59519943036776a718a4ba2ca4f1ea753d87fc..50bf5f532d7704bd7c28b61f7f92a8d622cbac8b 100644
--- a/src/uncategorized/hgSelect.tw
+++ b/src/uncategorized/hgSelect.tw
@@ -5,10 +5,9 @@
 <h1>Head Girl Management</h1>
 
 <<set _HGName = "Your Head Girl">>
-<<if ($HeadGirl != 0)>>
-	<<set $HeadGirl = getSlave($HeadGirl.ID)>>
-	<<setLocalPronouns $HeadGirl>>
-	<<set _HGName = SlaveFullName($HeadGirl)>>
+<<if ($HeadGirlID != 0)>>
+	<<setLocalPronouns _S.HeadGirl>>
+	<<set _HGName = SlaveFullName(_S.HeadGirl)>>
 	<span class='slave-name'>_HGName</span> is serving as your Head Girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort; it is $his role to serve and comfort you at your side, in addition to performing normal Head Girl duties<</if>>.
 	<<if ($HGSuite)>>
 		<br> Currently $he lives in <<link "$HGSuiteNameCaps""Head Girl Suite">><</link>>
@@ -66,22 +65,22 @@ _HGName
 <</if>>
 
 <<if $seePreg != 0>>
-	<<if $HeadGirl != 0>>
+	<<if $HeadGirlID != 0>>
 		<<if $universalRulesImpregnation == "HG">>
 			<br><br>_HGName is responsible for impregnating fertile slaves.
-			<<set $HGCum = 2+Math.trunc(($HeadGirl.balls/5)+($HeadGirl.energy/95)+($HeadGirl.health.condition/95)+($HeadGirl.devotion/95)+($reproductionFormula*5))>>
-			<<if canPenetrate($HeadGirl) && $HeadGirl.pubertyXY == 1>>
-				To maximize the chances of impregnation, $he will fuck fertile pussies frequently during the week. $HeadGirl.slaveName can service $HGCum slaves this way.
-				<<if $HeadGirl.devotion > 95>>$He loves you so much $he'll fuck them until $he's sore.<<else>>If $he were more devoted to you, $he might be able to drive $himself to get hard and service one more.<</if>>
-				<<if $HeadGirl.balls >= 120>>$His unreal balls produce nearly an endless supply of semen; $his ability to impregnate is almost limitless.<<elseif $HeadGirl.balls >= 80>>$His inhuman balls produce so much semen $he can easily impregnate twenty girls in one sitting.<<elseif $HeadGirl.balls >= 50>>$His giant balls produce so much semen $he can easily impregnate twelve girls in one sitting.<<elseif $HeadGirl.balls >= 25>>$His oversized balls produce so much semen $he can cum repeatedly in a single session.<<elseif $HeadGirl.balls >= 5>>$His big balls produce so much semen $he can cum more before $he's drained.<<else>>Bigger balls would let $him cum more before $he's drained.<</if>>
-				<<if $HeadGirl.health.condition > 95>>$His wonderful health lets $him get hard and stay hard all the time.<<else>>If $his health were perfect, $he might be able to get hard more often.<</if>>
-				<<if $HeadGirl.energy > 95>>$His nymphomania drives $him to go above and beyond in this.<<else>>A more powerful sex drive could reduce $his refractory period.<</if>>
+			<<set $HGCum = 2+Math.trunc((_S.HeadGirl.balls/5)+(_S.HeadGirl.energy/95)+(_S.HeadGirl.health.condition/95)+(_S.HeadGirl.devotion/95)+($reproductionFormula*5))>>
+			<<if canPenetrate(_S.HeadGirl) && _S.HeadGirl.pubertyXY == 1>>
+				To maximize the chances of impregnation, $he will fuck fertile pussies frequently during the week. _S.HeadGirl.slaveName can service $HGCum slaves this way.
+				<<if _S.HeadGirl.devotion > 95>>$He loves you so much $he'll fuck them until $he's sore.<<else>>If $he were more devoted to you, $he might be able to drive $himself to get hard and service one more.<</if>>
+				<<if _S.HeadGirl.balls >= 120>>$His unreal balls produce nearly an endless supply of semen; $his ability to impregnate is almost limitless.<<elseif _S.HeadGirl.balls >= 80>>$His inhuman balls produce so much semen $he can easily impregnate twenty girls in one sitting.<<elseif _S.HeadGirl.balls >= 50>>$His giant balls produce so much semen $he can easily impregnate twelve girls in one sitting.<<elseif _S.HeadGirl.balls >= 25>>$His oversized balls produce so much semen $he can cum repeatedly in a single session.<<elseif _S.HeadGirl.balls >= 5>>$His big balls produce so much semen $he can cum more before $he's drained.<<else>>Bigger balls would let $him cum more before $he's drained.<</if>>
+				<<if _S.HeadGirl.health.condition > 95>>$His wonderful health lets $him get hard and stay hard all the time.<<else>>If $his health were perfect, $he might be able to get hard more often.<</if>>
+				<<if _S.HeadGirl.energy > 95>>$His nymphomania drives $him to go above and beyond in this.<<else>>A more powerful sex drive could reduce $his refractory period.<</if>>
 			<<else>>
-				However, $HeadGirl.slaveName cannot perform this duty.
+				However, _S.HeadGirl.slaveName cannot perform this duty.
 			<</if>>
 			[["Rescind " + $his + " impregnation responsibility"|HG Select][$universalRulesImpregnation = "none"]] | [[See to it yourself|HG Select][$universalRulesImpregnation = "PC"]]
 		<<else>>
-			<<if canPenetrate($HeadGirl) && $HeadGirl.pubertyXY == 1>>
+			<<if canPenetrate(_S.HeadGirl) && _S.HeadGirl.pubertyXY == 1>>
 				<br><br>_HGName is capable of impregnating slaves, but it's not part of $his responsibilities. [["Assign " + $him + " to impregnate"|HG Select][$universalRulesImpregnation = "HG"]]
 			<</if>>
 		<</if>>
@@ -89,6 +88,6 @@ _HGName
 <</if>>
 
 <br><br>''Appoint a Head Girl from among your devoted slaves:''
-<br><br>[[None|Main][removeJob($HeadGirl, "be your Head Girl")]]
+<br><br>[[None|Main][removeJob(_S.HeadGirl, "be your Head Girl")]]
 <br><br>
 <<includeDOM App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.headGirlSuite, "Main")>>
diff --git a/src/uncategorized/industrialDairyAssignmentScene.tw b/src/uncategorized/industrialDairyAssignmentScene.tw
index 87706ae8439dad5212d902ec86c0d121b0c58486..f11092ded5895057c367edd4fa235544afd3bf37 100644
--- a/src/uncategorized/industrialDairyAssignmentScene.tw
+++ b/src/uncategorized/industrialDairyAssignmentScene.tw
@@ -237,10 +237,10 @@ When $activeSlave.slaveName reports to the dairy, it's to the <<if canSee($activ
 	<<else>>
 		$He turns and tries to run, so
 	<</if>>
-	<<if ($Milkmaid == 0)>>
+	<<if (_S.Milkmaid == 0)>>
 		you are
 	<<else>>
-		$Milkmaid.slaveName is
+		_S.Milkmaid.slaveName is
 	<</if>>
 	obliged to
 	<<if (!isAmputee($activeSlave))>>
@@ -275,10 +275,10 @@ When $activeSlave.slaveName reports to the dairy, it's to the <<if canSee($activ
 	<<else>>
 		$He turns and tries to run, so
 	<</if>>
-	<<if ($Milkmaid == 0)>>
+	<<if (_S.Milkmaid == 0)>>
 		you are
 	<<else>>
-		$Milkmaid.slaveName is
+		_S.Milkmaid.slaveName is
 	<</if>>
 	obliged to
 	<<if (!isAmputee($activeSlave))>>
diff --git a/src/uncategorized/madamSelect.tw b/src/uncategorized/madamSelect.tw
index ef9dd5cba03b64805673f427aa54641c13ff5eeb..35ec6c33eb6b97f7f5f6e8f5dca0c69b1643e038 100644
--- a/src/uncategorized/madamSelect.tw
+++ b/src/uncategorized/madamSelect.tw
@@ -1,15 +1,14 @@
 :: Madam Select [nobr jump-to-safe jump-hidden jump-from-safe]
 
 <<set $nextButton = "Back", $nextLink = "Brothel", $encyclopedia = "Madam">>
-<<if ($Madam != 0)>>
-	<<set $Madam = getSlave($Madam.ID)>>
-	<<setLocalPronouns $Madam>>
-	<span class='slave-name'><<= SlaveFullName($Madam)>></span> is serving as your Madam.<br><br>$He will manage the brothel.
+<<if ($MadamID != 0)>>
+	<<setLocalPronouns _S.Madam>>
+	<span class='slave-name'><<= SlaveFullName(_S.Madam)>></span> is serving as your Madam.<br><br>$He will manage the brothel.
 <<else>>
 	You have not selected a Madam.
 <</if>>
 
 <br><br>''Appoint a Madam from your devoted slaves:''
-<br><br>[[None|Brothel][removeJob($Madam, "be the Madam")]]
+<br><br>[[None|Brothel][removeJob(_S.Madam, "be the Madam")]]
 <br><br>
 <<includeDOM App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.brothel, "Brothel")>>
diff --git a/src/uncategorized/masterSuite.tw b/src/uncategorized/masterSuite.tw
index c7d5fc3a683355a4f759a4444c850ecbc7e28472..42a8792219a00200441e8f5582cef00220be59b0 100644
--- a/src/uncategorized/masterSuite.tw
+++ b/src/uncategorized/masterSuite.tw
@@ -9,9 +9,9 @@
 
 <<set $masterSuiteAverageEnergy = 0, _masterSuiteAverageCum = 0, _masterSuiteAverageDick = 0, _masterSuiteAverageDom = 0, _masterSuiteAverageMilk = 0, _masterSuiteAveragePreg = 0, _masterSuiteAverageSadism = 0, _masterSuitePregnantSlaves = 0, _masterSuitePregnantSlavesMultiple = 0>>
 
-<<if ($Concubine != 0 && $Concubine.pregKnown == 1)>>
+<<if (_S.Concubine && _S.Concubine.pregKnown == 1)>>
 	<<set _masterSuitePregnantSlaves++>>
-	<<if $Concubine.pregType > 1>>
+	<<if _S.Concubine.pregType > 1>>
 		<<set _masterSuitePregnantSlavesMultiple++>>
 	<</if>>
 <</if>>
@@ -323,7 +323,7 @@ $masterSuiteNameCaps is furnished
 <<set _Tmult0 = Math.trunc($masterSuite*1000*$upgradeMultiplierArcology)>>
 <div class="choices" style="font-style:normal">
 	[[Expand the Master Suite|Master Suite][cashX(forceNeg(_Tmult0), "capEx"), $masterSuite += 2, $PC.skill.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>//
-	<<if $Concubine == 0 && _MsL == 0>>
+	<<if $ConcubineID == 0 && _MsL == 0>>
 		| [[Decommission the Master Suite|Main][$masterSuite = 0, $masterSuiteUpgradeLuxury = 0, $masterSuitePregnancySlaveLuxuries = 0, $masterSuiteDecoration = "standard", $masterSuitePregnancyFertilityDrugs = 0, $masterSuitePregnancyFertilitySupplements = 0, $masterSuiteUpgradePregnancy = 0, $masterSuiteHyperPregnancy = 0]]
 	<</if>>
 </div>
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index 011d38e4bb5f810e78c101a6bdbfcaf3c86d0645..e6fe51ccbb1c5280597b942aeca12639e55af432 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -2,13 +2,9 @@
 
 <<set _slaves = App.Utils.sortedEmployees(App.Entity.facilities.masterSuite)>>
 <<set _DL = _slaves.length, _SL = $slaves.length, $legendaryAbolitionistID = 0, $masterSuiteAverageEnergy = 0, _masterSuiteAverageCum = 0, _masterSuiteAverageDick = 0, _masterSuiteAverageDom = 0, _masterSuiteAverageMilk = 0, _masterSuiteAveragePreg = 0, _masterSuiteAverageSadism = 0, _masterSuitePregnantSlaves = 0, _masterSuitePregnantSlavesMultiple = 0>>
-<<if $Concubine != 0>>
-	<<set _FLs = $slaveIndices[$Concubine.ID]>>
-
-	<<if def _FLs>>
-		/% Add the Concubine to the _slaves list at the front of the array, so that $he displays first %/
-		<<set _slaves.unshift($Concubine), _DL++>>
-	<</if>>
+<<if $ConcubineID != 0>>
+	/% Add the Concubine to the _slaves list at the front of the array, so that $he displays first %/
+	<<set _slaves.unshift(_S.Concubine), _DL++>>
 <</if>>
 
 <<if _DL > 0>>
@@ -105,45 +101,44 @@
 		</div>
 		<</if>>
 		/* 000-250-006 */
-		<<if (_slave.assignment == "be your Concubine")>>
-			<<set $Concubine = $slaves[_FLs]>>
-			''Your concubine <<= SlaveFullName($Concubine)>> is serving you in $masterSuiteName.'' More than any other slave, $his sexual brilliance and physical appeal are @@.green;critical@@ to your reputation.
+		<<if (_slave.assignment == Job.CONCUBINE)>>
+			''Your concubine <<= SlaveFullName(_S.Concubine)>> is serving you in $masterSuiteName.'' More than any other slave, $his sexual brilliance and physical appeal are @@.green;critical@@ to your reputation.
 
-			<<if (($Concubine.prestigeDesc == "You bankrupted and enslaved $him in revenge for $his part in the attack on your arcology by the Daughters of Liberty.") && ($Concubine.newGamePlus == 0))>>
+			<<if ((_S.Concubine.prestigeDesc == "You bankrupted and enslaved $him in revenge for $his part in the attack on your arcology by the Daughters of Liberty.") && (_S.Concubine.newGamePlus == 0))>>
 				$He was once your rival, and your relationship is widely thought to be @@.green;the perfect modern romance.@@
-				<<run repX(500, "concubine", $Concubine)>>
-			<<elseif ($Concubine.prestige > 0)>>
-				<<run repX(500*$Concubine.prestige, "concubine", $Concubine)>>
+				<<run repX(500, "concubine", _S.Concubine)>>
+			<<elseif (_S.Concubine.prestige > 0)>>
+				<<run repX(500*_S.Concubine.prestige, "concubine", _S.Concubine)>>
 				<<if $verboseDescriptions == 1>>
 					Keeping such a prestigious slave as your concubine @@.green;adds to your fame.@@
-					<<if $Concubine.prestigeDesc == "$He is a famed Free Cities whore, and commands top prices.">>
+					<<if _S.Concubine.prestigeDesc == "$He is a famed Free Cities whore, and commands top prices.">>
 						When $he has a free moment, $he refines $his flexibility so that $he is prepared for any sexual position you can think of, and many more that $he researched just for your pleasure.
 					<</if>>
-					<<if $Concubine.prestigeDesc == "$He is a famed Free Cities slut, and can please anyone.">>
+					<<if _S.Concubine.prestigeDesc == "$He is a famed Free Cities slut, and can please anyone.">>
 						When $he has a free moment, $he pretties $himself up so that $he may be as beautiful as possible to make you look even better.
 					<</if>>
-					<<if $Concubine.prestigeDesc == "$He is remembered for winning best in show as a cockmilker.">>
-						<<if $Concubine.balls > 10 || $Concubine.prostate > 1>>
+					<<if _S.Concubine.prestigeDesc == "$He is remembered for winning best in show as a cockmilker.">>
+						<<if _S.Concubine.balls > 10 || _S.Concubine.prostate > 1>>
 							$He does $his best to prevent $himself from making a mess when you don't want one. When $he has free time, $he researches new techniques to make use of $his huge loads to entertain you.
-						<<elseif $Concubine.balls > 0>>
+						<<elseif _S.Concubine.balls > 0>>
 							When $he has a free moment, $he researches ways to increase the size of $his loads for you; $he dreams of the day $he show you just what $he was capable of.
 						<<else>>
 							$He wishes $he could blow huge loads for you, but without balls, there is little $he can do.
 						<</if>>
 					<</if>>
-					<<if $Concubine.prestigeDesc == "$He is remembered for winning best in show as a dairy cow.">>
-						<<if $Concubine.lactation > 1 || $Concubine.lactationAdaptation > 90>>
+					<<if _S.Concubine.prestigeDesc == "$He is remembered for winning best in show as a dairy cow.">>
+						<<if _S.Concubine.lactation > 1 || _S.Concubine.lactationAdaptation > 90>>
 							$He does $his best to prevent $himself from making a mess when you don't want one. When $he has free time, $he researches new techniques to make use of $his excessive milk to entertain you.
-						<<elseif $Concubine.lactation > 0>>
+						<<elseif _S.Concubine.lactation > 0>>
 							$He does $his best to prevent $himself from making a mess when you don't want one. When $he has free time, $he researches new techniques to make use of $his breast milk to entertain you.
 						<<else>>
 							$He wishes $he could lactate for you, but $he has dried up since $his glory days.
 						<</if>>
 					<</if>>
-					<<if $Concubine.prestigeDesc == "$He is remembered for winning best in show as a breeder.">>
-						<<if $Concubine.bellyPreg >= 5000>>
+					<<if _S.Concubine.prestigeDesc == "$He is remembered for winning best in show as a breeder.">>
+						<<if _S.Concubine.bellyPreg >= 5000>>
 							When $he has a free moment, $he refines $his flexibility so that $he can perform any sexual position possible for $him in $his motherly state. $He takes the time to look up new positions to work around $his growing pregnancy.
-						<<elseif isFertile($Concubine) || $Concubine.preg > 0>>
+						<<elseif isFertile(_S.Concubine) || _S.Concubine.preg > 0>>
 							When $he has a free moment, $he refines $his flexibility so that $he is prepared for any sexual position you can think of, no matter how heavy $he becomes with children.
 						<<else>>
 							When $he has a free moment, $he researches ways to restore $his fertility; $he dreams of the day $he can carry <<if $PC.dick != 0>>your children<<else>>children for you<</if>>.
@@ -151,16 +146,16 @@
 					<</if>>
 				<</if>>
 			<</if>>
-			<<if $Concubine.porn.prestige > 2>>
-				<<run repX(800, "concubine", $Concubine)>>
+			<<if _S.Concubine.porn.prestige > 2>>
+				<<run repX(800, "concubine", _S.Concubine)>>
 				Having a porn star as your personal bed warmer @@.green;reflects on your standing.@@ Your citizens can only wonder at what kinky things happen behind closed doors.
-			<<elseif $Concubine.porn.prestige > 1>>
-				<<run repX(300, "concubine", $Concubine)>>
+			<<elseif _S.Concubine.porn.prestige > 1>>
+				<<run repX(300, "concubine", _S.Concubine)>>
 				Having a rising porn star as your personal bed warmer @@.green;reflects on your standing.@@
 			<</if>>
-			<<if ($Concubine.counter.oral + $Concubine.counter.anal + $Concubine.counter.vaginal + $Concubine.counter.mammary + $Concubine.counter.penetrative > 1000)>>
-				<<if $verboseDescriptions == 1>>Many citizens <<if $Concubine.counter.publicUse > 10>>remember having had $him themselves, and <</if>>@@.green;respectfully@@ envy you $his exclusive company.<</if>>
-				<<run repX(300, "concubine", $Concubine)>>
+			<<if (_S.Concubine.counter.oral + _S.Concubine.counter.anal + _S.Concubine.counter.vaginal + _S.Concubine.counter.mammary + _S.Concubine.counter.penetrative > 1000)>>
+				<<if $verboseDescriptions == 1>>Many citizens <<if _S.Concubine.counter.publicUse > 10>>remember having had $him themselves, and <</if>>@@.green;respectfully@@ envy you $his exclusive company.<</if>>
+				<<run repX(300, "concubine", _S.Concubine)>>
 			<</if>>
 			<<if $masterSuiteUpgradeLuxury > 0>>
 				<<set _slave.rules.living = "luxurious", _slave.devotion += 4, _slave.trust += 4>>
@@ -170,7 +165,7 @@
 			<<if $masterSuiteDecoration != "standard">>
 				<<set _slave.devotion++>>
 			<</if>>
-			<<run repX(Beauty($Concubine) * 5 + ($Concubine.skill.vaginal || 0) + ($Concubine.skill.anal || 0) + ($Concubine.skill.oral || 0) + ($Concubine.skill.whoring || 0) + ($Concubine.skill.entertainment || 0), "concubine", $Concubine)>>
+			<<run repX(Beauty_S. * 5 + (_S.Concubine.skill.vaginal || 0) + (_S.Concubine.skill.anal || 0) + (_S.Concubine.skill.oral || 0) + (_S.Concubine.skill.whoring || 0) + (_S.Concubine.skill.entertainment || 0), "concubine", _S.Concubine)>>
 		<<else>> /* not Concubine */
 			<span class='slave-name'><<= SlaveFullName(_slave)>></span>
 			<<if _slave.choosesOwnAssignment == 2>>
@@ -421,6 +416,6 @@
 		<br><br>&nbsp;&nbsp;&nbsp;&nbsp;$masterSuiteNameCaps's $masterSuiteDecoration atmosphere @@.hotpink;has a minor impact on your fucktoys.@@
 	<</if>>
 <</if>>
-<<if _DL > 0 || $Concubine != 0>>
+<<if _DL > 0 || _S.Concubine>>
 	<br><br>
 <</if>>
diff --git a/src/uncategorized/milkmaidSelect.tw b/src/uncategorized/milkmaidSelect.tw
index 36069c2e9c08c7a57e0c1f7a05019ab010c5aca1..02bfe668d0e973b28a3b8deef5ae6eb7d2e896b4 100644
--- a/src/uncategorized/milkmaidSelect.tw
+++ b/src/uncategorized/milkmaidSelect.tw
@@ -1,15 +1,14 @@
 :: Milkmaid Select [nobr jump-to-safe jump-hidden jump-from-safe]
 
 <<set $nextButton = "Back", $nextLink = "Dairy", $encyclopedia = "Milkmaid">>
-<<if ($Milkmaid != 0)>>
-	<<set $Milkmaid = getSlave($Milkmaid.ID)>>
-	<<setLocalPronouns $Milkmaid>>
-	<span class='slave-name'><<= SlaveFullName($Milkmaid)>></span> is serving as your Milkmaid.<br><br>$He will look after your livestock, helping them give milk<<if $seeDicks > 0>> and semen<</if>>.
+<<if ($MilkmaidID != 0)>>
+	<<setLocalPronouns _S.Milkmaid>>
+	<span class='slave-name'><<= SlaveFullName(_S.Milkmaid)>></span> is serving as your Milkmaid.<br><br>$He will look after your livestock, helping them give milk<<if $seeDicks > 0>> and semen<</if>>.
 <<else>>
 	You have not selected a Milkmaid.
 <</if>>
 
 <br><br>''Appoint a Milkmaid from your obedient slaves:''
-<br><br>[[None|Dairy][removeJob($Milkmaid, "be the Milkmaid")]]
+<br><br>[[None|Dairy][removeJob(_S.Milkmaid, "be the Milkmaid")]]
 <br><br>
 <<includeDOM App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.dairy, "Dairy")>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 44c4d5cf6691a27f2e62c86217d2b1740eafd640..b7cb402cc5f2683c8cc1fe3dfae0db99af2f0001 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -1526,7 +1526,7 @@ The legalities completed, <span class='slave-name'><<= SlaveFullName($activeSlav
 							You kneel behind $him and begin to gently massage $his swollen breasts. A steady stream of milk begins to erupt from each nipple. With a sharp intake of breath $he begins to squirm, and $his breast fetish soon has $him moaning and writhing as $he fights an intense orgasm with tears of shame rolling down $his flushed cheeks.
 						<</if>>
 					<</if>>
-					As you summon <<if $HeadGirl != 0>>your Head Girl<<else>>another slave<</if>> to escort the $girl to $his first assignment, $he slumps dejectedly in $his restraints. $He is torn between the knowledge that $he is little more than livestock to you, and the disturbing realization that @@.hotpink;$he might enjoy $his new life as a human cow.@@
+					As you summon <<if $HeadGirlID != 0>>your Head Girl<<else>>another slave<</if>> to escort the $girl to $his first assignment, $he slumps dejectedly in $his restraints. $He is torn between the knowledge that $he is little more than livestock to you, and the disturbing realization that @@.hotpink;$he might enjoy $his new life as a human cow.@@
 					<<set $activeSlave.devotion += 4>>
 				<<else>>
 					<<if $servantMilkers == 1>>
@@ -1534,7 +1534,7 @@ The legalities completed, <span class='slave-name'><<= SlaveFullName($activeSlav
 					<<else>>
 						You kneel behind $him and begin to gently massage $his swollen breasts. A steady stream of milk begins to erupt from each nipple as a look of confusion washes over $his features. $He then closes $his eyes tight and does $his best to ignore what's happening in a futile attempt to deny $his new reality, but you continue $his milking until $he is drained.
 					<</if>>
-					As you summon <<if $HeadGirl != 0>>your Head Girl<<else>>another slave<</if>> to escort the $girl to $his first assignment $he glares at you with disgust. $His resentment at the new burden you've saddled $him with is evident, and the regular milkings $he'll require will serve to remind $him of the @@.gold;disturbing fact that $he is little more than livestock to you.@@
+					As you summon <<if $HeadGirlID != 0>>your Head Girl<<else>>another slave<</if>> to escort the $girl to $his first assignment $he glares at you with disgust. $His resentment at the new burden you've saddled $him with is evident, and the regular milkings $he'll require will serve to remind $him of the @@.gold;disturbing fact that $he is little more than livestock to you.@@
 					<<set $activeSlave.devotion -= 4>>
 				<</if>>
 			<</if>>
@@ -2299,7 +2299,7 @@ The legalities completed, <span class='slave-name'><<= SlaveFullName($activeSlav
 				<<set $activeSlave.counter.anal += 10, $analTotal += 10>>
 				<<= assignJob($activeSlave, "dairy")>>
 				<<replace "#introResult">>
-					You order <<if $HeadGirl == 0>>another slave<<else>>$HeadGirl.slaveName<</if>> to get $activeSlave.slaveName set up in $dairyName. The new slave does not know what $dairyName is, not really, and $he doesn't know what being set up there means, either. If $he knew that you are able to send $him there so blithely only because it is equipped with a special preparatory raper that will seize $him, <<if $activeSlave.vagina > -1>>mercilessly fuck $his pussy and ass until both are gaped<<else>>ream $his anus until it's cavernously gaped<</if>>, and then consign $him to constant fucking by gargantuan machine phalli, $he might resist. But $he doesn't, so $he does not.
+					You order <<if $HeadGirlID == 0>>another slave<<else>>_S.HeadGirl.slaveName<</if>> to get $activeSlave.slaveName set up in $dairyName. The new slave does not know what $dairyName is, not really, and $he doesn't know what being set up there means, either. If $he knew that you are able to send $him there so blithely only because it is equipped with a special preparatory raper that will seize $him, <<if $activeSlave.vagina > -1>>mercilessly fuck $his pussy and ass until both are gaped<<else>>ream $his anus until it's cavernously gaped<</if>>, and then consign $him to constant fucking by gargantuan machine phalli, $he might resist. But $he doesn't, so $he does not.
 				<</replace>>
 			<</link>>
 		<</if>>
@@ -2410,7 +2410,7 @@ The legalities completed, <span class='slave-name'><<= SlaveFullName($activeSlav
 			<<set $activeSlave.assignment = "be confined in the arcade">>
 			<<set $activeSlave.choosesOwnAssignment = 0>>
 			<<replace "#introResult">>
-				You order <<if $HeadGirl == 0>>another slave<<else>>$HeadGirl.slaveName<</if>> to get $activeSlave.slaveName set up in $arcadeName. The new slave does not know what $arcadeName is, not really, and $he doesn't know what being set up there means, either. $He'll be confined inside a small space, not too different from the indignities $he's suffered already. It's only when the restraints lock into place that $he'll understand $his doom. $His mouth will be forced open and presented at one wall of $arcadeName, and $his ass will protrude from its other side, $his holes available for public relief at both ends. $He'll probably refuse to believe the truth, until the first cockhead enters $his mouth<<if $activeSlave.vagina > -1>>, parts $his pussylips,<</if>> or presses against $his poor anus.
+				You order <<if $HeadGirlID == 0>>another slave<<else>>_S.HeadGirl.slaveName<</if>> to get $activeSlave.slaveName set up in $arcadeName. The new slave does not know what $arcadeName is, not really, and $he doesn't know what being set up there means, either. $He'll be confined inside a small space, not too different from the indignities $he's suffered already. It's only when the restraints lock into place that $he'll understand $his doom. $His mouth will be forced open and presented at one wall of $arcadeName, and $his ass will protrude from its other side, $his holes available for public relief at both ends. $He'll probably refuse to believe the truth, until the first cockhead enters $his mouth<<if $activeSlave.vagina > -1>>, parts $his pussylips,<</if>> or presses against $his poor anus.
 				<<if ($arcade <= App.Entity.facilities.arcade.employeesIDs().size)>>Mere <<if $showInches == 2>>yards<<else>>meters<</if>> away, preparations to convert the least appealing Arcade slave into a Fuckdoll begin. As $activeSlave.slaveName is broken in by $his first customers, $he's blissfully unaware that $he's $arcade new slaves away from the same fate.<</if>>
 			<</replace>>
 		<</link>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index 262c4c606437daec3162e5aa103526bf9be78fbc..cab88b126bad39dc1e74211bfd2fe9085479bc97 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -198,10 +198,10 @@
 	<<set $slaves[_i].lactationAdaptation = Math.clamp($slaves[_i].lactationAdaptation.toFixed(1), 0, 100)>>
 	<<set $slaves[_i].intelligenceImplant = Number($slaves[_i].intelligenceImplant.toFixed(1), 0, 30)>>
 	<<set $slaves[_i].prematureBirth = 0>>
-	<<if ($HGSuiteEquality == 1) && ($HeadGirl != 0) && ($slaves[_i].devotion > 50)>>
+	<<if ($HGSuiteEquality == 1) && ($HeadGirlID != 0) && ($slaves[_i].devotion > 50)>>
 		<<if ($slaves[_i].assignment == "live with your Head Girl")>>
 			<<set _NewHG = _i>>
-		<<elseif ($slaves[_i].ID == $HeadGirl.ID)>>
+		<<elseif ($slaves[_i].ID == $HeadGirlID)>>
 			<<set _OldHG = _i>>
 		<</if>>
 	<</if>>
diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw
index 2b47ddbf08dc62cf7e0735312e99a1e7906ace20..a6d7540fa34d7edb07ec73b5c8cb228c84cd9eca 100644
--- a/src/uncategorized/nonRandomEvent.tw
+++ b/src/uncategorized/nonRandomEvent.tw
@@ -19,7 +19,7 @@
 <<elseif (_effectiveWeek == 11)>>
 	<<set $Event = "assistant">>
 	<<goto "Assistant Events">>
-<<elseif (_effectiveWeek == 12) && $raped == -1 && $arcologyUpgrade.drones != 1 && $Bodyguard == 0 && $PC.career != "arcology owner">>
+<<elseif (_effectiveWeek == 12) && $raped == -1 && $arcologyUpgrade.drones != 1 && $BodyguardID == 0 && $PC.career != "arcology owner">>
 	<<goto "P raped">>
 <<elseif (_effectiveWeek == 14) && $badC != 1>>
 	<<set _valid = $slaves.find(function(s) { return s.curatives > 1 || s.inflationType == "curative"; })>>
@@ -169,7 +169,7 @@
 	<<goto "Generic Plot Events">>
 <<elseif ($slaveMedic > 0)>>
 	<<goto "P slave medic">>
-<<elseif ($PPit == 1) && ($Bodyguard != 0)>>
+<<elseif ($PPit == 1) && ($BodyguardID != 0)>>
 	<<goto "PE pit fight">>
 <<elseif $rivalOwner == 0 && $smilingManProgress == 0 && _effectiveWeek >= 74 && $secExpEnabled == 1>>
 	<<goto "secExpSmilingMan">>
diff --git a/src/uncategorized/pBombing.tw b/src/uncategorized/pBombing.tw
index 92b5569be2b67e6fcb5e8262e43c23d8bc1db794..4b2ee2408738518c0b286d657b25451773a906a7 100644
--- a/src/uncategorized/pBombing.tw
+++ b/src/uncategorized/pBombing.tw
@@ -3,15 +3,15 @@
 <<set $nextButton = "Continue">>
 <<set $nextLink = "Random Nonindividual Event">>
 
-<<if $Bodyguard != 0>>
-	<<setLocalPronouns $Bodyguard>>
+<<if _S.Bodyguard>>
+	<<setLocalPronouns _S.Bodyguard>>
 	<span id="artFrame">
 	/* 000-250-006 */
 	<<if $seeImages == 1>>
 		<<if $imageChoice == 1>>
-			<div class="imageRef lrgVector"><div class="mask">&nbsp;</div><<= SlaveArt($Bodyguard, 2, 0)>></div>
+			<div class="imageRef lrgVector"><div class="mask">&nbsp;</div><<= SlaveArt(_S.Bodyguard, 2, 0)>></div>
 		<<else>>
-			<div class="imageRef lrgRender"><div class="mask">&nbsp;</div><<= SlaveArt($Bodyguard, 2, 0)>></div>
+			<div class="imageRef lrgRender"><div class="mask">&nbsp;</div><<= SlaveArt(_S.Bodyguard, 2, 0)>></div>
 		<</if>>
 	<</if>>
 	/* 000-250-006 */
@@ -19,22 +19,22 @@
 <</if>>
 <<set $fcnn.push("...new report on advances in security screening designed to sniff out small explosives like...")>>
 
-One fine day, you're strolling down the main promenade, making your usual combined inspection and public rounds. These walks are triply useful, since they allow you to keep a finger on the pulse of your demesne, identify any problems, and display yourself to the population. <<if $Bodyguard != 0>>$Bodyguard.slaveName is walking with you, of course; $his presence protection, intimidation, and ostentation, all in one.<</if>>
+One fine day, you're strolling down the main promenade, making your usual combined inspection and public rounds. These walks are triply useful, since they allow you to keep a finger on the pulse of your demesne, identify any problems, and display yourself to the population. <<if _S.Bodyguard>>_S.Bodyguard.slaveName is walking with you, of course; $his presence protection, intimidation, and ostentation, all in one.<</if>>
 
 <<= capFirstChar($assistant.name)>> suddenly relays a silent alarm, highlighting a scruffy individual twenty <<if $showInches == 2>>yards<<else>>meters<</if>> ahead. This person is hooded and acting oddly. You catch a glance from beneath the hood in your direction: and the figure obviously decides that it can get no closer to you. Your assistant's scanning detects the presence of an implanted bomb moments before the suicide bomber detonates themselves.
 
-The implant is small, and went off too far ahead to do anything more than stun. <<if $Bodyguard != 0>>Since $he was behind you, $Bodyguard.slaveName is in much better shape than you, $his ears clear and $his senses sharp. <</if>>Three other assailants run at you from where they were waiting in the confusion, wielding improvised weapons that apparently did not set off the security scanners.
+The implant is small, and went off too far ahead to do anything more than stun. <<if _S.Bodyguard>>Since $he was behind you, _S.Bodyguard.slaveName is in much better shape than you, $his ears clear and $his senses sharp. <</if>>Three other assailants run at you from where they were waiting in the confusion, wielding improvised weapons that apparently did not set off the security scanners.
 
 <br><br>
 
-<<if $Bodyguard != 0>>
-	<<if getLimbCount($Bodyguard, 105) === 4>>
-		$Bodyguard.slaveName glances at you to check that $his principal is alive, $his P-Limbs already entering combat mode. $He becomes more inhuman by the moment,
-		<<if ($Bodyguard.muscles+$Bodyguard.height-100)/25 > 5>>
+<<if _S.Bodyguard>>
+	<<if getLimbCount(_S.Bodyguard, 105) === 4>>
+		_S.Bodyguard.slaveName glances at you to check that $his principal is alive, $his P-Limbs already entering combat mode. $He becomes more inhuman by the moment,
+		<<if (_S.Bodyguard.muscles+_S.Bodyguard.height-100)/25 > 5>>
 			$his calves unfolding to reveal stabilizers that slide down and broaden $his ground contact. The targeting programs in $his arms allow $him to fire $his light machine gun from the hip, and $he places a precise burst in each target.
-		<<elseif ($Bodyguard.muscles+$Bodyguard.height-100)/25 > 4>>
+		<<elseif (_S.Bodyguard.muscles+_S.Bodyguard.height-100)/25 > 4>>
 			the arm that holds $his battle rifle extending to lock to its foregrip and stock. With it fully attached to $him, $he raises that arm at each attacker in turn.
-		<<elseif ($Bodyguard.muscles+$Bodyguard.height-100)/25 > 3>>
+		<<elseif (_S.Bodyguard.muscles+_S.Bodyguard.height-100)/25 > 3>>
 			stabilizers extending from the forearm that holds $his submachine gun. $He fires it one-handed, the weapons barely moving at all as $he flicks from target to target.
 		<<else>>
 			$his hand extending fully around $his machine pistol even as $he brings it up to meet the first target. When its first magazine is expended, $his forearm unfolds to reveal another.
@@ -42,37 +42,37 @@ The implant is small, and went off too far ahead to do anything more than stun.
 		Your bodyguard's enhancements are not exactly secret, however, and the attackers are numerous, sent to overwhelm $him. $He drops $his weapon, ammunition expended, producing a scream of triumph from one of the few remaining assailants. Nothing daunted, $he swings $his dominant hand down to $his thigh on that side. It unfolds and places a pistol in $his grip, which $he brings up and uses to end the engagement.
 		<br><br>
 		After reloading $his pistol from the ammunition compartment in $his other thigh, $he strides mechanically from body to body, a few of which are still moving. Stopping by each one, $he places $his palm against the base of each head with obscene care before extending the blade in $his forearm through it. This done, $he scans for further threats. There are none, and due to $his terrifying display there is @@.green;an increase in confidence in the security of $arcologies[0].name@@ and @@.green;public applause for your skill in training $him.@@ There is some @@.red;minor damage@@ to repair, but no lasting harm.
-		<<run cashX(-1000, "event", $Bodyguard)>>
-		<<run repX(2500, "event", $Bodyguard)>>
+		<<run cashX(-1000, "event", _S.Bodyguard)>>
+		<<run repX(2500, "event", _S.Bodyguard)>>
 		<<set $arcologies[0].prosperity += 1>>
 
-	<<elseif $Bodyguard.skill.combat > 0>>
-		$Bodyguard.slaveName glances at you to check that $his principal is alive for the moment, already
-		<<if ($Bodyguard.muscles+$Bodyguard.height-100)/25 > 5>>
+	<<elseif _S.Bodyguard.skill.combat > 0>>
+		_S.Bodyguard.slaveName glances at you to check that $his principal is alive for the moment, already
+		<<if (_S.Bodyguard.muscles+_S.Bodyguard.height-100)/25 > 5>>
 			getting $his light machine gun into action. Since they're so close, $he doesn't even bother to shoulder the weapon, simply using $his weapon's firepower to dump rounds into each attacker.
-		<<elseif ($Bodyguard.muscles+$Bodyguard.height-100)/25 > 4>>
+		<<elseif (_S.Bodyguard.muscles+_S.Bodyguard.height-100)/25 > 4>>
 			bringing $his battle rifle up. $He swivels from target to target, placing a single round in each, using the weapon's devastating stopping power to good effect.
-		<<elseif ($Bodyguard.muscles+$Bodyguard.height-100)/25 > 3>>
-			bringing $his submachine gun up. $He cradles the compact weapon in <<if hasBothArms($Bodyguard)>>both hands<<else>>$his hand<</if>> and swivels from target to target, placing a long burst of fire in each, using the weapon's large ammunition capacity to good effect.
+		<<elseif (_S.Bodyguard.muscles+_S.Bodyguard.height-100)/25 > 3>>
+			bringing $his submachine gun up. $He cradles the compact weapon in <<if hasBothArms(_S.Bodyguard)>>both hands<<else>>$his hand<</if>> and swivels from target to target, placing a long burst of fire in each, using the weapon's large ammunition capacity to good effect.
 		<<else>>
-			drawing $his machine pistol. $He cradles the diminutive weapon in <<if hasBothArms($Bodyguard)>>both hands<<else>>$his hand<</if>> and swivels from target to target, placing a disciplined burst of fire in each at its center of mass.
+			drawing $his machine pistol. $He cradles the diminutive weapon in <<if hasBothArms(_S.Bodyguard)>>both hands<<else>>$his hand<</if>> and swivels from target to target, placing a disciplined burst of fire in each at its center of mass.
 		<</if>>
-		None of them gets within five <<if $showInches == 2>>yards<<else>>meters<</if>>. $Bodyguard.slaveName dispassionately places a round in the head of each body, reloads, and takes up a position from which $he can watch for further threats. There are none, and due to $his sterling conduct there is @@.green;an increase in confidence in the security of $arcologies[0].name@@ and @@.green;public applause for your skill in training $him.@@ There is some @@.red;minor damage@@ to repair, but no lasting harm.
-		<<run cashX(-1000, "event", $Bodyguard)>>
-		<<run repX(2500, "event", $Bodyguard)>>
+		None of them gets within five <<if $showInches == 2>>yards<<else>>meters<</if>>. _S.Bodyguard.slaveName dispassionately places a round in the head of each body, reloads, and takes up a position from which $he can watch for further threats. There are none, and due to $his sterling conduct there is @@.green;an increase in confidence in the security of $arcologies[0].name@@ and @@.green;public applause for your skill in training $him.@@ There is some @@.red;minor damage@@ to repair, but no lasting harm.
+		<<run cashX(-1000, "event", _S.Bodyguard)>>
+		<<run repX(2500, "event", _S.Bodyguard)>>
 		<<set $arcologies[0].prosperity += 1>>
 
-	<<elseif $Bodyguard.muscles > 5>>
-		$Bodyguard.slaveName hurriedly <<if ($Bodyguard.muscles+$Bodyguard.height-100)/25 > 5>>gets $his light machine gun firing. The weapon's high rate of fire tears through the first enemy but rapidly pulls $his aim off target.<<elseif ($Bodyguard.muscles+$Bodyguard.height-100)/25 > 4>>brings up $his battle rifle. $He hits the nearest assailant with $his first round and then fires again, but the weapon's powerful recoil sends it over $his target.<<elseif ($Bodyguard.muscles+$Bodyguard.height-100)/25 > 3>>brings up $his submachine gun. $He points it at the nearest assailant and pulls the trigger; the weapon's high rate of fire tears through the enemy but rapidly pulls $his aim off target.<<else>>draws $his machine pistol. $He points it one-handed at the nearest assailant and pulls the trigger; the weapon's high rate of fire tears through the enemy but rapidly pulls $his aim off target.<</if>> By the time $he pulls the muzzle back down the others are on $him. Fortunately, $he is equal to the challenge, getting $his sword into gory action. $He is physically powerful but unskilled, so the result is simple, unlovely butcher's work. This spectacle produces @@.green;an increase in confidence in the security of $arcologies[0].name.@@ There is some @@.red;minor property damage@@ to repair, but no lasting harm.
-		<<run cashX(-1000, "event", $Bodyguard)>>
+	<<elseif _S.Bodyguard.muscles > 5>>
+		_S.Bodyguard.slaveName hurriedly <<if (_S.Bodyguard.muscles+_S.Bodyguard.height-100)/25 > 5>>gets $his light machine gun firing. The weapon's high rate of fire tears through the first enemy but rapidly pulls $his aim off target.<<elseif (_S.Bodyguard.muscles+_S.Bodyguard.height-100)/25 > 4>>brings up $his battle rifle. $He hits the nearest assailant with $his first round and then fires again, but the weapon's powerful recoil sends it over $his target.<<elseif (_S.Bodyguard.muscles+_S.Bodyguard.height-100)/25 > 3>>brings up $his submachine gun. $He points it at the nearest assailant and pulls the trigger; the weapon's high rate of fire tears through the enemy but rapidly pulls $his aim off target.<<else>>draws $his machine pistol. $He points it one-handed at the nearest assailant and pulls the trigger; the weapon's high rate of fire tears through the enemy but rapidly pulls $his aim off target.<</if>> By the time $he pulls the muzzle back down the others are on $him. Fortunately, $he is equal to the challenge, getting $his sword into gory action. $He is physically powerful but unskilled, so the result is simple, unlovely butcher's work. This spectacle produces @@.green;an increase in confidence in the security of $arcologies[0].name.@@ There is some @@.red;minor property damage@@ to repair, but no lasting harm.
+		<<run cashX(-1000, "event", _S.Bodyguard)>>
 		<<set $arcologies[0].prosperity += 1>>
 
 	<<else>>
-		$Bodyguard.slaveName hurriedly <<if ($Bodyguard.muscles+$Bodyguard.height-100)/25 > 5>>gets $his light machine gun firing. The weapon's high rate of fire tears through the first enemy but rapidly pulls $his aim off target.<<elseif ($Bodyguard.muscles+$Bodyguard.height-100)/25 > 4>>brings up $his battle rifle. $He hits the nearest assailant with $his first round and then fires again, but the weapon's powerful recoil sends it over $his target.<<elseif ($Bodyguard.muscles+$Bodyguard.height-100)/25 > 3>>brings up $his submachine gun. $He points it at the nearest assailant and pulls the trigger; the weapon's high rate of fire tears through the enemy but rapidly pulls $his aim off target.<<else>>draws $his machine pistol. $He points it one-handed at the nearest assailant and pulls the trigger; the weapon's high rate of fire tears through the enemy but rapidly pulls $his aim off target.<</if>> By the time $he pulls the muzzle back down the others are on $him. $His sword is very sharp, but so are $his assailants' weapons, and everyone is unskilled. As often happens with bladed fights between unarmored novices, everyone dies, and so fast that you cannot intervene. $Bodyguard.slaveName expires gasping in agony over multiple deep wounds to $his abdomen, but still manages to lock eyes with you as $he does. There is some @@.red;minor property damage@@ to repair, but no lasting harm.
-		<<run cashX(-1000, "event", $Bodyguard), healthDamage($Bodyguard, 1000)>>
-		<<set $activeSlave = $Bodyguard>>
+		_S.Bodyguard.slaveName hurriedly <<if (_S.Bodyguard.muscles+_S.Bodyguard.height-100)/25 > 5>>gets $his light machine gun firing. The weapon's high rate of fire tears through the first enemy but rapidly pulls $his aim off target.<<elseif (_S.Bodyguard.muscles+_S.Bodyguard.height-100)/25 > 4>>brings up $his battle rifle. $He hits the nearest assailant with $his first round and then fires again, but the weapon's powerful recoil sends it over $his target.<<elseif (_S.Bodyguard.muscles+_S.Bodyguard.height-100)/25 > 3>>brings up $his submachine gun. $He points it at the nearest assailant and pulls the trigger; the weapon's high rate of fire tears through the enemy but rapidly pulls $his aim off target.<<else>>draws $his machine pistol. $He points it one-handed at the nearest assailant and pulls the trigger; the weapon's high rate of fire tears through the enemy but rapidly pulls $his aim off target.<</if>> By the time $he pulls the muzzle back down the others are on $him. $His sword is very sharp, but so are $his assailants' weapons, and everyone is unskilled. As often happens with bladed fights between unarmored novices, everyone dies, and so fast that you cannot intervene. _S.Bodyguard.slaveName expires gasping in agony over multiple deep wounds to $his abdomen, but still manages to lock eyes with you as $he does. There is some @@.red;minor property damage@@ to repair, but no lasting harm.
+		<<run cashX(-1000, "event", _S.Bodyguard), healthDamage(_S.Bodyguard, 1000)>>
+		<<set $activeSlave = _S.Bodyguard>>
 		<<= removeActiveSlave() >>
-	<</if>> /* closes $Bodyguard != 0 */
+	<</if>> /* closes if _S.Bodyguard */
 
 <<elseif $personalArms > 0>>
 	You are prepared for this exigency. Your handsome clothing conceals a small but very powerful pistol. This fact comes slowly back to you as your ears and mind shake off the blast effects. There is something important about this fact, but you are having trouble thinking of it. Eventually, you remember, and groggily draw and level the weapon. Its rocket-assisted slugs detonate on contact, assisting your impaired marksmanship by causing fatal damage regardless of shot placement. You are alive, and not permanently damaged, which is more than can be said for your assailants, who have, with the assistance of your weapon, redecorated this area of the club in red tones. There is some @@.red;minor property damage@@ to repair, but no lasting harm.
diff --git a/src/uncategorized/peCombatTraining.tw b/src/uncategorized/peCombatTraining.tw
index 21662d1ec38d2750492d5cbc2d5b630514b837fd..b8d5bc9452148237f8beda5767b3db64bc7cd2a4 100644
--- a/src/uncategorized/peCombatTraining.tw
+++ b/src/uncategorized/peCombatTraining.tw
@@ -2,7 +2,7 @@
 
 <<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "RIE Eligibility Check">>
 
-<<set $activeSlave = $Bodyguard>>
+<<set $activeSlave = _S.Bodyguard>>
 <<setLocalPronouns $activeSlave>>
 
 <span id="artFrame">
diff --git a/src/uncategorized/peConcubineInterview.tw b/src/uncategorized/peConcubineInterview.tw
index c4232a18dd2eec67cdc5fb2a80a6079db0318f57..bb85625c4f900354a789e191213f3bdb003e3f6e 100644
--- a/src/uncategorized/peConcubineInterview.tw
+++ b/src/uncategorized/peConcubineInterview.tw
@@ -1,6 +1,6 @@
 :: PE concubine interview [nobr]
 
-<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "RIE Eligibility Check", $activeSlave = $Concubine, _oldRep = $rep>>
+<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "RIE Eligibility Check", $activeSlave = _S.Concubine, _oldRep = $rep>>
 <<run Enunciate($activeSlave)>>
 <<setLocalPronouns $activeSlave>>
 <<set _belly = bellyAdjective($activeSlave)>>
diff --git a/src/uncategorized/peHeadgirlConcubine.tw b/src/uncategorized/peHeadgirlConcubine.tw
index 1ce3fc86a9c8ad2c58b0c950186958ae2fb13b90..4bc9ea2986100693642d89d3082ce0ca8ee42450 100644
--- a/src/uncategorized/peHeadgirlConcubine.tw
+++ b/src/uncategorized/peHeadgirlConcubine.tw
@@ -2,12 +2,10 @@
 
 <<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check", $returnTo = "RIE Eligibility Check">>
 
-<<set _headGirl = $slaveIndices[$HeadGirl.ID]>>
-<<set _concubine = $slaveIndices[$Concubine.ID]>>
-<<setLocalPronouns $HeadGirl>>
-<<set _belly = bellyAdjective($HeadGirl)>>
-<<setLocalPronouns $Concubine 2>>
-<<set _bellyCon = bellyAdjective($Concubine)>>
+<<setLocalPronouns _S.HeadGirl>>
+<<set _belly = bellyAdjective(_S.HeadGirl)>>
+<<setLocalPronouns _S.Concubine 2>>
+<<set _bellyCon = bellyAdjective(_S.Concubine)>>
 <<setAssistantPronouns>>
 
 <span id="artFrame">
@@ -15,27 +13,27 @@
 	<<if $seeImages == 1>>
 		<div class="imageColumn">
 			<div class="imageRef medImg">
-				<<= SlaveArt($HeadGirl, 2, 0)>>
+				<<= SlaveArt(_S.HeadGirl, 2, 0)>>
 			</div>
 			<div class="imageRef medImg">
-				<<= SlaveArt($Concubine, 2, 0)>>
+				<<= SlaveArt(_S.Concubine, 2, 0)>>
 			</div>
 		</div>
 	<</if>>
 	/* 000-250-006 */
 </span>
 
-You wake up one morning to find $HeadGirl.slaveName and $Concubine.slaveName waiting next to your bed. It's immediately obvious that they both have a minor item of business for you, since nothing was urgent enough to wake you early, and they evidently both came in to catch you at your normal hour of rising. They're kneeling side by side next to the
-<<if $HeadGirl.boobs >= 10000 && $Concubine.boobs >= 10000>>
+You wake up one morning to find _S.HeadGirl.slaveName and _S.Concubine.slaveName waiting next to your bed. It's immediately obvious that they both have a minor item of business for you, since nothing was urgent enough to wake you early, and they evidently both came in to catch you at your normal hour of rising. They're kneeling side by side next to the
+<<if _S.HeadGirl.boobs >= 10000 && _S.Concubine.boobs >= 10000>>
 	bed (a position that smashes their massive breasts together on one side),
-<<elseif $HeadGirl.belly >= 45000 && $Concubine.belly >= 45000>>
+<<elseif _S.HeadGirl.belly >= 45000 && _S.Concubine.belly >= 45000>>
 	bed (a position that forces their swollen middles to compete for space),
-<<elseif $HeadGirl.butt > 5 && $Concubine.butt > 5>>
+<<elseif _S.HeadGirl.butt > 5 && _S.Concubine.butt > 5>>
 	bed (a position that smashes their massive asses together on one side),
 <<else>>
 	bed,
 <</if>>
-and it's also obvious that they've been filling the few minutes they've been waiting for you to wake up by making out. Their lips are moist, $Concubine.slaveName's $Concubine.skin cheeks are a little flushed, and there's even a little unnoticed strand of saliva running from _his2 mouth to $HeadGirl.slaveName's. They both look at you expectantly, wondering whether to speak up or save their questions for after you take a moment to get ready for your day.
+and it's also obvious that they've been filling the few minutes they've been waiting for you to wake up by making out. Their lips are moist, _S.Concubine.slaveName's _S.Concubine.skin cheeks are a little flushed, and there's even a little unnoticed strand of saliva running from _his2 mouth to _S.HeadGirl.slaveName's. They both look at you expectantly, wondering whether to speak up or save their questions for after you take a moment to get ready for your day.
 
 <br><br>
 
@@ -43,12 +41,12 @@ and it's also obvious that they've been filling the few minutes they've been wai
 <<link "Get right to work">>
 	<<replace "#result">>
 	You didn't get to where you are by lying around on the job. You <<if $PC.belly < 5000>>spring<<elseif $PC.belly < 10000>>pull yourself<<else>>slowly slip your gravid bulk<</if>> out of bed and head straight towards your office and its desk to get some work done with your first rush of morning energy before your ablutions. Your Head Girl and Concubine follow along behind you;
-	$HeadGirl.slaveName does $his best to keep up, because the sight of your
-	<<if $HeadGirl.fetish == "pregnancy" && $PC.belly >= 10000>>
+	_S.HeadGirl.slaveName does $his best to keep up, because the sight of your
+	<<if _S.HeadGirl.fetish == "pregnancy" && $PC.belly >= 10000>>
 		increasingly large baby bump and motherly waddle
-	<<elseif $HeadGirl.fetish == "cumslut" && $PC.balls >= 20>>
+	<<elseif _S.HeadGirl.fetish == "cumslut" && $PC.balls >= 20>>
 		over-burdened scrotum in motion as you walk
-	<<elseif $HeadGirl.attrXX > 65 && $HeadGirl.attrXY > 65 && $PC.dick != -1 && ($PC.boobs >= 650 || $PC.title == 0 || $PC.vagina != -1)>>
+	<<elseif _S.HeadGirl.attrXX > 65 && _S.HeadGirl.attrXY > 65 && $PC.dick != -1 && ($PC.boobs >= 650 || $PC.title == 0 || $PC.vagina != -1)>>
 		dangling penis
 		<<if $PC.boobs >= 650>>
 			and bouncing boobs
@@ -58,7 +56,7 @@ and it's also obvious that they've been filling the few minutes they've been wai
 			on such a feminine body
 		<</if>>
 		in motion as you walk
-	<<elseif $HeadGirl.attrXY > 65>>
+	<<elseif _S.HeadGirl.attrXY > 65>>
 		<<if $PC.dick != 0>>
 			dangling penis
 		<<elseif $PC.title == 1>>
@@ -67,7 +65,7 @@ and it's also obvious that they've been filling the few minutes they've been wai
 			beloved body nude
 		<</if>>
 		in motion as you walk
-	<<elseif $HeadGirl.attrXX > 65>>
+	<<elseif _S.HeadGirl.attrXX > 65>>
 		<<if $PC.boobs >= 300>>
 			<<if $PC.boobs >= 1400>>
 				huge boobs from behind
@@ -87,7 +85,7 @@ and it's also obvious that they've been filling the few minutes they've been wai
 	<<else>>
 		beloved body nude in motion as you walk
 	<</if>>
-	is something $he openly enjoys, while $Concubine.slaveName at least tries to be a little more modest. You sit down at your desk, taking in the situation in your domain at a glance as $assistant.name
+	is something $he openly enjoys, while _S.Concubine.slaveName at least tries to be a little more modest. You sit down at your desk, taking in the situation in your domain at a glance as $assistant.name
 	<<switch $assistant.appearance>>
 	<<case "monstergirl">>
 		springs into monstrous life on the glass desktop, eyes flashing and hair writhing.
@@ -127,41 +125,41 @@ and it's also obvious that they've been filling the few minutes they've been wai
 		appears as a glowing icon on the glass desktop, awaiting instructions.
 	<</switch>>
 	<br><br>
-	You look at $HeadGirl.slaveName, standing across the desk from you, and $he takes the cue and goes first. $He asks your permission to make a couple of last-minute changes to slaves' assignments for the day, and you ask about a couple of minor efficiency issues before giving $him the go ahead. Meanwhile, $Concubine.slaveName kneels beside your chair, resting _his2 <<if $Concubine.bald == 0 && $Concubine.hLength > 0>>$Concubine.hColor<<else>>smooth<</if>> head on your knee, _his2
-	<<if $Concubine.dick > 8>>
+	You look at _S.HeadGirl.slaveName, standing across the desk from you, and $he takes the cue and goes first. $He asks your permission to make a couple of last-minute changes to slaves' assignments for the day, and you ask about a couple of minor efficiency issues before giving $him the go ahead. Meanwhile, _S.Concubine.slaveName kneels beside your chair, resting _his2 <<if _S.Concubine.bald == 0 && _S.Concubine.hLength > 0>>_S.Concubine.hColor<<else>>smooth<</if>> head on your knee, _his2
+	<<if _S.Concubine.dick > 8>>
 		limp, monstrous cock resting softly against one of your ankles.
-	<<elseif $Concubine.boobs > 10000>>
+	<<elseif _S.Concubine.boobs > 10000>>
 		titanic udders a nice cushion against your calves.
-	<<elseif $Concubine.weight > 30>>
+	<<elseif _S.Concubine.weight > 30>>
 		soft body cushioning nicely against your leg.
-	<<elseif $Concubine.belly >= 100000>>
+	<<elseif _S.Concubine.belly >= 100000>>
 		_bellyCon belly resting warmly against your leg.
-	<<elseif $Concubine.boobs > 1000>>
+	<<elseif _S.Concubine.boobs > 1000>>
 		heavy breast resting against your calf on that side.
 	<<else>>
 		chest warm against your calf on that side.
 	<</if>>
-	_He2 places a <<if $Concubine.muscles > 50>>strong<<else>>soft<</if>> hand on the inside of your shin and hugs your lower leg, sensual, but companionable rather than sexually insistent.
+	_He2 places a <<if _S.Concubine.muscles > 50>>strong<<else>>soft<</if>> hand on the inside of your shin and hugs your lower leg, sensual, but companionable rather than sexually insistent.
 	<br><br>
 	Your Head Girl exits, performing the proper formalities and then hurrying off to make sure the reassigned slaves get going. As $he withdraws $he
-	<<if $HeadGirl.relationship <= -2>>
+	<<if _S.HeadGirl.relationship <= -2>>
 		has eyes only for you; $he
-	<<elseif $HeadGirl.relationship == -1>>
-		gives $Concubine.slaveName a look up and down, which $his slutty nature obliges $him to give everyone; then $he
-	<<elseif $HeadGirl.relationshipTarget == $Concubine.ID>>
-		<<if $HeadGirl.relationship == 1>>
-			gives $his friend $Concubine.slaveName a smile; then $he
-		<<elseif $HeadGirl.relationship == 2>>
-			gives $his best friend $Concubine.slaveName a smile and a little wave; then $he
-		<<elseif $HeadGirl.relationship == 3>>
-			gives $his fuckbuddy $Concubine.slaveName a flirty wink; then $he
-		<<elseif $HeadGirl.relationship == 4>>
-			blows $his lover $Concubine.slaveName a kiss; then $he
+	<<elseif _S.HeadGirl.relationship == -1>>
+		gives _S.Concubine.slaveName a look up and down, which $his slutty nature obliges $him to give everyone; then $he
+	<<elseif _S.HeadGirl.relationshipTarget == $ConcubineID>>
+		<<if _S.HeadGirl.relationship == 1>>
+			gives $his friend _S.Concubine.slaveName a smile; then $he
+		<<elseif _S.HeadGirl.relationship == 2>>
+			gives $his best friend _S.Concubine.slaveName a smile and a little wave; then $he
+		<<elseif _S.HeadGirl.relationship == 3>>
+			gives $his fuckbuddy _S.Concubine.slaveName a flirty wink; then $he
+		<<elseif _S.HeadGirl.relationship == 4>>
+			blows $his lover _S.Concubine.slaveName a kiss; then $he
 		<<else>>
-			mouths "I love you" at $his _wife2 $Concubine.slaveName; then $he
+			mouths "I love you" at $his _wife2 _S.Concubine.slaveName; then $he
 		<</if>>
 	<</if>>
-	<<switch $HeadGirl.fetish>>
+	<<switch _S.HeadGirl.fetish>>
 	<<case "submissive">>
 		catches $his lower lip behind $his teeth and gives you a blushing, sexually submissive look
 	<<case "cumslut">>
@@ -169,7 +167,7 @@ and it's also obvious that they've been filling the few minutes they've been wai
 	<<case "humiliation">>
 		flashes you and blushes artfully
 	<<case "buttslut">>
-		<<if canDoAnal($HeadGirl)>>
+		<<if canDoAnal(_S.HeadGirl)>>
 			cocks $his hips, pulls one buttock aside, and winks $his asshole in your direction
 		<<else>>
 			looks you in the eye and gives $his booty a slap
@@ -187,20 +185,20 @@ and it's also obvious that they've been filling the few minutes they've been wai
 	<<default>>
 		looks at you and adds a bit of extra sway to $his hips
 	<</switch>>
-	on $his way out the door. When $he's gone, your Concubine speaks up from _his2 adoring embrace of your leg. _He2 asks a little aesthetic question about one of your other bedslaves, _his2 <<if $Concubine.voice < 2>>deep voice rumbling against your knee<<elseif $Concubine.voice > 2>>high voice humming against your knee<<else>>feminine voice purring against your knee<</if>>. You chat with _him2 about how you'd like the bedslave to look and act, ideally, and do other work while running your fingers
-	<<if $Concubine.bald == 0 && $Concubine.hLength > 0>>
-		through your Concubine's<<if $Concubine.hLength < 10>> short<</if>> hair.
+	on $his way out the door. When $he's gone, your Concubine speaks up from _his2 adoring embrace of your leg. _He2 asks a little aesthetic question about one of your other bedslaves, _his2 <<if _S.Concubine.voice < 2>>deep voice rumbling against your knee<<elseif _S.Concubine.voice > 2>>high voice humming against your knee<<else>>feminine voice purring against your knee<</if>>. You chat with _him2 about how you'd like the bedslave to look and act, ideally, and do other work while running your fingers
+	<<if _S.Concubine.bald == 0 && _S.Concubine.hLength > 0>>
+		through your Concubine's<<if _S.Concubine.hLength < 10>> short<</if>> hair.
 	<<else>>
-		along your Concubine's <<if $Concubine.bald == 1>>bald<<else>>shaved<</if>> head.
+		along your Concubine's <<if _S.Concubine.bald == 1>>bald<<else>>shaved<</if>> head.
 	<</if>>
 	Your Head Girl's confident assistance managing your chattel and your Concubine's devoted comfort as you work allows you to @@.yellowgreen;be unusually productive@@ all morning.
-	<<run cashX(5000, "event", $HeadGirl)>>
+	<<run cashX(5000, "event", _S.HeadGirl)>>
 	<</replace>>
 <</link>>
 <br><<link "Tease them while they meet with you">>
 	<<replace "#result">>
-	<<run Enunciate($HeadGirl)>>
-	You tell them to go ahead, $HeadGirl.slaveName first, but you flip the sheet back and pat the soft mattress on either side of you while you do. They laugh and clamber on up, $HeadGirl.slaveName first, and $he manages to drag a $HeadGirl.nipples nipple across your
+	<<run Enunciate(_S.HeadGirl)>>
+	You tell them to go ahead, _S.HeadGirl.slaveName first, but you flip the sheet back and pat the soft mattress on either side of you while you do. They laugh and clamber on up, _S.HeadGirl.slaveName first, and $he manages to drag a _S.HeadGirl.nipples nipple across your
 	<<if $PC.boobs >= 300>>
 		own bare breasts
 	<<elseif $PC.title == 0>>
@@ -208,35 +206,35 @@ and it's also obvious that they've been filling the few minutes they've been wai
 	<<else>>
 		chest
 	<</if>>
-	as $he <<if $PC.belly >= 10000 || $HeadGirl.boobs > 10000 || $HeadGirl.belly >= 5000 || $HeadGirl.dick > 20 || $HeadGirl.balls > 20>>struggles to get<<else>>climbs<</if>> over you. Once $he's situated under the crook of your arm,
-	<<if $HeadGirl.boobs > 25000>>
+	as $he <<if $PC.belly >= 10000 || _S.HeadGirl.boobs > 10000 || _S.HeadGirl.belly >= 5000 || _S.HeadGirl.dick > 20 || _S.HeadGirl.balls > 20>>struggles to get<<else>>climbs<</if>> over you. Once $he's situated under the crook of your arm,
+	<<if _S.HeadGirl.boobs > 25000>>
 		the huge weight of $his boobs pressing against your ribcage,
-	<<elseif $HeadGirl.belly >= 10000>>
+	<<elseif _S.HeadGirl.belly >= 10000>>
 		the huge weight of $his _belly middle pressing against your body,
-	<<elseif $HeadGirl.dick > 4 && canAchieveErection($HeadGirl)>>
+	<<elseif _S.HeadGirl.dick > 4 && canAchieveErection(_S.HeadGirl)>>
 		which presses $his absurd erection against your hip,
-	<<elseif $HeadGirl.dick > 5>>
+	<<elseif _S.HeadGirl.dick > 5>>
 		which leaves $his absurd dick resting across your lap,
-	<<elseif $HeadGirl.energy > 95>>
+	<<elseif _S.HeadGirl.energy > 95>>
 		making the eager heat between the nympho's legs quite noticeable against your hip,
 	<<else>>
 		$his body warm against you,
 	<</if>>
 	$he clears $his throat and asks your permission to make a couple of last-minute changes to slaves' assignments for the day.
 	<br><br>
-	As $he did so, you were encircling your <<if $girl == _girl2>>$girl<<else>>lover<</if>>s in your <<if $arcologies[0].FSPhysicalIdealist != "unset">>powerful arms<<elseif $PC.title == 1>>dominant grip<<else>>loving grip<</if>>. Cupping your Head Girl's butt in your left hand and your Concubine's in your right, you give them a good squeeze as $HeadGirl.slaveName finishes $his question. $His voice rises cutely as your marauding hand moves over the
-	<<if $HeadGirl.butt > 10>>
-		endless expanse of $his backside. $He manages to finish, but trails off into a groan, the <<if Math.floor($HeadGirl.buttImplant/$HeadGirl.butt) > .60>>firm<<else>>soft<</if>> flesh quivering against your palm.
+	As $he did so, you were encircling your <<if $girl == _girl2>>$girl<<else>>lover<</if>>s in your <<if $arcologies[0].FSPhysicalIdealist != "unset">>powerful arms<<elseif $PC.title == 1>>dominant grip<<else>>loving grip<</if>>. Cupping your Head Girl's butt in your left hand and your Concubine's in your right, you give them a good squeeze as _S.HeadGirl.slaveName finishes $his question. $His voice rises cutely as your marauding hand moves over the
+	<<if _S.HeadGirl.butt > 10>>
+		endless expanse of $his backside. $He manages to finish, but trails off into a groan, the <<if Math.floor(_S.HeadGirl.buttImplant/_S.HeadGirl.butt) > .60>>firm<<else>>soft<</if>> flesh quivering against your palm.
 	<<else>>
-		place between $his <<if $HeadGirl.butt > 6>>huge<<elseif $HeadGirl.butt > 3>>healthy<<else>>cute<</if>> buttocks and you slowly
-		<<if canDoAnal($HeadGirl)>>
-			press a single malicious finger in against $his <<if $HeadGirl.anus > 2>>loose asspussy<<elseif $HeadGirl.butt > 0>>practiced asshole<<else>>virgin pucker<</if>>. $He manages to finish, but trails off into a groan, the warm, crinkled skin spasming against the teasing digit.
+		place between $his <<if _S.HeadGirl.butt > 6>>huge<<elseif _S.HeadGirl.butt > 3>>healthy<<else>>cute<</if>> buttocks and you slowly
+		<<if canDoAnal(_S.HeadGirl)>>
+			press a single malicious finger in against $his <<if _S.HeadGirl.anus > 2>>loose asspussy<<elseif _S.HeadGirl.butt > 0>>practiced asshole<<else>>virgin pucker<</if>>. $He manages to finish, but trails off into a groan, the warm, crinkled skin spasming against the teasing digit.
 		<<else>>
 			trace the perimeter of $his chastity. $He manages to finish, but trails off into a groan, $his rump tightening around the invading hand.
 		<</if>>
 	<</if>>
 	<br><br>
-	$Concubine.slaveName laughs at $him and asks _his2 own question, a little aesthetic question about one of your other bedslaves, but something you like to exercise artistic control over. _His2 giggling is cut off as _he2 has to concentrate on getting _his2 words out as you use two fingers to massage and tease the sensitive skin between _his2 ass and <<if $Concubine.vagina > -1>>the start of _his2 cunt<<elseif $Concubine.scrotum > 0>>_his2 ballsack<<else>>the base of _his2 dick<</if>>. It's $HeadGirl.slaveName's turn to laugh, which $he does throatily, $his warm breath gusting deliciously across your <<if $PC.boobs >= 300 || $PC.title == 0>>hardening nipples<<else>>pecs<</if>>. "<<S>>ee, it'<<s>> not ea<<s>>y," $he breathes across you at your Concubine.
+	_S.Concubine.slaveName laughs at $him and asks _his2 own question, a little aesthetic question about one of your other bedslaves, but something you like to exercise artistic control over. _His2 giggling is cut off as _he2 has to concentrate on getting _his2 words out as you use two fingers to massage and tease the sensitive skin between _his2 ass and <<if _S.Concubine.vagina > -1>>the start of _his2 cunt<<elseif _S.Concubine.scrotum > 0>>_his2 ballsack<<else>>the base of _his2 dick<</if>>. It's _S.HeadGirl.slaveName's turn to laugh, which $he does throatily, $his warm breath gusting deliciously across your <<if $PC.boobs >= 300 || $PC.title == 0>>hardening nipples<<else>>pecs<</if>>. "<<S>>ee, it'<<s>> not ea<<s>>y," $he breathes across you at your Concubine.
 	<br><br>
 	They soon get their revenge as you give them their orders, though, moving their expert hands between your legs to give you a handjob. They do it cooperatively as you continue to play with them, letting you enjoy the delightful sensation of
 	<<if $PC.dick != 0>>
@@ -250,142 +248,142 @@ and it's also obvious that they've been filling the few minutes they've been wai
 		a hand massaging your petals on either side while another delves two fingers inside you and a fourth pleasures your clit.
 	<</if>>
 	They crane their necks to rain kisses on your chin, neck, <<if $PC.boobs >= 300>>breasts, and nipples,<<elseif $PC.title == 0>>and nipples,<<else>>and chest,<</if>> and on each other's mouths. You <<if $PC.belly < 5000>>spring<<elseif $PC.belly < 10000>>pull yourself<<else>>slowly tip your gravid bulk<</if>> out of bed when you're satisfied, pulling your leadership with you towards the shower, and they @@.mediumaquamarine;trustingly bounce up to follow.@@
-	<<set $slaves[_headGirl].trust += 4, $slaves[_concubine].trust += 4>>
-	<<set $slaves[_headGirl].counter.oral++, $slaves[_concubine].counter.oral++>>
+	<<set _S.HeadGirl.trust += 4, _S.Concubine.trust += 4>>
+	<<set _S.HeadGirl.counter.oral++, _S.Concubine.counter.oral++>>
 	<<set $oralTotal += 2>>
 	<</replace>>
 <</link>>
-<<if ((canDoAnal($HeadGirl) && $HeadGirl.anus > 0) || (canDoVaginal($HeadGirl) && $HeadGirl.vagina > 0)) && ((canDoAnal($Concubine) && $Concubine.anus > 0) || (canDoVaginal($Concubine) && $Concubine.vagina > 0)) && $PC.belly+$Concubine.belly < 50000 && $PC.belly+$HeadGirl.belly < 50000>>
+<<if ((canDoAnal(_S.HeadGirl) && _S.HeadGirl.anus > 0) || (canDoVaginal(_S.HeadGirl) && _S.HeadGirl.vagina > 0)) && ((canDoAnal(_S.Concubine) && _S.Concubine.anus > 0) || (canDoVaginal(_S.Concubine) && _S.Concubine.vagina > 0)) && $PC.belly+_S.Concubine.belly < 50000 && $PC.belly+_S.HeadGirl.belly < 50000>>
 	<br><<link "Double penetrate them while they meet with you">>
 		<<replace "#result">>
-		You sit up and order $HeadGirl.slaveName up onto the bed, on $his back, and while $he's <<if $HeadGirl.energy > 95>>eagerly obeying<<else>>obediently getting situated<</if>>, you tell $Concubine.slaveName to ride $him, reverse cowgirl. $He straddles your Head Girl,
-		<<if $Concubine.butt > 6>>
+		You sit up and order _S.HeadGirl.slaveName up onto the bed, on $his back, and while $he's <<if _S.HeadGirl.energy > 95>>eagerly obeying<<else>>obediently getting situated<</if>>, you tell _S.Concubine.slaveName to ride $him, reverse cowgirl. $He straddles your Head Girl,
+		<<if _S.Concubine.butt > 6>>
 			using _his2 hands to situate _his2 huge buttocks.
-		<<elseif $Concubine.belly >= 10000>>
+		<<elseif _S.Concubine.belly >= 10000>>
 			making sure _his2 _bellyCon belly is comfortably positioned.
-		<<elseif $Concubine.boobs > 4000>>
+		<<elseif _S.Concubine.boobs > 4000>>
 			making _his2 heavy boobs sway deliciously.
 		<<else>>
-			carefully situating _his2 legs astride $HeadGirl.slaveName's hips.
+			carefully situating _his2 legs astride _S.HeadGirl.slaveName's hips.
 		<</if>>
-		You plant a hard kiss on $Concubine.slaveName's mouth, pressing _him2 backwards <<if $HeadGirl.belly >= 10000>>into $HeadGirl.slaveName's taut belly <</if>>as you maneuver yourself into place<<if $PC.dick == 0>> and don a strap-on, since there isn't enough space for tribbing to work here<</if>>.
-		<<if (canDoVaginal($Concubine) && $Concubine.vagina > 0)>>
+		You plant a hard kiss on _S.Concubine.slaveName's mouth, pressing _him2 backwards <<if _S.HeadGirl.belly >= 10000>>into _S.HeadGirl.slaveName's taut belly <</if>>as you maneuver yourself into place<<if $PC.dick == 0>> and don a strap-on, since there isn't enough space for tribbing to work here<</if>>.
+		<<if (canDoVaginal(_S.Concubine) && _S.Concubine.vagina > 0)>>
 			/* this is up here to give the PC priority on pregnancy */
-			<<if canImpreg($slaves[_concubine], $PC)>>
-				<<= knockMeUp($slaves[_concubine], 10, 0, -1, 1)>>
+			<<if canImpreg(_S.Concubine, $PC)>>
+				<<= knockMeUp(_S.Concubine, 10, 0, -1, 1)>>
 			<</if>>
-			<<set $slaves[_concubine].counter.vaginal++, $vaginalTotal++>>
-			_He2 moans into you as _he2 feels you run <<if $PC.dick == 0>>the cool head of the phallus<<else>>your cockhead<</if>> along _his2<<if $Concubine.labia > 0>> generous<</if>> labia before plunging it inside _him2. Getting the idea, $HeadGirl.slaveName
-			<<if (canPenetrate($HeadGirl))>>
-				<<if (canDoAnal($Concubine) && $Concubine.anus > 0)>>
-					<<if $HeadGirl.dick - $Concubine.anus > 2>>
-						gently pushes $his cock up $Concubine.slaveName's ass, since $he knows your Concubine's anus will be a little tight around $his imposing dick.
-					<<elseif $HeadGirl.dick - $Concubine.anus > 0>>
-						pushes $his cock up $Concubine.slaveName's ass, since $he knows your Concubine can take $his dick without too much trouble.
+			<<set _S.Concubine.counter.vaginal++, $vaginalTotal++>>
+			_He2 moans into you as _he2 feels you run <<if $PC.dick == 0>>the cool head of the phallus<<else>>your cockhead<</if>> along _his2<<if _S.Concubine.labia > 0>> generous<</if>> labia before plunging it inside _him2. Getting the idea, _S.HeadGirl.slaveName
+			<<if (canPenetrate(_S.HeadGirl))>>
+				<<if (canDoAnal(_S.Concubine) && _S.Concubine.anus > 0)>>
+					<<if _S.HeadGirl.dick - _S.Concubine.anus > 2>>
+						gently pushes $his cock up _S.Concubine.slaveName's ass, since $he knows your Concubine's anus will be a little tight around $his imposing dick.
+					<<elseif _S.HeadGirl.dick - _S.Concubine.anus > 0>>
+						pushes $his cock up _S.Concubine.slaveName's ass, since $he knows your Concubine can take $his dick without too much trouble.
 					<<else>>
-						shoves $his cock up $Concubine.slaveName's ass, since $he knows your Concubine can take $his dick with ease.
+						shoves $his cock up _S.Concubine.slaveName's ass, since $he knows your Concubine can take $his dick with ease.
 					<</if>>
-					<<if $PC.dick != 0>>You feel the penetration through $Concubine.slaveName's vaginal walls, an incredible sensation.<</if>>
-					<<if canImpreg($slaves[_concubine], $slaves[_headGirl])>>
-						<<= knockMeUp($slaves[_concubine], 10, 1, $slaves[_headGirl].ID, 1)>>
+					<<if $PC.dick != 0>>You feel the penetration through _S.Concubine.slaveName's vaginal walls, an incredible sensation.<</if>>
+					<<if canImpreg(_S.Concubine, _S.HeadGirl)>>
+						<<= knockMeUp(_S.Concubine, 10, 1, _S.HeadGirl.ID, 1)>>
 					<</if>>
-					<<set $slaves[_concubine].counter.anal++, $analTotal++>>
+					<<set _S.Concubine.counter.anal++, $analTotal++>>
 				<<else>>
-					gently eases $his cock in beside you.<<if $PC.dick != 0>> The added friction against you in $Concubine.slaveName's vagina feels incredible.<</if>>
-					<<set $slaves[_concubine].counter.vaginal++, $vaginalTotal++>>
-					<<if canImpreg($slaves[_concubine], $slaves[_headGirl])>>
-						<<= knockMeUp($slaves[_concubine], 10, 0, $slaves[_headGirl].ID, 1)>>
+					gently eases $his cock in beside you.<<if $PC.dick != 0>> The added friction against you in _S.Concubine.slaveName's vagina feels incredible.<</if>>
+					<<set _S.Concubine.counter.vaginal++, $vaginalTotal++>>
+					<<if canImpreg(_S.Concubine, _S.HeadGirl)>>
+						<<= knockMeUp(_S.Concubine, 10, 0, _S.HeadGirl.ID, 1)>>
 					<</if>>
 				<</if>>
-				<<set $slaves[_headGirl].counter.penetrative++, $penetrativeTotal++>>
+				<<set _S.HeadGirl.counter.penetrative++, $penetrativeTotal++>>
 			<<else>>
 				slides a hand down and
-				<<if (canDoAnal($Concubine) && $Concubine.anus > 0)>>
-					<<if $Concubine.anus > 3>>
-						fists $Concubine.slaveName's loose ass, since that's what it takes to fill your Concubine's gaping asspussy.
-					<<elseif $Concubine.anus == 3>>
-						starts to fuck $Concubine.slaveName's soft anus with three fingers.
-					<<elseif $Concubine.anus == 2>>
-						starts to fuck $Concubine.slaveName's asspussy with two fingers.
+				<<if (canDoAnal(_S.Concubine) && _S.Concubine.anus > 0)>>
+					<<if _S.Concubine.anus > 3>>
+						fists _S.Concubine.slaveName's loose ass, since that's what it takes to fill your Concubine's gaping asspussy.
+					<<elseif _S.Concubine.anus == 3>>
+						starts to fuck _S.Concubine.slaveName's soft anus with three fingers.
+					<<elseif _S.Concubine.anus == 2>>
+						starts to fuck _S.Concubine.slaveName's asspussy with two fingers.
 					<<else>>
-						starts to fuck $Concubine.slaveName's tight little backdoor with a finger.
+						starts to fuck _S.Concubine.slaveName's tight little backdoor with a finger.
 					<</if>>
-					<<if $PC.dick != 0>>You feel the penetration through $Concubine.slaveName's vaginal walls, an incredible sensation.<</if>>
-					<<set $slaves[_concubine].counter.anal++, $analTotal++>>
+					<<if $PC.dick != 0>>You feel the penetration through _S.Concubine.slaveName's vaginal walls, an incredible sensation.<</if>>
+					<<set _S.Concubine.counter.anal++, $analTotal++>>
 				<<else>>
-					gently eases a few fingers in beside you.<<if $PC.dick != 0>> The added sensation in $Concubine.slaveName's vagina feels incredible.<</if>>
-					<<set $slaves[_concubine].counter.vaginal++, $vaginalTotal++>>
+					gently eases a few fingers in beside you.<<if $PC.dick != 0>> The added sensation in _S.Concubine.slaveName's vagina feels incredible.<</if>>
+					<<set _S.Concubine.counter.vaginal++, $vaginalTotal++>>
 				<</if>>
 			<</if>>
 		<<else>>
 			/* this is up here to give the PC priority on pregnancy */
-			<<if canImpreg($slaves[_concubine], $PC)>>
-				<<= knockMeUp($slaves[_concubine], 10, 1, -1, 1)>>
+			<<if canImpreg(_S.Concubine, $PC)>>
+				<<= knockMeUp(_S.Concubine, 10, 1, -1, 1)>>
 			<</if>>
-			<<set $slaves[_concubine].counter.anal += 2, $analTotal += 2>>
-			Getting the idea, $HeadGirl.slaveName
-			<<if (canPenetrate($HeadGirl))>>
-				<<if $HeadGirl.dick - $Concubine.anus > 2>>
-					gently pushes $his cock up $Concubine.slaveName's ass, since $he knows your Concubine's anus will be a little tight around $his imposing dick.
-				<<elseif $HeadGirl.dick - $Concubine.anus > 0>>
-					pushes $his cock up $Concubine.slaveName's ass, since $he knows your Concubine can take $his dick without too much trouble.
+			<<set _S.Concubine.counter.anal += 2, $analTotal += 2>>
+			Getting the idea, _S.HeadGirl.slaveName
+			<<if (canPenetrate(_S.HeadGirl))>>
+				<<if _S.HeadGirl.dick - _S.Concubine.anus > 2>>
+					gently pushes $his cock up _S.Concubine.slaveName's ass, since $he knows your Concubine's anus will be a little tight around $his imposing dick.
+				<<elseif _S.HeadGirl.dick - _S.Concubine.anus > 0>>
+					pushes $his cock up _S.Concubine.slaveName's ass, since $he knows your Concubine can take $his dick without too much trouble.
 				<<else>>
-					shoves $his cock up $Concubine.slaveName's ass, since $he knows your Concubine can take $his dick with ease.
+					shoves $his cock up _S.Concubine.slaveName's ass, since $he knows your Concubine can take $his dick with ease.
 				<</if>>
-				Then $he grabs $Concubine.slaveName <<if !hasAnyLegs($Concubine)>>by the stumps<<else>>behind the knee<<if hasBothLegs($Concubine)>>s<</if>><</if>> and spreads _his2 <<if hasBothLegs($Concubine)>>legs<<else>>cheeks<</if>> as far as they'll go, rotating _his2 hips to position _him2 for another phallus up the butt.
-				<<set $slaves[_headGirl].counter.penetrative++, $penetrativeTotal++>>
-				<<if canImpreg($slaves[_concubine], $slaves[_headGirl])>>
-					<<= knockMeUp($slaves[_concubine], 10, 1, $slaves[_headGirl].ID, 1)>>
+				Then $he grabs _S.Concubine.slaveName <<if !hasAnyLegs(_S.Concubine)>>by the stumps<<else>>behind the knee<<if hasBothLegs(_S.Concubine)>>s<</if>><</if>> and spreads _his2 <<if hasBothLegs(_S.Concubine)>>legs<<else>>cheeks<</if>> as far as they'll go, rotating _his2 hips to position _him2 for another phallus up the butt.
+				<<set _S.HeadGirl.counter.penetrative++, $penetrativeTotal++>>
+				<<if canImpreg(_S.Concubine, _S.HeadGirl)>>
+					<<= knockMeUp(_S.Concubine, 10, 1, _S.HeadGirl.ID, 1)>>
 				<</if>>
 			<<else>>
 				slides a hand down and
-				<<if $Concubine.anus > 3>>
-					fists $Concubine.slaveName's loose ass, since that's what it takes to fill your Concubine's gaping asspussy.
-				<<elseif $Concubine.anus == 3>>
-					starts to fuck $Concubine.slaveName's soft anus with three fingers.
-				<<elseif $Concubine.anus == 2>>
-					starts to fuck $Concubine.slaveName's asspussy with two fingers.
+				<<if _S.Concubine.anus > 3>>
+					fists _S.Concubine.slaveName's loose ass, since that's what it takes to fill your Concubine's gaping asspussy.
+				<<elseif _S.Concubine.anus == 3>>
+					starts to fuck _S.Concubine.slaveName's soft anus with three fingers.
+				<<elseif _S.Concubine.anus == 2>>
+					starts to fuck _S.Concubine.slaveName's asspussy with two fingers.
 				<<else>>
-					starts to fuck $Concubine.slaveName's tight little backdoor with a finger.
+					starts to fuck _S.Concubine.slaveName's tight little backdoor with a finger.
 				<</if>>
-				Then $he grabs $Concubine.slaveName behind a knee with $his other hand and rotates _his2 hips to position _him2 for additional anal penetration.
+				Then $he grabs _S.Concubine.slaveName behind a knee with $his other hand and rotates _his2 hips to position _him2 for additional anal penetration.
 			<</if>>
 			Your Concubine shivers and moans as _his2 sphincter accommodates <<if $PC.dick != 0>>your cock<<else>>the strap-on<</if>>, too.
 		<</if>>
 		<br><br>
-		You start to fuck _him2, and then ask _him2 what _he2 needed from you. The poor _girl2 has to concentrate hard to remember why _he2's here through the waterfall of sensations, but _he2 manages it eventually, gasping out a little aesthetic question about one of your other bedslaves. You give _him2 _his2 answer and make _him2 repeat it back. When you're satisfied, you grab _his2 <<if !hasAnyLegs($Concubine)>>hips<<else>>ankle<<if hasBothLegs($Concubine)>>s<</if>><</if>> and pull them up, sliding _him2 off your <<if $PC.dick != 0>>pole<<else>>strap-on<</if>> and $HeadGirl.slaveName's <<if (canPenetrate($HeadGirl))>>dick<<else>>penetrating fingers<</if>> with a lovely lewd noise. After appreciating the sight of _his2 well-fucked <<if ((canDoAnal($Concubine) && $Concubine.anus > 0) && (canDoVaginal($Concubine) && $Concubine.vagina > 0))>>holes<<else>>hole<</if>>, you swing _his2 ass over and deposit it on the bed, producing a grunt as the drop forces the wind out of _him2. Grabbing your Head Girl in turn, you yank $him towards you, give the giggling slave a kiss, seize $his
-		<<if $HeadGirl.hips > 2>>
+		You start to fuck _him2, and then ask _him2 what _he2 needed from you. The poor _girl2 has to concentrate hard to remember why _he2's here through the waterfall of sensations, but _he2 manages it eventually, gasping out a little aesthetic question about one of your other bedslaves. You give _him2 _his2 answer and make _him2 repeat it back. When you're satisfied, you grab _his2 <<if !hasAnyLegs(_S.Concubine)>>hips<<else>>ankle<<if hasBothLegs(_S.Concubine)>>s<</if>><</if>> and pull them up, sliding _him2 off your <<if $PC.dick != 0>>pole<<else>>strap-on<</if>> and _S.HeadGirl.slaveName's <<if (canPenetrate(_S.HeadGirl))>>dick<<else>>penetrating fingers<</if>> with a lovely lewd noise. After appreciating the sight of _his2 well-fucked <<if ((canDoAnal(_S.Concubine) && _S.Concubine.anus > 0) && (canDoVaginal(_S.Concubine) && _S.Concubine.vagina > 0))>>holes<<else>>hole<</if>>, you swing _his2 ass over and deposit it on the bed, producing a grunt as the drop forces the wind out of _him2. Grabbing your Head Girl in turn, you yank $him towards you, give the giggling slave a kiss, seize $his
+		<<if _S.HeadGirl.hips > 2>>
 			breeding
-		<<elseif $HeadGirl.weight > 95>>
+		<<elseif _S.HeadGirl.weight > 95>>
 			padded
-		<<elseif $HeadGirl.weight > 10>>
+		<<elseif _S.HeadGirl.weight > 10>>
 			plush
-		<<elseif $HeadGirl.hips > 1>>
+		<<elseif _S.HeadGirl.hips > 1>>
 			broad
-		<<elseif $HeadGirl.hips >= 0>>
+		<<elseif _S.HeadGirl.hips >= 0>>
 			curvy
 		<<else>>
 			trim
 		<</if>>
-		hips and lift $him onto $Concubine.slaveName's lap. $He takes
-		<<if (canDoVaginal($HeadGirl) && $HeadGirl.vagina > 0)>>
-			<<if (canDoVaginal($Concubine) && $Concubine.vagina > 0)>>
-				<<if (canDoAnal($HeadGirl) && $HeadGirl.anus > 0)>>
+		hips and lift $him onto _S.Concubine.slaveName's lap. $He takes
+		<<if (canDoVaginal(_S.HeadGirl) && _S.HeadGirl.vagina > 0)>>
+			<<if (canDoVaginal(_S.Concubine) && _S.Concubine.vagina > 0)>>
+				<<if (canDoAnal(_S.HeadGirl) && _S.HeadGirl.anus > 0)>>
 					$his own double pounding, pussy and ass,
 				<<else>>
 					$his own double pounding,
 				<</if>>
 			<<else>>
-				<<if (canDoAnal($HeadGirl) && $HeadGirl.anus > 0)>>
+				<<if (canDoAnal(_S.HeadGirl) && _S.HeadGirl.anus > 0)>>
 					double penetration instead, since unlike your Concubine $he has two lower fuckholes,
 				<<else>>
 					$his own double pounding,
 				<</if>>
 			<</if>>
 		<<else>>
-			<<if (canDoVaginal($Concubine) && $Concubine.vagina > 0)>>
+			<<if (canDoVaginal(_S.Concubine) && _S.Concubine.vagina > 0)>>
 				double anal instead, since unlike your Concubine
-				<<if $HeadGirl.vagina == -1>>
+				<<if _S.HeadGirl.vagina == -1>>
 					$he only has the one lower fuckhole,
 				<<else>>
 					$his pussy is off limits,
@@ -395,55 +393,55 @@ and it's also obvious that they've been filling the few minutes they've been wai
 			<</if>>
 		<</if>>
 		while taking $his turn getting instructions. $He manages to ask your permission to make a couple of last-minute changes to slaves' assignments for the day. Having thus given your leadership guidance, you jump up for a shower, crooking a finger to indicate that they should follow. They @@.hotpink;trail obediently after you,@@ a bit sore, their holes dripping
-		<<if ($HeadGirl.vagina > -1) || ($HeadGirl.vagina > -1)>>
-			<<if ($PC.balls > 0) || ($HeadGirl.balls > 0) || ($Concubine.balls > 0)>>
+		<<if (_S.HeadGirl.vagina > -1) || (_S.HeadGirl.vagina > -1)>>
+			<<if ($PC.balls > 0) || (_S.HeadGirl.balls > 0) || (_S.Concubine.balls > 0)>>
 				cum, pussyjuice, and lube.
 			<<else>>
 				pussyjuice and lube.
 			<</if>>
 		<<else>>
-			<<if ($PC.balls > 0) || ($HeadGirl.balls > 0) || ($Concubine.balls > 0)>>
+			<<if ($PC.balls > 0) || (_S.HeadGirl.balls > 0) || (_S.Concubine.balls > 0)>>
 				cum and lube.
 			<<else>>
 				lube.
 			<</if>>
 		<</if>>
-		<<set $slaves[_headGirl].devotion += 4, $slaves[_concubine].devotion += 4>>
-		/* sex count cleanup for $HeadGirl since the above block is not pretty */
-		<<if (canDoVaginal($HeadGirl) && $HeadGirl.vagina > 0)>>
-			<<if canImpreg($slaves[_headGirl], $PC)>>
-				<<= knockMeUp($slaves[_headGirl], 10, 0, -1, 1)>>
+		<<set _S.HeadGirl.devotion += 4, _S.Concubine.devotion += 4>>
+		/* sex count cleanup for _S.HeadGirl since the above block is not pretty */
+		<<if (canDoVaginal(_S.HeadGirl) && _S.HeadGirl.vagina > 0)>>
+			<<if canImpreg(_S.HeadGirl, $PC)>>
+				<<= knockMeUp(_S.HeadGirl, 10, 0, -1, 1)>>
 			<</if>>
-			<<set $slaves[_headGirl].counter.vaginal++, $vaginalTotal++>>
-			<<if (canPenetrate($Concubine))>>
-				<<if (canDoAnal($HeadGirl) && $HeadGirl.anus > 0)>>
-					<<if canImpreg($slaves[_headGirl], $slaves[_concubine])>>
-						<<= knockMeUp($slaves[_headGirl], 10, 1, $slaves[_concubine].ID, 1)>>
+			<<set _S.HeadGirl.counter.vaginal++, $vaginalTotal++>>
+			<<if (canPenetrate(_S.Concubine))>>
+				<<if (canDoAnal(_S.HeadGirl) && _S.HeadGirl.anus > 0)>>
+					<<if canImpreg(_S.HeadGirl, _S.Concubine)>>
+						<<= knockMeUp(_S.HeadGirl, 10, 1, $ConcubineID, 1)>>
 					<</if>>
-					<<set $slaves[_headGirl].counter.anal++, $analTotal++>>
+					<<set _S.HeadGirl.counter.anal++, $analTotal++>>
 				<<else>>
-					<<set $slaves[_headGirl].counter.vaginal++, $vaginalTotal++>>
-					<<if canImpreg($slaves[_headGirl], $slaves[_concubine])>>
-						<<= knockMeUp($slaves[_headGirl], 10, 0, $slaves[_concubine].ID, 1)>>
+					<<set _S.HeadGirl.counter.vaginal++, $vaginalTotal++>>
+					<<if canImpreg(_S.HeadGirl, _S.Concubine)>>
+						<<= knockMeUp(_S.HeadGirl, 10, 0, $ConcubineID, 1)>>
 					<</if>>
 				<</if>>
-				<<set $slaves[_concubine].counter.penetrative++, $penetrativeTotal++>>
+				<<set _S.Concubine.counter.penetrative++, $penetrativeTotal++>>
 			<<else>>
-				<<if (canDoAnal($HeadGirl) && $HeadGirl.anus > 0)>>
-					<<set $slaves[_headGirl].counter.anal++, $analTotal++>>
+				<<if (canDoAnal(_S.HeadGirl) && _S.HeadGirl.anus > 0)>>
+					<<set _S.HeadGirl.counter.anal++, $analTotal++>>
 				<<else>>
-					<<set $slaves[_headGirl].counter.vaginal++, $vaginalTotal++>>
+					<<set _S.HeadGirl.counter.vaginal++, $vaginalTotal++>>
 				<</if>>
 			<</if>>
 		<<else>>
-			<<if canImpreg($slaves[_headGirl], $PC)>>
-				<<= knockMeUp($slaves[_headGirl], 10, 1, -1, 1)>>
+			<<if canImpreg(_S.HeadGirl, $PC)>>
+				<<= knockMeUp(_S.HeadGirl, 10, 1, -1, 1)>>
 			<</if>>
-			<<set $slaves[_headGirl].counter.anal += 2, $analTotal += 2>>
-			<<if (canPenetrate($Concubine))>>
-				<<set $slaves[_headGirl].counter.penetrative++, $penetrativeTotal++>>
-				<<if canImpreg($slaves[_headGirl], $slaves[_concubine])>>
-					<<= knockMeUp($slaves[_headGirl], 10, 1, $slaves[_concubine].ID, 1)>>
+			<<set _S.HeadGirl.counter.anal += 2, $analTotal += 2>>
+			<<if (canPenetrate(_S.Concubine))>>
+				<<set _S.HeadGirl.counter.penetrative++, $penetrativeTotal++>>
+				<<if canImpreg(_S.HeadGirl, _S.Concubine)>>
+					<<= knockMeUp(_S.HeadGirl, 10, 1, $ConcubineID, 1)>>
 				<</if>>
 			<</if>>
 		<</if>>
diff --git a/src/uncategorized/peLonelyBodyguard.tw b/src/uncategorized/peLonelyBodyguard.tw
index 3b2f4f7b991c29b61a5403376cf65a0fd9deecc5..bccd428a8b32e8adf289d122e9ee45c06a15b608 100644
--- a/src/uncategorized/peLonelyBodyguard.tw
+++ b/src/uncategorized/peLonelyBodyguard.tw
@@ -2,9 +2,9 @@
 
 <<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Random Nonindividual Event">>
 
-<<set $activeSlave = $Bodyguard, _targetSlaveIndex = []>>
+<<set $activeSlave =_S.Bodyguard, _targetSlaveIndex = []>>
 <<for _i = 0; _i < $slaves.length; _i++>>
-	<<if $slaves[_i].devotion >= -20 && $slaves[_i].relationship == 0 && $slaves[_i].ID != $Bodyguard.ID>>
+	<<if $slaves[_i].devotion >= -20 && $slaves[_i].relationship == 0 && $slaves[_i].ID != $BodyguardID>>
 		<<set _targetSlaveIndex.push(_i)>>
 	<</if>>
 <</for>>
diff --git a/src/uncategorized/pePitFight.tw b/src/uncategorized/pePitFight.tw
index 962dd2d72ce2aa089ae56d3e9db4dcff92243785..bbc7850decc8badfdad4b11b4ea8d8227316900c 100644
--- a/src/uncategorized/pePitFight.tw
+++ b/src/uncategorized/pePitFight.tw
@@ -2,7 +2,7 @@
 
 <<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Random Nonindividual Event">>
 
-<<set $activeSlave = $Bodyguard>>
+<<set $activeSlave = _S.Bodyguard>>
 <<setLocalPronouns $activeSlave>>
 
 <<set _deadliness = Deadliness($activeSlave)>>
diff --git a/src/uncategorized/pePitFightInvite.tw b/src/uncategorized/pePitFightInvite.tw
index 13ae2a8eae689b55145d80e84c84dab99ef77563..97cba9c2f4bfcaac73e0503ee4ac5787afc926bf 100644
--- a/src/uncategorized/pePitFightInvite.tw
+++ b/src/uncategorized/pePitFightInvite.tw
@@ -4,7 +4,7 @@
 <<set $nextLink = "RIE Eligibility Check">>
 
 <<set $PPit = 0>>
-<<setLocalPronouns $Bodyguard>>
+<<setLocalPronouns _S.Bodyguard>>
 <span id="artFrame">
 </span>
 
@@ -21,9 +21,9 @@
 	/* 000-250-006 */
 	<<if $seeImages == 1>>
 		<<if $imageChoice == 1>>
-			<div class="imageRef lrgVector"><div class="mask">&nbsp;</div><<= SlaveArt($Bodyguard, 2, 0)>></div>
+			<div class="imageRef lrgVector"><div class="mask">&nbsp;</div><<= SlaveArt(_S.Bodyguard, 2, 0)>></div>
 		<<else>>
-			<div class="imageRef lrgRender"><div class="mask">&nbsp;</div><<= SlaveArt($Bodyguard, 2, 0)>></div>
+			<div class="imageRef lrgRender"><div class="mask">&nbsp;</div><<= SlaveArt(_S.Bodyguard, 2, 0)>></div>
 		<</if>>
 	<</if>>
 	/* 000-250-006 */
diff --git a/src/uncategorized/penthouseReport.tw b/src/uncategorized/penthouseReport.tw
index ecbf0225270a7333bf7c1efde3bb9f90058faa40..ee0fb9e21b76ff76723f1a1122c2a87a3da79a94 100644
--- a/src/uncategorized/penthouseReport.tw
+++ b/src/uncategorized/penthouseReport.tw
@@ -1,11 +1,6 @@
 :: Penthouse Report [nobr]
 
 <<set _SL = $slaves.length>>
-<<if _S.HeadGirl>>
-	<<set _HGID = _S.HeadGirl.ID>>
-<<else>>
-	<<set _HGID = 0>>
-<</if>>
 
 <<set _HGSuitSlaves = App.Utils.jobForAssignment(Job.HEADGIRLSUITE).employees()>>
 
@@ -19,7 +14,7 @@
 		<<include "Full Report">>
 		<br><br>
 
-		<<if ($slaves[$i].ID == _HGID) && (_HGSuitSlaves.length > 0)>>
+		<<if ($slaves[$i].ID == $HeadGirlID) && (_HGSuitSlaves.length > 0)>>
 			/% We found the Head Girl, now let's find her slave %/
 			<<set _iTemp = $i>>
 			<<set _ID = _HGSuitSlaves[0].ID, $i = $slaveIndices[_ID]>>
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index f64939884ac8d646c88fa8749d4c64e1dd5b30dd..bf4d33b4cdd91ed004da9e3a0c382da6a0402b6e 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -320,7 +320,7 @@
 		During important meetings with higher society, it is wise to have a lot of slaves to put at the disposition of others. But some slaveowners grow really attached to their slaves, and so they'd much rather rent out unknown slaves from an anonymous owner's stock than use their own. This is a good opportunity to make some money, as shown by the @@.yellowgreen;<<print cashFormat(_income)>>@@ you managed to make.
 	<<case "chinese law">>
 		<<set _income += random(2000,3000)>>
-		<<setLocalPronouns $HeadGirl>>
+		<<setLocalPronouns _S.HeadGirl>>
 		This time, you have a good idea that will also make use of your Head Girl. You coax $him into thinking $he should accept bribes for the time being, making up a good reason on the spot, and $he ends up bringing back @@.yellowgreen;<<print cashFormat(_income)>>@@ from all the bribes people gave for $him to turn the other way.
 	<<case "chinese">>
 		<<set _income += random(1500,2500)>>
diff --git a/src/uncategorized/personalAttentionSelect.tw b/src/uncategorized/personalAttentionSelect.tw
index c4516490fe4d061924b6ad093dfdfda1e86914eb..1f52bae005cb55866918141e98b2ce52e542ad4d 100644
--- a/src/uncategorized/personalAttentionSelect.tw
+++ b/src/uncategorized/personalAttentionSelect.tw
@@ -23,7 +23,7 @@
 <<if $PC.skill.hacking > 25>>
 	<br>[[Sell your intrusion services to the highest bidder|Main][$personalAttention = "technical accidents"]]
 <</if>>
-<<if $HeadGirl != 0>>
+<<if $HeadGirlID != 0>>
 	<br>[[Support your Head Girl|Main][$personalAttention = "HG"]]
 <</if>>
 <br>[[Have as much sex with your slaves as possible|Main][$personalAttention = "sex"]]
diff --git a/src/uncategorized/pit.tw b/src/uncategorized/pit.tw
index 23b9f4956ec74aa5ce70650130574e48e9a6234b..8ca6957340c2612260c4da0a1c301f00824c57c3 100644
--- a/src/uncategorized/pit.tw
+++ b/src/uncategorized/pit.tw
@@ -4,8 +4,8 @@
 <<if $pitName != "the Pit">>
 	<<set $pitNameCaps = $pitName.replace("the ", "The ")>>
 <</if>>
-<<if $pitBG == 1 && $fighterIDs.includes($Bodyguard.ID)>>
-	<<set $fighterIDs.delete($Bodyguard.ID), _DL-->>
+<<if $pitBG == 1 && $fighterIDs.includes($BodyguardID)>>
+	<<set $fighterIDs.delete($BodyguardID), _DL-->>
 <</if>>
 
 $pitNameCaps is clean and ready,
@@ -37,16 +37,16 @@ $pitNameCaps is clean and ready,
 <</if>>
 
 <<if $killChoice != 2>>
-	<<if $Bodyguard != 0 || (_CL > 0 && $activeCanine != 0) || (_HL > 0 && $activeHooved != 0) || (_FL > 0 && $activeFeline != 0)>>
+	<<if _S.Bodyguard || (_CL > 0 && $activeCanine != 0) || (_HL > 0 && $activeHooved != 0) || (_FL > 0 && $activeFeline != 0)>>
 		<br>
 		<<if $pitBG == 0>>
 			<<if $pitAnimal == 0>>
 				Two fighters will be selected from the pool at random.
-				<<if $Bodyguard != 0>>[[Guarantee your Bodyguard a slot|Pit][$pitBG = 1, $pitAnimal = 0]]<</if>>
-				<<if $Bodyguard != 0 && ($activeCanine != 0 || $activeHooved != 0 || $activeFeline != 0)>> | <</if>>
+				<<if _S.Bodyguard>>[[Guarantee your Bodyguard a slot|Pit][$pitBG = 1, $pitAnimal = 0]]<</if>>
+				<<if _S.Bodyguard && ($activeCanine != 0 || $activeHooved != 0 || $activeFeline != 0)>> | <</if>>
 				<<if $activeCanine != 0 || $activeHooved != 0 || $activeFeline != 0>>[[Have a slave fight an animal|Pit][$pitBG = 0, $pitAnimal = 1]]<</if>>
 			<<else>>
-				A random slave will fight an animal. [[Have them fight another slave|Pit][$pitBG = 0, $pitAnimal = 0]]<<if $Bodyguard != 0>> | [[Have them fight your Bodyguard|Pit][$pitBG = 1, $pitAnimal = 0]]<</if>>
+				A random slave will fight an animal. [[Have them fight another slave|Pit][$pitBG = 0, $pitAnimal = 0]]<<if _S.Bodyguard>> | [[Have them fight your Bodyguard|Pit][$pitBG = 1, $pitAnimal = 0]]<</if>>
 			<</if>>
 		<<else>>
 			Your Bodyguard will fight a slave selected from the pool at random. [[Make both slots random|Pit][$pitBG = 0, $pitAnimal = 0]]
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index fe1403fdd8e2953f137c2b85076c5be249e88c39..33f53a37d92b3a49be1077d4edf869851e0d7ad9 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -329,44 +329,44 @@
 		<<set $events.push("RE busy arcade")>>
 	<</if>>
 	<<if App.Entity.facilities.masterSuite.employeesIDs().size > 3>>
-		<<if $Concubine != 0>>
+		<<if $ConcubineID != 0>>
 			<<set $events.push("RE busy master suite")>>
 		<</if>>
 	<</if>>
 
 	/* Position Events */
 
-	<<if ($HeadGirl != 0)>>
+	<<if ($HeadGirlID != 0)>>
 
-		<<if ($Concubine != 0)>>
+		<<if (_S.Concubine)>>
 			<<if $fuckSlaves > 1>>
-				<<if canTalk($Concubine) && canSee($Concubine) && canHear($Concubine) && $Concubine.fetish != "mindbroken" && canHold($Concubine) && canWalk($Concubine)>>
+				<<if canTalk(_S.Concubine) && canSee(_S.Concubine) && canHear(_S.Concubine) && _S.Concubine.fetish != "mindbroken" && canHold(_S.Concubine) && canWalk(_S.Concubine)>>
 					<<set $events.push("PE headgirl concubine")>>
 				<</if>>
 			<</if>>
 		<</if>>
 
-		<<set $j = $slaves.findIndex(function(s) { return s.ID != $HeadGirl.ID && s.devotion <= 20; })>>
+		<<set $j = $slaves.findIndex(function(s) { return s.ID != $HeadGirlID && s.devotion <= 20; })>>
 
-		<<if canPenetrate($HeadGirl) && ($HeadGirl.balls > 0)>>
+		<<if canPenetrate(_S.HeadGirl) && (_S.HeadGirl.balls > 0)>>
 			<<if $j != -1>>
 				<<set $PESSevent.push("headgirl dickgirl")>> /* requires valid $slaves[$j] */
 			<</if>>
 
 			<<if ($universalRulesImpregnation == "HG")>>
-				<<if ($HeadGirl.devotion > 95)>>
+				<<if (_S.HeadGirl.devotion > 95)>>
 					<<set $PESSevent.push("worshipful impregnatrix")>> /* does not use $j */
 				<</if>>
 			<</if>>
 		<</if>>
 
-		<<if ($HeadGirl.devotion > 95)>>
+		<<if (_S.HeadGirl.devotion > 95)>>
 			<<if ($slaves.length > 4)>>
 				<<set $PESSevent.push("loving headgirl")>> /* uses $j if valid, but not required */
 			<</if>>
 			<<if ($week > 20)>>
-				<<if ($HeadGirl.trust > 95)>>
-					<<if ($HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 50)>>
+				<<if (_S.HeadGirl.trust > 95)>>
+					<<if (_S.HeadGirl.intelligence+_S.HeadGirl.intelligenceImplant > 50)>>
 						<<set $PESSevent.push("worried headgirl")>> /* does not use $j */
 					<</if>>
 				<</if>>
@@ -375,22 +375,22 @@
 
 	<</if>>
 
-	<<if ($Bodyguard != 0)>>
+	<<if _S.Bodyguard>>
 
 		<<set $events.push("PE pit fight invite")>>
 
-		<<if ($Bodyguard.skill.combat != 0)>>
+		<<if (_S.Bodyguard.skill.combat != 0)>>
 			<<set $PESSevent.push("bodyguard bedtime")>>
 		<</if>>
 
-		<<if ($Bodyguard.devotion > 45)>>
+		<<if (_S.Bodyguard.devotion > 45)>>
 			<<set $PESSevent.push("bodyguard beatdown")>>
 		<</if>>
 
-		<<if ($Bodyguard.relationship == 0)>>
-			<<if ($Bodyguard.rules.relationship == "permissive")>>
-				<<if ($Bodyguard.fetish != "mindbroken")>>
-					<<set $j = $slaves.findIndex(function(s) { return s.ID != $Bodyguard.ID && s.relationship == 0 && s.devotion >= -20; })>>
+		<<if (_S.Bodyguard.relationship == 0)>>
+			<<if (_S.Bodyguard.rules.relationship == "permissive")>>
+				<<if (_S.Bodyguard.fetish != "mindbroken")>>
+					<<set $j = $slaves.findIndex(function(s) { return s.ID != $BodyguardID && s.relationship == 0 && s.devotion >= -20; })>>
 					<<if $j != -1>>
 						<<set $events.push("PE lonely bodyguard")>> /* requires valid $slaves[$j] */
 					<</if>>
@@ -398,7 +398,7 @@
 			<</if>>
 		<</if>>
 
-		<<if ($Bodyguard.skill.combat == 0)>>
+		<<if (_S.Bodyguard.skill.combat == 0)>>
 			<<set $events.push("PE combat training")>>
 			<<set $events.push("PE combat training")>>
 			<<set $events.push("PE combat training")>>
@@ -406,11 +406,11 @@
 
 	<</if>>
 
-	<<if ($Milkmaid != 0) && (_L.dairy >= 5) && ($Milkmaid.health.condition >= 70)>>
-		<<if ($Milkmaid.muscles > 5)>>
+	<<if ($MilkmaidID != 0) && (_L.dairy >= 5) && (_S.Milkmaid.health.condition >= 70)>>
+		<<if (_S.Milkmaid.muscles > 5)>>
 			<<set $PESSevent.push("tired milkmaid")>>
 		<</if>>
-		<<if canAchieveErection($Milkmaid)>>
+		<<if canAchieveErection(_S.Milkmaid)>>
 			<<set $PESSevent.push("tired collectrix")>>
 		<</if>>
 	<</if>>
@@ -419,7 +419,7 @@
 		<<set $PETSevent.push("stewardess beating")>>
 	<</if>>
 
-	<<if ($Madam != 0) && (_L.brothel >= 5) && ($Madam.actualAge >= 35 || $AgePenalty == 0) && ($Madam.skill.whoring >= 100)>>
+	<<if ($MadamID != 0) && (_L.brothel >= 5) && (_S.Madam.actualAge >= 35 || $AgePenalty == 0) && (_S.Madam.skill.whoring >= 100)>>
 		<<set $PESSevent.push("madam strategy")>>
 	<</if>>
 
@@ -446,12 +446,12 @@
 		<</if>>
 	<</if>>
 
-	<<if ($Concubine != 0)>>
-		<<if canWalk($Concubine)>>
-			<<if canSee($Concubine)>>
+	<<if (_S.Concubine)>>
+		<<if canWalk(_S.Concubine)>>
+			<<if canSee(_S.Concubine)>>
 				<<set $PESSevent.push("loving concubine")>>
 			<</if>>
-			<<if canTalk($Concubine) && canHear($Concubine)>>
+			<<if canTalk(_S.Concubine) && canHear(_S.Concubine)>>
 				<<set $events.push("PE concubine interview")>>
 			<</if>>
 		<</if>>
@@ -543,10 +543,10 @@
 		<<if ($cash > 20000)>>
 			<<set $recruit.push("school sale")>>
 		<</if>>
-		<<if ($HeadGirl.devotion > 50) && ($HeadGirl.skill.entertainment >= 100)>>
+		<<if (_S.HeadGirl.devotion > 50) && (_S.HeadGirl.skill.entertainment >= 100)>>
 			<<set $recruit.push("female recruit")>>
 		<</if>>
-		<<if ($HeadGirl.devotion > 50) && ($HeadGirl.skill.whoring >= 100)>>
+		<<if (_S.HeadGirl.devotion > 50) && (_S.HeadGirl.skill.whoring >= 100)>>
 			<<set $recruit.push("whore recruit")>>
 		<</if>>
 		<<if $PC.skill.hacking >= 50 && (random(0,100) < $PC.skill.hacking) || $cheatMode>>
@@ -601,11 +601,11 @@
 		<<if ($cash > 20000)>>
 			<<set $recruit.push("school trap")>>
 		<</if>>
-		<<if ($HeadGirl.devotion > 50) && ($HeadGirl.dick > 0)>>
+		<<if (_S.HeadGirl.devotion > 50) && (_S.HeadGirl.dick > 0)>>
 			<<set $recruit.push("male recruit")>>
 		<</if>>
 		<<if $seeDicks != 100>>
-			<<if ($HeadGirl.devotion > 50)>>
+			<<if (_S.HeadGirl.devotion > 50)>>
 				<<set $RecETSevent.push("mismatched pair")>>
 			<</if>>
 			<<if ($rep/400) > (random(1,100) || $cheatMode)>>
diff --git a/src/uncategorized/reAnalPunishment.tw b/src/uncategorized/reAnalPunishment.tw
index 0e6494fa54c21ccb26f0530171c8b21a8eddbd9a..36aff4000c744ec3b85af74f2360c5d77349420e 100644
--- a/src/uncategorized/reAnalPunishment.tw
+++ b/src/uncategorized/reAnalPunishment.tw
@@ -4,18 +4,18 @@
 
 <<set $activeSlave = $eventSlave>>
 <<setLocalPronouns $activeSlave>>
-<<setLocalPronouns $HeadGirl 2>>
+<<setLocalPronouns _S.HeadGirl 2>>
 
 <<run Enunciate($activeSlave)>>
 
 <<set _clothesTemp = $activeSlave.clothes, $activeSlave.clothes = "no clothing">>
-<<set _clothesTemp2 = $HeadGirl.clothes, $HeadGirl.clothes = "no clothing">>
+<<set _clothesTemp2 = _S.HeadGirl.clothes, _S.HeadGirl.clothes = "no clothing">>
 <span id="artFrame">
 /* 000-250-006 */
 <<if $seeImages == 1>>
 	<div class="imageColumn">
 		<div class="imageRef medImg">
-			<<= SlaveArt($HeadGirl, 2, 0)>>
+			<<= SlaveArt(_S.HeadGirl, 2, 0)>>
 		</div>
 		<div class="imageRef medImg">
 			<<= SlaveArt($activeSlave, 2, 0)>>
@@ -25,32 +25,31 @@
 /* 000-250-006 */
 </span>
 <<set $activeSlave.clothes = _clothesTemp>>
-<<set $HeadGirl.clothes = _clothesTemp2>>
+<<set _S.HeadGirl.clothes = _clothesTemp2>>
 
-As you're making the rounds through your penthouse, you hear $HeadGirl.slaveName speaking in the tones _he2 uses to castigate misbehaving slaves in the next room. When you appear in the doorway, you have little chance to survey the situation before <<= App.UI.slaveDescriptionDialog($activeSlave)>>, apparently the miscreant, flings $himself at your feet. $He clings to one of your legs convulsively, choking on tears as $he stares up at you and tries to muster an explanation. After two false starts, $he manages to start begging. "Plea<<s>>e, <<Master>>," $he wails miserably. "Plea<<s>>e don't let _him2 rape my butt."
+As you're making the rounds through your penthouse, you hear _S.HeadGirl.slaveName speaking in the tones _he2 uses to castigate misbehaving slaves in the next room. When you appear in the doorway, you have little chance to survey the situation before <<= App.UI.slaveDescriptionDialog($activeSlave)>>, apparently the miscreant, flings $himself at your feet. $He clings to one of your legs convulsively, choking on tears as $he stares up at you and tries to muster an explanation. After two false starts, $he manages to start begging. "Plea<<s>>e, <<Master>>," $he wails miserably. "Plea<<s>>e don't let _him2 rape my butt."
 <br><br>
-You shoot an amused glance at $HeadGirl.slaveName, who smiles back as _he2 explains the slave's minor sin and _his2 intention to sodomize the malefactor. _He2 does not bother to keep an edge of anticipation out of _his2 voice, and $activeSlave.slaveName cries harder and clings to you with renewed force as your Head Girl pronounces _his2 intention with cruel clarity.<<if $activeSlave.boobs > 4000>> The supplicant's breasts are so huge that $his embrace of your leg has completely surrounded it in deliciously heaving breastflesh.<<elseif $activeSlave.boobs > 1000>> The weight of the supplicant's breasts is quite noticeable as $his embrace of your leg presses them against it.<</if>> You look down at $activeSlave.slaveName. $He stares back with huge wet <<= App.Desc.eyesColor($activeSlave)>>, doing $his best to implore you with $his gaze, and scooting $his rear in towards your foot in an unconscious effort to protect it from the promised assrape. $He's quite authentically terrified; $his whole body is shaking.
+You shoot an amused glance at _S.HeadGirl.slaveName, who smiles back as _he2 explains the slave's minor sin and _his2 intention to sodomize the malefactor. _He2 does not bother to keep an edge of anticipation out of _his2 voice, and $activeSlave.slaveName cries harder and clings to you with renewed force as your Head Girl pronounces _his2 intention with cruel clarity.<<if $activeSlave.boobs > 4000>> The supplicant's breasts are so huge that $his embrace of your leg has completely surrounded it in deliciously heaving breastflesh.<<elseif $activeSlave.boobs > 1000>> The weight of the supplicant's breasts is quite noticeable as $his embrace of your leg presses them against it.<</if>> You look down at $activeSlave.slaveName. $He stares back with huge wet <<= App.Desc.eyesColor($activeSlave)>>, doing $his best to implore you with $his gaze, and scooting $his rear in towards your foot in an unconscious effort to protect it from the promised assrape. $He's quite authentically terrified; $his whole body is shaking.
 <br><br>
-$HeadGirl.slaveName is very much acting within _his2 duties, and $activeSlave.slaveName has now misbehaved twice by trying to go over your Head Girl's head by appealing to you. $HeadGirl.slaveName is ready to carry out the sentence: <<if canPenetrate($HeadGirl) && ($HeadGirl.dick > 2)>>_his2 cock is fully erect, and _he2's keeping it hard with one hand. _He2 slaps its head against _his2 other palm<<elseif $HeadGirl.dick > 0>>since _his2 dick isn't an appropriate instrument for inflicting anal pain, _he2's got an elephantine dildo ready. _He2 slaps it against _his2 palm<<else>>_He2's got an elephantine dildo ready, and _he2 slaps it against _his2 palm<</if>>, forcing a frightened moan from $activeSlave.slaveName.
+_S.HeadGirl.slaveName is very much acting within _his2 duties, and $activeSlave.slaveName has now misbehaved twice by trying to go over your Head Girl's head by appealing to you. _S.HeadGirl.slaveName is ready to carry out the sentence: <<if canPenetrate(_S.HeadGirl) && (_S.HeadGirl.dick > 2)>>_his2 cock is fully erect, and _he2's keeping it hard with one hand. _He2 slaps its head against _his2 other palm<<elseif _S.HeadGirl.dick > 0>>since _his2 dick isn't an appropriate instrument for inflicting anal pain, _he2's got an elephantine dildo ready. _He2 slaps it against _his2 palm<<else>>_He2's got an elephantine dildo ready, and _he2 slaps it against _his2 palm<</if>>, forcing a frightened moan from $activeSlave.slaveName.
 
 <br><br>
 
 <span id="result">
 <<link "Carry on">>
 	<<replace "#result">>
-	You ignore $activeSlave.slaveName — no small feat, since the poor <<if $activeSlave.physicalAge > 30>>$woman<<else>>$girl<</if>> is clinging to your leg — and tell $HeadGirl.slaveName to carry on. Your Head Girl @@.mediumaquamarine;puffs up a bit with pride,@@ and orders the weeping slave to present $his anus. The <<if $activeSlave.physicalAge > 30>>$woman<<else>>$girl<</if>> does not resist, but nor does $he comply. $HeadGirl.slaveName jabs a thumb into $activeSlave.slaveName's side, right above $his kidney, driving the wind out of the slave with a pained grunt. $He arches $his back involuntarily and $his grip on you loosens, and $HeadGirl.slaveName drags $him off you. _He2 jabs $him again, depriving _his2 victim of breath completely, and then takes _him2 by the ankle, dragging the slave across the floor with comic effect. The slave leaves a trail of tears across the flooring as $he vanishes into the room. As you continue making your rounds, you hear a drawn-out howl followed by rhythmic screaming.
+	You ignore $activeSlave.slaveName — no small feat, since the poor <<if $activeSlave.physicalAge > 30>>$woman<<else>>$girl<</if>> is clinging to your leg — and tell _S.HeadGirl.slaveName to carry on. Your Head Girl @@.mediumaquamarine;puffs up a bit with pride,@@ and orders the weeping slave to present $his anus. The <<if $activeSlave.physicalAge > 30>>$woman<<else>>$girl<</if>> does not resist, but nor does $he comply. _S.HeadGirl.slaveName jabs a thumb into $activeSlave.slaveName's side, right above $his kidney, driving the wind out of the slave with a pained grunt. $He arches $his back involuntarily and $his grip on you loosens, and _S.HeadGirl.slaveName drags $him off you. _He2 jabs $him again, depriving _his2 victim of breath completely, and then takes _him2 by the ankle, dragging the slave across the floor with comic effect. The slave leaves a trail of tears across the flooring as $he vanishes into the room. As you continue making your rounds, you hear a drawn-out howl followed by rhythmic screaming.
 	<<set $activeSlave.counter.anal += 1>>
 	<<set $analTotal += 1>>
-	<<set $HeadGirl.trust += 4, $HeadGirl.counter.penetrative += 1>>
+	<<set _S.HeadGirl.trust += 4, _S.HeadGirl.counter.penetrative += 1>>
 	<<set $penetrativeTotal += 1>>
-	<<set $slaves[$slaveIndices[$HeadGirl.ID]] = $HeadGirl>>
 	<</replace>>
 <</link>>
 <br><<link "Take part">>
 	<<replace "#result">>
-	You explain $activeSlave.slaveName's double crime to $him, and tell $HeadGirl.slaveName to get started. Your Head Girl orders the weeping slave to present $his anus. The <<if $activeSlave.physicalAge > 30>>$woman<<else>>$girl<</if>> does not resist, but nor does $he comply. $HeadGirl.slaveName jabs a thumb into $activeSlave.slaveName's side, right above $his kidney, driving the wind out of the slave with a pained grunt. $He arches $his back involuntarily and $his grip on you loosens, so $HeadGirl.slaveName drags $him off you, telling $activeSlave.slaveName that it'll hurt less if $he cooperates and assumes the proper position. $He doesn't, so $HeadGirl.slaveName assfucks $him lying flat on the floor, with the poor $girl sobbing loudly as $HeadGirl.slaveName <<if canPenetrate($HeadGirl) && ($HeadGirl.dick > 2)>>pistons _his2 cock in and out of $his rectum<<else>>rams the massive dildo up $his butt<</if>>.
+	You explain $activeSlave.slaveName's double crime to $him, and tell _S.HeadGirl.slaveName to get started. Your Head Girl orders the weeping slave to present $his anus. The <<if $activeSlave.physicalAge > 30>>$woman<<else>>$girl<</if>> does not resist, but nor does $he comply. _S.HeadGirl.slaveName jabs a thumb into $activeSlave.slaveName's side, right above $his kidney, driving the wind out of the slave with a pained grunt. $He arches $his back involuntarily and $his grip on you loosens, so _S.HeadGirl.slaveName drags $him off you, telling $activeSlave.slaveName that it'll hurt less if $he cooperates and assumes the proper position. $He doesn't, so _S.HeadGirl.slaveName assfucks $him lying flat on the floor, with the poor $girl sobbing loudly as _S.HeadGirl.slaveName <<if canPenetrate(_S.HeadGirl) && (_S.HeadGirl.dick > 2)>>pistons _his2 cock in and out of $his rectum<<else>>rams the massive dildo up $his butt<</if>>.
 	<br><br>
-	After enjoying the spectacle for a while, you judge that the slave's sphincter is loose enough and tell $HeadGirl.slaveName to flip the bitch over. @@.hotpink;_He2 obeys, chuckling,@@ sitting _himself2 down and hauling the reluctant slave onto _his2 lap by seizing a nipple and pulling it into position so the agonized slave is forced to follow. <<if canPenetrate($HeadGirl) && ($HeadGirl.dick > 2)>>$HeadGirl.slaveName reinserts _his2 dick, <<else>>$HeadGirl.slaveName maneuvers the dildo down over _his2 own crotch, approximating the position of a natural cock and using its base to stimulate _himself2. _He2 reinserts it,<</if>> intentionally missing twice to keep the experience unpleasant despite _his2 victim's well-fucked backdoor.
+	After enjoying the spectacle for a while, you judge that the slave's sphincter is loose enough and tell _S.HeadGirl.slaveName to flip the bitch over. @@.hotpink;_He2 obeys, chuckling,@@ sitting _himself2 down and hauling the reluctant slave onto _his2 lap by seizing a nipple and pulling it into position so the agonized slave is forced to follow. <<if canPenetrate(_S.HeadGirl) && (_S.HeadGirl.dick > 2)>>_S.HeadGirl.slaveName reinserts _his2 dick, <<else>>_S.HeadGirl.slaveName maneuvers the dildo down over _his2 own crotch, approximating the position of a natural cock and using its base to stimulate _himself2. _He2 reinserts it,<</if>> intentionally missing twice to keep the experience unpleasant despite _his2 victim's well-fucked backdoor.
 	<br><br>
 	$activeSlave.slaveName, now facing upward rather than having $his face ground into the floor, notices for the first time that <<if $PC.dick != 0>>you've got your dick out and hard<<else>>you've donned one of your punishment-sized strap-ons<</if>>. $His <<= App.Desc.eyesColor($activeSlave)>> @@.gold;fly open with horror@@ as you kneel down and smack its head against $his <<if $activeSlave.vagina > -1>>poor pussy<<else>>stretched taint<</if>>, but $he doesn't realize how comprehensively fucked $he is until you press it against the top of $his already-stretched anal sphincter. "Plea<<s>>e no, <<Master>>! It won't fit! Plea<<s>>e <<if $activeSlave.vagina > 0>>put it in my pu<<ss>>y<<else>>let me <<s>>uck it<</if>> in<<s>>tead," $he begs desperately. "I p-promi<<s>>e I'll be a g-good
 	<<if $girl == "girl">>
@@ -65,16 +64,15 @@ $HeadGirl.slaveName is very much acting within _his2 duties, and $activeSlave.sl
 	$he howls. $He gasps for air, tears streaming down $his $activeSlave.skin cheeks, and then continues: "AAAH! FUCK! TAKE IT OUUUT! N-NOOO, PLEA<<S>>E DON'T THRU<<S>>T — AAAH! AAAH! AAAH!"
 	<<set $activeSlave.trust -= 5, $activeSlave.counter.anal += 1>>
 	<<set $analTotal += 1>>
-	<<set $HeadGirl.devotion += 4, $HeadGirl.counter.penetrative += 1>>
+	<<set _S.HeadGirl.devotion += 4, _S.HeadGirl.counter.penetrative += 1>>
 	<<set $penetrativeTotal += 1>>
-	<<set $slaves[$slaveIndices[$HeadGirl.ID]] = $HeadGirl>>
 	<</replace>>
 <</link>>
 <br><<link "Take pity">>
 	<<replace "#result">>
-	You tell $HeadGirl.slaveName you've decided to be merciful, just this once. $activeSlave.slaveName holds your leg even harder, @@.mediumaquamarine;sobbing $his thanks@@ over and over until you reach down, pat $his head, and tell $him it will be all right, calming the hysterical <<if $activeSlave.physicalAge > 30>>$woman<<else>>$girl<</if>>. $HeadGirl.slaveName, meanwhile, stammers an apology. _He2 hurries about _his2 business, @@.gold;badly puzzled@@ and more than a little shaken. _He2 thought _he2 had the authority to anally rape misbehaving slaves, but _he2's no longer so sure of _his2 rights and responsibilities.
+	You tell _S.HeadGirl.slaveName you've decided to be merciful, just this once. $activeSlave.slaveName holds your leg even harder, @@.mediumaquamarine;sobbing $his thanks@@ over and over until you reach down, pat $his head, and tell $him it will be all right, calming the hysterical <<if $activeSlave.physicalAge > 30>>$woman<<else>>$girl<</if>>. _S.HeadGirl.slaveName, meanwhile, stammers an apology. _He2 hurries about _his2 business, @@.gold;badly puzzled@@ and more than a little shaken. _He2 thought _he2 had the authority to anally rape misbehaving slaves, but _he2's no longer so sure of _his2 rights and responsibilities.
 	<<set $activeSlave.trust += 4>>
-	<<set $slaves[$slaveIndices[$HeadGirl.ID]].trust -= 15>>
+	<<set _S.HeadGirl.trust -= 15>>
 	<</replace>>
 <</link>>
 </span>
diff --git a/src/uncategorized/reBusyMasterSuite.tw b/src/uncategorized/reBusyMasterSuite.tw
index 6d3a70940bc0d2fbde3b54c45bc672deab284b17..03185e81da49bf4f9e9395284172b3a3a3bc56a2 100644
--- a/src/uncategorized/reBusyMasterSuite.tw
+++ b/src/uncategorized/reBusyMasterSuite.tw
@@ -25,10 +25,10 @@
 	<<goto "RIE Eligibility Check">>
 <<else>>
 
-<<setLocalPronouns $Concubine>>
+<<setLocalPronouns _S.Concubine>>
 <<setLocalPronouns _bottomSlave 2>>
 
-<p>You have an extended meeting with a prominent citizen planned, from the start of business in the morning until you're done. That's likely to be in the late evening, since he's probably going to get into technical business proposals, and $Concubine.slaveName knows it. $He is surprised, therefore, when a minor business emergency calls your would-be interlocutor away, canceling the meeting and sending you home hours earlier than you'd planned. $He <<if canTalk($Concubine)>>giggles helplessly<<else>>signs humorously<</if>> at the surprise when you walk into your suite. Apparently, $he decided to while away the hours until you got back by having some truly grandiose group sex with all the slaves you have in the suite.</p>
+<p>You have an extended meeting with a prominent citizen planned, from the start of business in the morning until you're done. That's likely to be in the late evening, since he's probably going to get into technical business proposals, and _S.Concubine.slaveName knows it. $He is surprised, therefore, when a minor business emergency calls your would-be interlocutor away, canceling the meeting and sending you home hours earlier than you'd planned. $He <<if canTalk(_S.Concubine)>>giggles helplessly<<else>>signs humorously<</if>> at the surprise when you walk into your suite. Apparently, $he decided to while away the hours until you got back by having some truly grandiose group sex with all the slaves you have in the suite.</p>
 
 <p>$He had to turn to greet you as you entered, since $he was facing away from the entry, and the reason why is rather obvious. Up near the opposite wall, _bottomSlave.slaveName is on the floor with _his2 face down and _his2 ass up.
 
@@ -36,7 +36,7 @@
 <<print _msSlaves.filter((s) => s.mode !== "none").reduce((acc, cur, i, arr) => {
 	let r = ``;
 	const {mode, slave} = cur;
-	const nextSlave = (i+1 >= arr.length) ? V.Concubine : arr[i+1].slave;
+	const nextSlave = (i+1 >= arr.length) ? S.Concubine : arr[i+1].slave;
 	let hole = () => {
 		if (mode === "vaginal") {
 			if (slave.vagina > 2) {
@@ -116,7 +116,7 @@
 <<set _nonparticipants = _msSlaves.filter((s) => s.mode === "none").map((s) => s.slave)>>
 <<if _nonparticipants.length > 0>>
 	<p>
-		<<print _nonparticipants.map((s) => s.slaveName).reduce((res, ch, i, arr) => res + (i === arr.length - 1 ? ' and ' : ', ') + ch)>> can't participate in the train, so $Concubine.slaveName has them busy lying under the slaves who are, offering what oral stimulation they can manage.
+		<<print _nonparticipants.map((s) => s.slaveName).reduce((res, ch, i, arr) => res + (i === arr.length - 1 ? ' and ' : ', ') + ch)>> can't participate in the train, so _S.Concubine.slaveName has them busy lying under the slaves who are, offering what oral stimulation they can manage.
 	</p>
 	<<run _nonparticipants.forEach((s) => actX(s, "oral"))>>
 <</if>>
@@ -124,35 +124,35 @@
 <<set _top = _msSlaves.slice().reverse().find((s) => s.mode !== "none")>>
 
 <<set _concubineMode = "none">>
-<<if canDoAnal($Concubine) && $Concubine.anus > 0>>
+<<if canDoAnal(_S.Concubine) && _S.Concubine.anus > 0>>
 	<<set _concubineMode = "anal">>
-	<<if ($Concubine.anus > 2)>><<set _concubineHole = "loose anus">><<elseif ($Concubine.anus > 1)>><<set _concubineHole = "asshole">><<else>><<set _concubineHole = "tight little asshole">><</if>>
-<<elseif canDoVaginal($Concubine) && $Concubine.vagina > 0>>
+	<<if (_S.Concubine.anus > 2)>><<set _concubineHole = "loose anus">><<elseif (_S.Concubine.anus > 1)>><<set _concubineHole = "asshole">><<else>><<set _concubineHole = "tight little asshole">><</if>>
+<<elseif canDoVaginal(_S.Concubine) && _S.Concubine.vagina > 0>>
 	<<set _concubineMode = "vaginal">>
-	<<if ($Concubine.vagina > 2)>><<set _concubineHole = "loose pussy">><<elseif ($Concubine.vagina > 1)>><<set _concubineHole = "pussy">><<else>><<set _concubineHole = "tight little pussy">><</if>>
+	<<if (_S.Concubine.vagina > 2)>><<set _concubineHole = "loose pussy">><<elseif (_S.Concubine.vagina > 1)>><<set _concubineHole = "pussy">><<else>><<set _concubineHole = "tight little pussy">><</if>>
 <</if>>
 <span id="result">
 <<if _concubineMode !== "none">>
 	<<link "Slide in behind the concubine for some action">>
 		<<replace "#result">>
 		<<setLocalPronouns _top.slave 2>>
-		$Concubine.slaveName anticipates you, and is already sliding $himself partway out of _top.slave.slaveName and cocking $his hips to spread $his
+		_S.Concubine.slaveName anticipates you, and is already sliding $himself partway out of _top.slave.slaveName and cocking $his hips to spread $his
 		<<if $activeSlave.butt > 15>>
 			immeasurable
 		<<elseif $activeSlave.butt > 10>>
 			expansive
 		<<elseif $activeSlave.butt > 7>>
 			enormous
-		<<elseif ($Concubine.butt > 5)>>
+		<<elseif (_S.Concubine.butt > 5)>>
 			huge
-		<<elseif ($Concubine.butt > 2)>>
+		<<elseif (_S.Concubine.butt > 2)>>
 			healthy
 		<<else>>
 			trim
 		<</if>>
-		buttocks as wide as $he can without disentangling $himself from the sex train. Up on the bed $he's at just the right height, and $he winks $his _concubineHole invitingly<<if canTalk($Concubine)>>, laughing at the sheer decadence of it<</if>>. <<if ($PC.dick == 0)>>You pull on a strap-on and push it<<else>>You push yourself<</if>> home with some force, your concubine's extreme state of arousal leaving $his ass very relaxed and welcoming; the thrust shoves $him forward to hilt $himself in _top.slave.slaveName, and so on down the line, producing more giggling, some squealing, and much scrabbling for balance. It takes a while to find the rhythm, and while you wait for the inevitable tangles to be fixed you decide to challenge yourself. You reach around and <<if ($Concubine.boobs > 10000)>>sink your hands into $Concubine.slaveName's massive boobs<<elseif ($Concubine.boobs > 1000)>>heft $Concubine.slaveName's heavy boobs<<elseif ($Concubine.boobs > 300)>>tease $Concubine.slaveName's healthy breasts<<else>>massage $Concubine.slaveName's flat chest<</if>>, nibbling $his $Concubine.skin neck, and generally torturing $him with stimulation until $he climaxes to $his beloved <<= WrittenMaster($Concubine)>>. When $he does, you extract yourself and pull $him unceremoniously off _top.slave.slaveName, replacing $him in _top.slave.slaveName's <<if _top.mode === "anal">>butt<<else>>pussy<</if>>. You work your way down the line, orgasm by orgasm, delaying your own climax until the exhausted _bottomSlave.slaveName manages yet another orgasm by heroic efforts, and you're done. As you roll off _him2, panting, there is scattered applause and much congratulation from your harem of @@.mediumaquamarine;trusting slaves.@@
-		<<set getSlave($Concubine.ID).trust += 5>>
-		<<run seX($PC, "penetrative", getSlave($Concubine.ID), _concubineMode)>>
+		buttocks as wide as $he can without disentangling $himself from the sex train. Up on the bed $he's at just the right height, and $he winks $his _concubineHole invitingly<<if canTalk(_S.Concubine)>>, laughing at the sheer decadence of it<</if>>. <<if ($PC.dick == 0)>>You pull on a strap-on and push it<<else>>You push yourself<</if>> home with some force, your concubine's extreme state of arousal leaving $his ass very relaxed and welcoming; the thrust shoves $him forward to hilt $himself in _top.slave.slaveName, and so on down the line, producing more giggling, some squealing, and much scrabbling for balance. It takes a while to find the rhythm, and while you wait for the inevitable tangles to be fixed you decide to challenge yourself. You reach around and <<if (_S.Concubine.boobs > 10000)>>sink your hands into _S.Concubine.slaveName's massive boobs<<elseif (_S.Concubine.boobs > 1000)>>heft _S.Concubine.slaveName's heavy boobs<<elseif (_S.Concubine.boobs > 300)>>tease _S.Concubine.slaveName's healthy breasts<<else>>massage _S.Concubine.slaveName's flat chest<</if>>, nibbling $his _S.Concubine.skin neck, and generally torturing $him with stimulation until $he climaxes to $his beloved <<= WrittenMaster(_S.Concubine)>>. When $he does, you extract yourself and pull $him unceremoniously off _top.slave.slaveName, replacing $him in _top.slave.slaveName's <<if _top.mode === "anal">>butt<<else>>pussy<</if>>. You work your way down the line, orgasm by orgasm, delaying your own climax until the exhausted _bottomSlave.slaveName manages yet another orgasm by heroic efforts, and you're done. As you roll off _him2, panting, there is scattered applause and much congratulation from your harem of @@.mediumaquamarine;trusting slaves.@@
+		<<set _S.Concubine.trust += 5>>
+		<<run seX($PC, "penetrative", _S.Concubine, _concubineMode)>>
 		<<run _msSlaves.forEach((s) => {
 			s.slave.trust += 1;
 			seX($PC, "penetrative", s.slave, s.mode);
@@ -176,23 +176,23 @@
 	<<else>>
 		lips
 	<</if>>
-	around your <<if ($PC.dick == 0)>>clit<<else>>cock<<if $PC.vagina != -1>> and starts stroking your pussy<</if>><</if>> eagerly enough, even as _msSlaves[1].slave.slaveName goes back to fucking _him2. The sex train is fairly gentle, since anything too fast would disintegrate the gymnastic arrangement, but _bottomSlave.slaveName is still getting enough stimulation that _he2 whimpers quietly into your <<if ($PC.vagina != -1)>>pussy<<else>>dick<</if>>, a nice feeling. The blowjob is <<if (_bottomSlave.skill.oral >= 100)>>masterful, despite the distraction<<elseif (_bottomSlave.skill.oral > 10)>>serviceable, despite the distraction<<else>>only mediocre, but serviceable enough<</if>>, so you let _him2 work for a while before gently shoving _him2 off the side of the bed and telling _him2 to get to the back of the line. The slaves all shuffle forward awkwardly, and inadvertently block your view so that you hear rather than see _bottomSlave.slaveName start groping your concubine $Concubine.slaveName's
+	around your <<if ($PC.dick == 0)>>clit<<else>>cock<<if $PC.vagina != -1>> and starts stroking your pussy<</if>><</if>> eagerly enough, even as _msSlaves[1].slave.slaveName goes back to fucking _him2. The sex train is fairly gentle, since anything too fast would disintegrate the gymnastic arrangement, but _bottomSlave.slaveName is still getting enough stimulation that _he2 whimpers quietly into your <<if ($PC.vagina != -1)>>pussy<<else>>dick<</if>>, a nice feeling. The blowjob is <<if (_bottomSlave.skill.oral >= 100)>>masterful, despite the distraction<<elseif (_bottomSlave.skill.oral > 10)>>serviceable, despite the distraction<<else>>only mediocre, but serviceable enough<</if>>, so you let _him2 work for a while before gently shoving _him2 off the side of the bed and telling _him2 to get to the back of the line. The slaves all shuffle forward awkwardly, and inadvertently block your view so that you hear rather than see _bottomSlave.slaveName start groping your concubine _S.Concubine.slaveName's
 	<<if $activeSlave.butt > 15>>
 		immeasurable
 	<<elseif $activeSlave.butt > 10>>
 		expansive
 	<<elseif $activeSlave.butt > 7>>
 		enormous
-	<<elseif ($Concubine.butt > 5)>>
+	<<elseif (_S.Concubine.butt > 5)>>
 		huge
-	<<elseif ($Concubine.butt > 2)>>
+	<<elseif (_S.Concubine.butt > 2)>>
 		healthy
 	<<else>>
 		trim
 	<</if>>
 	ass down near the foot of the bed. You climax, on occasion, but are enjoying yourself so immensely that you let the slaves continue the rotation until you're entirely spent, and they're entirely exhausted. You reach for a tablet to get some work done, in the center of a pile of sweaty, tired slaves, all of whom are resting with at least one body part in contact with their @@.hotpink;beloved@@ <<= properMaster()>>.
-	<<set getSlave($Concubine.ID).devotion += 5>>
-	<<run seX($PC, "penetrative", getSlave($Concubine.ID), "oral")>>
+	<<set _S.Concubine.devotion += 5>>
+	<<run seX($PC, "penetrative", _S.Concubine, "oral")>>
 	<<run _msSlaves.forEach((s) => {
 		s.slave.devotion += 1;
 		seX($PC, "penetrative", s.slave, "oral", 2);
diff --git a/src/uncategorized/reCitizenHookup.tw b/src/uncategorized/reCitizenHookup.tw
index b710e363344bc58cf66915c40fda9a7301ac01da..5d8dd99b878b2f75f5e6fadc558eda31304438f5 100644
--- a/src/uncategorized/reCitizenHookup.tw
+++ b/src/uncategorized/reCitizenHookup.tw
@@ -235,8 +235,8 @@ She's clearly attracted to you; even the most consummate actress would have diff
 <br><<link "To them that hath, it shall be given">>
 	<<replace "#result">>
 	You're not exactly starved for casual sex, but you've never thought there was any such thing as too much of a good thing. You place a <<if $PC.title == 1>>masculine<<else>>feminine<</if>> hand against the small of her back, feeling the warmth of her through the material of her evening wear. You hear a slight gasp from her as she realizes that her gambit has succeeded with more immediate effect than she expected. She shivers with anticipation as you steer her back through a side door, making a discreet exit towards your private suite.
-	<<if $Concubine != 0 && $Concubine.intelligence+$Concubine.intelligenceImplant > 50>>
-		$Concubine.slaveName is there, of course, and she instantly sees that her continued presence for a ménage à trois is wanted by both you and your guest.
+	<<if _S.Concubine && _S.Concubine.intelligence+_S.Concubine.intelligenceImplant > 50>>
+		_S.Concubine.slaveName is there, of course, and she instantly sees that her continued presence for a ménage à trois is wanted by both you and your guest.
 	<</if>>
 	Your guest restrains her eager praise now that you're in private, but her wide-eyed appreciation of your domain is compliment enough. Once in your suite, she strips, revealing
 	<<switch _FS>>
@@ -311,9 +311,9 @@ She's clearly attracted to you; even the most consummate actress would have diff
 		a hot young body.
 	<</switch>>
 	Citizens like her often appreciate a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known you had her, though, and she's deliciously eager as you press her down onto the bed<<if $PC.dick == 0>> and pull on your usual harness<</if>>. She ruts herself hard back against you as you thrust into her, moaning, and after a short while she begs for it even harder, so you flip her over and mount her like a bitch, making her scream.
-	<<if $Concubine != 0 && $Concubine.intelligence > 1>>
-		<<setLocalPronouns $Concubine>>
-		The view of your conquest's rutting back is nice, of course, but after enjoying it for a few moments you pull $Concubine.slaveName in and kiss your favorite deeply, playing with $him as you fuck.
+	<<if _S.Concubine && _S.Concubine.intelligence > 1>>
+		<<setLocalPronouns _S.Concubine>>
+		The view of your conquest's rutting back is nice, of course, but after enjoying it for a few moments you pull _S.Concubine.slaveName in and kiss your favorite deeply, playing with $him as you fuck.
 	<</if>>
 	When your guest is finally spent, she showers, dresses, and leaves discreetly, offering you a proper thank you. This is the kind of thing that @@.green;builds a lasting reputation@@ in the Free Cities.
 	<<run repX(5000, "event")>>
diff --git a/src/uncategorized/reHGReplacement.tw b/src/uncategorized/reHGReplacement.tw
index c4be84321a12b2401f1591b9a35ae98a4ea84747..82110986a5f2f82cbe5f47f234abf93f99ca980c 100644
--- a/src/uncategorized/reHGReplacement.tw
+++ b/src/uncategorized/reHGReplacement.tw
@@ -3,11 +3,11 @@
 <<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Next Week", $activeSlave = $eventSlave>>
 <<run Enunciate($activeSlave)>>
 <<setLocalPronouns $activeSlave>>
-<<setLocalPronouns $HeadGirl 2>>
-<<setSpokenLocalPronouns $activeSlave $HeadGirl>>
+<<setLocalPronouns _S.HeadGirl 2>>
+<<setSpokenLocalPronouns $activeSlave _S.HeadGirl>>
 
 <<set _clothesTemp = $activeSlave.clothes, $activeSlave.clothes = "no clothing">>
-<<set _clothesTemp2 = $HeadGirl.clothes>>
+<<set _clothesTemp2 = _S.HeadGirl.clothes>>
 <span id="artFrame">
 /* 000-250-006 */
 <<if $seeImages == 1>>
@@ -16,21 +16,21 @@
 			<<= SlaveArt($activeSlave, 2, 0)>>
 		</div>
 		<div class="imageRef medImg">
-			<<= SlaveArt($HeadGirl, 2, 0)>>
+			<<= SlaveArt(_S.HeadGirl, 2, 0)>>
 		</div>
 	</div>
 <</if>>
 /* 000-250-006 */
 </span>
 <<set $activeSlave.clothes = _clothesTemp>>
-<<set $HeadGirl.clothes = _clothesTemp2>>
+<<set _S.HeadGirl.clothes = _clothesTemp2>>
 
-There's a constant traffic of slaves in and out of your office as your chattel comes in and out for instructions, inspections, and sex. Your Head Girl $HeadGirl.slaveName is one of the most frequent visitors, since although you trust _him2, _he2's still a slave and has to check with you before acting on some matters.<<if $HeadGirl.relationship == -3>> (_He2's also your _wife2, making _his2 visits a pleasant diversion.)<<elseif $arcologies[0].FSEgyptianRevivalistLaw == 1>> (_He2's also your Consort, making _his2 visits a pleasant diversion.)<</if>> During one of _his2 visits, <<= App.UI.slaveDescriptionDialog($activeSlave)>> happens to come in for $his scheduled inspection. $He perches politely on the couch, waiting $his turn like a good $girl. $His <<= App.Desc.eyesColor($activeSlave)>> are watchful, however, and $he seems to be paying very close attention to your conversation with your Head Girl.
+There's a constant traffic of slaves in and out of your office as your chattel comes in and out for instructions, inspections, and sex. Your Head Girl _S.HeadGirl.slaveName is one of the most frequent visitors, since although you trust _him2, _he2's still a slave and has to check with you before acting on some matters.<<if _S.HeadGirl.relationship == -3>> (_He2's also your _wife2, making _his2 visits a pleasant diversion.)<<elseif $arcologies[0].FSEgyptianRevivalistLaw == 1>> (_He2's also your Consort, making _his2 visits a pleasant diversion.)<</if>> During one of _his2 visits, <<= App.UI.slaveDescriptionDialog($activeSlave)>> happens to come in for $his scheduled inspection. $He perches politely on the couch, waiting $his turn like a good $girl. $His <<= App.Desc.eyesColor($activeSlave)>> are watchful, however, and $he seems to be paying very close attention to your conversation with your Head Girl.
 
-When $HeadGirl.slaveName leaves, $he clears $his throat nervously. $He gathers $his courage, and <<say>>s, "<<Master>>, I think I would make a better Head Girl than $him." $He takes a deep breath and plunges on. "I'm ju<<s>>t a<<s>> <<s>>mart a<<s>> <<he 2>> i<<s>>. And, <<Master>>, I'm <<s>>ure you've noti<<c>>ed <<he 2>> i<<s>>n't very good at teaching other girl<<s>> vaginal <<s>>kill<<s>>.
-<<if $HeadGirl.vagina > 0>>
+When _S.HeadGirl.slaveName leaves, $he clears $his throat nervously. $He gathers $his courage, and <<say>>s, "<<Master>>, I think I would make a better Head Girl than $him." $He takes a deep breath and plunges on. "I'm ju<<s>>t a<<s>> <<s>>mart a<<s>> <<he 2>> i<<s>>. And, <<Master>>, I'm <<s>>ure you've noti<<c>>ed <<he 2>> i<<s>>n't very good at teaching other girl<<s>> vaginal <<s>>kill<<s>>.
+<<if _S.HeadGirl.vagina > 0>>
 	I could do it much better than <<he 2>> doe<<s>>,
-<<elseif $HeadGirl.vagina == 0>>
+<<elseif _S.HeadGirl.vagina == 0>>
 	How could <<he 2>> be? <<He 2>>'<<s>> a virgin! I can manage it,
 <<else>>
 	How could <<he 2>> be? <<He 2>> doe<<s>>n't have a pu<<ss>>y! I can manage it,
@@ -42,7 +42,7 @@ When $HeadGirl.slaveName leaves, $he clears $his throat nervously. $He gathers $
 <span id="result">
 	<<link "$He's right">>
 		<<replace "#result">>
-			After giving the matter some consideration, you agree, instructing $assistant.name that $activeSlave.slaveName is now the Head Girl. $activeSlave.slaveName is @@.hotpink;overjoyed,@@ and bounces to $his feet, clearly very eager to begin. You caution $him that $he is not to undermine $HeadGirl.slaveName by letting anyone know why you decided to change Head Girls. $He nods obediently. As far as $HeadGirl.slaveName knows, it's just a standard change of Head Girls, and _he2's too good a slave to let it affect _him2 seriously.
+			After giving the matter some consideration, you agree, instructing $assistant.name that $activeSlave.slaveName is now the Head Girl. $activeSlave.slaveName is @@.hotpink;overjoyed,@@ and bounces to $his feet, clearly very eager to begin. You caution $him that $he is not to undermine _S.HeadGirl.slaveName by letting anyone know why you decided to change Head Girls. $He nods obediently. As far as _S.HeadGirl.slaveName knows, it's just a standard change of Head Girls, and _he2's too good a slave to let it affect _him2 seriously.
 			<<set $activeSlave.devotion += 5>>
 			<<= assignJob($activeSlave, "be your Head Girl")>>
 		<</replace>>
@@ -55,13 +55,13 @@ When $HeadGirl.slaveName leaves, $he clears $his throat nervously. $He gathers $
 	<</link>>
 	<br><<link "Let your Head Girl sort this out however _he2 sees fit">>
 		<<replace "#result">>
-			<<run Enunciate($HeadGirl)>>
-			You page $HeadGirl.slaveName, telling _him2 to get back up to your office. $activeSlave.slaveName hears you, of course, and stiffens with fear. $He knows $he's in trouble, but $he doesn't yet know how much. You tell $HeadGirl.slaveName to have a seat next to $activeSlave.slaveName on the couch, and instruct $assistant.name to replay the last five minutes of the feeds from your office on a wallscreen. $activeSlave.slaveName's<<if $activeSlave.lips > 40>> pillowlike<</if>> lower lip begins to tremble at this, and $he can barely manage to keep $his gaze on the fatal replay of $his attempt to convince you to replace $HeadGirl.slaveName with $him. $HeadGirl.slaveName, who is no fool, is not surprised by this, but the replay still angers _him2. As it rolls on, _his2 hands begin to roam across $activeSlave.slaveName, who winces at _his2 touch. About halfway through, $HeadGirl.slaveName looks straight at you and cruelly pinches one of $activeSlave.slaveName's nipples. You respond to the nonverbal question with a silent nod, and $HeadGirl.slaveName smiles briefly at you. Then, _he2 sticks _his2 tongue in $activeSlave.slaveName's ear. The poor slave starts at the warm, wet intrusion, but knows better than to try to resist. $He closes $his eyes tight.
+			<<run Enunciate(_S.HeadGirl)>>
+			You page _S.HeadGirl.slaveName, telling _him2 to get back up to your office. $activeSlave.slaveName hears you, of course, and stiffens with fear. $He knows $he's in trouble, but $he doesn't yet know how much. You tell _S.HeadGirl.slaveName to have a seat next to $activeSlave.slaveName on the couch, and instruct $assistant.name to replay the last five minutes of the feeds from your office on a wallscreen. $activeSlave.slaveName's<<if $activeSlave.lips > 40>> pillowlike<</if>> lower lip begins to tremble at this, and $he can barely manage to keep $his gaze on the fatal replay of $his attempt to convince you to replace _S.HeadGirl.slaveName with $him. _S.HeadGirl.slaveName, who is no fool, is not surprised by this, but the replay still angers _him2. As it rolls on, _his2 hands begin to roam across $activeSlave.slaveName, who winces at _his2 touch. About halfway through, _S.HeadGirl.slaveName looks straight at you and cruelly pinches one of $activeSlave.slaveName's nipples. You respond to the nonverbal question with a silent nod, and _S.HeadGirl.slaveName smiles briefly at you. Then, _he2 sticks _his2 tongue in $activeSlave.slaveName's ear. The poor slave starts at the warm, wet intrusion, but knows better than to try to resist. $He closes $his eyes tight.
 			<br><br>
-			$HeadGirl.slaveName hops off the couch, gets down in front of _his2 victim, and shoves $his legs apart. $activeSlave.slaveName scrunches up $his face, expecting something agonizing to happen to $his <<if $activeSlave.dick == 0>>pussy, but $HeadGirl.slaveName shocks $him by starting to hungrily eat $him out.<<else>>cock, but $HeadGirl.slaveName shocks $him by giving $him a lush blowjob.<</if>> $activeSlave.slaveName clearly expects a trap, but $HeadGirl.slaveName's attentions slowly distract $him. When $he's on the very verge of orgasm, your Head Girl suddenly stops and <<if $activeSlave.dick == 0>>pinches the $girl's pussylips,<<else>>tugs the $girl's cock downward by its head,<</if>> not painfully, but hard enough to communicate threat. $activeSlave.slaveName, shocked out of $his pleasure, looks down at _him2. $HeadGirl.slaveName <<say>>s menacingly, "Bitch, if you orga<<s>>m, I'm going to fucking de<<s>>troy you." Then _he2 goes back to giving $activeSlave.slaveName oral. $activeSlave.slaveName begins to cry, realizing how comprehensively fucked $he is.
+			_S.HeadGirl.slaveName hops off the couch, gets down in front of _his2 victim, and shoves $his legs apart. $activeSlave.slaveName scrunches up $his face, expecting something agonizing to happen to $his <<if $activeSlave.dick == 0>>pussy, but _S.HeadGirl.slaveName shocks $him by starting to hungrily eat $him out.<<else>>cock, but _S.HeadGirl.slaveName shocks $him by giving $him a lush blowjob.<</if>> $activeSlave.slaveName clearly expects a trap, but _S.HeadGirl.slaveName's attentions slowly distract $him. When $he's on the very verge of orgasm, your Head Girl suddenly stops and <<if $activeSlave.dick == 0>>pinches the $girl's pussylips,<<else>>tugs the $girl's cock downward by its head,<</if>> not painfully, but hard enough to communicate threat. $activeSlave.slaveName, shocked out of $his pleasure, looks down at _him2. _S.HeadGirl.slaveName <<say>>s menacingly, "Bitch, if you orga<<s>>m, I'm going to fucking de<<s>>troy you." Then _he2 goes back to giving $activeSlave.slaveName oral. $activeSlave.slaveName begins to cry, realizing how comprehensively fucked $he is.
 			<br><br>
-			Eventually, $he climaxes. $HeadGirl.slaveName has a talented tongue. $HeadGirl.slaveName does not begrudge the slave $his pleasure, <<if $activeSlave.dick == 0>>tonguing $his clit all the way through $his orgasm.<<else>>industriously sucking $his cock until _he2's swallowed every last drop of cum.<</if>> _He2 stands up and seizes $activeSlave.slaveName by the ear, <<say>>ing, "And now, <<s>>lut, you are fucked." $activeSlave.slaveName's weeping stopped during $his climax, but now $he starts to @@.gold;sob with terror,@@ and $he cries harder as your Head Girl hauls $him out of your office by $his ear. $HeadGirl.slaveName @@.mediumaquamarine;waves cheerfully@@ to you as _he2 leaves with _his2 victim.
-			<<set $i = $slaveIndices[$HeadGirl.ID]>>
+			Eventually, $he climaxes. _S.HeadGirl.slaveName has a talented tongue. _S.HeadGirl.slaveName does not begrudge the slave $his pleasure, <<if $activeSlave.dick == 0>>tonguing $his clit all the way through $his orgasm.<<else>>industriously sucking $his cock until _he2's swallowed every last drop of cum.<</if>> _He2 stands up and seizes $activeSlave.slaveName by the ear, <<say>>ing, "And now, <<s>>lut, you are fucked." $activeSlave.slaveName's weeping stopped during $his climax, but now $he starts to @@.gold;sob with terror,@@ and $he cries harder as your Head Girl hauls $him out of your office by $his ear. _S.HeadGirl.slaveName @@.mediumaquamarine;waves cheerfully@@ to you as _he2 leaves with _his2 victim.
+			<<set $i = $slaveIndices[$HeadGirlID]>>
 			<<set $slaves[$i].trust += 4, $slaves[$i].counter.oral += 1>>
 			<<set $oralTotal += 1>>
 			<<set $activeSlave.trust -= 4, $activeSlave.counter.oral += 1>>
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index 71426e5e0846d12ecfc05562564736d0ab81ea1e..3d590bf4b88f8f2f7bde774a3315ca760ecead2d 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -104,40 +104,40 @@
 <<if ($activeSlave.skill.oral <= 30) && ($activeSlave.skill.anal <= 30)>>
 	<<set _qualifiedNicknames.push("novice")>>
 <</if>>
-<<if ($activeSlave.ID == $HeadGirl.ID)>>
+<<if ($activeSlave.ID == $HeadGirlID)>>
 	<<set _qualifiedNicknames.push("Head Girl")>>
 <</if>>
-<<if ($activeSlave.ID == $Bodyguard.ID)>>
+<<if ($activeSlave.ID == $BodyguardID)>>
 	<<set _qualifiedNicknames.push("Bodyguard")>>
 <</if>>
-<<if ($activeSlave.ID == $Concubine.ID)>>
+<<if ($activeSlave.ID == $ConcubineID)>>
 	<<set _qualifiedNicknames.push("Concubine")>>
 <</if>>
 <<if ($activeSlave.ID == $AttendantID)>>
 	<<set _qualifiedNicknames.push("Attendant")>>
 <</if>>
-<<if ($activeSlave.ID == $Matron.ID)>>
+<<if ($activeSlave.ID == $MatronID)>>
 	<<set _qualifiedNicknames.push("Matron")>>
 <</if>>
-<<if ($activeSlave.ID == $Madam.ID)>>
+<<if ($activeSlave.ID == _S.Madam.ID)>>
 	<<set _qualifiedNicknames.push("Madam")>>
 <</if>>
 <<if ($activeSlave.ID == $djID)>>
 	<<set _qualifiedNicknames.push("DJ")>>
 <</if>>
-<<if ($activeSlave.ID == $Recruiter.ID)>>
+<<if ($activeSlave.ID == $RecruiterID)>>
 	<<set _qualifiedNicknames.push("Recruiter")>>
 <</if>>
 <<if ($activeSlave.ID == $WardenessID)>>
 	<<set _qualifiedNicknames.push("Wardeness")>>
 <</if>>
-<<if ($activeSlave.ID == $Milkmaid.ID)>>
+<<if ($activeSlave.ID == $MilkmaidID)>>
 	<<set _qualifiedNicknames.push("Milkmaid")>>
 <</if>>
-<<if ($activeSlave.ID == $Farmer.ID)>>
+<<if ($activeSlave.ID == $FarmerID)>>
 	<<set _qualifiedNicknames.push("Farmer")>>
 <</if>>
-<<if ($activeSlave.ID == $Milkmaid.ID) && $activeSlave.dick > 5 && canPenetrate($activeSlave) && $cumSlaves > 3>>
+<<if ($activeSlave.ID == $MilkmaidID) && $activeSlave.dick > 5 && canPenetrate($activeSlave) && $cumSlaves > 3>>
 	<<set _qualifiedNicknames.push("Collectrix")>>
 <</if>>
 <<if ($activeSlave.ID == $StewardessID)>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 331070fcb62fdf9213996ea2d9f616c6c2bf1239..5af04f9b5389af46df5fc4034299d4a345f5948a 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -2059,30 +2059,30 @@
 <<switch $recruit>>
 <<case "female recruit">>
 
-<<setLocalPronouns $HeadGirl 2>>
-<<setSpokenLocalPronouns $activeSlave $HeadGirl>>
+<<setLocalPronouns _S.HeadGirl 2>>
+<<setSpokenLocalPronouns $activeSlave _S.HeadGirl>>
 
-Your Head Girl sends you a discreet message that _he2 may have found a slave for you. $HeadGirl.slaveName duly ushers a $girl into your office. $He looks very young, like a dissolute party $girl. $He bites $his lip nervously when $he sees you, and looks to $HeadGirl.slaveName for guidance. $HeadGirl.slaveName nods at $him reassuringly, so $he explains $himself.
+Your Head Girl sends you a discreet message that _he2 may have found a slave for you. _S.HeadGirl.slaveName duly ushers a $girl into your office. $He looks very young, like a dissolute party $girl. $He bites $his lip nervously when $he sees you, and looks to _S.HeadGirl.slaveName for guidance. _S.HeadGirl.slaveName nods at $him reassuringly, so $he explains $himself.
 <br><br>
-"<<if $PC.title != 0>><<S>>ir<<else>>Ma'am<</if>>, my name i<<s>> $activeSlave.slaveName. I'm, um, bored, I gue<<ss>>. I go to club<<s>> and get drunk and fuck guy<<s>> and it'<<s>> ju<<s>>t kinda boring. I thought it would be different when I turned <<= num($activeSlave.actualAge)>>, but that wa<<s>> a couple month<<s>> ago and, well, nothing'<<s>> different. I <<s>>aw $HeadGirl.slaveName and <<he 2>> wa<<s>> ju<<s>>t <<s>>o gra<<c>>eful and beautiful and <<he 2>> <<s>>eemed <<s>>o confident in what <<he 2>> wa<<s>> doing and who <<he 2>> wa<<s>> and I talked to _him2 and <<he 2>> <<s>>aid <<he 2>> wa<<s>> your Head Girl and... I want to be like _him2. Can I be your <<s>>lave? I'd be good, I'm good at <<s>>ucking dick<<s>> and <<s>>tuff." $He seems to be a little naïve about sexual slavery, but there's no need to tell $him that.
+"<<if $PC.title != 0>><<S>>ir<<else>>Ma'am<</if>>, my name i<<s>> $activeSlave.slaveName. I'm, um, bored, I gue<<ss>>. I go to club<<s>> and get drunk and fuck guy<<s>> and it'<<s>> ju<<s>>t kinda boring. I thought it would be different when I turned <<= num($activeSlave.actualAge)>>, but that wa<<s>> a couple month<<s>> ago and, well, nothing'<<s>> different. I <<s>>aw _S.HeadGirl.slaveName and <<he 2>> wa<<s>> ju<<s>>t <<s>>o gra<<c>>eful and beautiful and <<he 2>> <<s>>eemed <<s>>o confident in what <<he 2>> wa<<s>> doing and who <<he 2>> wa<<s>> and I talked to _him2 and <<he 2>> <<s>>aid <<he 2>> wa<<s>> your Head Girl and... I want to be like _him2. Can I be your <<s>>lave? I'd be good, I'm good at <<s>>ucking dick<<s>> and <<s>>tuff." $He seems to be a little naïve about sexual slavery, but there's no need to tell $him that.
 
 <<case "male recruit">>
 
-<<setLocalPronouns $HeadGirl 2>>
-<<setSpokenLocalPronouns $activeSlave $HeadGirl>>
+<<setLocalPronouns _S.HeadGirl 2>>
+<<setSpokenLocalPronouns $activeSlave _S.HeadGirl>>
 
-Your Head Girl sends you a discreet message that _he2 may have found a slave for you. $HeadGirl.slaveName duly ushers an androgynous young person into your office. $He's dressed as a girl and acts like one. $He looks very young, like a dissolute party girl. $He bites $his lip nervously when $he sees you, and looks to $HeadGirl.slaveName for guidance. $HeadGirl.slaveName nods at $him reassuringly, so $he explains $himself.
+Your Head Girl sends you a discreet message that _he2 may have found a slave for you. _S.HeadGirl.slaveName duly ushers an androgynous young person into your office. $He's dressed as a girl and acts like one. $He looks very young, like a dissolute party girl. $He bites $his lip nervously when $he sees you, and looks to _S.HeadGirl.slaveName for guidance. _S.HeadGirl.slaveName nods at $him reassuringly, so $he explains $himself.
 <br><br>
-"<<if $PC.title != 0>><<S>>ir<<else>>Ma'am<</if>>, my name i<<s>> $activeSlave.slaveName. I'm, um, bored, I gue<<ss>>. I go to club<<s>> and get drunk and fuck guy<<s>> and it'<<s>> ju<<s>>t kinda boring. I thought it would be different when I turned <<= num($activeSlave.actualAge)>>, but that wa<<s>> a couple month<<s>> ago and, well, nothing'<<s>> different. I <<s>>aw $HeadGirl.slaveName and <<he 2>> wa<<s>> ju<<s>>t <<s>>o beautiful and ha<<s>> a dick like me and <<he 2>> <<s>>eemed <<s>>o confident in what <<he 2>> wa<<s>> doing and who <<he 2>> wa<<s>> and I talked to _him2 and <<he 2>> <<s>>aid <<he 2>> wa<<s>> your Head Girl and... I want to be like _him2. Can I be your <<s>>lave? I'd be good, I'm good at <<s>>ucking dick<<s>>." $He seems to be a little naïve about sexual slavery, but there's no need to tell $him that.
+"<<if $PC.title != 0>><<S>>ir<<else>>Ma'am<</if>>, my name i<<s>> $activeSlave.slaveName. I'm, um, bored, I gue<<ss>>. I go to club<<s>> and get drunk and fuck guy<<s>> and it'<<s>> ju<<s>>t kinda boring. I thought it would be different when I turned <<= num($activeSlave.actualAge)>>, but that wa<<s>> a couple month<<s>> ago and, well, nothing'<<s>> different. I <<s>>aw _S.HeadGirl.slaveName and <<he 2>> wa<<s>> ju<<s>>t <<s>>o beautiful and ha<<s>> a dick like me and <<he 2>> <<s>>eemed <<s>>o confident in what <<he 2>> wa<<s>> doing and who <<he 2>> wa<<s>> and I talked to _him2 and <<he 2>> <<s>>aid <<he 2>> wa<<s>> your Head Girl and... I want to be like _him2. Can I be your <<s>>lave? I'd be good, I'm good at <<s>>ucking dick<<s>>." $He seems to be a little naïve about sexual slavery, but there's no need to tell $him that.
 
 <<case "whore recruit">>
 
-<<setLocalPronouns $HeadGirl 2>>
-<<setSpokenLocalPronouns $activeSlave $HeadGirl>>
+<<setLocalPronouns _S.HeadGirl 2>>
+<<setSpokenLocalPronouns $activeSlave _S.HeadGirl>>
 
-Your Head Girl sends you a discreet message that _he2 may have found a slave for you. $HeadGirl.slaveName duly ushers a working $girl into your office. $He looks like a classic street hooker, and $he's clearly had a rough time recently. $He needs no prompting to explain $himself, and $he does so without embarrassment.
+Your Head Girl sends you a discreet message that _he2 may have found a slave for you. _S.HeadGirl.slaveName duly ushers a working $girl into your office. $He looks like a classic street hooker, and $he's clearly had a rough time recently. $He needs no prompting to explain $himself, and $he does so without embarrassment.
 <br><br>
-"<<if $PC.title != 0>><<S>>ir<<else>>Ma'am<</if>>, my name i<<s>> $activeSlave.slaveName. I'm a <<s>>treet whore. Working <<= $girl>><<s>> get to know each other, <<s>>o I know $HeadGirl.slaveName pretty well. I've been having a bad time on the <<s>>treet<<s>>, and la<<s>>t night a john beat on me pretty good. I'm broke and I'm <<s>>ick of thi<<s>>. Being free i<<s>>n't worth shit. $HeadGirl.slaveName like<<s>> you and <<he 2>> <<s>>eem<<s>> to do OK. <<S>>o, can I be your <<s>>lave? I'm a good bet, <<if $PC.title != 0>><<s>>ir<<else>>ma'am<</if>>. I'd be happy enough working for you a<<s>> a <<s>>lave whore if you keep me healthy and <<s>>afe, and I'm a good fuck."
+"<<if $PC.title != 0>><<S>>ir<<else>>Ma'am<</if>>, my name i<<s>> $activeSlave.slaveName. I'm a <<s>>treet whore. Working <<= $girl>><<s>> get to know each other, <<s>>o I know _S.HeadGirl.slaveName pretty well. I've been having a bad time on the <<s>>treet<<s>>, and la<<s>>t night a john beat on me pretty good. I'm broke and I'm <<s>>ick of thi<<s>>. Being free i<<s>>n't worth shit. _S.HeadGirl.slaveName like<<s>> you and <<he 2>> <<s>>eem<<s>> to do OK. <<S>>o, can I be your <<s>>lave? I'm a good bet, <<if $PC.title != 0>><<s>>ir<<else>>ma'am<</if>>. I'd be happy enough working for you a<<s>> a <<s>>lave whore if you keep me healthy and <<s>>afe, and I'm a good fuck."
 
 <<case "female debtor">>
 
@@ -2600,9 +2600,9 @@ He explains that one of his servant <<= $girl>>s was impregnated by his fool of
 		<<case "rogue cyborg">>
 			With your order received the target quickly seeks you out. After a huge sum of credits changes hands to render it penthouse safe, the legalities and biometric scanning are complete and you are now the proud owner of a cyber<<= $loli>>.
 		<<case "female recruit">>
-			You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName bounces nervously on $his heels. Finally $he works up $his courage and asks, <<if $HeadGirl.clothes != "no clothing">>"Can I have <<if $HeadGirl.clothes == "choosing her own clothes">>a cute outfit<<else>>$HeadGirl.clothes<</if>> like $HeadGirl.slaveName?"<<else>>"Can I work with $HeadGirl.slaveName?"<</if>> Your sternly tell $him to call you <<= properMaster()>>, to ask questions only with permission, and to strip. $He looks at $HeadGirl.slaveName, but $HeadGirl.slaveName returns $his look with no compassion at all and tells $him to do what you say. Looking suddenly fearful, $activeSlave.slaveName strips. Once your inspection of $his body reaches $his anus, $he becomes suddenly nervous. "A-am I going to have t-to do butt <<s>>tuff, <<Master>>?"
+			You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName bounces nervously on $his heels. Finally $he works up $his courage and asks, <<if _S.HeadGirl.clothes != "no clothing">>"Can I have <<if _S.HeadGirl.clothes == "choosing her own clothes">>a cute outfit<<else>>_S.HeadGirl.clothes<</if>> like _S.HeadGirl.slaveName?"<<else>>"Can I work with _S.HeadGirl.slaveName?"<</if>> Your sternly tell $him to call you <<= properMaster()>>, to ask questions only with permission, and to strip. $He looks at _S.HeadGirl.slaveName, but _S.HeadGirl.slaveName returns $his look with no compassion at all and tells $him to do what you say. Looking suddenly fearful, $activeSlave.slaveName strips. Once your inspection of $his body reaches $his anus, $he becomes suddenly nervous. "A-am I going to have t-to do butt <<s>>tuff, <<Master>>?"
 		<<case "male recruit">>
-			You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName bounces nervously on $his heels. Finally $he works up $his courage and asks, <<if $HeadGirl.clothes != "no clothing">>"Can I have <<if $HeadGirl.clothes == "choosing her own clothes">>a cute outfit<<else>>$HeadGirl.clothes<</if>> like $HeadGirl.slaveName?"<<else>>"Can I work with $HeadGirl.slaveName?"<</if>> Your sternly tell $him to call you <<= properMaster()>>, to ask questions only with permission, and to strip. $He looks at $HeadGirl.slaveName, but $HeadGirl.slaveName returns $his look with no compassion at all and tells $him to do what you say. Looking suddenly fearful, $activeSlave.slaveName strips. $His cock is totally flaccid as $he looks at the floor, shivering. Once your inspection of $his body reaches $his anus, $he becomes suddenly nervous. "A-am I going to have t-to do butt <<s>>tuff, <<Master>>?"
+			You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName bounces nervously on $his heels. Finally $he works up $his courage and asks, <<if _S.HeadGirl.clothes != "no clothing">>"Can I have <<if _S.HeadGirl.clothes == "choosing her own clothes">>a cute outfit<<else>>_S.HeadGirl.clothes<</if>> like _S.HeadGirl.slaveName?"<<else>>"Can I work with _S.HeadGirl.slaveName?"<</if>> Your sternly tell $him to call you <<= properMaster()>>, to ask questions only with permission, and to strip. $He looks at _S.HeadGirl.slaveName, but _S.HeadGirl.slaveName returns $his look with no compassion at all and tells $him to do what you say. Looking suddenly fearful, $activeSlave.slaveName strips. $His cock is totally flaccid as $he looks at the floor, shivering. Once your inspection of $his body reaches $his anus, $he becomes suddenly nervous. "A-am I going to have t-to do butt <<s>>tuff, <<Master>>?"
 		<<case "whore recruit">>
 			You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName participates matter-of-factly, and there's a certain sense of relief about $him. $His fate is out of $his hands now, and you get the impression $he isn't sorry about that at all.
 		<<case "desperate birth">>
@@ -2752,11 +2752,11 @@ He explains that one of his servant <<= $girl>>s was impregnated by his fool of
 		<<case "rogue cyborg">>
 			With your order received the target quickly seeks you out. After a huge sum of credits changes hands to render it safe, the legalities and biometric scanning are complete and it is sold off to a very eager robophile.
 		<<case "female recruit">>
-			You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName bounces nervously on $his heels. Finally $he works up $his courage and asks, <<if $HeadGirl.clothes != "no clothing">>"Can I have <<if $HeadGirl.clothes == "choosing her own clothes">>a cute outfit<<else>>$HeadGirl.clothes<</if>> like $HeadGirl.slaveName?"<<else>>"Can I work with $HeadGirl.slaveName?"<</if>> Your answer appears in the form of a purchasing agent, here to take $him away. As he restrains the disbelieving $girl, you tell $him $he's been purchased by a brothel, so $he's going to be fucked about 70,000 times before $he gets to be too old and is retired, so $he can be sure $he won't be bored. $He releases a wail of utter despair, quickly cut off by a sturdy bag being fastened over $his head.
+			You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName bounces nervously on $his heels. Finally $he works up $his courage and asks, <<if _S.HeadGirl.clothes != "no clothing">>"Can I have <<if _S.HeadGirl.clothes == "choosing her own clothes">>a cute outfit<<else>>_S.HeadGirl.clothes<</if>> like _S.HeadGirl.slaveName?"<<else>>"Can I work with _S.HeadGirl.slaveName?"<</if>> Your answer appears in the form of a purchasing agent, here to take $him away. As he restrains the disbelieving $girl, you tell $him $he's been purchased by a brothel, so $he's going to be fucked about 70,000 times before $he gets to be too old and is retired, so $he can be sure $he won't be bored. $He releases a wail of utter despair, quickly cut off by a sturdy bag being fastened over $his head.
 		<<case "male recruit">>
-			You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName bounces nervously on $his heels. Finally $he works up $his courage and asks, <<if $HeadGirl.clothes != "no clothing">>"Can I have <<if $HeadGirl.clothes == "choosing her own clothes">>a cute outfit<<else>>$HeadGirl.clothes<</if>> like $HeadGirl.slaveName?"<<else>>"Can I work with $HeadGirl.slaveName?"<</if>> Your answer appears in the form of a purchasing agent, here to take $him away. As he restrains the disbelieving bitch, you tell $him $he's been purchased by a brothel, so $he's going to be fucked about 70,000 times before $he gets to be too old and is retired, so $he can be sure $he won't be bored. $He releases a wail of utter despair, quickly cut off by a sturdy bag being fastened over $his head.
+			You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName bounces nervously on $his heels. Finally $he works up $his courage and asks, <<if _S.HeadGirl.clothes != "no clothing">>"Can I have <<if _S.HeadGirl.clothes == "choosing her own clothes">>a cute outfit<<else>>_S.HeadGirl.clothes<</if>> like _S.HeadGirl.slaveName?"<<else>>"Can I work with _S.HeadGirl.slaveName?"<</if>> Your answer appears in the form of a purchasing agent, here to take $him away. As he restrains the disbelieving bitch, you tell $him $he's been purchased by a brothel, so $he's going to be fucked about 70,000 times before $he gets to be too old and is retired, so $he can be sure $he won't be bored. $He releases a wail of utter despair, quickly cut off by a sturdy bag being fastened over $his head.
 		<<case "whore recruit">>
-			When the purchasing agent appears to take $him away, $he looks rueful. "God fucking damn it," $he <<say>>s, less angrily than you expected. "I <<sh>>ould have known. $HeadGirl.slaveName played me good. Treat _him2 right, _he2'<<s>> got <<s>>kill<<s>>."
+			When the purchasing agent appears to take $him away, $he looks rueful. "God fucking damn it," $he <<say>>s, less angrily than you expected. "I <<sh>>ould have known. _S.HeadGirl.slaveName played me good. Treat _him2 right, _he2'<<s>> got <<s>>kill<<s>>."
 		<<case "female debtor">>
 			$He sobs as the biometric scanners scrupulously record $his every particular as belonging not to a person but to a piece of human property. $He tries to resist placing $his biometric signature in testament to the truth of $his debt, but when you observe that the alternative is death, $he complies. A purchasing agent appears to take $him away.
 		<<case "male debtor">>
diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw
index 58cf6af091d2f7489f10cf4d6d90b720cd986b90..b43b73611cf03f0a117a51375280f534ce49da9c 100644
--- a/src/uncategorized/reShelterInspection.tw
+++ b/src/uncategorized/reShelterInspection.tw
@@ -118,12 +118,12 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
 	<<include "New Slave Intro">>
 	<</replace>>
 <</link>> //This will cost <<print cashFormat(_ContractCost)>>//
-<<if $Bodyguard != 0 || $mercenaries > 1 || ($SF.Toggle && $SF.Active >= 1)>>
+<<if _S.Bodyguard || $mercenaries > 1 || ($SF.Toggle && $SF.Active >= 1)>>
 	<br><<link "Escort _him2 off your property">>
 	<<replace "#result">>
 		You along with
-		<<if $Bodyguard != 0>>
-			your bodyguard <<print SlaveFullName($Bodyguard)>>
+		<<if _S.Bodyguard>>
+			your bodyguard <<print SlaveFullName(_S.Bodyguard)>>
 			<<if $mercenaries > 1 || ($SF.Toggle && $SF.Active >= 1)>>
 				and
 			<</if>>
diff --git a/src/uncategorized/reShowerPunishment.tw b/src/uncategorized/reShowerPunishment.tw
index 3123fc2027f83e620379be56db2b11fa797a98e4..cadb97b772dc691e1f189f38835e9666ebdd1786 100644
--- a/src/uncategorized/reShowerPunishment.tw
+++ b/src/uncategorized/reShowerPunishment.tw
@@ -4,18 +4,18 @@
 
 <<set $activeSlave = $eventSlave>>
 <<setLocalPronouns $activeSlave>>
-<<setLocalPronouns $HeadGirl 2>>
+<<setLocalPronouns _S.HeadGirl 2>>
 <<setPlayerPronouns>>
-<<run Enunciate($HeadGirl)>>
+<<run Enunciate(_S.HeadGirl)>>
 
 <<set _clothesTemp = $activeSlave.clothes, $activeSlave.clothes = "no clothing">>
-<<set _clothesTemp2 = $HeadGirl.clothes, $HeadGirl.clothes = "no clothing">>
+<<set _clothesTemp2 = _S.HeadGirl.clothes, _S.HeadGirl.clothes = "no clothing">>
 <span id="artFrame">
 /* 000-250-006 */
 <<if $seeImages == 1>>
 	<div class="imageColumn">
 		<div class="imageRef medImg">
-			<<= SlaveArt($HeadGirl, 2, 0)>>
+			<<= SlaveArt(_S.HeadGirl, 2, 0)>>
 		</div>
 		<div class="imageRef medImg">
 			<<= SlaveArt($activeSlave, 2, 0)>>
@@ -25,45 +25,45 @@
 /* 000-250-006 */
 </span>
 <<set $activeSlave.clothes = _clothesTemp>>
-<<set $HeadGirl.clothes = _clothesTemp2>>
+<<set _S.HeadGirl.clothes = _clothesTemp2>>
 
 <<if $HGSuite == 1>>
 	Looking in on your Head Girl in _his2 suite, you hear _his2 private shower running and head that way. Through the thick steam the shower makes on its hottest setting, you see
 <<else>>
 	Passing by the showers, you see, through the steam of a very hot shower,
 <</if>>
-a <<if $activeSlave.height > 180>>tall, <<elseif $activeSlave.height < 150>>tiny, <</if>>$activeSlave.skin form moving busily around a $HeadGirl.skin figure, which is standing confidently in the middle of the warm, moist space. As you draw nearer, you identify the stationary slave as your Head Girl, <<= App.UI.slaveDescriptionDialog($HeadGirl)>>. _His2 attendant is <<= contextualIntro($HeadGirl, $activeSlave, true)>>, and $he's washing $his superior with a big sponge.
+a <<if $activeSlave.height > 180>>tall, <<elseif $activeSlave.height < 150>>tiny, <</if>>$activeSlave.skin form moving busily around a _S.HeadGirl.skin figure, which is standing confidently in the middle of the warm, moist space. As you draw nearer, you identify the stationary slave as your Head Girl, <<= App.UI.slaveDescriptionDialog(_S.HeadGirl)>>. _His2 attendant is <<= contextualIntro(_S.HeadGirl, $activeSlave, true)>>, and $he's washing $his superior with a big sponge.
 <<if $HGSeverity > 0>>
 	By virtue of not being rape, this is an unusually mild punishment by your Head Girl, if indeed that's what it is. But perhaps _he2's saving that for later. And to go by the cringing, frightened mien of the busy little bath bitch, that's probably it.
 <<elseif $HGSeverity == 0>>
-	Your Head Girl does _his2 best to fit the punishment to the crime, so $activeSlave.slaveName's failure was likely minor. With $HeadGirl.slaveName's penchant for poetic justice, probably some little deficiency of personal cleanliness.
+	Your Head Girl does _his2 best to fit the punishment to the crime, so $activeSlave.slaveName's failure was likely minor. With _S.HeadGirl.slaveName's penchant for poetic justice, probably some little deficiency of personal cleanliness.
 <<else>>
 	This is the sort of mild punishment that your regime of respect and dignity requires _him2 to use for all but the most egregious fault. Thus restricted, _he2 does _his2 best to come up with novel little degradations to keep _his2 charges on their toes.
 <</if>>
 <br><br>
-$activeSlave.slaveName is being very thorough. When you first appeared, $he was working $his way up $HeadGirl.slaveName's <<if $HeadGirl.muscles > 30>>muscle-corded<<elseif $HeadGirl.weight > 10>>soft<<elseif $HeadGirl.vagina > -1>>feminine<<else>>pretty<</if>> thighs, having obviously started at the bottom. $He skips over $HeadGirl.slaveName's crotch, probably under instructions to leave it for last. It's late in your Head Girl's busy day, and you hear _his2 groan of relaxation over the running water when the stiff sponge begins to scrub back and forth across _his2 <<if $HeadGirl.belly >= 60000>>enormously <<if $HeadGirl.preg > 0>>pregnant<<else>>rounded<</if>> belly<<elseif $HeadGirl.weight > 190>>massively fat gut<<elseif $HeadGirl.belly >= 10000>>hugely <<if $HeadGirl.preg > 0>>pregnant<<else>>rounded<</if>> belly<<elseif $HeadGirl.weight > 95>>big soft belly<<elseif $HeadGirl.belly >= 5000>><<if $HeadGirl.preg > 0>>pregnant<<else>>round<</if>> belly<<elseif $HeadGirl.weight > 30>>soft belly<<elseif $HeadGirl.belly >= 1500>>bloated belly<<elseif $HeadGirl.muscles > 30>>shredded abs<<elseif $HeadGirl.weight > 10>>plush belly<<elseif $HeadGirl.navelPiercing > 0>>pierced belly button<<elseif $HeadGirl.waist < -10>><<if $HeadGirl.waist < -95>>absurdly <</if>>narrow waist<<else>>belly<</if>>.
+$activeSlave.slaveName is being very thorough. When you first appeared, $he was working $his way up _S.HeadGirl.slaveName's <<if _S.HeadGirl.muscles > 30>>muscle-corded<<elseif _S.HeadGirl.weight > 10>>soft<<elseif _S.HeadGirl.vagina > -1>>feminine<<else>>pretty<</if>> thighs, having obviously started at the bottom. $He skips over _S.HeadGirl.slaveName's crotch, probably under instructions to leave it for last. It's late in your Head Girl's busy day, and you hear _his2 groan of relaxation over the running water when the stiff sponge begins to scrub back and forth across _his2 <<if _S.HeadGirl.belly >= 60000>>enormously <<if _S.HeadGirl.preg > 0>>pregnant<<else>>rounded<</if>> belly<<elseif _S.HeadGirl.weight > 190>>massively fat gut<<elseif _S.HeadGirl.belly >= 10000>>hugely <<if _S.HeadGirl.preg > 0>>pregnant<<else>>rounded<</if>> belly<<elseif _S.HeadGirl.weight > 95>>big soft belly<<elseif _S.HeadGirl.belly >= 5000>><<if _S.HeadGirl.preg > 0>>pregnant<<else>>round<</if>> belly<<elseif _S.HeadGirl.weight > 30>>soft belly<<elseif _S.HeadGirl.belly >= 1500>>bloated belly<<elseif _S.HeadGirl.muscles > 30>>shredded abs<<elseif _S.HeadGirl.weight > 10>>plush belly<<elseif _S.HeadGirl.navelPiercing > 0>>pierced belly button<<elseif _S.HeadGirl.waist < -10>><<if _S.HeadGirl.waist < -95>>absurdly <</if>>narrow waist<<else>>belly<</if>>.
 
 <br><br>
 
 <span id="result">
 <<link "Just spectate">>
 	<<replace "#result">>
-	You could strip off your suit, walk into the steam, and enjoy your slaves' ministrations, but sometimes the artistry of tastefully nude bodies is a welcome change of pace. You lean against the wall, far enough away that they remain unaware of your presence, and take in the sight. $HeadGirl.slaveName makes the penitent $girl do the job with Brahmanical thoroughness, cleaning $his superior's $HeadGirl.race body down to its very last pore. As $activeSlave.slaveName circles the Head Girl laboriously, doing $his best to ingratiate $himself by diligence, the pair of naked <<if $girl == _girl2>>$women<<else>>slaves<</if>> present a fascinating contrast. They are unclothed alike, the water streaming off their bodies without any distinction, but even an old world fool could not mistake the immense gulf between them.
+	You could strip off your suit, walk into the steam, and enjoy your slaves' ministrations, but sometimes the artistry of tastefully nude bodies is a welcome change of pace. You lean against the wall, far enough away that they remain unaware of your presence, and take in the sight. _S.HeadGirl.slaveName makes the penitent $girl do the job with Brahmanical thoroughness, cleaning $his superior's _S.HeadGirl.race body down to its very last pore. As $activeSlave.slaveName circles the Head Girl laboriously, doing $his best to ingratiate $himself by diligence, the pair of naked <<if $girl == _girl2>>$women<<else>>slaves<</if>> present a fascinating contrast. They are unclothed alike, the water streaming off their bodies without any distinction, but even an old world fool could not mistake the immense gulf between them.
 	<br><br>
-	When $activeSlave.slaveName is finally done, $HeadGirl.slaveName's
+	When $activeSlave.slaveName is finally done, _S.HeadGirl.slaveName's
 	<<if $HGSeverity > 0>>
 		hands seize $him by the ears and pull $his head in for a kiss that is dominance distilled into the form of a loving gesture. Then _he2 pokes _his2 bitch in the side, forcing the slave to collapse in just the right way.
 	<<elseif $HGSeverity == 0>>
 		arms encircle $him in an embrace that is simultaneously controlling, comforting, and sexually insistent. The slave does not resist, allowing the Head Girl to run _his2 hands over the warm, wet sex slave.
 	<<else>>
-		arousal is obvious. Though the respectful regime you require secures $him from the fear of being used, $activeSlave.slaveName nonverbally offers $his superior oral, out of obvious gratitude that whatever $he did is being treated so leniently, and perhaps out of a desire to be in $HeadGirl.slaveName's good graces.
+		arousal is obvious. Though the respectful regime you require secures $him from the fear of being used, $activeSlave.slaveName nonverbally offers $his superior oral, out of obvious gratitude that whatever $he did is being treated so leniently, and perhaps out of a desire to be in _S.HeadGirl.slaveName's good graces.
 	<</if>>
-	In no time at all, $activeSlave.slaveName's $activeSlave.hColor head descends to obscure $HeadGirl.slaveName's groin. The <<if $HeadGirl.face > 95>>heartrendingly gorgeous<<elseif $HeadGirl.face <= 95>>wonderfully pretty<<elseif $HeadGirl.face <= 40>>approachably lovely<<elseif $HeadGirl.face <= 10>>not unattractive<<else>>homely<</if>> <<if $HeadGirl.physicalAge > 25>>_woman2's<<else>>_girl2's<</if>> head cranes back with orgasm before long; that diligent scrub must have been quite stimulating.
+	In no time at all, $activeSlave.slaveName's $activeSlave.hColor head descends to obscure _S.HeadGirl.slaveName's groin. The <<if _S.HeadGirl.face > 95>>heartrendingly gorgeous<<elseif _S.HeadGirl.face <= 95>>wonderfully pretty<<elseif _S.HeadGirl.face <= 40>>approachably lovely<<elseif _S.HeadGirl.face <= 10>>not unattractive<<else>>homely<</if>> <<if _S.HeadGirl.physicalAge > 25>>_woman2's<<else>>_girl2's<</if>> head cranes back with orgasm before long; that diligent scrub must have been quite stimulating.
 	<br><br>
-	$activeSlave.slaveName stays in the shower to clean $himself, so $HeadGirl.slaveName exits to see you watching the denouement. _He2 @@.hotpink;smiles,@@ murmuring a greeting, and hurries over to give you a peck on the cheek, leaning in as best _he2 can to keep _his2 moist body away from your suit. "Thi<<s>> i<<s>> the life, <<Master>>," _he2 whispers.
+	$activeSlave.slaveName stays in the shower to clean $himself, so _S.HeadGirl.slaveName exits to see you watching the denouement. _He2 @@.hotpink;smiles,@@ murmuring a greeting, and hurries over to give you a peck on the cheek, leaning in as best _he2 can to keep _his2 moist body away from your suit. "Thi<<s>> i<<s>> the life, <<Master>>," _he2 whispers.
 	<<set $activeSlave.counter.oral += 1>>
 	<<set $oralTotal += 1>>
-	<<set $i = $slaveIndices[$HeadGirl.ID]>>
+	<<set $i = $slaveIndices[$HeadGirlID]>>
 	<<set $slaves[$i].devotion += 4>>
 	<<set $slaves[$i].counter.penetrative += 1>>
 	<<set $penetrativeTotal += 1>>
@@ -71,43 +71,43 @@ $activeSlave.slaveName is being very thorough. When you first appeared, $he was
 <</link>>
 <br><<link "Get a scrub down too">>
 	<<replace "#result">>
-	You strip off your suit and enter the shower. By the time you get in, $HeadGirl.slaveName's sponge scrub is almost done. _He2 turns to greet you with half-lidded eyes, well pleased with _his2 thorough scrubbing. _His2 $HeadGirl.skin skin shines with wet cleanliness, and _his2 $HeadGirl.nipples nipples begin to <<if $HeadGirl.nipples == "fuckable">>swell with arousal<<else>>stiffen<</if>> as _he2 sees your gaze take in _his2 nude body. _He2 brusquely orders $activeSlave.slaveName to scrub you, too, anticipating your intention. The rough, exfoliating sensation of the sponge is indeed delightful, and you close your eyes to savor the feeling as the slave rubs it up and down your calves and then the backs of your knees.
+	You strip off your suit and enter the shower. By the time you get in, _S.HeadGirl.slaveName's sponge scrub is almost done. _He2 turns to greet you with half-lidded eyes, well pleased with _his2 thorough scrubbing. _His2 _S.HeadGirl.skin skin shines with wet cleanliness, and _his2 _S.HeadGirl.nipples nipples begin to <<if _S.HeadGirl.nipples == "fuckable">>swell with arousal<<else>>stiffen<</if>> as _he2 sees your gaze take in _his2 nude body. _He2 brusquely orders $activeSlave.slaveName to scrub you, too, anticipating your intention. The rough, exfoliating sensation of the sponge is indeed delightful, and you close your eyes to savor the feeling as the slave rubs it up and down your calves and then the backs of your knees.
 	<br><br>
 	<<if $HGSeverity > 0>>
 		You detect tremors of fear in the slave<<if hasAnyArms($activeSlave)>>'s hand<<if hasBothArms($activeSlave)>>s<</if>><</if>>; $he knows that $he hasn't extirpated $his misbehavior, whatever it was, just yet. You let your Head Girl manage that, however, and _he2 does. When $activeSlave.slaveName is stuck in one position for a short time by the need to wash your thighs, you hear a gasp and open your eyes to the sight of your Head Girl crouched behind $him, giving $him an anal fingerfuck. When $activeSlave.slaveName is done washing you, your Head Girl holds the slave's head to your
 	<<else>>
-		When the washing reaches your shoulders, it becomes clumsier, and $activeSlave.slaveName's wet body begins to bump gently against your torso. Opening your eyes, you see that your Head Girl is taking $him as $he finishes your bath. $activeSlave.slaveName is doing $his best to do a good job as $he's fucked, and $he manages it reasonably well. When $he's done, $HeadGirl.slaveName pushes $his head down towards your
+		When the washing reaches your shoulders, it becomes clumsier, and $activeSlave.slaveName's wet body begins to bump gently against your torso. Opening your eyes, you see that your Head Girl is taking $him as $he finishes your bath. $activeSlave.slaveName is doing $his best to do a good job as $he's fucked, and $he manages it reasonably well. When $he's done, _S.HeadGirl.slaveName pushes $his head down towards your
 	<</if>>
 	<<if $PC.dick != 0>>groin so $he can suck you off<<if $PC.vagina != -1>> and stroke your cunt<</if>><<else>>cunt so $he can eat you out<</if>>. $activeSlave.slaveName complies, and afterward, $he seems to feel that @@.mediumaquamarine;$he came off reasonably well;@@ it could have been worse.
 	<<set $activeSlave.counter.anal += 1>>
 	<<set $analTotal += 1>>
-	<<= knockMeUp($activeSlave, 10, 1, $HeadGirl.ID)>>
+	<<= knockMeUp($activeSlave, 10, 1, $HeadGirlID)>>
 	<<set $activeSlave.counter.oral += 1>>
 	<<set $oralTotal += 1>>
 	<<set $activeSlave.trust += 4>>
-	<<set $i = $slaveIndices[$HeadGirl.ID]>>
+	<<set $i = $slaveIndices[$HeadGirlID]>>
 	<<set $slaves[$i].counter.penetrative += 1>>
 	<<set $penetrativeTotal += 1>>
 	<</replace>>
 <</link>>
 <br><<link "Focus on your Head Girl">>
 	<<replace "#result">>
-	You strip off your suit and walk into the steam, producing a surprised but welcoming greeting from your Head Girl and a muffled, submissive noise from $activeSlave.slaveName. $HeadGirl.slaveName is held more or less stationary by the slave _he2's straddling, so you step in, hook a dominant arm around _his2 waist, and kiss _him2. There's precisely one person in this arcology who's allowed to treat _him2 as _hersP, and it's you. _He2 relaxes into you with gratitude as you shoulder the burden of being the leader in this little area of your empire, lifting it from _his2 shoulders for now.
+	You strip off your suit and walk into the steam, producing a surprised but welcoming greeting from your Head Girl and a muffled, submissive noise from $activeSlave.slaveName. _S.HeadGirl.slaveName is held more or less stationary by the slave _he2's straddling, so you step in, hook a dominant arm around _his2 waist, and kiss _him2. There's precisely one person in this arcology who's allowed to treat _him2 as _hersP, and it's you. _He2 relaxes into you with gratitude as you shoulder the burden of being the leader in this little area of your empire, lifting it from _his2 shoulders for now.
 	<br><br>
-	You run a hand up the side of _his2 neck, bringing it to rest with your fingers cupping _him2 under the ear and your thumb running up along _his2 temple. _He2 shivers, unable to concentrate despite all _his2 poise, the ongoing oral service blending into your intense closeness. Right now, _he2's the <<if $HeadGirl.physicalAge > 25>>_woman2<<else>>_girl2<</if>> for you, so you snap your fingers next to the ear of the slave <<if $HeadGirl.vagina > -1>>eating _him2 out<<else>>blowing _him2<</if>>, point at the dropped sponge, and then point at yourself. The oral stops as $activeSlave.slaveName hurries to scrub you, starting at your feet, but your Head Girl doesn't care. You're kissing _him2.
+	You run a hand up the side of _his2 neck, bringing it to rest with your fingers cupping _him2 under the ear and your thumb running up along _his2 temple. _He2 shivers, unable to concentrate despite all _his2 poise, the ongoing oral service blending into your intense closeness. Right now, _he2's the <<if _S.HeadGirl.physicalAge > 25>>_woman2<<else>>_girl2<</if>> for you, so you snap your fingers next to the ear of the slave <<if _S.HeadGirl.vagina > -1>>eating _him2 out<<else>>blowing _him2<</if>>, point at the dropped sponge, and then point at yourself. The oral stops as $activeSlave.slaveName hurries to scrub you, starting at your feet, but your Head Girl doesn't care. You're kissing _him2.
 	<br><br>
 	_He2 gently strokes your <<if $PC.dick != 0>>rapidly hardening member, smiling into your mouth at the speed with which it stiffens<<if $PC.vagina != -1>>, and teases your pussylips with mischievous fingers<</if>><<else>>flushed cunt, smiling into your mouth at the moisture that instantly coats _his2 fingertips<</if>>. You reach out in turn,
-	<<if $HeadGirl.vagina > -1>>
-		caressing _his2 pussylips before slowly inserting a digit inside _his2 warmth while nuzzling _his2 clit with the knuckle of your thumb. At the first real brush against _his2 clitoris, the overstimulated $HeadGirl.slaveName climaxes, pulling _his2 mouth away from you to shout your name and then sobbing thanks into your ear.
+	<<if _S.HeadGirl.vagina > -1>>
+		caressing _his2 pussylips before slowly inserting a digit inside _his2 warmth while nuzzling _his2 clit with the knuckle of your thumb. At the first real brush against _his2 clitoris, the overstimulated _S.HeadGirl.slaveName climaxes, pulling _his2 mouth away from you to shout your name and then sobbing thanks into your ear.
 	<<else>>
-		hooking your fingers up underneath _his2 taint to grope _his2 anus. After teasing _his2 asspussy for a moment you bring your hand slowly across _his2 perineum<<if $HeadGirl.scrotum > 0>> until _his2 ballsack rests against your wrist<</if>>. The overstimulated $HeadGirl.slaveName cums the instant the butt of your hand touches the base of _his2 cock. _He2 screams your name.
+		hooking your fingers up underneath _his2 taint to grope _his2 anus. After teasing _his2 asspussy for a moment you bring your hand slowly across _his2 perineum<<if _S.HeadGirl.scrotum > 0>> until _his2 ballsack rests against your wrist<</if>>. The overstimulated _S.HeadGirl.slaveName cums the instant the butt of your hand touches the base of _his2 cock. _He2 screams your name.
 	<</if>>
 	<br><br>
-	_He2 isn't terribly affected by loving shower sex with you; after all, it isn't exactly novel for _him2. $activeSlave.slaveName was there to bear witness, though, scrubbing your back as $HeadGirl.slaveName clung to it with orgasm. $He can't help but be @@.hotpink;impressed.@@ Maybe, just maybe, that could be $him someday. $He seems distinctly uncomfortable.
+	_He2 isn't terribly affected by loving shower sex with you; after all, it isn't exactly novel for _him2. $activeSlave.slaveName was there to bear witness, though, scrubbing your back as _S.HeadGirl.slaveName clung to it with orgasm. $He can't help but be @@.hotpink;impressed.@@ Maybe, just maybe, that could be $him someday. $He seems distinctly uncomfortable.
 	<<set $activeSlave.counter.oral += 1>>
 	<<set $oralTotal += 1>>
 	<<set $activeSlave.devotion += 4>>
-	<<set $i = $slaveIndices[$HeadGirl.ID]>>
+	<<set $i = $slaveIndices[$HeadGirlID]>>
 	<<set $slaves[$i].counter.oral += 1>>
 	<<set $oralTotal += 1>>
 	<</replace>>
diff --git a/src/uncategorized/reStandardPunishment.tw b/src/uncategorized/reStandardPunishment.tw
index e8c184aaa1b2236d9f195e3470af1391a7d1ae70..753539203771632259ff9593da8329a4f84fd7d6 100644
--- a/src/uncategorized/reStandardPunishment.tw
+++ b/src/uncategorized/reStandardPunishment.tw
@@ -9,8 +9,8 @@
 	<div class="imageColumn">
 		<<if $imageChoice == 1>>
 			<div class="imageRef medImg"><<= SlaveArt($activeSlave, 2, 0)>></div>
-			<<if $HeadGirl != 0>>
-				<div class="imageRef medImg"><<= SlaveArt($HeadGirl, 2, 0)>></div>
+			<<if $HeadGirlID != 0>>
+				<div class="imageRef medImg"><<= SlaveArt(_S.HeadGirl, 2, 0)>></div>
 			<<else>>
 				<<= assistantArt(3)>>
 			<</if>>
@@ -74,9 +74,9 @@
 	ERROR: bad sin
 <</switch>>
 
-<<if $HeadGirl != 0>>
-	<<setLocalPronouns $HeadGirl 2>>
-	$HeadGirl.slaveName is <<if $activeSlave.rules.punishment == "situational">>assessing an appropriate punishment<<else>>sentencing $him to $his standard punishment, <<switch $activeSlave.rules.punishment>><<case "confinement">>several hours in confinement<<case "whipping">>a whipping<<case "chastity">>several hours in chastity<</switch>><</if>>. _He2 immediately defers to you, should you wish to take over.
+<<if $HeadGirlID != 0>>
+	<<setLocalPronouns _S.HeadGirl 2>>
+	_S.HeadGirl.slaveName is <<if $activeSlave.rules.punishment == "situational">>assessing an appropriate punishment<<else>>sentencing $him to $his standard punishment, <<switch $activeSlave.rules.punishment>><<case "confinement">>several hours in confinement<<case "whipping">>a whipping<<case "chastity">>several hours in chastity<</switch>><</if>>. _He2 immediately defers to you, should you wish to take over.
 <<else>>
 	<<setAssistantPronouns>>
 	$assistant.name is <<if $activeSlave.rules.punishment == "situational">>assessing an appropriate punishment<<else>>sentencing $him to $his standard punishment, <<switch $activeSlave.rules.punishment>><<case "confinement">>several hours in confinement<<case "whipping">>a whipping<<case "chastity">>several hours in chastity<</switch>><</if>>. _HeA immediately defers to you, should you wish to take over.
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index 9564b26d47729380892ee0f36f16b57ffe7159d6..655855adc5dad1b7bb2849eac349f726c1e09bfb 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -1314,12 +1314,12 @@
 					This call is coming from a public kiosk, which is usually an indication that the person on the other end is a transient individual who has decided to take slavery over homelessness. In this case, however, the story is more unusual — the callers seem stressed, but otherwise normal. They haltingly and quietly explain that they are a father and _daughter2 who had to flee their home after $his wife found out $he was having sex with their _daughter2. They feel that life in an arcology together, even as slaves, would be better than their current life on the streets.
 				</p>
 			<<case "mismatched pair">>
-				<<setLocalPronouns $HeadGirl 3>>
+				<<setLocalPronouns _S.HeadGirl 3>>
 				<p>
 					Your Head Girl comes to see you. _He3 flags a slave posted for sale on your desk. The posting seems completely unimpressive — just a bitch barely past $his <<= ordinalSuffix($activeSlave.actualAge)>> birthday with basic implants and a pathetic little dick — until _he3 points out that the person posting $him for sale is $his _sister2. $His slightly older, naturally female _sister2. Who, to go by the pictures, the younger sibling has desperately been trying to mold $himself to look more like.
 				</p>
 				<p>
-					<<run Enunciate ($HeadGirl)>>
+					<<run Enunciate (_S.HeadGirl)>>
 					"It won't <<sh>>ow on the de<<s>>k yet, but rumor i<<s>> the little cunt'<<s>> gotten them both in bad debt, <<Master>>. You could grab them both cheap."
 				</p>
 				<p>
diff --git a/src/uncategorized/recruiterSelect.tw b/src/uncategorized/recruiterSelect.tw
index 91f29f6dcdea9aa45c2aa043c1b0153449e0f675..23c96f0d8cc23063cdd6b7620c8c611222adee15 100644
--- a/src/uncategorized/recruiterSelect.tw
+++ b/src/uncategorized/recruiterSelect.tw
@@ -1,10 +1,9 @@
 :: Recruiter Select [nobr jump-to-safe jump-from-safe]
 
 <<set $nextButton = "Back to Main", $nextLink = "Main", $encyclopedia = "Recruiter">>
-<<if ($Recruiter != 0)>>
-	<<set $Recruiter = getSlave($Recruiter.ID)>>
-	<<setLocalPronouns $Recruiter>>
-	<span class='slave-name'><<= SlaveFullName($Recruiter)>></span> is
+<<if ($RecruiterID != 0)>>
+	<<setLocalPronouns _S.Recruiter>>
+	<span class='slave-name'><<= SlaveFullName(_S.Recruiter)>></span> is
 	<<if $recruiterTarget != "other arcologies">>
 		recruiting girls.
 	<<else>>
@@ -63,6 +62,6 @@
 <br>&nbsp; //"Facilities" doesn't include training slots in cellblock, schoolroom, spa, clinic (but does include those leaders)//
 
 <br><br>''Appoint a recruiter from among your devoted slaves:''
-<br>[[None|Main][removeJob($Recruiter, "recruit girls")]]
+<br>[[None|Main][removeJob(_S.Recruiter, "recruit girls")]]
 <br><br>
 <<includeDOM App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.penthouse, "Main")>>
diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw
index 5e99ce9a76f37bea098ddef72ec0967e549cd8fa..3ff287fcf7ff7307b8e4c1884871584e6251af74 100644
--- a/src/uncategorized/reputation.tw
+++ b/src/uncategorized/reputation.tw
@@ -525,7 +525,7 @@ _enduringRep = $enduringRep>>
 		Society @@.green;approves@@ of your advancing age, which advances the ancient Aztec ideal of an experienced leader of the people.
 		<<= FutureSocieties.Change("AztecRevivalist", 1)>>
 	<</if>>
-	<<if $HeadGirl == 0>>
+	<<if $HeadGirlID == 0>>
 		Society @@.red;disapproves@@ of you not having a Head Girl as an advisor and assistant.
 		<<= FutureSocieties.Change("AztecRevivalist", -2)>>
 	<<else>>
@@ -582,21 +582,21 @@ _enduringRep = $enduringRep>>
 		<<= FutureSocieties.Change("ArabianRevivalist", -2)>>
 	<</if>>
 <<elseif $arcologies[0].FSChineseRevivalist != "unset">>
-	<<if $HeadGirl == 0>>
+	<<if $HeadGirlID == 0>>
 		Society @@.red;disapproves@@ of your failure to rely on a Head Girl, as proper imperial administration requires,
 		<<= FutureSocieties.Change("ChineseRevivalist", -2)>>
 	<<else>>
 		Society @@.green;approves@@ of your reliance on a Head Girl, as proper imperial administration requires,
 		<<= FutureSocieties.Change("ChineseRevivalist", 2)>>
 	<</if>>
-	<<if $Recruiter == 0>>
+	<<if $RecruiterID == 0>>
 		@@.red;disapproves@@ of your failure to maintain a Recruiter to expand the Middle Kingdom,
 		<<= FutureSocieties.Change("ChineseRevivalist", -2)>>
 	<<else>>
 		@@.green;approves@@ of your maintaining a Recruiter to expand the Middle Kingdom,
 		<<= FutureSocieties.Change("ChineseRevivalist", 2)>>
 	<</if>>
-	<<if $Bodyguard == 0>>
+	<<if !_S.Bodyguard>>
 		and @@.red;disapproves@@ of your failure to keep a Bodyguard as befits a proper imperial palace.
 		<<= FutureSocieties.Change("ChineseRevivalist", -2)>>
 	<<else>>
diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw
index 0bcfe68a2dab80763b62519d42ee48de3170cdf3..32f698d9ce680470d37e41a763df0b0e8bdf736d 100644
--- a/src/uncategorized/saLiveWithHG.tw
+++ b/src/uncategorized/saLiveWithHG.tw
@@ -1,6 +1,5 @@
 :: SA live with HG [nobr]
 
-<<set $HeadGirl = $slaves[_iTemp]>>
 <<set _oralUse = 0, _analUse = 0, _vaginalUse = 0, _mammaryUse = 0, _penetrativeUse = 0>>
 
 <<if $seeImages && $seeReportImages>>
@@ -10,7 +9,7 @@
 <</if>>
 
 <<setLocalPronouns $slaves[$i]>>
-<<setLocalPronouns $HeadGirl 2>>
+<<setLocalPronouns _S.HeadGirl 2>>
 
 /* run this up here so that it affects things better */
 <<if $arcologies[0].FSSlimnessEnthusiast != "unset">>
@@ -29,7 +28,7 @@
 	<<set $HGTastes = 2>>
 <</if>>
 <<set _diet = $slaves[$i].diet>>
-<<if ($arcologies[0].FSRepopulationFocusPregPolicy == 1 || ($arcologies[0].FSRestart == "unset" && $HeadGirl.fetish == "pregnancy")) && canImpreg($slaves[$i], $HeadGirl) && ($dietFertility == 1)>>
+<<if ($arcologies[0].FSRepopulationFocusPregPolicy == 1 || ($arcologies[0].FSRestart == "unset" && _S.HeadGirl.fetish == "pregnancy")) && canImpreg($slaves[$i], _S.HeadGirl) && ($dietFertility == 1)>>
 	<<if $slaves[$i].diet != "fertility">>
 		<<set $slaves[$i].diet = "fertility">>
 	<</if>>
@@ -41,11 +40,11 @@
 	<<if $slaves[$i].diet != "restricted">>
 		<<set $slaves[$i].diet = "restricted">>
 	<</if>>
-<<elseif (($slaves[$i].muscles <= 95 && (($arcologies[0].FSPhysicalIdealist > 0 && $arcologies[0].FSPhysicalIdealistLaw == 0) || (($HeadGirl.fetish == "submissive" || $HeadGirl.fetish == "masochist") && $HeadGirl.fetishKnown == 1))) || ($slaves[$i].muscles <= 45 && ($arcologies[0].FSPhysicalIdealist > 0 && $arcologies[0].FSPhysicalIdealistLaw == 1)) || $slaves[$i].muscles <= 5) && !isAmputee($slaves[$i])>>
+<<elseif (($slaves[$i].muscles <= 95 && (($arcologies[0].FSPhysicalIdealist > 0 && $arcologies[0].FSPhysicalIdealistLaw == 0) || ((_S.HeadGirl.fetish == "submissive" || _S.HeadGirl.fetish == "masochist") && _S.HeadGirl.fetishKnown == 1))) || ($slaves[$i].muscles <= 45 && ($arcologies[0].FSPhysicalIdealist > 0 && $arcologies[0].FSPhysicalIdealistLaw == 1)) || $slaves[$i].muscles <= 5) && !isAmputee($slaves[$i])>>
 	<<if $slaves[$i].diet != "muscle building">>
 		<<set $slaves[$i].diet = "muscle building">>
 	<</if>>
-<<elseif $slaves[$i].balls > 0 && $HeadGirl.fetish == "cumslut" && $HeadGirl.fetishKnown == 1 && $cumProDiet == 1>>
+<<elseif $slaves[$i].balls > 0 && _S.HeadGirl.fetish == "cumslut" && _S.HeadGirl.fetishKnown == 1 && $cumProDiet == 1>>
 	<<if $slaves[$i].diet != "cum production">>
 		<<set $slaves[$i].diet = "cum production">>
 	<</if>>
@@ -66,23 +65,23 @@
 		<<set $slaves[$i].drugs = "lip injections">>
 	<<elseif $arcologies[0].FSSlaveProfessionalismResearch == 1 && $HGSuiteEquality != 0 && canImproveIntelligence($slaves[$i])>>
 		<<set $slaves[$i].drugs = "psychostimulants">>
-	<<elseif ($HeadGirl.fetishKnown == 1) && ($HeadGirl.fetish == "buttslut") && $arcologies[0].FSAssetExpansionistResearch == 1 && $slaves[$i].butt < 18>>
+	<<elseif (_S.HeadGirl.fetishKnown == 1) && (_S.HeadGirl.fetish == "buttslut") && $arcologies[0].FSAssetExpansionistResearch == 1 && $slaves[$i].butt < 18>>
 		<<set $slaves[$i].drugs = "hyper butt injections">>
-	<<elseif ($HeadGirl.fetishKnown == 1) && ($HeadGirl.fetish == "buttslut") && $arcologies[0].FSAssetExpansionistResearch == 1 && $slaves[$i].butt < 8>>
+	<<elseif (_S.HeadGirl.fetishKnown == 1) && (_S.HeadGirl.fetish == "buttslut") && $arcologies[0].FSAssetExpansionistResearch == 1 && $slaves[$i].butt < 8>>
 		<<set $slaves[$i].drugs = "butt injections">>
-	<<elseif ($HeadGirl.fetishKnown == 1) && ($HeadGirl.fetish == "cumslut") && $arcologies[0].FSAssetExpansionistResearch == 1 && $slaves[$i].balls < 100 && $slaves[$i].balls > 0 && $slaves[$i].dick > 0>>
+	<<elseif (_S.HeadGirl.fetishKnown == 1) && (_S.HeadGirl.fetish == "cumslut") && $arcologies[0].FSAssetExpansionistResearch == 1 && $slaves[$i].balls < 100 && $slaves[$i].balls > 0 && $slaves[$i].dick > 0>>
 		<<set $slaves[$i].drugs = "hyper testicle enhancement">>
-	<<elseif ($HeadGirl.fetishKnown == 1) && ($HeadGirl.fetish == "cumslut") && $slaves[$i].balls < 10 && $slaves[$i].balls > 0 && $slaves[$i].dick > 0>>
+	<<elseif (_S.HeadGirl.fetishKnown == 1) && (_S.HeadGirl.fetish == "cumslut") && $slaves[$i].balls < 10 && $slaves[$i].balls > 0 && $slaves[$i].dick > 0>>
 		<<set $slaves[$i].drugs = "testicle enhancement">>
-	<<elseif ($HeadGirl.fetishKnown == 1) && ($HeadGirl.fetish == "masochist" || $HeadGirl.fetish == "submissive") && canImproveHeight($slaves[$i])>>
+	<<elseif (_S.HeadGirl.fetishKnown == 1) && (_S.HeadGirl.fetish == "masochist" || _S.HeadGirl.fetish == "submissive") && canImproveHeight($slaves[$i])>>
 		<<set $slaves[$i].drugs = "growth stimulants">>
-	<<elseif ($HeadGirl.fetishKnown == 1) && ($HeadGirl.fetish == "boobs") && ($slaves[$i].boobs < 8000)>>
+	<<elseif (_S.HeadGirl.fetishKnown == 1) && (_S.HeadGirl.fetish == "boobs") && ($slaves[$i].boobs < 8000)>>
 		<<if $arcologies[0].FSAssetExpansionistResearch == 1>>
 			<<set $slaves[$i].drugs = "hyper breast injections">>
 		<<else>>
 			<<set $slaves[$i].drugs = "breast injections">>
 		<</if>>
-	<<elseif canImpreg($slaves[$i], $HeadGirl) && $arcologies[0].FSRestart == "unset" && ($HGTastes == 4 || $HeadGirl.fetish == "pregnancy" || $arcologies[0].FSRepopulationFocusPregPolicy == 1)>>
+	<<elseif canImpreg($slaves[$i], _S.HeadGirl) && $arcologies[0].FSRestart == "unset" && ($HGTastes == 4 || _S.HeadGirl.fetish == "pregnancy" || $arcologies[0].FSRepopulationFocusPregPolicy == 1)>>
 		<<set $slaves[$i].drugs = "fertility drugs">>
 	<<elseif $HGTastes > 1>>
 		<<if ($slaves[$i].lips <= 70)>>
@@ -105,26 +104,26 @@
 
 <<if $slaves[$i].devotion > 20>>
 	<<if $HGSlaveSuccess == 1>>
-		looks after your Head Girl <<= SlaveFullName($HeadGirl)>> domestically and sexually, freeing _him2 to devote more of _his2 time to looking after your other slaves.
+		looks after your Head Girl <<= SlaveFullName(_S.HeadGirl)>> domestically and sexually, freeing _him2 to devote more of _his2 time to looking after your other slaves.
 	<<else>>
-		does $his best to look after your Head Girl <<= SlaveFullName($HeadGirl)>> domestically and sexually, but doesn't free up much of _his2 time this week.
+		does $his best to look after your Head Girl <<= SlaveFullName(_S.HeadGirl)>> domestically and sexually, but doesn't free up much of _his2 time this week.
 	<</if>>
 <<elseif $slaves[$i].trust < -20>>
 	<<if $HGSlaveSuccess == 1>>
-		obeys Head Girl <<= SlaveFullName($HeadGirl)>> domestically and sexually, freeing _him2 to devote more of _his2 time to looking after your other slaves.
+		obeys Head Girl <<= SlaveFullName(_S.HeadGirl)>> domestically and sexually, freeing _him2 to devote more of _his2 time to looking after your other slaves.
 	<<else>>
-		tries to look after your Head Girl <<= SlaveFullName($HeadGirl)>> domestically and sexually, but doesn't free up much of _his2 time this week.
+		tries to look after your Head Girl <<= SlaveFullName(_S.HeadGirl)>> domestically and sexually, but doesn't free up much of _his2 time this week.
 	<</if>>
 <<else>>
 	<<if $HGSlaveSuccess == 1>>
-		resists Head Girl <<= SlaveFullName($HeadGirl)>>'s domestic and sexual use, but still frees _him2 to devote more of _his2 time to looking after your other slaves.
+		resists Head Girl <<= SlaveFullName(_S.HeadGirl)>>'s domestic and sexual use, but still frees _him2 to devote more of _his2 time to looking after your other slaves.
 	<<else>>
-		resists Head Girl <<= SlaveFullName($HeadGirl)>>'s domestic and sexual use, and doesn't free up much of _his2 time this week.
+		resists Head Girl <<= SlaveFullName(_S.HeadGirl)>>'s domestic and sexual use, and doesn't free up much of _his2 time this week.
 	<</if>>
 <</if>>
 
-<<if ($HeadGirl.fetish == "sadist") && ($HeadGirl.fetishStrength > 60) && ($HeadGirl.fetishKnown == 1)>>
-	Since $HeadGirl.slaveName is a sadist, poor $slaves[$i].slaveName lives a life of fear and pain.
+<<if (_S.HeadGirl.fetish == "sadist") && (_S.HeadGirl.fetishStrength > 60) && (_S.HeadGirl.fetishKnown == 1)>>
+	Since _S.HeadGirl.slaveName is a sadist, poor $slaves[$i].slaveName lives a life of fear and pain.
 	<<if ($slaves[$i].energy > 95)>>
 		Though it's hard, $he manages to find @@.hotpink;sexual satisfaction@@ being a pain slave.
 		<<set $slaves[$i].devotion += 4>>
@@ -152,39 +151,39 @@
 	<</if>>
 <<elseif ($slaves[$i].devotion < -20)>>
 	<<if ($slaves[$i].trust >= -20)>>
-		Since $he is not yet obedient, $HeadGirl.slaveName @@.gold;punishes@@ $him constantly, training $him to be a decent assistant or suffer pain.
+		Since $he is not yet obedient, _S.HeadGirl.slaveName @@.gold;punishes@@ $him constantly, training $him to be a decent assistant or suffer pain.
 		<<set $slaves[$i].trust -= 5>>
 	<<else>>
-		Since $he isn't suitably broken into slavery yet, $HeadGirl.slaveName trains $him to be @@.hotpink;obedient@@ or suffer pain.
+		Since $he isn't suitably broken into slavery yet, _S.HeadGirl.slaveName trains $him to be @@.hotpink;obedient@@ or suffer pain.
 		<<set $slaves[$i].devotion += 5>>
 	<</if>>
 <<elseif ($slaves[$i].devotion <= 20)>>
-	Since $he is not yet well trained, $HeadGirl.slaveName instructs $him, @@.hotpink;training@@ $him to be a proper assistant.
+	Since $he is not yet well trained, _S.HeadGirl.slaveName instructs $him, @@.hotpink;training@@ $him to be a proper assistant.
 	<<set $slaves[$i].devotion += 4>>
 <<elseif ($slaves[$i].devotion <= 50)>>
-	Since $he is not yet a devoted slave, $HeadGirl.slaveName works with $him, @@.hotpink;training@@ $him to be a good assistant.
+	Since $he is not yet a devoted slave, _S.HeadGirl.slaveName works with $him, @@.hotpink;training@@ $him to be a good assistant.
 	<<set $slaves[$i].devotion += 2>>
 <<else>>
-	Since $he is a devoted assistant, $HeadGirl.slaveName @@.hotpink;praises@@ and encourages $him.
+	Since $he is a devoted assistant, _S.HeadGirl.slaveName @@.hotpink;praises@@ and encourages $him.
 	<<set $slaves[$i].devotion += 1>>
 <</if>>
 
-<<if ($HeadGirl.rivalry != 0) && ($HeadGirl.rivalryTarget == $slaves[$i].ID)>>
-	$HeadGirl.slaveName @@.lightgreen;resolves the rivalry@@ between _him2 and $slaves[$i].slaveName, mostly by the expedient of punishing $slaves[$i].slaveName savagely whenever $he gives any trouble.
-	<<set $HeadGirl.rivalry = 0, $HeadGirl.rivalryTarget = 0, $slaves[$i].rivalry = 0, $slaves[$i].rivalryTarget = 0>>
-<<elseif ($HeadGirl.relationship == 0)>>
-	<<if areRelated($slaves[$i], $HeadGirl)>>
-		$HeadGirl.slaveName
-		<<if $HeadGirl.devotion > 95>>
+<<if (_S.HeadGirl.rivalry != 0) && (_S.HeadGirl.rivalryTarget == $slaves[$i].ID)>>
+	_S.HeadGirl.slaveName @@.lightgreen;resolves the rivalry@@ between _him2 and $slaves[$i].slaveName, mostly by the expedient of punishing $slaves[$i].slaveName savagely whenever $he gives any trouble.
+	<<set _S.HeadGirl.rivalry = 0, _S.HeadGirl.rivalryTarget = 0, $slaves[$i].rivalry = 0, $slaves[$i].rivalryTarget = 0>>
+<<elseif (_S.HeadGirl.relationship == 0)>>
+	<<if areRelated($slaves[$i], _S.HeadGirl)>>
+		_S.HeadGirl.slaveName
+		<<if _S.HeadGirl.devotion > 95>>
 			is so inured to the perversities of slavery that _he2 @@.hotpink;enjoys@@ the prospect of sexual service from _his2
-			<<set $HeadGirl.devotion += 1>>
-		<<elseif $HeadGirl.devotion > 60>>
+			<<set _S.HeadGirl.devotion += 1>>
+		<<elseif _S.HeadGirl.devotion > 60>>
 			is so devoted to you that _he2 accepts the prospect of sexual service from _his2
 		<<else>>
 			is somewhat @@.mediumorchid;disturbed@@ by the prospect of sexual service from _his2
-			<<set $HeadGirl.devotion -= 2>>
+			<<set _S.HeadGirl.devotion -= 2>>
 		<</if>>
-		<<print relativeTerm($HeadGirl, $slaves[$i])>>.
+		<<print relativeTerm(_S.HeadGirl, $slaves[$i])>>.
 		$slaves[$i].slaveName
 		<<if $slaves[$i].devotion > 95>>
 			is so inured to the perversities of slavery that $he @@.hotpink;enjoys@@ the prospect of sexually servicing $his
@@ -204,109 +203,109 @@
 			is @@.mediumorchid;revolted@@ by the prospect of sexually servicing $his
 			<<set $slaves[$i].devotion -= 10>>
 		<</if>>
-		<<print relativeTerm($slaves[$i], $HeadGirl)>>.
+		<<print relativeTerm($slaves[$i], _S.HeadGirl)>>.
 	<</if>>
 	<<if ($slaves[$i].relationship == 0) && ($slaves[$i].devotion > 20)>>
-		$slaves[$i].slaveName sees $HeadGirl.slaveName constantly, and does $his best to @@.lightgreen;become _his2 friend.@@
-		<<set $HeadGirl.relationship = 1, $HeadGirl.relationshipTarget = $slaves[$i].ID, $slaves[$i].relationship = 1, $slaves[$i].relationshipTarget = $HeadGirl.ID>>
+		$slaves[$i].slaveName sees _S.HeadGirl.slaveName constantly, and does $his best to @@.lightgreen;become _his2 friend.@@
+		<<set _S.HeadGirl.relationship = 1, _S.HeadGirl.relationshipTarget = $slaves[$i].ID, $slaves[$i].relationship = 1, $slaves[$i].relationshipTarget = $HeadGirlID>>
 	<<elseif ($slaves[$i].relationship == -2) && ($slaves[$i].devotion > 20) && ($slaves[$i].devotion > 50)>>
-		$slaves[$i].slaveName sees $HeadGirl.slaveName so much more than $he sees you and begins to warm up to _him2 instead of you, @@.lightgreen;becoming _his2 friend.@@
-		<<set $HeadGirl.relationship = 1, $HeadGirl.relationshipTarget = $slaves[$i].ID, $slaves[$i].relationship = 1, $slaves[$i].relationshipTarget = $HeadGirl.ID>>
-	<<elseif ($slaves[$i].relationship != 5) && ($slaves[$i].relationship > 0) && ($slaves[$i].relationshipTarget != $HeadGirl.ID)>>
+		$slaves[$i].slaveName sees _S.HeadGirl.slaveName so much more than $he sees you and begins to warm up to _him2 instead of you, @@.lightgreen;becoming _his2 friend.@@
+		<<set _S.HeadGirl.relationship = 1, _S.HeadGirl.relationshipTarget = $slaves[$i].ID, $slaves[$i].relationship = 1, $slaves[$i].relationshipTarget = $HeadGirlID>>
+	<<elseif ($slaves[$i].relationship != 5) && ($slaves[$i].relationship > 0) && ($slaves[$i].relationshipTarget != $HeadGirlID)>>
 		<<set _j = $slaves.findIndex(function(s) { return s.ID == $slaves[$i].relationshipTarget; })>>
-		$slaves[$i].slaveName, as $HeadGirl.slaveName's bitch, knows $slaves[_j].slaveName cannot compete with the Head Girl, and so their relationship fades.
+		$slaves[$i].slaveName, as _S.HeadGirl.slaveName's bitch, knows $slaves[_j].slaveName cannot compete with the Head Girl, and so their relationship fades.
 		<<set $slaves[$i].relationship = 0, $slaves[$i].relationshipTarget = 0, $slaves[_j].relationship = 0, $slaves[_j].relationshipTarget = 0>>
 	<</if>>
 <<else>>
-	<<if ($HeadGirl.relationshipTarget == $slaves[$i].ID)>>
-		<<set $slaves[$i].trust += 1, $HeadGirl.trust += 1>>
+	<<if (_S.HeadGirl.relationshipTarget == $slaves[$i].ID)>>
+		<<set $slaves[$i].trust += 1, _S.HeadGirl.trust += 1>>
 		<<if $slaves[$i].relationship <= 2>>
-			Since $HeadGirl.slaveName and $slaves[$i].slaveName are already friends, they're @@.mediumaquamarine;thankful@@ to you for allowing it. After a few nights of offering each other sexual comfort, they consider themselves @@.lightgreen;friends with benefits.@@
-			<<set $HeadGirl.relationship = 3, $HeadGirl.relationshipTarget = $slaves[$i].ID>>
-			<<set $slaves[$i].relationship = 3, $slaves[$i].relationshipTarget = $HeadGirl.ID>>
+			Since _S.HeadGirl.slaveName and $slaves[$i].slaveName are already friends, they're @@.mediumaquamarine;thankful@@ to you for allowing it. After a few nights of offering each other sexual comfort, they consider themselves @@.lightgreen;friends with benefits.@@
+			<<set _S.HeadGirl.relationship = 3, _S.HeadGirl.relationshipTarget = $slaves[$i].ID>>
+			<<set $slaves[$i].relationship = 3, $slaves[$i].relationshipTarget = $HeadGirlID>>
 		<<elseif $slaves[$i].relationship <= 3>>
-			Since $HeadGirl.slaveName and $slaves[$i].slaveName are already lovers, they both @@.hotpink;enjoy@@ living together and are @@.mediumaquamarine;thankful@@ to you for allowing it. After living together for a few days, they draw closer emotionally, too, and consider themselves @@.lightgreen;lovers.@@
-			<<set $HeadGirl.relationship = 4, $HeadGirl.relationshipTarget = $slaves[$i].ID>>
-			<<set $slaves[$i].relationship = 4, $slaves[$i].relationshipTarget = $HeadGirl.ID>>
+			Since _S.HeadGirl.slaveName and $slaves[$i].slaveName are already lovers, they both @@.hotpink;enjoy@@ living together and are @@.mediumaquamarine;thankful@@ to you for allowing it. After living together for a few days, they draw closer emotionally, too, and consider themselves @@.lightgreen;lovers.@@
+			<<set _S.HeadGirl.relationship = 4, _S.HeadGirl.relationshipTarget = $slaves[$i].ID>>
+			<<set $slaves[$i].relationship = 4, $slaves[$i].relationshipTarget = $HeadGirlID>>
 		<<elseif $slaves[$i].relationship <= 4>>
-			<<if ($HeadGirl.fetishKnown == 1) && ($HeadGirl.fetishStrength <= 60) && ($HeadGirl.fetish == "sadist") && ($slaves[$i].fetish != "masochist")>>
-				Since their relationship is very abusive, only $HeadGirl.slaveName @@.hotpink;enjoys@@ living together with $slaves[$i].slaveName.
+			<<if (_S.HeadGirl.fetishKnown == 1) && (_S.HeadGirl.fetishStrength <= 60) && (_S.HeadGirl.fetish == "sadist") && ($slaves[$i].fetish != "masochist")>>
+				Since their relationship is very abusive, only _S.HeadGirl.slaveName @@.hotpink;enjoys@@ living together with $slaves[$i].slaveName.
 				<<set $slaves[$i].devotion -= 5, $slaves[$i].trust -= 5>>
 			<<else>>
-				Since $HeadGirl.slaveName and $slaves[$i].slaveName are lovers, they @@.hotpink;enjoy@@ living together.
+				Since _S.HeadGirl.slaveName and $slaves[$i].slaveName are lovers, they @@.hotpink;enjoy@@ living together.
 			<</if>>
 		<<else>>
-			Since $HeadGirl.slaveName and $slaves[$i].slaveName are <<if $wife == _wife2>>slave $wives<<else>>married<</if>>, they @@.hotpink;enjoy@@ living together.
+			Since _S.HeadGirl.slaveName and $slaves[$i].slaveName are <<if $wife == _wife2>>slave $wives<<else>>married<</if>>, they @@.hotpink;enjoy@@ living together.
 		<</if>>
 	<</if>>
 <</if>>
 
 <<set _skillIncrease = 10>>
 <<if ($slaves[$i].skill.oral <= 30)>>
-	$HeadGirl.slaveName wants to come home to a talented tongue, so _he2 trains $slaves[$i].slaveName's oral skills.
+	_S.HeadGirl.slaveName wants to come home to a talented tongue, so _he2 trains $slaves[$i].slaveName's oral skills.
 	<<= SkillIncrease.Oral($slaves[$i], _skillIncrease)>>
 <<elseif ($slaves[$i].vagina > 0) && ($slaves[$i].skill.vaginal <= 30)>>
-	$HeadGirl.slaveName wants _his2 personal sex slave to be as skilled with $his pussy as possible, so _he2 trains $slaves[$i].slaveName's vaginal skills.
+	_S.HeadGirl.slaveName wants _his2 personal sex slave to be as skilled with $his pussy as possible, so _he2 trains $slaves[$i].slaveName's vaginal skills.
 	<<= SkillIncrease.Vaginal($slaves[$i], _skillIncrease)>>
 <<elseif ($slaves[$i].anus > 0) && ($slaves[$i].skill.anal <= 30)>>
-	$HeadGirl.slaveName wants _his2 personal sex slave to be a skillful backdoor whore, so _he2 trains $slaves[$i].slaveName's anal skills.
+	_S.HeadGirl.slaveName wants _his2 personal sex slave to be a skillful backdoor whore, so _he2 trains $slaves[$i].slaveName's anal skills.
 	<<= SkillIncrease.Anal($slaves[$i], _skillIncrease)>>
 <<elseif ($slaves[$i].skill.entertainment <= 10)>>
-	$HeadGirl.slaveName wants to be kept amused in _his2 occasional free time, so _he2 trains $slaves[$i].slaveName's entertainment skills.
+	_S.HeadGirl.slaveName wants to be kept amused in _his2 occasional free time, so _he2 trains $slaves[$i].slaveName's entertainment skills.
 	<<= SkillIncrease.Entertain($slaves[$i], _skillIncrease)>>
 <<elseif ($slaves[$i].sexualFlaw != "none")>>
-	$HeadGirl.slaveName is annoyed by $slaves[$i].slaveName's sexual flaws, so _he2 @@.green;trains@@ $him out of them.
+	_S.HeadGirl.slaveName is annoyed by $slaves[$i].slaveName's sexual flaws, so _he2 @@.green;trains@@ $him out of them.
 	<<set $slaves[$i].sexualFlaw = "none">>
 <<elseif ($slaves[$i].behavioralFlaw != "none")>>
-	$HeadGirl.slaveName is irritated by $slaves[$i].slaveName's flaws, so _he2 @@.green;trains@@ $him out of them.
+	_S.HeadGirl.slaveName is irritated by $slaves[$i].slaveName's flaws, so _he2 @@.green;trains@@ $him out of them.
 	<<set $slaves[$i].behavioralFlaw = "none">>
 <</if>>
 
-<<if canPenetrate($HeadGirl)>>
+<<if canPenetrate(_S.HeadGirl)>>
 	<<if canDoVaginal($slaves[$i])>>
 		<<if ($slaves[$i].vagina == 0)>>
-			$HeadGirl.slaveName @@.hotpink;loves@@ @@.lime;taking@@ $slaves[$i].slaveName's virginity, and spends much of the week ogling _his2 conquest complacently.
-			<<set $slaves[$i].vagina = 1, $HeadGirl.devotion += 4>>
+			_S.HeadGirl.slaveName @@.hotpink;loves@@ @@.lime;taking@@ $slaves[$i].slaveName's virginity, and spends much of the week ogling _his2 conquest complacently.
+			<<set $slaves[$i].vagina = 1, _S.HeadGirl.devotion += 4>>
 		<<elseif ($slaves[$i].vagina == 1)>>
-			<<if ($HeadGirl.dick > 4) && ($HeadGirl.energy > 95)>>
-				$HeadGirl.slaveName has such a ferocious sex drive and such a big dick that _his2 constant pounding of $slaves[$i].slaveName @@.lime;loosens@@ the poor $girl's pussy.
+			<<if (_S.HeadGirl.dick > 4) && (_S.HeadGirl.energy > 95)>>
+				_S.HeadGirl.slaveName has such a ferocious sex drive and such a big dick that _his2 constant pounding of $slaves[$i].slaveName @@.lime;loosens@@ the poor $girl's pussy.
 				<<set $slaves[$i].vagina += 1>>
-			<<elseif ($HeadGirl.dick > 5)>>
-				Serving $HeadGirl.slaveName's monster cock @@.lime;loosens@@ $slaves[$i].slaveName's pussy.
+			<<elseif (_S.HeadGirl.dick > 5)>>
+				Serving _S.HeadGirl.slaveName's monster cock @@.lime;loosens@@ $slaves[$i].slaveName's pussy.
 				<<set $slaves[$i].vagina += 1>>
 			<</if>>
 		<<elseif ($slaves[$i].vagina == 2)>>
-			<<if ($HeadGirl.dick > 5) && ($HeadGirl.energy > 95)>>
-				$HeadGirl.slaveName has such a ferocious sex drive and such a monster cock that _his2 constant pounding of $slaves[$i].slaveName @@.lime;loosens@@ the poor $girl's pussy.
+			<<if (_S.HeadGirl.dick > 5) && (_S.HeadGirl.energy > 95)>>
+				_S.HeadGirl.slaveName has such a ferocious sex drive and such a monster cock that _his2 constant pounding of $slaves[$i].slaveName @@.lime;loosens@@ the poor $girl's pussy.
 				<<set $slaves[$i].vagina += 1>>
 			<</if>>
 		<<elseif ($slaves[$i].vagina == 3)>>
-			<<if ($HeadGirl.dick > 5) && ($HeadGirl.energy > 95) && random(1,100) > 80>>
-				$HeadGirl.slaveName has such a ferocious sex drive and such a monster cock that _his2 constant pounding of $slaves[$i].slaveName's loose pussy inevitably leaves it @@.lime;gaping.@@
+			<<if (_S.HeadGirl.dick > 5) && (_S.HeadGirl.energy > 95) && random(1,100) > 80>>
+				_S.HeadGirl.slaveName has such a ferocious sex drive and such a monster cock that _his2 constant pounding of $slaves[$i].slaveName's loose pussy inevitably leaves it @@.lime;gaping.@@
 				<<set $slaves[$i].vagina += 1>>
 			<</if>>
 		<</if>>
 	<</if>>
 	<<if canDoAnal($slaves[$i])>>
 		<<if ($slaves[$i].anus == 0)>>
-			$HeadGirl.slaveName @@.hotpink;relishes@@ @@.lime;taking@@ $slaves[$i].slaveName's anal virginity, and spends much of the week groping _his2 conquest's rear end possessively.
-			<<set $slaves[$i].anus = 1, $HeadGirl.devotion += 4>>
+			_S.HeadGirl.slaveName @@.hotpink;relishes@@ @@.lime;taking@@ $slaves[$i].slaveName's anal virginity, and spends much of the week groping _his2 conquest's rear end possessively.
+			<<set $slaves[$i].anus = 1, _S.HeadGirl.devotion += 4>>
 		<<elseif ($slaves[$i].anus == 1)>>
-			<<if ($HeadGirl.dick > 4) && ($HeadGirl.energy > 95)>>
-				$HeadGirl.slaveName uses $slaves[$i].slaveName's anus to vent _his2 sexual addiction. Constant assrape from such a huge dick @@.lime;loosens@@ $his sphincter.
+			<<if (_S.HeadGirl.dick > 4) && (_S.HeadGirl.energy > 95)>>
+				_S.HeadGirl.slaveName uses $slaves[$i].slaveName's anus to vent _his2 sexual addiction. Constant assrape from such a huge dick @@.lime;loosens@@ $his sphincter.
 				<<set $slaves[$i].anus += 1>>
-			<<elseif ($HeadGirl.dick > 5)>>
-				Taking $HeadGirl.slaveName's monster cock up the butt @@.lime;loosens@@ $slaves[$i].slaveName's anal sphincter.
+			<<elseif (_S.HeadGirl.dick > 5)>>
+				Taking _S.HeadGirl.slaveName's monster cock up the butt @@.lime;loosens@@ $slaves[$i].slaveName's anal sphincter.
 				<<set $slaves[$i].anus += 1>>
 			<</if>>
 		<<elseif ($slaves[$i].anus == 2)>>
-			<<if ($HeadGirl.dick > 5) && ($HeadGirl.energy > 95)>>
-				$HeadGirl.slaveName uses $slaves[$i].slaveName's anus to vent _his2 sexual addiction. Constant assrape from the Head Girl's monster cock @@.lime;loosens@@ $his sphincter.
+			<<if (_S.HeadGirl.dick > 5) && (_S.HeadGirl.energy > 95)>>
+				_S.HeadGirl.slaveName uses $slaves[$i].slaveName's anus to vent _his2 sexual addiction. Constant assrape from the Head Girl's monster cock @@.lime;loosens@@ $his sphincter.
 				<<set $slaves[$i].anus += 1>>
 			<</if>>
 		<<elseif ($slaves[$i].anus == 3)>>
-			<<if ($HeadGirl.dick > 5) && ($HeadGirl.energy > 95) && random(1,100) > 80>>
-				$HeadGirl.slaveName uses $slaves[$i].slaveName's loose anus to vent _his2 sexual addiction. Constant assrape from the Head Girl's monster cock eventually leaves it @@.lime;gaping.@@
+			<<if (_S.HeadGirl.dick > 5) && (_S.HeadGirl.energy > 95) && random(1,100) > 80>>
+				_S.HeadGirl.slaveName uses $slaves[$i].slaveName's loose anus to vent _his2 sexual addiction. Constant assrape from the Head Girl's monster cock eventually leaves it @@.lime;gaping.@@
 				<<set $slaves[$i].anus += 1>>
 			<</if>>
 		<</if>>
@@ -314,49 +313,49 @@
 <</if>>
 
 <<if $seePreg != 0>>
-	<<if ($HeadGirl.fetish == "pregnancy") && canImpreg($slaves[$i], $HeadGirl)>>
+	<<if (_S.HeadGirl.fetish == "pregnancy") && canImpreg($slaves[$i], _S.HeadGirl)>>
 		<<if $arcologies[0].FSRestart == "unset">>
-			$HeadGirl.slaveName promptly @@.lime;impregnates@@
-			<<if $HeadGirl.fetishKnown == 1>>
+			_S.HeadGirl.slaveName promptly @@.lime;impregnates@@
+			<<if _S.HeadGirl.fetishKnown == 1>>
 				$slaves[$i].slaveName, to your Head Girl's considerable @@.hotpink;satisfaction.@@ $slaves[$i].slaveName spent the week regularly getting held down and ejaculated into anytime $his superior had cum to spare.
-				<<set $HeadGirl.devotion += 4>>
+				<<set _S.HeadGirl.devotion += 4>>
 			<<else>>
 				$slaves[$i].slaveName. _His2 eagerness completely exposes _his2 hidden @@.lightcoral;pregnancy kink.@@
-				<<set $HeadGirl.fetishKnown = 1>>
+				<<set _S.HeadGirl.fetishKnown = 1>>
 			<</if>>
-			<<= knockMeUp($slaves[$i], 100, 2, $HeadGirl.ID, 1)>>
-			<<if ($HeadGirl.fetishStrength > 70) && canImpreg($HeadGirl, $slaves[$i])>>
+			<<= knockMeUp($slaves[$i], 100, 2, $HeadGirlID, 1)>>
+			<<if (_S.HeadGirl.fetishStrength > 70) && canImpreg(_S.HeadGirl, $slaves[$i])>>
 				Unsurprisingly, _his2 gives in to _his2 own cravings and also takes $slaves[$i].slaveName's loads until _he2 @@.lime;gets pregnant@@ too.
-				<<= knockMeUp($HeadGirl, 100, 2, $slaves[$i].ID, 1)>>
+				<<= knockMeUp(_S.HeadGirl, 100, 2, $slaves[$i].ID, 1)>>
 			<</if>>
-		<<elseif $HeadGirl.fetishKnown == 1>>
-			$HeadGirl.slaveName knows better than to even consider knocking up $slaves[$i].slaveName.
+		<<elseif _S.HeadGirl.fetishKnown == 1>>
+			_S.HeadGirl.slaveName knows better than to even consider knocking up $slaves[$i].slaveName.
 		<</if>>
-	<<elseif ($HeadGirl.fetish == "pregnancy") && canImpreg($HeadGirl, $slaves[$i])>>
-		<<if $arcologies[0].FSRestart == "unset" && ($HeadGirl.fetishStrength > 70)>>
-			$HeadGirl.slaveName promptly @@.lime;knocks _himself2 up@@ with $slaves[$i].slaveName's
-			<<if $HeadGirl.fetishKnown == 1>>
+	<<elseif (_S.HeadGirl.fetish == "pregnancy") && canImpreg(_S.HeadGirl, $slaves[$i])>>
+		<<if $arcologies[0].FSRestart == "unset" && (_S.HeadGirl.fetishStrength > 70)>>
+			_S.HeadGirl.slaveName promptly @@.lime;knocks _himself2 up@@ with $slaves[$i].slaveName's
+			<<if _S.HeadGirl.fetishKnown == 1>>
 				seed, to your Head Girl's considerable @@.hotpink;satisfaction.@@
-				<<set $HeadGirl.devotion += 4>>
+				<<set _S.HeadGirl.devotion += 4>>
 			<<else>>
 				seed. _His2 @@.hotpink;pride@@ over _his2 new pregnancy and eagerness to get pregnant completely exposes _his2 hidden, and powerful, @@.lightcoral;pregnancy fetish.@@
-				<<set $HeadGirl.fetishKnown = 1, $HeadGirl.devotion += 4>>
+				<<set _S.HeadGirl.fetishKnown = 1, _S.HeadGirl.devotion += 4>>
 			<</if>>
-			<<= knockMeUp($HeadGirl, 100, 2, $slaves[$i].ID, 1)>>
-		<<elseif $HeadGirl.fetishKnown == 1>>
-			$HeadGirl.slaveName knows better than to even consider getting knocked up by $slaves[$i].slaveName.
+			<<= knockMeUp(_S.HeadGirl, 100, 2, $slaves[$i].ID, 1)>>
+		<<elseif _S.HeadGirl.fetishKnown == 1>>
+			_S.HeadGirl.slaveName knows better than to even consider getting knocked up by $slaves[$i].slaveName.
 		<</if>>
-	<<elseif $arcologies[0].FSRepopulationFocusPregPolicy == 1 && canImpreg($slaves[$i], $HeadGirl)>>
-		$HeadGirl.slaveName wastes no time in chasing the current trend and hurries to @@.lime;impregnate@@ $slaves[$i].slaveName.
-		<<= knockMeUp($slaves[$i], 100, 2, $HeadGirl.ID, 1)>>
+	<<elseif $arcologies[0].FSRepopulationFocusPregPolicy == 1 && canImpreg($slaves[$i], _S.HeadGirl)>>
+		_S.HeadGirl.slaveName wastes no time in chasing the current trend and hurries to @@.lime;impregnate@@ $slaves[$i].slaveName.
+		<<= knockMeUp($slaves[$i], 100, 2, $HeadGirlID, 1)>>
 	<<elseif $slaves[$i].pregKnown == 1>>
 		<<if $slaves[$i].breedingMark == 1>>
-			Since $slaves[$i].slaveName is marked as a breeding slave, $HeadGirl.slaveName feels it is _his2 duty to keep $his pregnancy safe.
+			Since $slaves[$i].slaveName is marked as a breeding slave, _S.HeadGirl.slaveName feels it is _his2 duty to keep $his pregnancy safe.
 		<<elseif $slaves[$i].pregSource == -1>>
-			Since $slaves[$i].slaveName is bearing your child<<if $slaves[$i].pregType > 1>>ren<</if>>, $HeadGirl.slaveName feels _he2 has been tasked with keeping $his pregnancy safe.
-		<<elseif $HeadGirl.fetish == "pregnancy">>
-			$HeadGirl.slaveName
-			<<if $HeadGirl.fetishKnown == 1>>
+			Since $slaves[$i].slaveName is bearing your child<<if $slaves[$i].pregType > 1>>ren<</if>>, _S.HeadGirl.slaveName feels _he2 has been tasked with keeping $his pregnancy safe.
+		<<elseif _S.HeadGirl.fetish == "pregnancy">>
+			_S.HeadGirl.slaveName
+			<<if _S.HeadGirl.fetishKnown == 1>>
 				<<if $slaves[$i].bellyPreg > 500>>
 					enjoys the swell of $slaves[$i].slaveName's baby bump, giving _him2 plenty of reason to keep $his pregnancy.
 				<<else>>
@@ -367,10 +366,10 @@
 			<</if>>
 		<<elseif $arcologies[0].FSRepopulationFocusPregPolicy == 0 && $arcologies[0].FSRepopulationFocus == "unset" && $HGSuiteDrugs == 1>>
 			<<if $slaves[$i].preg > $slaves[$i].pregData.normalBirth-2 && $slaves[$i].preg > $slaves[$i].pregData.minLiveBirth && $slaves[$i].broodmother === 0 && $slaves[$i].labor === 0>>
-				$HeadGirl.slaveName has no interest in a slut stuffed full of unwanted spawn, so _he2 promptly doses slaves[$i].slaveName with labor inducing agents to get $him back in fucking shape.
+				_S.HeadGirl.slaveName has no interest in a slut stuffed full of unwanted spawn, so _he2 promptly doses slaves[$i].slaveName with labor inducing agents to get $him back in fucking shape.
 				<<set $slaves[$i].labor = 1, $slaves[$i].induce = 1, $birthee = 1>>
 			<<else>>
-				$HeadGirl.slaveName promptly aborts the child growing in $slaves[$i].slaveName since _he2 prefers _his2 <<= $girl>>s not harboring someone else's child or loaded down with _his2 own unwanted spawn.
+				_S.HeadGirl.slaveName promptly aborts the child growing in $slaves[$i].slaveName since _he2 prefers _his2 <<= $girl>>s not harboring someone else's child or loaded down with _his2 own unwanted spawn.
 				<<run TerminatePregnancy($slaves[$i])>>
 				<<set $slaves[$i].counter.abortions++>>
 				<<set $abortionsTotal++>>
@@ -380,68 +379,68 @@
 <</if>>
 
 <<if ($slaves[$i].devotion > 50)>>
-	<<if (($slaves[$i].fetishStrength <= 95) || ($slaves[$i].fetishKnown == 0)) && ($HeadGirl.fetishKnown == 1) && ($HeadGirl.fetishStrength > 60) && ($slaves[$i].fetish != $HeadGirl.fetish) && ($slaves[$i].fetish != "mindbroken")>>
-		<<if ($HeadGirl.fetish == "submissive")>>
-			$slaves[$i].slaveName slowly gets used to $HeadGirl.slaveName's need to be sexually dominated, and begins to @@.pink;enjoy being a top@@ within the confines of the suite.
+	<<if (($slaves[$i].fetishStrength <= 95) || ($slaves[$i].fetishKnown == 0)) && (_S.HeadGirl.fetishKnown == 1) && (_S.HeadGirl.fetishStrength > 60) && ($slaves[$i].fetish != _S.HeadGirl.fetish) && ($slaves[$i].fetish != "mindbroken")>>
+		<<if (_S.HeadGirl.fetish == "submissive")>>
+			$slaves[$i].slaveName slowly gets used to _S.HeadGirl.slaveName's need to be sexually dominated, and begins to @@.pink;enjoy being a top@@ within the confines of the suite.
 			<<set $slaves[$i].fetish = "dom", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
-		<<elseif ($HeadGirl.fetish == "dom")>>
+		<<elseif (_S.HeadGirl.fetish == "dom")>>
 			<<if ($slaves[$i].fetish != "submissive") || ($slaves[$i].fetish == 0)>>
-				$slaves[$i].slaveName slowly gets used to being tied up and fucked regularly, and accepts that it's how $HeadGirl.slaveName's sexual attraction to $him expresses itself. $He begins to @@.pink;enjoy being a sub,@@ especially for $HeadGirl.slaveName.
+				$slaves[$i].slaveName slowly gets used to being tied up and fucked regularly, and accepts that it's how _S.HeadGirl.slaveName's sexual attraction to $him expresses itself. $He begins to @@.pink;enjoy being a sub,@@ especially for _S.HeadGirl.slaveName.
 				<<set $slaves[$i].fetish = "submissive", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
 			<</if>>
-		<<elseif ($HeadGirl.fetish == "boobs")>>
-			$HeadGirl.slaveName lavishes so much attention on $slaves[$i].slaveName's boobs that $slaves[$i].slaveName really starts to @@.pink;fetishize tits@@ too.
+		<<elseif (_S.HeadGirl.fetish == "boobs")>>
+			_S.HeadGirl.slaveName lavishes so much attention on $slaves[$i].slaveName's boobs that $slaves[$i].slaveName really starts to @@.pink;fetishize tits@@ too.
 			<<set $slaves[$i].fetish = "boobs", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
-		<<elseif ($HeadGirl.fetish == "pregnancy")>>
-			$slaves[$i].slaveName and $HeadGirl.slaveName spend so much time talking about pregnancy and fertility that $slaves[$i].slaveName really starts to @@.pink;fetishize pregnancy@@ too.
+		<<elseif (_S.HeadGirl.fetish == "pregnancy")>>
+			$slaves[$i].slaveName and _S.HeadGirl.slaveName spend so much time talking about pregnancy and fertility that $slaves[$i].slaveName really starts to @@.pink;fetishize pregnancy@@ too.
 			<<set $slaves[$i].fetish = "pregnancy", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
-		<<elseif ($HeadGirl.fetish == "cumslut")>>
-			$slaves[$i].slaveName participates in enough of $HeadGirl.slaveName's cum games that $he can't help but @@.pink;enjoy oral sex@@ $himself.
+		<<elseif (_S.HeadGirl.fetish == "cumslut")>>
+			$slaves[$i].slaveName participates in enough of _S.HeadGirl.slaveName's cum games that $he can't help but @@.pink;enjoy oral sex@@ $himself.
 			<<set $slaves[$i].fetish = "cumslut", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
-		<<elseif ($HeadGirl.fetish == "humiliation")>>
-			$slaves[$i].slaveName has so much public sex with $HeadGirl.slaveName that $he really starts to @@.pink;enjoy humiliation@@ $himself.
+		<<elseif (_S.HeadGirl.fetish == "humiliation")>>
+			$slaves[$i].slaveName has so much public sex with _S.HeadGirl.slaveName that $he really starts to @@.pink;enjoy humiliation@@ $himself.
 			<<set $slaves[$i].fetish = "humiliation", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
-		<<elseif ($HeadGirl.fetish == "buttslut")>>
+		<<elseif (_S.HeadGirl.fetish == "buttslut")>>
 			<<if canDoAnal($slaves[$i])>>
-				$slaves[$i].slaveName takes $HeadGirl.slaveName's <<if canPenetrate($HeadGirl)>>dick<<else>>strap-on and dildos<</if>> up $his poor anus so often that $he starts to @@.pink;enjoy buttsex@@ $himself.
+				$slaves[$i].slaveName takes _S.HeadGirl.slaveName's <<if canPenetrate(_S.HeadGirl)>>dick<<else>>strap-on and dildos<</if>> up $his poor anus so often that $he starts to @@.pink;enjoy buttsex@@ $himself.
 			<<else>>
-				$HeadGirl.slaveName lavishes so much attention on $slaves[$i].slaveName's butt, since _he2 can't use it, that $slaves[$i].slaveName really starts to @@.pink;fetishize rears@@ too.
+				_S.HeadGirl.slaveName lavishes so much attention on $slaves[$i].slaveName's butt, since _he2 can't use it, that $slaves[$i].slaveName really starts to @@.pink;fetishize rears@@ too.
 			<</if>>
 			<<set $slaves[$i].fetish = "buttslut", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
-		<<elseif ($HeadGirl.fetish == "masochist")>>
+		<<elseif (_S.HeadGirl.fetish == "masochist")>>
 			<<if ($slaves[$i].fetish != "submissive") || ($slaves[$i].fetish == 0)>>
-				$slaves[$i].slaveName is initially shocked to be asked to cause $HeadGirl.slaveName pain, but $he slowly begins to understand the honestly sexual nature of the arrangement. $He starts to @@.pink;enjoy causing pain,@@ since $HeadGirl.slaveName is clearly enjoying it so much.
+				$slaves[$i].slaveName is initially shocked to be asked to cause _S.HeadGirl.slaveName pain, but $he slowly begins to understand the honestly sexual nature of the arrangement. $He starts to @@.pink;enjoy causing pain,@@ since _S.HeadGirl.slaveName is clearly enjoying it so much.
 				<<set $slaves[$i].fetish = "sadist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
 			<</if>>
 		<<else>>
-			$slaves[$i].slaveName often takes $HeadGirl.slaveName's <<if canPenetrate($HeadGirl)>>dick<<else>>strap-on<</if>> in the missionary position, after some light foreplay and before bed; $he honestly enjoys the respectful lovemaking, and begins to @@.pink;enjoy vanilla sex@@ $himself.
+			$slaves[$i].slaveName often takes _S.HeadGirl.slaveName's <<if canPenetrate(_S.HeadGirl)>>dick<<else>>strap-on<</if>> in the missionary position, after some light foreplay and before bed; $he honestly enjoys the respectful lovemaking, and begins to @@.pink;enjoy vanilla sex@@ $himself.
 			<<set $slaves[$i].fetish = "none", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
 		<</if>>
 	<</if>>
-	<<if ($HeadGirl.attrKnown == 1)>>
-		<<if ($HeadGirl.attrXX > 85) && ($slaves[$i].attrXX > 65) && ($slaves[$i].attrXX <= 85)>>
-			$slaves[$i].slaveName and $HeadGirl.slaveName spend so much time giggling over which of your other slaves they think is prettiest (typically followed by giggling sex) that $slaves[$i].slaveName really starts to @@.green;fetishize girls@@ too.
+	<<if (_S.HeadGirl.attrKnown == 1)>>
+		<<if (_S.HeadGirl.attrXX > 85) && ($slaves[$i].attrXX > 65) && ($slaves[$i].attrXX <= 85)>>
+			$slaves[$i].slaveName and _S.HeadGirl.slaveName spend so much time giggling over which of your other slaves they think is prettiest (typically followed by giggling sex) that $slaves[$i].slaveName really starts to @@.green;fetishize girls@@ too.
 			<<set $slaves[$i].attrXX += 2, $slaves[$i].attrKnown = 1>>
 		<</if>>
-		<<if ($HeadGirl.attrXY > 85) && ($slaves[$i].attrXY > 65) && ($slaves[$i].attrXY <= 85)>>
-			$slaves[$i].slaveName and $HeadGirl.slaveName have so much fun debating which male citizens and slave dickgirls are cutest (typically followed by <<if canDoAnal($slaves[$i]) || canDoVaginal($slaves[$i])>>$HeadGirl.slaveName banging _his2 girltoy <<if canPenetrate($HeadGirl)>>with a strap-on<<else>>senseless<</if>><<else>>giggling sex<</if>>) that $slaves[$i].slaveName really starts to @@.green;fetishize boys@@ too.
+		<<if (_S.HeadGirl.attrXY > 85) && ($slaves[$i].attrXY > 65) && ($slaves[$i].attrXY <= 85)>>
+			$slaves[$i].slaveName and _S.HeadGirl.slaveName have so much fun debating which male citizens and slave dickgirls are cutest (typically followed by <<if canDoAnal($slaves[$i]) || canDoVaginal($slaves[$i])>>_S.HeadGirl.slaveName banging _his2 girltoy <<if canPenetrate(_S.HeadGirl)>>with a strap-on<<else>>senseless<</if>><<else>>giggling sex<</if>>) that $slaves[$i].slaveName really starts to @@.green;fetishize boys@@ too.
 			<<set $slaves[$i].attrXY += 2, $slaves[$i].attrKnown = 1>>
 		<</if>>
-		<<if ($HeadGirl.energy > 95) && ($slaves[$i].energy <= 95)>>
-			$slaves[$i].slaveName has so much fun sex with $HeadGirl.slaveName that @@.green;$his sex drive is slowly enhanced.@@
+		<<if (_S.HeadGirl.energy > 95) && ($slaves[$i].energy <= 95)>>
+			$slaves[$i].slaveName has so much fun sex with _S.HeadGirl.slaveName that @@.green;$his sex drive is slowly enhanced.@@
 			<<set $slaves[$i].energy += 2>>
 		<</if>>
 	<</if>>
 <</if>>
 
-<<if ($HeadGirl.fetishKnown == 1)>>
-	<<if ($HeadGirl.energy > 95)>>
-		$slaves[$i].slaveName spends a lot of time getting fucked in whichever hole or cranny $HeadGirl.slaveName decides to shove _his2 <<if canPenetrate($HeadGirl)>>dick<<else>>strap-on<</if>> into next.
+<<if (_S.HeadGirl.fetishKnown == 1)>>
+	<<if (_S.HeadGirl.energy > 95)>>
+		$slaves[$i].slaveName spends a lot of time getting fucked in whichever hole or cranny _S.HeadGirl.slaveName decides to shove _his2 <<if canPenetrate(_S.HeadGirl)>>dick<<else>>strap-on<</if>> into next.
 		<<set _oralUse += 5>>
 		<<if canDoAnal($slaves[$i])>>
 			<<set _analUse += 5>>
-			<<if canImpreg($slaves[$i], $HeadGirl)>>
-				<<= knockMeUp($slaves[$i], 5, 1, $HeadGirl.ID)>>
+			<<if canImpreg($slaves[$i], _S.HeadGirl)>>
+				<<= knockMeUp($slaves[$i], 5, 1, $HeadGirlID)>>
 			<</if>>
 		<<elseif $slaves[$i] >= 500>>
 			<<set _mammaryUse += 5>>
@@ -450,25 +449,25 @@
 		<</if>>
 		<<if ($slaves[$i].vagina > 0) && canDoVaginal($slaves[$i])>>
 			<<set _vaginalUse += 5>>
-			<<if canImpreg($slaves[$i], $HeadGirl)>>
-				<<= knockMeUp($slaves[$i], 5, 0, $HeadGirl.ID)>>
+			<<if canImpreg($slaves[$i], _S.HeadGirl)>>
+				<<= knockMeUp($slaves[$i], 5, 0, $HeadGirlID)>>
 			<</if>>
 		<<elseif canDoAnal($slaves[$i])>>
 			<<set _analUse += 5>>
-			<<if canImpreg($slaves[$i], $HeadGirl)>>
-				<<= knockMeUp($slaves[$i], 5, 1, $HeadGirl.ID)>>
+			<<if canImpreg($slaves[$i], _S.HeadGirl)>>
+				<<= knockMeUp($slaves[$i], 5, 1, $HeadGirlID)>>
 			<</if>>
 		<<else>>
 			<<set _oralUse += 5>>
 		<</if>>
-		<<set $HeadGirl.counter.penetrative += 15, $penetrativeTotal += 15>>
-	<<elseif ($HeadGirl.fetish == "submissive")>>
-		$HeadGirl.slaveName walks a fine line with $slaves[$i].slaveName. They work out a sexual life in which $HeadGirl.slaveName is in charge, but $slaves[$i].slaveName takes the sexual lead: $slaves[$i].slaveName serves $his superior by taking _him2 firmly.
+		<<set _S.HeadGirl.counter.penetrative += 15, $penetrativeTotal += 15>>
+	<<elseif (_S.HeadGirl.fetish == "submissive")>>
+		_S.HeadGirl.slaveName walks a fine line with $slaves[$i].slaveName. They work out a sexual life in which _S.HeadGirl.slaveName is in charge, but $slaves[$i].slaveName takes the sexual lead: $slaves[$i].slaveName serves $his superior by taking _him2 firmly.
 		<<set _oralUse += 4>>
 		<<if canDoAnal($slaves[$i])>>
 			<<set _analUse += 3>>
-			<<if canImpreg($slaves[$i], $HeadGirl)>>
-				<<= knockMeUp($slaves[$i], 3, 1, $HeadGirl.ID)>>
+			<<if canImpreg($slaves[$i], _S.HeadGirl)>>
+				<<= knockMeUp($slaves[$i], 3, 1, $HeadGirlID)>>
 			<</if>>
 		<<elseif $slaves[$i] >= 500>>
 			<<set _mammaryUse += 3>>
@@ -477,25 +476,25 @@
 		<</if>>
 		<<if ($slaves[$i].vagina > 0) && canDoVaginal($slaves[$i])>>
 			<<set _vaginalUse += 3>>
-			<<if canImpreg($slaves[$i], $HeadGirl)>>
-				<<= knockMeUp($slaves[$i], 3, 0, $HeadGirl.ID)>>
+			<<if canImpreg($slaves[$i], _S.HeadGirl)>>
+				<<= knockMeUp($slaves[$i], 3, 0, $HeadGirlID)>>
 			<</if>>
 		<<elseif canDoAnal($slaves[$i])>>
 			<<set _analUse += 3>>
-			<<if canImpreg($slaves[$i], $HeadGirl)>>
-				<<= knockMeUp($slaves[$i], 3, 1, $HeadGirl.ID)>>
+			<<if canImpreg($slaves[$i], _S.HeadGirl)>>
+				<<= knockMeUp($slaves[$i], 3, 1, $HeadGirlID)>>
 			<</if>>
 		<<else>>
 			<<set _oralUse += 3>>
 		<</if>>
-		<<set $HeadGirl.counter.penetrative += 10, $penetrativeTotal += 10>>
-	<<elseif ($HeadGirl.fetish == "dom")>>
-		$slaves[$i].slaveName serves $HeadGirl.slaveName as _his2 sexual and moral inferior, taking the Head Girl's <<if canPenetrate($HeadGirl)>>dick<<else>>strap-on<</if>> in all $his holes. Though it isn't necessary with such an obedient partner, $slaves[$i].slaveName is often tied up for use.
+		<<set _S.HeadGirl.counter.penetrative += 10, $penetrativeTotal += 10>>
+	<<elseif (_S.HeadGirl.fetish == "dom")>>
+		$slaves[$i].slaveName serves _S.HeadGirl.slaveName as _his2 sexual and moral inferior, taking the Head Girl's <<if canPenetrate(_S.HeadGirl)>>dick<<else>>strap-on<</if>> in all $his holes. Though it isn't necessary with such an obedient partner, $slaves[$i].slaveName is often tied up for use.
 		<<set _oralUse += 4>>
 		<<if canDoAnal($slaves[$i])>>
 			<<set _analUse += 3>>
-			<<if canImpreg($slaves[$i], $HeadGirl)>>
-				<<= knockMeUp($slaves[$i], 3, 1, $HeadGirl.ID)>>
+			<<if canImpreg($slaves[$i], _S.HeadGirl)>>
+				<<= knockMeUp($slaves[$i], 3, 1, $HeadGirlID)>>
 			<</if>>
 		<<elseif $slaves[$i] >= 500>>
 			<<set _mammaryUse += 3>>
@@ -504,25 +503,25 @@
 		<</if>>
 		<<if ($slaves[$i].vagina > 0) && canDoVaginal($slaves[$i])>>
 			<<set _vaginalUse += 3>>
-			<<if canImpreg($slaves[$i], $HeadGirl)>>
-				<<= knockMeUp($slaves[$i], 3, 0, $HeadGirl.ID)>>
+			<<if canImpreg($slaves[$i], _S.HeadGirl)>>
+				<<= knockMeUp($slaves[$i], 3, 0, $HeadGirlID)>>
 			<</if>>
 		<<elseif canDoAnal($slaves[$i])>>
 			<<set _analUse += 3>>
-			<<if canImpreg($slaves[$i], $HeadGirl)>>
-				<<= knockMeUp($slaves[$i], 3, 1, $HeadGirl.ID)>>
+			<<if canImpreg($slaves[$i], _S.HeadGirl)>>
+				<<= knockMeUp($slaves[$i], 3, 1, $HeadGirlID)>>
 			<</if>>
 		<<else>>
 			<<set _oralUse += 3>>
 		<</if>>
-		<<set $HeadGirl.counter.penetrative += 10, $penetrativeTotal += 10>>
-	<<elseif ($HeadGirl.fetish == "humiliation")>>
-		$HeadGirl.slaveName is such an exhibitionist that $slaves[$i].slaveName finds $himself taking $HeadGirl.slaveName's <<if canPenetrate($HeadGirl)>>dick<<else>>strap-on<</if>> in public quite often.
+		<<set _S.HeadGirl.counter.penetrative += 10, $penetrativeTotal += 10>>
+	<<elseif (_S.HeadGirl.fetish == "humiliation")>>
+		_S.HeadGirl.slaveName is such an exhibitionist that $slaves[$i].slaveName finds $himself taking _S.HeadGirl.slaveName's <<if canPenetrate(_S.HeadGirl)>>dick<<else>>strap-on<</if>> in public quite often.
 		<<set _oralUse += 4>>
 		<<if canDoAnal($slaves[$i])>>
 			<<set _analUse += 3>>
-			<<if canImpreg($slaves[$i], $HeadGirl)>>
-				<<= knockMeUp($slaves[$i], 3, 1, $HeadGirl.ID)>>
+			<<if canImpreg($slaves[$i], _S.HeadGirl)>>
+				<<= knockMeUp($slaves[$i], 3, 1, $HeadGirlID)>>
 			<</if>>
 		<<elseif $slaves[$i] >= 500>>
 			<<set _mammaryUse += 3>>
@@ -531,55 +530,55 @@
 		<</if>>
 		<<if ($slaves[$i].vagina > 0) && canDoVaginal($slaves[$i])>>
 			<<set _vaginalUse += 3>>
-			<<if canImpreg($slaves[$i], $HeadGirl)>>
-				<<= knockMeUp($slaves[$i], 3, 0, $HeadGirl.ID)>>
+			<<if canImpreg($slaves[$i], _S.HeadGirl)>>
+				<<= knockMeUp($slaves[$i], 3, 0, $HeadGirlID)>>
 			<</if>>
 		<<elseif canDoAnal($slaves[$i])>>
 			<<set _analUse += 3>>
-			<<if canImpreg($slaves[$i], $HeadGirl)>>
-				<<= knockMeUp($slaves[$i], 3, 1, $HeadGirl.ID)>>
+			<<if canImpreg($slaves[$i], _S.HeadGirl)>>
+				<<= knockMeUp($slaves[$i], 3, 1, $HeadGirlID)>>
 			<</if>>
 		<<else>>
 			<<set _oralUse += 3>>
 		<</if>>
-		<<set $HeadGirl.counter.penetrative += 10, $penetrativeTotal += 10>>
-	<<elseif ($HeadGirl.fetish == "boobs")>>
-		$HeadGirl.slaveName is such a boob fetishist that $slaves[$i].slaveName sometimes wonders whether $HeadGirl.slaveName thinks there are four clits in the suite: the four nipples between the two of them.
+		<<set _S.HeadGirl.counter.penetrative += 10, $penetrativeTotal += 10>>
+	<<elseif (_S.HeadGirl.fetish == "boobs")>>
+		_S.HeadGirl.slaveName is such a boob fetishist that $slaves[$i].slaveName sometimes wonders whether _S.HeadGirl.slaveName thinks there are four clits in the suite: the four nipples between the two of them.
 		<<set _oralUse += 4>>
 		<<set _mammaryUse += 6>>
-		<<set $HeadGirl.counter.mammary += 10, $mammaryTotal += 10>>
-	<<elseif ($HeadGirl.fetish == "buttslut")>>
-		$HeadGirl.slaveName takes a dominant sexual role with $slaves[$i].slaveName; _he2 indulges _his2 <<if canDoAnal($slaves[$i])>>anal addiction by constantly buttfucking $slaves[$i].slaveName<<else>>ass obsession by constantly molesting and using $slaves[$i].slaveName's buttcheeks as a sex toy<</if>> while wearing a vibrating plug _himself2.
+		<<set _S.HeadGirl.counter.mammary += 10, $mammaryTotal += 10>>
+	<<elseif (_S.HeadGirl.fetish == "buttslut")>>
+		_S.HeadGirl.slaveName takes a dominant sexual role with $slaves[$i].slaveName; _he2 indulges _his2 <<if canDoAnal($slaves[$i])>>anal addiction by constantly buttfucking $slaves[$i].slaveName<<else>>ass obsession by constantly molesting and using $slaves[$i].slaveName's buttcheeks as a sex toy<</if>> while wearing a vibrating plug _himself2.
 		<<if canDoAnal($slaves[$i])>>
 			<<set _analUse += 10>>
-			<<set $HeadGirl.counter.penetrative += 10, $penetrativeTotal += 10>>
-			<<if canImpreg($slaves[$i], $HeadGirl)>>
-				<<= knockMeUp($slaves[$i], 10, 1, $HeadGirl.ID)>>
+			<<set _S.HeadGirl.counter.penetrative += 10, $penetrativeTotal += 10>>
+			<<if canImpreg($slaves[$i], _S.HeadGirl)>>
+				<<= knockMeUp($slaves[$i], 10, 1, $HeadGirlID)>>
 			<</if>>
 		<</if>>
-	<<elseif ($HeadGirl.fetish == "cumslut")>>
-		$HeadGirl.slaveName takes a dominant sexual role with $slaves[$i].slaveName; _he2 indulges _his2 oral fixation with constant oral sex. _He2 certainly applies _his2 mouth to $slaves[$i].slaveName when _he2 gets the chance, but $slaves[$i].slaveName does most of the sucking.
+	<<elseif (_S.HeadGirl.fetish == "cumslut")>>
+		_S.HeadGirl.slaveName takes a dominant sexual role with $slaves[$i].slaveName; _he2 indulges _his2 oral fixation with constant oral sex. _He2 certainly applies _his2 mouth to $slaves[$i].slaveName when _he2 gets the chance, but $slaves[$i].slaveName does most of the sucking.
 		<<set _oralUse += 20>>
-		<<set $HeadGirl.counter.oral += 10, $oralTotal += 10>>
-		<<set $HeadGirl.counter.penetrative += 10, $penetrativeTotal += 10>>
-	<<elseif ($HeadGirl.fetish == "masochist")>>
-		$HeadGirl.slaveName carefully structures _his2 sexual games with $slaves[$i].slaveName to gratify _his2 deep need to be physically hurt during sex without damaging _his2 leadership. Usually, $slaves[$i].slaveName tortures $HeadGirl.slaveName until _he2's quite sated, and then takes a rough <<if canDoAnal($slaves[$i])>>buttfuck<<else>>facefucking<</if>> from the aroused $HeadGirl.slaveName's <<if canPenetrate($HeadGirl)>>dick<<else>>strap-on<</if>> to restore their relative positions.
+		<<set _S.HeadGirl.counter.oral += 10, $oralTotal += 10>>
+		<<set _S.HeadGirl.counter.penetrative += 10, $penetrativeTotal += 10>>
+	<<elseif (_S.HeadGirl.fetish == "masochist")>>
+		_S.HeadGirl.slaveName carefully structures _his2 sexual games with $slaves[$i].slaveName to gratify _his2 deep need to be physically hurt during sex without damaging _his2 leadership. Usually, $slaves[$i].slaveName tortures _S.HeadGirl.slaveName until _he2's quite sated, and then takes a rough <<if canDoAnal($slaves[$i])>>buttfuck<<else>>facefucking<</if>> from the aroused _S.HeadGirl.slaveName's <<if canPenetrate(_S.HeadGirl)>>dick<<else>>strap-on<</if>> to restore their relative positions.
 		<<if canDoAnal($slaves[$i])>>
 			<<set _analUse += 10>>
-			<<if canImpreg($slaves[$i], $HeadGirl)>>
-				<<= knockMeUp($slaves[$i], 10, 1, $HeadGirl.ID)>>
+			<<if canImpreg($slaves[$i], _S.HeadGirl)>>
+				<<= knockMeUp($slaves[$i], 10, 1, $HeadGirlID)>>
 			<</if>>
 		<<else>>
 			<<set _oralUse += 10>>
 		<</if>>
-		<<set $HeadGirl.counter.penetrative += 10, $penetrativeTotal += 10>>
-	<<elseif ($HeadGirl.attrXX > 65)>>
-		$HeadGirl.slaveName expects $slaves[$i].slaveName to be girlish sexually, and $slaves[$i].slaveName spends a lot of time <<if hasBothLegs($slaves[$i])>>on $his knees<<else>>servicing _him2<</if>>.
+		<<set _S.HeadGirl.counter.penetrative += 10, $penetrativeTotal += 10>>
+	<<elseif (_S.HeadGirl.attrXX > 65)>>
+		_S.HeadGirl.slaveName expects $slaves[$i].slaveName to be girlish sexually, and $slaves[$i].slaveName spends a lot of time <<if hasBothLegs($slaves[$i])>>on $his knees<<else>>servicing _him2<</if>>.
 		<<set _oralUse += 6>>
 		<<if canDoAnal($slaves[$i])>>
 			<<set _analUse++>>
-			<<if canImpreg($slaves[$i], $HeadGirl)>>
-				<<= knockMeUp($slaves[$i], 1, 1, $HeadGirl.ID)>>
+			<<if canImpreg($slaves[$i], _S.HeadGirl)>>
+				<<= knockMeUp($slaves[$i], 1, 1, $HeadGirlID)>>
 			<</if>>
 		<<elseif $slaves[$i] >= 500>>
 			<<set _mammaryUse++>>
@@ -588,25 +587,25 @@
 		<</if>>
 		<<if ($slaves[$i].vagina > 0) && canDoVaginal($slaves[$i])>>
 			<<set _vaginalUse++>>
-			<<if canImpreg($slaves[$i], $HeadGirl)>>
-				<<= knockMeUp($slaves[$i], 1, 0, $HeadGirl.ID)>>
+			<<if canImpreg($slaves[$i], _S.HeadGirl)>>
+				<<= knockMeUp($slaves[$i], 1, 0, $HeadGirlID)>>
 			<</if>>
 		<<elseif canDoAnal($slaves[$i])>>
 			<<set _analUse++>>
-			<<if canImpreg($slaves[$i], $HeadGirl)>>
-				<<= knockMeUp($slaves[$i], 1, 1, $HeadGirl.ID)>>
+			<<if canImpreg($slaves[$i], _S.HeadGirl)>>
+				<<= knockMeUp($slaves[$i], 1, 1, $HeadGirlID)>>
 			<</if>>
 		<<else>>
 			<<set _oralUse++>>
 		<</if>>
-		<<set $HeadGirl.counter.penetrative += 8, $penetrativeTotal += 8>>
+		<<set _S.HeadGirl.counter.penetrative += 8, $penetrativeTotal += 8>>
 	<<else>>
-		$HeadGirl.slaveName takes a dominant sexual role with $slaves[$i].slaveName, mostly getting oral<<if canPenetrate($HeadGirl) && (canDoVaginal($slaves[$i]) || canDoAnal($slaves[$i]))>> and fucking $him in the missionary position<<elseif $slaves[$i] >= 300>> and molesting $his breasts<</if>>.
+		_S.HeadGirl.slaveName takes a dominant sexual role with $slaves[$i].slaveName, mostly getting oral<<if canPenetrate(_S.HeadGirl) && (canDoVaginal($slaves[$i]) || canDoAnal($slaves[$i]))>> and fucking $him in the missionary position<<elseif $slaves[$i] >= 300>> and molesting $his breasts<</if>>.
 		<<set _oralUse += 4>>
 		<<if canDoAnal($slaves[$i])>>
 			<<set _analUse += 3>>
-			<<if canImpreg($slaves[$i], $HeadGirl)>>
-				<<= knockMeUp($slaves[$i], 3, 1, $HeadGirl.ID)>>
+			<<if canImpreg($slaves[$i], _S.HeadGirl)>>
+				<<= knockMeUp($slaves[$i], 3, 1, $HeadGirlID)>>
 			<</if>>
 		<<elseif $slaves[$i] >= 300>>
 			<<set _mammaryUse += 3>>
@@ -615,20 +614,20 @@
 		<</if>>
 		<<if ($slaves[$i].vagina > 0) && canDoVaginal($slaves[$i])>>
 			<<set _vaginalUse += 3>>
-			<<if canImpreg($slaves[$i], $HeadGirl)>>
-				<<= knockMeUp($slaves[$i], 3, 0, $HeadGirl.ID)>>
+			<<if canImpreg($slaves[$i], _S.HeadGirl)>>
+				<<= knockMeUp($slaves[$i], 3, 0, $HeadGirlID)>>
 			<</if>>
 		<<elseif canDoAnal($slaves[$i])>>
 			<<set _analUse += 3>>
-			<<if canImpreg($slaves[$i], $HeadGirl)>>
-				<<= knockMeUp($slaves[$i], 3, 1, $HeadGirl.ID)>>
+			<<if canImpreg($slaves[$i], _S.HeadGirl)>>
+				<<= knockMeUp($slaves[$i], 3, 1, $HeadGirlID)>>
 			<</if>>
 		<<elseif $slaves[$i] >= 300>>
 			<<set _mammaryUse += 3>>
 		<<else>>
 			<<set _oralUse += 3>>
 		<</if>>
-		<<set $HeadGirl.counter.penetrative += 10, $penetrativeTotal += 10>>
+		<<set _S.HeadGirl.counter.penetrative += 10, $penetrativeTotal += 10>>
 	<</if>>
 <</if>>
 
@@ -685,7 +684,7 @@
 <</if>>
 
 <<set $slaves[$i].need -= ((_vaginalUse+_penetrativeUse+_analUse)*5)>>
-<<set $HeadGirl.need = 0>>
+<<set _S.HeadGirl.need = 0>>
 
 <<if _cervixPump > 0>>
 	$slaves[$i].slaveName notices $his @@.lime;belly swell@@ after
@@ -699,22 +698,22 @@
 <</if>>
 
 <<if $slaves[$i].health.tired > 60>>
-	$HeadGirl.slaveName sees $he is becoming exhausted and gives $him lighter duties so $he doesn't break.
+	_S.HeadGirl.slaveName sees $he is becoming exhausted and gives $him lighter duties so $he doesn't break.
 <</if>>
 <<run tired($slaves[$i])>>
 
-<<if ($HeadGirl.fetishKnown == 1)>>
-	<<if ($HeadGirl.energy > 95)>>
-		$HeadGirl.slaveName keeps $slaves[$i].slaveName naked so _he2 doesn't have to waste any time tearing $his clothes off.
+<<if (_S.HeadGirl.fetishKnown == 1)>>
+	<<if (_S.HeadGirl.energy > 95)>>
+		_S.HeadGirl.slaveName keeps $slaves[$i].slaveName naked so _he2 doesn't have to waste any time tearing $his clothes off.
 		<<set $slaves[$i].clothes = "no clothing">>
 	<<elseif $slaves[$i].devotion <= 20>>
-		$HeadGirl.slaveName keeps $slaves[$i].slaveName in a torturous habit since $he still clings to $his dignity and remains defiant.
+		_S.HeadGirl.slaveName keeps $slaves[$i].slaveName in a torturous habit since $he still clings to $his dignity and remains defiant.
 		<<set $slaves[$i].clothes = "a penitent nuns habit">>
-	<<elseif ($HeadGirl.fetish == "submissive")>>
-		$HeadGirl.slaveName keeps $slaves[$i].slaveName dressed up in slutty power clothing, since _he2's attracted to competence.
+	<<elseif (_S.HeadGirl.fetish == "submissive")>>
+		_S.HeadGirl.slaveName keeps $slaves[$i].slaveName dressed up in slutty power clothing, since _he2's attracted to competence.
 		<<set $slaves[$i].clothes = "slutty business attire">>
-	<<elseif ($HeadGirl.fetish == "masochist")>>
-		$HeadGirl.slaveName keeps $slaves[$i].slaveName
+	<<elseif (_S.HeadGirl.fetish == "masochist")>>
+		_S.HeadGirl.slaveName keeps $slaves[$i].slaveName
 		<<if isItemAccessible.entry("battledress", "clothing")>>
 			in battledress, since _he2 likes the fantasy of being raped by a soldier $girl.
 			<<set $slaves[$i].clothes = "battledress">>
@@ -722,82 +721,82 @@
 			in a scalemail bikini, since _he2 likes the fantasy of being raped by a horny barbarian.
 			<<set $slaves[$i].clothes = "a scalemail bikini">>
 		<</if>>
-	<<elseif ($HeadGirl.fetish == "dom")>>
-		$HeadGirl.slaveName keeps $slaves[$i].slaveName dressed up as a school<<= $girl>>
+	<<elseif (_S.HeadGirl.fetish == "dom")>>
+		_S.HeadGirl.slaveName keeps $slaves[$i].slaveName dressed up as a school<<= $girl>>
 		<<if $slaves[$i].physicalAge > 16>>
 			to infantilize _his2 sub.
 		<<else>>
 			to highlight _his2 authority over _his2 young sub.
 		<</if>>
 		<<set $slaves[$i].clothes = "a schoolgirl outfit">>
-	<<elseif ($HeadGirl.fetish == "boobs")>>
-		$HeadGirl.slaveName keeps $slaves[$i].slaveName wearing a string bikini, since _he2 likes seeing those tits.
+	<<elseif (_S.HeadGirl.fetish == "boobs")>>
+		_S.HeadGirl.slaveName keeps $slaves[$i].slaveName wearing a string bikini, since _he2 likes seeing those tits.
 		<<set $slaves[$i].clothes = "a string bikini">>
-	<<elseif ($HeadGirl.fetish == "cumslut")>>
-		$HeadGirl.slaveName keeps $slaves[$i].slaveName in restrictive latex, because _he2 likes how it draws attention to $his mouth.
+	<<elseif (_S.HeadGirl.fetish == "cumslut")>>
+		_S.HeadGirl.slaveName keeps $slaves[$i].slaveName in restrictive latex, because _he2 likes how it draws attention to $his mouth.
 		<<set $slaves[$i].clothes = "restrictive latex">>
-	<<elseif ($HeadGirl.fetish == "humiliation")>>
-		$HeadGirl.slaveName keeps $slaves[$i].slaveName in humiliating bondage gear, because _he2 likes to see others blush, too.
+	<<elseif (_S.HeadGirl.fetish == "humiliation")>>
+		_S.HeadGirl.slaveName keeps $slaves[$i].slaveName in humiliating bondage gear, because _he2 likes to see others blush, too.
 		<<set $slaves[$i].clothes = "uncomfortable straps">>
-	<<elseif ($HeadGirl.fetish == "sadist")>>
-		$HeadGirl.slaveName keeps $slaves[$i].slaveName in humiliating bondage gear, because it can easily be tightened to cause considerable anguish.
+	<<elseif (_S.HeadGirl.fetish == "sadist")>>
+		_S.HeadGirl.slaveName keeps $slaves[$i].slaveName in humiliating bondage gear, because it can easily be tightened to cause considerable anguish.
 		<<set $slaves[$i].clothes = "uncomfortable straps">>
-	<<elseif ($HeadGirl.fetish == "buttslut")>>
-		$HeadGirl.slaveName keeps $slaves[$i].slaveName wearing nothing but slutty bangles, since _he2 likes dressing $him up but wants that butt bare.
+	<<elseif (_S.HeadGirl.fetish == "buttslut")>>
+		_S.HeadGirl.slaveName keeps $slaves[$i].slaveName wearing nothing but slutty bangles, since _he2 likes dressing $him up but wants that butt bare.
 		<<set $slaves[$i].clothes = "slutty jewelry">>
-	<<elseif ($HeadGirl.fetish == "pregnancy" && isItemAccessible.entry("a huge empathy belly", "bellyAccessory", $slaves[$i]) == true)>>
-		$HeadGirl.slaveName keeps $slaves[$i].slaveName wearing an empathy belly, since _he2 likes _his2 <<= $girl>>s with a bun in the oven.
+	<<elseif (_S.HeadGirl.fetish == "pregnancy" && isItemAccessible.entry("a huge empathy belly", "bellyAccessory", $slaves[$i]) == true)>>
+		_S.HeadGirl.slaveName keeps $slaves[$i].slaveName wearing an empathy belly, since _he2 likes _his2 <<= $girl>>s with a bun in the oven.
 		<<set $slaves[$i].bellyAccessory = "a large empathy belly">>
-	<<elseif ($HeadGirl.fetish == "pregnancy") && ($slaves[$i].preg > 0) && ($slaves[$i].pregSource == $HeadGirl.ID)>>
-		$HeadGirl.slaveName keeps the pregnant $slaves[$i].slaveName dressed as a slutty maid, since _he2 wants $him to look motherly yet fuckable while _he2 fantasizes about fucking $him pregnant again.
+	<<elseif (_S.HeadGirl.fetish == "pregnancy") && ($slaves[$i].preg > 0) && ($slaves[$i].pregSource == $HeadGirlID)>>
+		_S.HeadGirl.slaveName keeps the pregnant $slaves[$i].slaveName dressed as a slutty maid, since _he2 wants $him to look motherly yet fuckable while _he2 fantasizes about fucking $him pregnant again.
 		<<set $slaves[$i].clothes = "a slutty maid outfit">>
-	<<elseif ($HeadGirl.fetish == "pregnancy")>>
-		$HeadGirl.slaveName keeps $slaves[$i].slaveName dressed as a slutty maid, since _he2 wants $him to look motherly yet fuckable while _he2 fantasizes about putting a bun in $his oven.
+	<<elseif (_S.HeadGirl.fetish == "pregnancy")>>
+		_S.HeadGirl.slaveName keeps $slaves[$i].slaveName dressed as a slutty maid, since _he2 wants $him to look motherly yet fuckable while _he2 fantasizes about putting a bun in $his oven.
 		<<set $slaves[$i].clothes = "a slutty maid outfit">>
-	<<elseif ($HeadGirl.attrXX > 85)>>
-		$HeadGirl.slaveName keeps $slaves[$i].slaveName wearing nice lingerie, since girls and girliness turn _him2 on.
+	<<elseif (_S.HeadGirl.attrXX > 85)>>
+		_S.HeadGirl.slaveName keeps $slaves[$i].slaveName wearing nice lingerie, since girls and girliness turn _him2 on.
 		<<set $slaves[$i].clothes = "attractive lingerie">>
-	<<elseif ($HeadGirl.attrXY > 85) && ($slaves[$i].dick > 0)>>
-		$HeadGirl.slaveName keeps $slaves[$i].slaveName wearing slutty netting with a hole for $his dick to stick through, since _he2 likes it bare.
+	<<elseif (_S.HeadGirl.attrXY > 85) && ($slaves[$i].dick > 0)>>
+		_S.HeadGirl.slaveName keeps $slaves[$i].slaveName wearing slutty netting with a hole for $his dick to stick through, since _he2 likes it bare.
 		<<set $slaves[$i].clothes = "clubslut netting">>
 	<<else>>
-		$HeadGirl.slaveName keeps $slaves[$i].slaveName dressed as a slutty maid, since _he2 likes seeing $his body as $he looks after their suite.
+		_S.HeadGirl.slaveName keeps $slaves[$i].slaveName dressed as a slutty maid, since _he2 likes seeing $his body as $he looks after their suite.
 		<<set $slaves[$i].clothes = "a slutty maid outfit">>
 	<</if>>
 <<else>>
-	$HeadGirl.slaveName keeps $slaves[$i].slaveName dressed as a slutty maid, since _he2 likes seeing $his body as $he looks after their suite.
+	_S.HeadGirl.slaveName keeps $slaves[$i].slaveName dressed as a slutty maid, since _he2 likes seeing $his body as $he looks after their suite.
 	<<set $slaves[$i].clothes = "a slutty maid outfit">>
 <</if>>
 <<set $slaves[$i].devotion += 1>>
 
-<<if $HeadGirl.energy > 95>>
-	<<if $HeadGirl.bald != 1&& $HeadGirl.hLength > 0>>
+<<if _S.HeadGirl.energy > 95>>
+	<<if _S.HeadGirl.bald != 1&& _S.HeadGirl.hLength > 0>>
 		<<if $slaves[$i].bald != 1>>
 			<<if !hasHColorRule($slaves[$i],$defaultRules)>>
-				<<if ($slaves[$i].hColor != $HeadGirl.hColor)>>
-					$HeadGirl.slaveName dyes $slaves[$i].slaveName's hair $HeadGirl.hColor, just like _his2 own, since with nymphomania comes narcissism.
-					<<set $slaves[$i].hColor = $HeadGirl.hColor>>
+				<<if ($slaves[$i].hColor != _S.HeadGirl.hColor)>>
+					_S.HeadGirl.slaveName dyes $slaves[$i].slaveName's hair _S.HeadGirl.hColor, just like _his2 own, since with nymphomania comes narcissism.
+					<<set $slaves[$i].hColor = _S.HeadGirl.hColor>>
 				<</if>>
 			<</if>>
 			<<if !hasHStyleRule($slaves[$i],$defaultRules)>>
-				<<if ($slaves[$i].hStyle != $HeadGirl.hStyle)>>
-					$HeadGirl.slaveName styles $slaves[$i].slaveName's hair just like _his2 own, since with nymphomania comes narcissism.
-					<<set $slaves[$i].hStyle = $HeadGirl.hStyle>>
-					<<set $slaves[$i].hLength = $HeadGirl.hLength>>
+				<<if ($slaves[$i].hStyle != _S.HeadGirl.hStyle)>>
+					_S.HeadGirl.slaveName styles $slaves[$i].slaveName's hair just like _his2 own, since with nymphomania comes narcissism.
+					<<set $slaves[$i].hStyle = _S.HeadGirl.hStyle>>
+					<<set $slaves[$i].hLength = _S.HeadGirl.hLength>>
 				<</if>>
 			<</if>>
 		<<else>>
 			<<if !hasHColorRule($slaves[$i],$defaultRules)>>
-				<<if ($slaves[$i].hColor != $HeadGirl.hColor)>>
-					$HeadGirl.slaveName changes $slaves[$i].slaveName's wig to $HeadGirl.hColor, just like _his2 own hair, since with nymphomania comes narcissism.
-					<<set $slaves[$i].hColor = $HeadGirl.hColor>>
+				<<if ($slaves[$i].hColor != _S.HeadGirl.hColor)>>
+					_S.HeadGirl.slaveName changes $slaves[$i].slaveName's wig to _S.HeadGirl.hColor, just like _his2 own hair, since with nymphomania comes narcissism.
+					<<set $slaves[$i].hColor = _S.HeadGirl.hColor>>
 				<</if>>
 			<</if>>
 			<<if !hasHStyleRule($slaves[$i],$defaultRules)>>
-				<<if ($slaves[$i].hStyle != $HeadGirl.hStyle)>>
-					$HeadGirl.slaveName changes $slaves[$i].slaveName's wig style to look just like _his2 own hair, since with nymphomania comes narcissism.
-					<<set $slaves[$i].hStyle = $HeadGirl.hStyle>>
-					<<set $slaves[$i].hLength = $HeadGirl.hLength>>
+				<<if ($slaves[$i].hStyle != _S.HeadGirl.hStyle)>>
+					_S.HeadGirl.slaveName changes $slaves[$i].slaveName's wig style to look just like _his2 own hair, since with nymphomania comes narcissism.
+					<<set $slaves[$i].hStyle = _S.HeadGirl.hStyle>>
+					<<set $slaves[$i].hLength = _S.HeadGirl.hLength>>
 				<</if>>
 			<</if>>
 		<</if>>
@@ -814,37 +813,37 @@
 	<</if>>
 
 	/* get eye colors, HG can be expected to have at least one working eye due to job requirements */
-	<<set _left = hasLeftEye($HeadGirl) ? getLeftEyeColor($HeadGirl) : getRightEyeColor($HeadGirl)>>
-	<<set _right = hasRightEye($HeadGirl) ? getRightEyeColor($HeadGirl) : _left>>
+	<<set _left = hasLeftEye(_S.HeadGirl) ? getLeftEyeColor(_S.HeadGirl) : getRightEyeColor(_S.HeadGirl)>>
+	<<set _right = hasRightEye(_S.HeadGirl) ? getRightEyeColor(_S.HeadGirl) : _left>>
 
 	/* make sure the slave has the same eye color as the HG */
 	<<if getLeftEyeColor($slaves[$i]) !== _left>>
 		<<run setEyeColor($slaves[$i], _left, "left")>>
-		$HeadGirl.slaveName <<if getLeftEyeType($slaves[$i] === 3)>> changes <<else>> gives <</if>> $slaves[$i].slaveName _left <<if getLeftEyeType($slaves[$i]) === 3>> eye lenses <<elseif getLeftEyeType($slaves[$i]) === 2>> glass eyes <<else>> contact lenses <</if>>, to match _his2 own left eye, since with nymphomania comes narcissism.
+		_S.HeadGirl.slaveName <<if getLeftEyeType($slaves[$i] === 3)>> changes <<else>> gives <</if>> $slaves[$i].slaveName _left <<if getLeftEyeType($slaves[$i]) === 3>> eye lenses <<elseif getLeftEyeType($slaves[$i]) === 2>> glass eyes <<else>> contact lenses <</if>>, to match _his2 own left eye, since with nymphomania comes narcissism.
 	<</if>>
 	<<if getRightEyeColor($slaves[$i]) !== _right>>
 		<<run setEyeColor($slaves[$i], _right, "right")>>
-		$HeadGirl.slaveName <<if getRightEyeType($slaves[$i] === 3)>> changes <<else>> gives <</if>> $slaves[$i].slaveName _right <<if getLeftRightType($slaves[$i]) === 3>> eye lenses <<elseif getLeftRightType($slaves[$i]) === 2>> glass eyes <<else>> contact lenses <</if>>, to match _his2 own right eye, since with nymphomania comes narcissism.
+		_S.HeadGirl.slaveName <<if getRightEyeType($slaves[$i] === 3)>> changes <<else>> gives <</if>> $slaves[$i].slaveName _right <<if getLeftRightType($slaves[$i]) === 3>> eye lenses <<elseif getLeftRightType($slaves[$i]) === 2>> glass eyes <<else>> contact lenses <</if>>, to match _his2 own right eye, since with nymphomania comes narcissism.
 	<</if>>
 	<</if>>
 <</if>>
 
-<<if ($arcologies[0].FSRepopulationFocusPregPolicy == 1 || ($arcologies[0].FSRestart == "unset" && $HeadGirl.fetish == "pregnancy")) && canImpreg($slaves[$i], $HeadGirl) && ($dietFertility == 1)>>
-	$HeadGirl.slaveName thinks $slaves[$i].slaveName could do with a bigger bump <<if $arcologies[0].FSRepopulationFocusPregPolicy>>since pregnant <<= $girl>>s are all the rage in your arcology <</if>>
+<<if ($arcologies[0].FSRepopulationFocusPregPolicy == 1 || ($arcologies[0].FSRestart == "unset" && _S.HeadGirl.fetish == "pregnancy")) && canImpreg($slaves[$i], _S.HeadGirl) && ($dietFertility == 1)>>
+	_S.HeadGirl.slaveName thinks $slaves[$i].slaveName could do with a bigger bump <<if $arcologies[0].FSRepopulationFocusPregPolicy>>since pregnant <<= $girl>>s are all the rage in your arcology <</if>>
 	<<if _diet != "fertility">>
 		and assigns $him a diet to promote ovulation.
 	<<else>>
 		and keeps $him on $his fertility diet.
 	<</if>>
 <<elseif ($slaves[$i].weight < 100 && $arcologies[0].FSHedonisticDecadence >= 20) || ($slaves[$i].weight < -10)>>
-	$HeadGirl.slaveName thinks $slaves[$i].slaveName could use a little extra weight <<if $arcologies[0].FSHedonisticDecadence >= 20>>since plump <<= $girl>>s are all the rage in your arcology <</if>>
+	_S.HeadGirl.slaveName thinks $slaves[$i].slaveName could use a little extra weight <<if $arcologies[0].FSHedonisticDecadence >= 20>>since plump <<= $girl>>s are all the rage in your arcology <</if>>
 	<<if _diet != "fattening">>
 		and assigns $him a diet to fatten $him up.
 	<<else>>
 		and keeps $him on $his fattening diet.
 	<</if>>
 <<elseif $slaves[$i].weight > 30 && $arcologies[0].FSHedonisticDecadence == "unset">>
-	$HeadGirl.slaveName thinks $slaves[$i].slaveName is a little too porky
+	_S.HeadGirl.slaveName thinks $slaves[$i].slaveName is a little too porky
 	<<if _diet != "restricted">>
 		and puts $him on a diet.
 	<<else>>
@@ -856,8 +855,8 @@
 		(
 			($arcologies[0].FSPhysicalIdealist > 0 && $arcologies[0].FSPhysicalIdealistLaw == 0) ||
 			(
-				($HeadGirl.fetish == "submissive" || $HeadGirl.fetish == "masochist") &&
-				$HeadGirl.fetishKnown == 1)
+				(_S.HeadGirl.fetish == "submissive" || _S.HeadGirl.fetish == "masochist") &&
+				_S.HeadGirl.fetishKnown == 1)
 			)
 		)
 		||
@@ -872,10 +871,10 @@
 			!isAmputee($slaves[$i])
 		)
 	)>>
-	$HeadGirl.slaveName thinks $slaves[$i].slaveName
-	<<if $HeadGirl.fetish == "submissive">>
+	_S.HeadGirl.slaveName thinks $slaves[$i].slaveName
+	<<if _S.HeadGirl.fetish == "submissive">>
 		could use bigger muscles to better dominate _him2 with in bed
-	<<elseif $HeadGirl.fetish == "masochist">>
+	<<elseif _S.HeadGirl.fetish == "masochist">>
 		could use bigger muscles to better spank _him2
 	<<elseif $arcologies[0].FSPhysicalIdealist > 0>>
 		could use bigger muscles to support your societal goals
@@ -887,8 +886,8 @@
 	<<else>>
 		and keeps $him working out.
 	<</if>>
-<<elseif $slaves[$i].balls > 0 && $HeadGirl.fetish == "cumslut" && $HeadGirl.fetishKnown == 1 && $cumProDiet == 1>>
-	$HeadGirl.slaveName loves cum, so _he2
+<<elseif $slaves[$i].balls > 0 && _S.HeadGirl.fetish == "cumslut" && _S.HeadGirl.fetishKnown == 1 && $cumProDiet == 1>>
+	_S.HeadGirl.slaveName loves cum, so _he2
 	<<if _diet != "cum production">>
 		puts
 	<<else>>
@@ -896,7 +895,7 @@
 	<</if>>
 	$slaves[$i].slaveName on a diet designed to make $him cum harder and stronger.
 <<else>>
-	$HeadGirl.slaveName thinks $slaves[$i].slaveName is fine as is
+	_S.HeadGirl.slaveName thinks $slaves[$i].slaveName is fine as is
 	<<if _diet != "healthy">>
 		and puts $him on a normal diet.
 	<<else>>
@@ -905,100 +904,100 @@
 <</if>>
 
 <<if $HGSuiteHormones != 0 && _hormones != 2>>
-	$HeadGirl.slaveName puts $slaves[$i].slaveName on intensive female hormones, since _he2 expects $him to act as the submissive, feminine partner.
+	_S.HeadGirl.slaveName puts $slaves[$i].slaveName on intensive female hormones, since _he2 expects $him to act as the submissive, feminine partner.
 <</if>>
 
 <<if $HGSuiteDrugs != 0>>
 	<<if ($slaves[$i].health.condition < 60)>>
-		$HeadGirl.slaveName gives $slaves[$i].slaveName curatives, since _he2 wants a shiningly healthy living partner.
+		_S.HeadGirl.slaveName gives $slaves[$i].slaveName curatives, since _he2 wants a shiningly healthy living partner.
 	<</if>>
 	<<if ($slaves[$i].lips <= 20)>>
-		$HeadGirl.slaveName gives $slaves[$i].slaveName lip injections, since _he2 wants to get oral from plump, luscious lips.
+		_S.HeadGirl.slaveName gives $slaves[$i].slaveName lip injections, since _he2 wants to get oral from plump, luscious lips.
 	<<elseif $arcologies[0].FSSlaveProfessionalismResearch == 1 && $HGSuiteEquality != 0 && canImproveIntelligence($slaves[$i])>>
-		$HeadGirl.slaveName gives $slaves[$i].slaveName psychostimulants, since $him being smarter will benefit them both when $he is in charge.
-	<<elseif ($HeadGirl.fetishKnown == 1) && ($HeadGirl.fetish == "buttslut") && $arcologies[0].FSAssetExpansionistResearch == 1 && $slaves[$i].butt < 18>>
-		$HeadGirl.slaveName gives $slaves[$i].slaveName hyper ass injections, since _he2 never once thought it possible to fuck an ass as big as _he2 is.
-	<<elseif ($HeadGirl.fetishKnown == 1) && ($HeadGirl.fetish == "buttslut") && $arcologies[0].FSAssetExpansionistResearch == 1 && $slaves[$i].butt < 8>>
-		$HeadGirl.slaveName gives $slaves[$i].slaveName ass injections, since _he2 likes comfortable padding as _he2 fucks a butt.
-	<<elseif ($HeadGirl.fetishKnown == 1) && ($HeadGirl.fetish == "cumslut") && $arcologies[0].FSAssetExpansionistResearch == 1 && $slaves[$i].balls < 100 && $slaves[$i].balls > 0 && $slaves[$i].dick > 0>>
-		$HeadGirl.slaveName gives $slaves[$i].slaveName hyper testicle injections, since _he2 wants to swim in a river of cum.
-	<<elseif ($HeadGirl.fetishKnown == 1) && ($HeadGirl.fetish == "cumslut") && $slaves[$i].balls < 10 && $slaves[$i].balls > 0 && $slaves[$i].dick > 0>>
-		$HeadGirl.slaveName gives $slaves[$i].slaveName testicle injections, since _he2 wants $slaves[$i].slaveName shooting bigger loads.
-	<<elseif ($HeadGirl.fetishKnown == 1) && ($HeadGirl.fetish == "masochist" || $HeadGirl.fetish == "submissive") && canImproveHeight($slaves[$i])>>
-		$HeadGirl.slaveName has a subconscious need to be hurt by the biggest, strongest $girl possible, so $he gives $slaves[$i].slaveName injections of growth stimulants to make $him grow taller.
-	<<elseif ($HeadGirl.fetishKnown == 1) && ($HeadGirl.fetish == "boobs") && ($slaves[$i].boobs < 8000)>>
-		$HeadGirl.slaveName gives $slaves[$i].slaveName <<if $arcologies[0].FSAssetExpansionistResearch == 1>>hyper <</if>> tit injections, since as far as _he2's concerned there's no such thing as too much boob.
-	<<elseif ($HGTastes == 4 || $HeadGirl.fetish == "pregnancy") && canImpreg($slaves[$i], $HeadGirl) && $arcologies[0].FSRestart == "unset">>
-		$HeadGirl.slaveName gives $slaves[$i].slaveName fertility enhancers, since _he2 wants to see $slaves[$i].slaveName heavy with child.
-	<<elseif $arcologies[0].FSRepopulationFocusPregPolicy == 1 && canImpreg($slaves[$i], $HeadGirl)>>
-		$HeadGirl.slaveName gives $slaves[$i].slaveName fertility enhancers, since pregnancy is popular and _he2 wants $slaves[$i].slaveName to look hot.
+		_S.HeadGirl.slaveName gives $slaves[$i].slaveName psychostimulants, since $him being smarter will benefit them both when $he is in charge.
+	<<elseif (_S.HeadGirl.fetishKnown == 1) && (_S.HeadGirl.fetish == "buttslut") && $arcologies[0].FSAssetExpansionistResearch == 1 && $slaves[$i].butt < 18>>
+		_S.HeadGirl.slaveName gives $slaves[$i].slaveName hyper ass injections, since _he2 never once thought it possible to fuck an ass as big as _he2 is.
+	<<elseif (_S.HeadGirl.fetishKnown == 1) && (_S.HeadGirl.fetish == "buttslut") && $arcologies[0].FSAssetExpansionistResearch == 1 && $slaves[$i].butt < 8>>
+		_S.HeadGirl.slaveName gives $slaves[$i].slaveName ass injections, since _he2 likes comfortable padding as _he2 fucks a butt.
+	<<elseif (_S.HeadGirl.fetishKnown == 1) && (_S.HeadGirl.fetish == "cumslut") && $arcologies[0].FSAssetExpansionistResearch == 1 && $slaves[$i].balls < 100 && $slaves[$i].balls > 0 && $slaves[$i].dick > 0>>
+		_S.HeadGirl.slaveName gives $slaves[$i].slaveName hyper testicle injections, since _he2 wants to swim in a river of cum.
+	<<elseif (_S.HeadGirl.fetishKnown == 1) && (_S.HeadGirl.fetish == "cumslut") && $slaves[$i].balls < 10 && $slaves[$i].balls > 0 && $slaves[$i].dick > 0>>
+		_S.HeadGirl.slaveName gives $slaves[$i].slaveName testicle injections, since _he2 wants $slaves[$i].slaveName shooting bigger loads.
+	<<elseif (_S.HeadGirl.fetishKnown == 1) && (_S.HeadGirl.fetish == "masochist" || _S.HeadGirl.fetish == "submissive") && canImproveHeight($slaves[$i])>>
+		_S.HeadGirl.slaveName has a subconscious need to be hurt by the biggest, strongest $girl possible, so $he gives $slaves[$i].slaveName injections of growth stimulants to make $him grow taller.
+	<<elseif (_S.HeadGirl.fetishKnown == 1) && (_S.HeadGirl.fetish == "boobs") && ($slaves[$i].boobs < 8000)>>
+		_S.HeadGirl.slaveName gives $slaves[$i].slaveName <<if $arcologies[0].FSAssetExpansionistResearch == 1>>hyper <</if>> tit injections, since as far as _he2's concerned there's no such thing as too much boob.
+	<<elseif ($HGTastes == 4 || _S.HeadGirl.fetish == "pregnancy") && canImpreg($slaves[$i], _S.HeadGirl) && $arcologies[0].FSRestart == "unset">>
+		_S.HeadGirl.slaveName gives $slaves[$i].slaveName fertility enhancers, since _he2 wants to see $slaves[$i].slaveName heavy with child.
+	<<elseif $arcologies[0].FSRepopulationFocusPregPolicy == 1 && canImpreg($slaves[$i], _S.HeadGirl)>>
+		_S.HeadGirl.slaveName gives $slaves[$i].slaveName fertility enhancers, since pregnancy is popular and _he2 wants $slaves[$i].slaveName to look hot.
 	<<elseif $HGTastes > 1>>
 		<<if ($slaves[$i].lips <= 70)>>
-			$HeadGirl.slaveName gives $slaves[$i].slaveName lip injections, since _he2 thinks $slaves[$i].slaveName should have lips so big $he can barely speak.
+			_S.HeadGirl.slaveName gives $slaves[$i].slaveName lip injections, since _he2 thinks $slaves[$i].slaveName should have lips so big $he can barely speak.
 		<<elseif ($slaves[$i].boobs > (125*Math.pow($slaves[$i].butt, 2)))>>
-			$HeadGirl.slaveName gives $slaves[$i].slaveName ass injections, since _he2 loves curves and thinks $slaves[$i].slaveName's butt needs the most work.
+			_S.HeadGirl.slaveName gives $slaves[$i].slaveName ass injections, since _he2 loves curves and thinks $slaves[$i].slaveName's butt needs the most work.
 		<<else>>
-			$HeadGirl.slaveName gives $slaves[$i].slaveName boob injections, since _he2 loves curves and thinks $slaves[$i].slaveName's tits need the most work.
+			_S.HeadGirl.slaveName gives $slaves[$i].slaveName boob injections, since _he2 loves curves and thinks $slaves[$i].slaveName's tits need the most work.
 		<</if>>
 	<</if>>
 <<else>>
 	<<if ($slaves[$i].health.condition < 100)>>
-		$HeadGirl.slaveName gives $slaves[$i].slaveName curatives, since _his2 assistant could be healthier.
+		_S.HeadGirl.slaveName gives $slaves[$i].slaveName curatives, since _his2 assistant could be healthier.
 	<</if>>
 <</if>>
 
 <<if $HGSuiteSurgery != 0>>
 	<<if $arcologies[0].FSBodyPurist == "unset">>
-		$HeadGirl.slaveName sends $assistant.name notes on what surgical modifications _he2 wants for $slaves[$i].slaveName.
+		_S.HeadGirl.slaveName sends $assistant.name notes on what surgical modifications _he2 wants for $slaves[$i].slaveName.
 		<<= rulesAutosurgery($slaves[$i])>>
 	<</if>>
-	<<if $HeadGirl.fetishKnown == 1>>
-		<<if ($HeadGirl.fetish == "sadist") && ($HeadGirl.fetishStrength > 95) && ($seeExtreme == 1) && ($slaves[$i].fetish != "mindbroken")>>
+	<<if _S.HeadGirl.fetishKnown == 1>>
+		<<if (_S.HeadGirl.fetish == "sadist") && (_S.HeadGirl.fetishStrength > 95) && ($seeExtreme == 1) && ($slaves[$i].fetish != "mindbroken")>>
 			<<if ($slaves[$i].health.condition > 40)>>
 				<<if hasAnyNaturalLimbs($slaves[$i]) && ($slaves[$i].devotion < -20)>>
-					$HeadGirl.slaveName decides to extract the ultimate in sadistic pleasure from $slaves[$i].slaveName, and directs the autosurgery to @@.red;amputate $his <<if hasAnyArms($slaves[$i])>>arm<<if hasBothArms($slaves[$i])>>s<</if>> <<if hasAnyLegs($slaves[$i])>>and<</if>><</if>><<if hasAnyLegs($slaves[$i])>> leg<<if hasBothLegs($slaves[$i])>>s<</if>><</if>>.@@ _He2 carefully describes the entire process to the sobbing slave @@.gold;in minute detail@@ before allowing $him to be sedated.
+					_S.HeadGirl.slaveName decides to extract the ultimate in sadistic pleasure from $slaves[$i].slaveName, and directs the autosurgery to @@.red;amputate $his <<if hasAnyArms($slaves[$i])>>arm<<if hasBothArms($slaves[$i])>>s<</if>> <<if hasAnyLegs($slaves[$i])>>and<</if>><</if>><<if hasAnyLegs($slaves[$i])>> leg<<if hasBothLegs($slaves[$i])>>s<</if>><</if>>.@@ _He2 carefully describes the entire process to the sobbing slave @@.gold;in minute detail@@ before allowing $him to be sedated.
 					<<set $slaves[$i].devotion -= 20, $slaves[$i].trust -= 20>>
 					<<run removeLimbs($slaves[$i], "all"), surgeryDamage($slaves[$i], 40)>>
 				<</if>>
 				<<if ($slaves[$i].balls > 0) && ($slaves[$i].devotion <= 50)>>
-					$HeadGirl.slaveName decides to have some once-only sadistic pleasure, and carefully straps $slaves[$i].slaveName into the surgery until $he's completely immobile. $HeadGirl.slaveName situates <<if canSee($slaves[$i])>>a mirror so the terrified $girl can see $his own crotch<<else>>$him so that the terrified $girl can sense what part of $his body is being manipulated even through the anesthetics<</if>>, gets behind $him, and carefully sodomizes $him during the entire process of @@.red;castration.@@ $slaves[$i].slaveName is anesthetized down there and can't feel the brutal anal rape, but $his abuser orgasms repeatedly to $him @@.gold;weeping at the <<if canSee($slaves[$i])>>sight<<else>>muted sensation<</if>> of being gelded and raped at once.@@
+					_S.HeadGirl.slaveName decides to have some once-only sadistic pleasure, and carefully straps $slaves[$i].slaveName into the surgery until $he's completely immobile. _S.HeadGirl.slaveName situates <<if canSee($slaves[$i])>>a mirror so the terrified $girl can see $his own crotch<<else>>$him so that the terrified $girl can sense what part of $his body is being manipulated even through the anesthetics<</if>>, gets behind $him, and carefully sodomizes $him during the entire process of @@.red;castration.@@ $slaves[$i].slaveName is anesthetized down there and can't feel the brutal anal rape, but $his abuser orgasms repeatedly to $him @@.gold;weeping at the <<if canSee($slaves[$i])>>sight<<else>>muted sensation<</if>> of being gelded and raped at once.@@
 					<<set $slaves[$i].devotion -= 20, $slaves[$i].trust -= 20, $slaves[$i].balls = 0>>
 					<<run surgeryDamage($slaves[$i], 20)>>
 				<</if>>
 			<</if>>
 			<<if ($slaves[$i].devotion < -90) && ($slaves[$i].fetish != "mindbroken")>>
-				$HeadGirl.slaveName tires of $slaves[$i].slaveName's protests that $HeadGirl.slaveName is a monster for hurting $him this way and $his complaints that $he deserves better. $HeadGirl.slaveName decides that it'll be just as much fun and a lot less trouble to mistreat $slaves[$i].slaveName once $he's mindbroken, and sends $him in for @@.red;chemical lobotomization.@@
+				_S.HeadGirl.slaveName tires of $slaves[$i].slaveName's protests that _S.HeadGirl.slaveName is a monster for hurting $him this way and $his complaints that $he deserves better. _S.HeadGirl.slaveName decides that it'll be just as much fun and a lot less trouble to mistreat $slaves[$i].slaveName once $he's mindbroken, and sends $him in for @@.red;chemical lobotomization.@@
 				<<set $slaves[$i].fetish = "mindbroken">>
 				<<run surgeryDamage($slaves[$i], 20)>>
 			<</if>>
-		<<elseif ($HeadGirl.fetish == "dom") && ($HeadGirl.fetishStrength > 60) && ($seeExtreme == 1) && ($slaves[$i].fetish != "mindbroken") && ($slaves[$i].devotion <= 50)>>
+		<<elseif (_S.HeadGirl.fetish == "dom") && (_S.HeadGirl.fetishStrength > 60) && ($seeExtreme == 1) && ($slaves[$i].fetish != "mindbroken") && ($slaves[$i].devotion <= 50)>>
 			<<if ($slaves[$i].health.condition > 40)>>
 				<<if ($slaves[$i].heels == 0) && hasAnyNaturalLegs($slaves[$i])>>
-					$HeadGirl.slaveName is not satisfied with $slaves[$i].slaveName's submissiveness, and directs the autosurgery to @@.red;clip $his Achilles tendons.@@ Once the slave is recovered from surgery, $HeadGirl.slaveName removes all shoes from the suite, too, so $slaves[$i].slaveName is forced to crawl like a good little bitch. $slaves[$i].slaveName is @@.gold;angry@@ and @@.gold;frightened.@@
+					_S.HeadGirl.slaveName is not satisfied with $slaves[$i].slaveName's submissiveness, and directs the autosurgery to @@.red;clip $his Achilles tendons.@@ Once the slave is recovered from surgery, _S.HeadGirl.slaveName removes all shoes from the suite, too, so $slaves[$i].slaveName is forced to crawl like a good little bitch. $slaves[$i].slaveName is @@.gold;angry@@ and @@.gold;frightened.@@
 					<<set $slaves[$i].devotion -= 5, $slaves[$i].heels = 1, $slaves[$i].shoes = "none">>
 					<<run surgeryDamage($slaves[$i], 20)>>
 				<</if>>
 				<<if ($slaves[$i].balls > 0)>>
-					$HeadGirl.slaveName decides that it's counterproductive for $slaves[$i].slaveName to be able to get hard, and sends $him in to have $his @@.red;balls removed.@@ $slaves[$i].slaveName is horrified, but $HeadGirl.slaveName uses $his anus with such persistence and mercilessness that the poor gelding doesn't have much time to mourn. $slaves[$i].slaveName is badly @@.gold;frightened@@ by $his new role as nothing but a recipient of anal.
+					_S.HeadGirl.slaveName decides that it's counterproductive for $slaves[$i].slaveName to be able to get hard, and sends $him in to have $his @@.red;balls removed.@@ $slaves[$i].slaveName is horrified, but _S.HeadGirl.slaveName uses $his anus with such persistence and mercilessness that the poor gelding doesn't have much time to mourn. $slaves[$i].slaveName is badly @@.gold;frightened@@ by $his new role as nothing but a recipient of anal.
 					<<set $slaves[$i].trust -= 10, $slaves[$i].balls = 0>>
 					<<run surgeryDamage($slaves[$i], 20)>>
 				<</if>>
 			<</if>>
-		<<elseif $HeadGirl.energy > 95>>
+		<<elseif _S.HeadGirl.energy > 95>>
 			<<if ($slaves[$i].health.condition > 40) && ($slaves[$i].heels == 0) && hasAnyNaturalLegs($slaves[$i]) && ($slaves[$i].devotion <= 50) && ($slaves[$i].fetish != "mindbroken")>>
-				$HeadGirl.slaveName wants a good little bimbo who sticks $his butt out all the time, and directs the autosurgery to @@.red;clip $slaves[$i].slaveName's Achilles tendons.@@ Once the slave is recovered from surgery, $HeadGirl.slaveName presents $slaves[$i].slaveName with a new pair of extra-tall heels to totter around in like a good little slut. $slaves[$i].slaveName is @@.gold;angry@@ and @@.gold;frightened.@@
+				_S.HeadGirl.slaveName wants a good little bimbo who sticks $his butt out all the time, and directs the autosurgery to @@.red;clip $slaves[$i].slaveName's Achilles tendons.@@ Once the slave is recovered from surgery, _S.HeadGirl.slaveName presents $slaves[$i].slaveName with a new pair of extra-tall heels to totter around in like a good little slut. $slaves[$i].slaveName is @@.gold;angry@@ and @@.gold;frightened.@@
 				<<set $slaves[$i].devotion -= 5, $slaves[$i].trust -= 5, $slaves[$i].heels = 1, $slaves[$i].shoes = "heels">>
 				<<run surgeryDamage($slaves[$i], 20)>>
 			<</if>>
-		<<elseif $HeadGirl.fetish == "masochist">>
+		<<elseif _S.HeadGirl.fetish == "masochist">>
 			<<if ($slaves[$i].health.condition > 40) && ($slaves[$i].heightImplant == 0) && ($slaves[$i].height < 185) && hasAllLimbs($slaves[$i])>>
-				$HeadGirl.slaveName has a subconscious need to be hurt by the biggest, strongest $girl possible, and directs the autosurgery to extend $slaves[$i].slaveName's arm and leg bones to make $him a little @@.lime;taller.@@
+				_S.HeadGirl.slaveName has a subconscious need to be hurt by the biggest, strongest $girl possible, and directs the autosurgery to extend $slaves[$i].slaveName's arm and leg bones to make $him a little @@.lime;taller.@@
 				<<set $slaves[$i].heightImplant = 1, $slaves[$i].height += 10>>
 				<<run surgeryDamage($slaves[$i], 20)>>
 			<</if>>
-		<<elseif $HeadGirl.fetish == "submissive">>
+		<<elseif _S.HeadGirl.fetish == "submissive">>
 			<<if ($slaves[$i].health.condition > 40) && ($slaves[$i].heightImplant == 0) && ($slaves[$i].height < 185) && hasAllLimbs($slaves[$i])>>
-				$HeadGirl.slaveName wants to be topped by the biggest, strongest $girl possible, and directs the autosurgery to extend $slaves[$i].slaveName's arm and leg bones to make $him a little @@.lime;taller.@@
+				_S.HeadGirl.slaveName wants to be topped by the biggest, strongest $girl possible, and directs the autosurgery to extend $slaves[$i].slaveName's arm and leg bones to make $him a little @@.lime;taller.@@
 				<<set $slaves[$i].heightImplant = 1, $slaves[$i].height += 10>>
 				<<run surgeryDamage($slaves[$i], 20)>>
 			<</if>>
@@ -1008,29 +1007,28 @@
 
 <<if $HGSuiteEquality != 0>>
 	<<if $slaves[$i].devotion > 50>>
-		$HeadGirl.slaveName and $slaves[$i].slaveName @@.hotpink;really appreciate@@ the equal, alternating Head Girl system, and @@.yellow;switch places at the end of the week.@@
-		<<set $HeadGirl.devotion += 1, $slaves[$i].devotion += 1>>
+		_S.HeadGirl.slaveName and $slaves[$i].slaveName @@.hotpink;really appreciate@@ the equal, alternating Head Girl system, and @@.yellow;switch places at the end of the week.@@
+		<<set _S.HeadGirl.devotion += 1, $slaves[$i].devotion += 1>>
 	<<else>>
-		$slaves[$i].slaveName is not a decent Head Girl candidate, so $HeadGirl.slaveName keeps the position for now.
+		$slaves[$i].slaveName is not a decent Head Girl candidate, so _S.HeadGirl.slaveName keeps the position for now.
 	<</if>>
 <<else>>
 	<<set _hgEnjoyment = $HGSuiteSurgery + $HGSuiteDrugs + $HGSuiteHormones>>
 	<<if _hgEnjoyment > 2>>
 		Your Head Girl @@.hotpink;really enjoys@@ being given total freedom to customize _his2 very own bitch.
-		<<set $HeadGirl.devotion += 2>>
+		<<set _S.HeadGirl.devotion += 2>>
 	<<elseif _hgEnjoyment == 2>>
 		Your Head Girl @@.hotpink;enjoys@@ being given freedom to customize _his2 very own $girl.
-		<<set $HeadGirl.devotion += 1>>
+		<<set _S.HeadGirl.devotion += 1>>
 	<<elseif _hgEnjoyment == 1>>
 		Your Head Girl @@.hotpink;appreciates@@ being given some freedom to customize _his2 own servant.
-		<<set $HeadGirl.devotion += 1>>
+		<<set _S.HeadGirl.devotion += 1>>
 	<</if>>
 <</if>>
 
-<<if ($HeadGirl.relationshipTarget == $slaves[$i].ID)>>
-	<<set ($HeadGirl.relationship = $slaves[$i].relationship)>>
+<<if (_S.HeadGirl.relationshipTarget == $slaves[$i].ID)>>
+	<<set (_S.HeadGirl.relationship = $slaves[$i].relationship)>>
 <</if>>
-<<set $slaves[_iTemp] = $HeadGirl>>
 
 <<if $showEWD == 0>>
 	<<silently>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index ef6befa207f6033b25e16362784657e726cc9734..786b96407cff77a88a32b706ecac6a4d8c46c715 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -2890,9 +2890,9 @@
 						<</if>>
 					<<case "dom">>
 						<<if $slaves[$i].sexualFlaw != "abusive">>
-							<<if $HeadGirl != 0>>
+							<<if $HeadGirlID != 0>>
 								<<if $HGSeverity >= 0>>
-									<<if $slaves[$i].ID == $HeadGirl.ID>>
+									<<if $slaves[$i].ID == $HeadGirlID>>
 										As Head Girl, $he's plentifully provided with misbehaving slaves to dominate sexually. $He becomes more and more eager until $he's actively @@.yellow;sexually abusive, getting off on the thrill of forcing $himself on other slaves.@@
 										<<set $slaves[$i].sexualFlaw = "abusive">>
 										<<set $slaves[$i].fetishStrength = 100>>
@@ -4501,31 +4501,31 @@
 			<<set $activeSlave = $slaves[$i]>><<if $slaves[$i].mpreg == 1>><<= VCheck.Anal(10)>><<else>><<= VCheck.Vaginal(10)>><</if>><<set $slaves[$i] = $activeSlave>>
 
 		<<elseif (($slaves[$i].vagina == 0) || (($slaves[$i].anus == 0) && ($slaves[$i].mpreg > 0))) && !_studIgnoresRules>>
-		<<elseif ($HeadGirl != 0) && ($HeadGirl.dick > 0) && ($slaves[$i].ID != $HeadGirl.ID) && ($universalRulesImpregnation == "HG") && canPenetrate($HeadGirl)>>
-			<<setLocalPronouns $HeadGirl 2>>
+		<<elseif ($HeadGirlID != 0) && (_S.HeadGirl.dick > 0) && ($slaves[$i].ID != $HeadGirlID) && ($universalRulesImpregnation == "HG") && canPenetrate(_S.HeadGirl)>>
+			<<setLocalPronouns _S.HeadGirl 2>>
 			<<if $slaves[$i].HGExclude == 1>>
-				It's $HeadGirl.slaveName's responsibility to impregnate fertile slaves, but your Head Girl is forbidden from impregnating $slaves[$i].slaveName.
+				It's _S.HeadGirl.slaveName's responsibility to impregnate fertile slaves, but your Head Girl is forbidden from impregnating $slaves[$i].slaveName.
 			<<elseif $universalHGImpregnateMasterSuiteToggle == 1 && ["serve in the master suite", "be your Concubine"].includes($slaves[$i].assignment)>>
-				It's $HeadGirl.slaveName's responsibility to impregnate fertile slaves, but $slaves[$i].slaveName is off-limits.
+				It's _S.HeadGirl.slaveName's responsibility to impregnate fertile slaves, but $slaves[$i].slaveName is off-limits.
 			<<elseif $HGCum == 0>>
-				It's $HeadGirl.slaveName's responsibility to impregnate fertile slaves, but your Head Girl can only fuck a limited number of slaves enough to ensure impregnation each week.
-			<<elseif !canBreed($slaves[$i], $HeadGirl)>>
-				It's $HeadGirl.slaveName's responsibility to impregnate fertile slaves, but $HeadGirl.slaveName's sperm is unable to fertilize $slaves[$i].slaveName's ova, so _he2 doesn't waste _his2 seed trying.
+				It's _S.HeadGirl.slaveName's responsibility to impregnate fertile slaves, but your Head Girl can only fuck a limited number of slaves enough to ensure impregnation each week.
+			<<elseif !canBreed($slaves[$i], _S.HeadGirl)>>
+				It's _S.HeadGirl.slaveName's responsibility to impregnate fertile slaves, but _S.HeadGirl.slaveName's sperm is unable to fertilize $slaves[$i].slaveName's ova, so _he2 doesn't waste _his2 seed trying.
 			<<else>>
-				It's $HeadGirl.slaveName's responsibility to get $him pregnant, a task your
-				<<if ($HeadGirl.fetish == "pregnancy") && ($HeadGirl.fetishKnown == 1) && ($HeadGirl.fetishStrength > 60)>>
+				It's _S.HeadGirl.slaveName's responsibility to get $him pregnant, a task your
+				<<if (_S.HeadGirl.fetish == "pregnancy") && (_S.HeadGirl.fetishKnown == 1) && (_S.HeadGirl.fetishStrength > 60)>>
 					pregnancy fetishist Head Girl is @@.hotpink;extremely pleased@@ to take on.
-					<<set $HeadGirl.devotion += 2>>
-					<<if ($HeadGirl.fetishStrength <= 95)>>
+					<<set _S.HeadGirl.devotion += 2>>
+					<<if (_S.HeadGirl.fetishStrength <= 95)>>
 						The opportunity @@.lightcoral;strengthens _his2 pregnancy fetish@@ by indulgence.
-						<<set $HeadGirl.fetishStrength += 4>>
+						<<set _S.HeadGirl.fetishStrength += 4>>
 					<</if>>
-				<<elseif $HeadGirl.career == "a breeding bull">>
+				<<elseif _S.HeadGirl.career == "a breeding bull">>
 					Head Girl feels @@.hotpink;_he2 was meant for.@@
-					<<set $HeadGirl.devotion += 1>>
-				<<elseif ($HeadGirl.attrXX > 65) && ($HeadGirl.attrKnown == 1)>>
+					<<set _S.HeadGirl.devotion += 1>>
+				<<elseif (_S.HeadGirl.attrXX > 65) && (_S.HeadGirl.attrKnown == 1)>>
 					<<if $slaves[$i].mpreg == 1>>ass<<else>>pussy<</if>>-hungry Head Girl is @@.hotpink;happy@@ to take on.
-					<<set $HeadGirl.devotion += 1>>
+					<<set _S.HeadGirl.devotion += 1>>
 				<<else>>
 					Head Girl approaches dutifully.
 				<</if>>
@@ -4533,11 +4533,11 @@
 					<<if $slaves[$i].career == "a dairy cow" && ($slaves[$i].devotion <= 20)>>
 						$slaves[$i].slaveName feels a need to be bred by the Head Girl, and submits $himself to $his superior's virile cock until @@.lime;conception@@ is verified.
 					<<elseif ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
-						<<if (($HeadGirl.fetish == "sadist") || ($HeadGirl.fetish == "dom")) && ($HeadGirl.fetishKnown == 1) && ($HeadGirl.fetishStrength > 60)>>
-							_His2 interest is piqued, however, when $slaves[$i].slaveName shows signs of resistance. $HeadGirl.slaveName @@.hotpink;enthusiastically@@ @@.mediumorchid;rapes the poor $girl@@ pregnant, ejaculating inside _his2 victim more often than is really necessary for @@.lime;conception.@@
-							<<set $HeadGirl.devotion += 2, $slaves[$i].devotion -= 5>>
+						<<if ((_S.HeadGirl.fetish == "sadist") || (_S.HeadGirl.fetish == "dom")) && (_S.HeadGirl.fetishKnown == 1) && (_S.HeadGirl.fetishStrength > 60)>>
+							_His2 interest is piqued, however, when $slaves[$i].slaveName shows signs of resistance. _S.HeadGirl.slaveName @@.hotpink;enthusiastically@@ @@.mediumorchid;rapes the poor $girl@@ pregnant, ejaculating inside _his2 victim more often than is really necessary for @@.lime;conception.@@
+							<<set _S.HeadGirl.devotion += 2, $slaves[$i].devotion -= 5>>
 						<<else>>
-							$slaves[$i].slaveName tries to resist _him2, so $HeadGirl.slaveName is forced to @@.mediumorchid;rape the poor $girl@@ pregnant, regularly ejaculating inside $him until @@.lime;conception@@ is confirmed.
+							$slaves[$i].slaveName tries to resist _him2, so _S.HeadGirl.slaveName is forced to @@.mediumorchid;rape the poor $girl@@ pregnant, regularly ejaculating inside $him until @@.lime;conception@@ is confirmed.
 							<<set $slaves[$i].devotion -= 4>>
 						<</if>>
 						<<if ($slaves[$i].sexualFlaw == "none")>>
@@ -4549,11 +4549,11 @@
 							<</if>>
 						<</if>>
 					<<elseif ($slaves[$i].devotion <= 20)>>
-						<<if (($HeadGirl.fetish == "sadist") || ($HeadGirl.fetish == "dom")) && ($HeadGirl.fetishKnown == 1) && ($HeadGirl.fetishStrength > 60)>>
-							_His2 interest is piqued, however, when it becomes clear that $slaves[$i].slaveName, though fearfully obedient, is not happy with being bred. $HeadGirl.slaveName @@.hotpink;enthusiastically@@ ensures that _his2 victim @@.mediumorchid;does not enjoy@@ a week of being @@.lime;raped pregnant.@@
-							<<set $HeadGirl.devotion += 2, $slaves[$i].devotion -= 3>>
+						<<if ((_S.HeadGirl.fetish == "sadist") || (_S.HeadGirl.fetish == "dom")) && (_S.HeadGirl.fetishKnown == 1) && (_S.HeadGirl.fetishStrength > 60)>>
+							_His2 interest is piqued, however, when it becomes clear that $slaves[$i].slaveName, though fearfully obedient, is not happy with being bred. _S.HeadGirl.slaveName @@.hotpink;enthusiastically@@ ensures that _his2 victim @@.mediumorchid;does not enjoy@@ a week of being @@.lime;raped pregnant.@@
+							<<set _S.HeadGirl.devotion += 2, $slaves[$i].devotion -= 3>>
 						<<else>>
-							$slaves[$i].slaveName, though fearfully obedient, is not happy with being bred, but $HeadGirl.slaveName @@.mediumorchid;rapes the poor $girl@@ pregnant anyway, regularly ejaculating inside $him until @@.lime;conception@@ is confirmed.
+							$slaves[$i].slaveName, though fearfully obedient, is not happy with being bred, but _S.HeadGirl.slaveName @@.mediumorchid;rapes the poor $girl@@ pregnant anyway, regularly ejaculating inside $him until @@.lime;conception@@ is confirmed.
 							<<set $slaves[$i].devotion -= 2>>
 						<</if>>
 						<<if ($slaves[$i].sexualFlaw == "none")>>
@@ -4591,13 +4591,13 @@
 						<</if>>
 					<</if>>
 				<</if>> /* closes not Fuckdoll not mindbroken */
-				<<set $slaves[$i].preg = 1, $slaves[$i].pregSource = $HeadGirl.ID, $slaves[$i].pregWeek = 1, $slaves[$i].pregKnown = 1, $HGCum -= 1, $HeadGirl.counter.penetrative += 10, $penetrativeTotal += 10>>
+				<<set $slaves[$i].preg = 1, $slaves[$i].pregSource = $HeadGirlID, $slaves[$i].pregWeek = 1, $slaves[$i].pregKnown = 1, $HGCum -= 1, _S.HeadGirl.counter.penetrative += 10, $penetrativeTotal += 10>>
 				<<set $slaves[$i].pregType = setPregType($slaves[$i])>>
-				<<set WombImpregnate($slaves[$i], $slaves[$i].pregType, $HeadGirl.ID, 1)>>
+				<<set WombImpregnate($slaves[$i], $slaves[$i].pregType, $HeadGirlID, 1)>>
 				<<set $activeSlave = $slaves[$i]>><<if $slaves[$i].mpreg == 1>><<= VCheck.Anal(10)>><<else>><<= VCheck.Vaginal(10)>><</if>><<set $slaves[$i] = $activeSlave>>
-				<<set _saLTE = $slaveIndices[$HeadGirl.ID]>>
+				<<set _saLTE = $slaveIndices[$HeadGirlID]>>
 				<<if def _saLTE>>
-					<<set $slaves[_saLTE] = $HeadGirl>>
+					<<set $slaves[_saLTE] = _S.HeadGirl>>
 				<</if>>
 			<</if>> /* closes HG impregnation */
 		<<elseif _Stud && $slaves[$i].ID != $StudID && $universalRulesImpregnation == "Stud">>
diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw
index 665fa092ab1b923dde5a19c3d10a0bc66b2b39af..1bd1f8859de4d19d2b6ce6756ee76bc3c34608bf 100644
--- a/src/uncategorized/saRecruitGirls.tw
+++ b/src/uncategorized/saRecruitGirls.tw
@@ -396,15 +396,15 @@
 	<</if>>
 
 	<<if $recruiterTarget == "desperate whores">>
-		<<if ($Recruiter.counter.anal + $Recruiter.counter.oral + $Recruiter.counter.vaginal) > 200>>
+		<<if (_S.Recruiter.counter.anal + _S.Recruiter.counter.oral + _S.Recruiter.counter.vaginal) > 200>>
 			As a veteran slut, $he speaks from experience when $he says that being your slave whore will be safer and healthier than streetwalking.
 			<<set $recruiterProgress += 1>>
 		<<else>>
 			$He does $his best to convince them that being your slave whore will be safer and healthier than streetwalking.
 		<</if>>
 	<<elseif $recruiterTarget == "expectant mothers">> /* now you can ginger too */
-		<<if (($Recruiter.belly >= 1500 || setup.fakeBellies.includes(_bellyAccessory) && $Recruiter.weight < 130) || $Recruiter.belly >= 100000)>>
-			<<if $Recruiter.preg > $Recruiter.pregData.normalBirth/8>>
+		<<if ((_S.Recruiter.belly >= 1500 || setup.fakeBellies.includes(_bellyAccessory) && _S.Recruiter.weight < 130) || _S.Recruiter.belly >= 100000)>>
+			<<if _S.Recruiter.preg > _S.Recruiter.pregData.normalBirth/8>>
 				Since $he's visibly pregnant $himself, $he speaks with authority when $he says that Free Cities medicine can keep them and their pregnancies safe and healthy.
 			<<else>>
 				Since $he looks visibly pregnant, $he's more convincing when $he says that Free Cities medicine can keep them and their pregnancies safe and healthy.
@@ -414,21 +414,21 @@
 			$He does $his best to convince them that Free Cities medicine can keep them and their pregnancies safe and healthy.
 		<</if>>
 	<<elseif $recruiterTarget == "young migrants">>
-		<<if ($Recruiter.health.condition >= 80) && ($Recruiter.face > 10)>>
+		<<if (_S.Recruiter.health.condition >= 80) && (_S.Recruiter.face > 10)>>
 			$His lovely face and shining health go a long way to convince them that being your slave promises a better life.
 			<<set $recruiterProgress += 1>>
 		<<else>>
 			$He does $his best to convince them that being your slave promises a better life.
 		<</if>>
 	<<elseif $recruiterTarget == "dissolute sissies">>
-		<<if ($Recruiter.dick > 1) && canAchieveErection($Recruiter) && !($Recruiter.chastityPenis)>>
+		<<if (_S.Recruiter.dick > 1) && canAchieveErection(_S.Recruiter) && !(_S.Recruiter.chastityPenis)>>
 			$He giggles and shows off $his erection, making it easy to convince them that your slaves with dicks enjoy a sexually satisfying life.
 			<<set $recruiterProgress += 1>>
 		<<else>>
 			$He does $his best to convince them that your slaves with dicks enjoy a sexually satisfying life.
 		<</if>>
 	<<elseif $recruiterTarget == "reassignment candidates">>
-		<<if (($Recruiter.balls > 0 && $Recruiter.ovaries == 0 && $Recruiter.genes == "XX") || ($Recruiter.ovaries == 1 && $Recruiter.scrotum == 0 && $Recruiter.genes == "XY")) && ($Recruiter.face > 10)>>
+		<<if ((_S.Recruiter.balls > 0 && _S.Recruiter.ovaries == 0 && _S.Recruiter.genes == "XX") || (_S.Recruiter.ovaries == 1 && _S.Recruiter.scrotum == 0 && _S.Recruiter.genes == "XY")) && (_S.Recruiter.face > 10)>>
 			$He shows off $his lovely face and describes $his unusual biological situation under your care, convincing them that you'll turn them into happy little slave girls.
 			<<set $recruiterProgress += 1>>
 		<<else>>
@@ -766,8 +766,8 @@
 			<<set _seed += 6, _FSmatch++, $arcologies[0].FSArabianRevivalist += 0.02*$FSSingleSlaveRep>>
 		<</if>>
 	<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
-		<<if $slaves[$i].intelligence+$slaves[$i].intelligenceImplant > 15 && $HeadGirl != 0 && $Bodyguard != 0 && $HGSuite > 0>>
-			<<set _seed += (Math.min((($HeadGirl.skill.entertainment/30)+($HeadGirl.intelligenceImplant/10)+$HeadGirl.prestige), 4)+Math.min($Bodyguard.prestige, 1)), _FSdefend++, $arcologies[0].FSChineseRevivalist += 0.03*$FSSingleSlaveRep>>
+		<<if $slaves[$i].intelligence+$slaves[$i].intelligenceImplant > 15 && $HeadGirlID != 0 && $BodyguardID != 0 && $HGSuite > 0>>
+			<<set _seed += (Math.min(((_S.HeadGirl.skill.entertainment/30)+(_S.HeadGirl.intelligenceImplant/10)+_S.HeadGirl.prestige), 4)+Math.min(_S.Bodyguard.prestige, 1)), _FSdefend++, $arcologies[0].FSChineseRevivalist += 0.03*$FSSingleSlaveRep>>
 		<</if>>
 	<</if>>
 	/* and then there's Aztec revivalist, completely forgotten */
@@ -1169,19 +1169,19 @@
 				$He makes a short video essay about your elaborate master suite, but there's no sex going on while $he films.
 			<</if>>
 		<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
-			<<if $slaves[$i].intelligence+$slaves[$i].intelligenceImplant > 50 && $HeadGirl != 0 && $Bodyguard != 0 && $HGSuite > 0>>
-				<<if (($HeadGirl.skill.entertainment/30)+($HeadGirl.intelligenceImplant/10)+$HeadGirl.prestige) >= 4>>
-					<<if $Bodyguard.prestige >= 1>>
-						$He deferentially chronicles the administration of your Imperial household by Head Girl $HeadGirl.slaveName and Bodyguard $Bodyguard.slaveName. The piece explains points of Chinese Revivalist protocol where new slaves or visitors to the Forbidden Penthouse might inadvertently stumble.
+			<<if $slaves[$i].intelligence+$slaves[$i].intelligenceImplant > 50 && $HeadGirlID != 0 && $BodyguardID != 0 && $HGSuite > 0>>
+				<<if ((_S.HeadGirl.skill.entertainment/30)+(_S.HeadGirl.intelligenceImplant/10)+_S.HeadGirl.prestige) >= 4>>
+					<<if _S.Bodyguard.prestige >= 1>>
+						$He deferentially chronicles the administration of your Imperial household by Head Girl _S.HeadGirl.slaveName and Bodyguard _S.Bodyguard.slaveName. The piece explains points of Chinese Revivalist protocol where new slaves or visitors to the Forbidden Penthouse might inadvertently stumble.
 					<<else>>
-						$He interviews your Head Girl about points of protocol and household administration for broadcast to the arcology. Your Bodyguard, $Bodyguard.slaveName, is not accustomed to fame and prefers to remain off-screen.
+						$He interviews your Head Girl about points of protocol and household administration for broadcast to the arcology. Your Bodyguard, _S.Bodyguard.slaveName, is not accustomed to fame and prefers to remain off-screen.
 					<</if>>
-				<<elseif $HeadGirl.intelligenceImplant < 15>>
+				<<elseif _S.HeadGirl.intelligenceImplant < 15>>
 					$He edits a documentary broadcast about the Revivalist protocols that drive your household, and in the process uncovers small but annoying lapses due to the Head Girl's lack of formal education.
 				<<else>>
-					$He broadcasts a documentary about life inside your Imperial Chinese household, but the Head Girl's segment comes out flat: $HeadGirl.slaveName needs more experience working in front of a camera.
+					$He broadcasts a documentary about life inside your Imperial Chinese household, but the Head Girl's segment comes out flat: _S.HeadGirl.slaveName needs more experience working in front of a camera.
 				<</if>>
-			<<elseif $HeadGirl == 0 || $Bodyguard == 0>>
+			<<elseif $HeadGirlID == 0 || $BodyguardID == 0>>
 				$He can't document the benefits of your Imperial Chinese administration because of unfilled posts in its leadership.
 			<<elseif $slaves[$i].intelligence+$slaves[$i].intelligenceImplant <= 15>>
 				Your household is a well-run model for the arcology at large, but your recruiter doesn't completely understand its intricate Revivalist protocols and can't explain it for the masses.
diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw
index 455f0ed014784845f43423d1ec317bb6b5af5b15..05ab346274d78453202ebdd0c55a8acfac15f202 100644
--- a/src/uncategorized/saRelationships.tw
+++ b/src/uncategorized/saRelationships.tw
@@ -75,7 +75,7 @@
 				<<set _SlaveJ = $slaves[_j]>>
 				<<setLocalPronouns _SlaveJ 2>>
 				<<if (_SlaveJ.ID != _SlaveI.ID) && (_SlaveJ.relationship == 0) && (_SlaveI.rivalryTarget != _SlaveJ.ID) && (_SlaveJ.assignment != "stay confined") && (_SlaveJ.fetish != "mindbroken")>>
-				<<if (_SlaveJ.ID == $Madam.ID) && (_SlaveI.assignment == "work in the brothel")>>
+				<<if (_SlaveJ.ID == _S.Madam.ID) && (_SlaveI.assignment == "work in the brothel")>>
 					<<if _SlaveJ.rules.relationship != "restrictive">>
 						_SlaveI.slaveName manages to ingratiate $himself with the Madam, _SlaveJ.slaveName. The two slaves have @@.lightgreen;struck up a friendship.@@
 						<<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID>>
@@ -86,7 +86,7 @@
 							<<set _SlaveI.trust -= 4>>
 						<</if>>
 					<</if>>
-				<<elseif (_SlaveJ.ID == $djID) && (_SlaveI.assignment == "serve in the club")>>
+				<<elseif (_SlaveJ.ID == $djID) && (_SlaveI.assignment == Job.CLUB)>>
 					<<if _SlaveJ.rules.relationship != "restrictive">>
 						_SlaveI.slaveName manages to ingratiate $himself with the DJ, _SlaveJ.slaveName. The two slaves have @@.lightgreen;struck up a friendship.@@
 						<<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID>>
@@ -97,7 +97,7 @@
 							<<set _SlaveI.trust -= 4>>
 						<</if>>
 					<</if>>
-				<<elseif (_SlaveJ.ID == $Milkmaid.ID) && (_SlaveI.assignment == "work in the dairy")>>
+				<<elseif (_SlaveJ.ID == $MilkmaidID) && (_SlaveI.assignment == "work in the dairy")>>
 					<<if _SlaveJ.rules.relationship != "restrictive">>
 						_SlaveI.slaveName manages to ingratiate $himself with the Milkmaid, _SlaveJ.slaveName. The two slaves have @@.lightgreen;struck up a friendship.@@
 						<<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID>>
@@ -108,7 +108,7 @@
 							<<set _SlaveI.trust -= 4>>
 						<</if>>
 					<</if>>
-				<<elseif (_SlaveJ.ID == $Farmer.ID) && (_SlaveI.assignment == "work as a farmhand")>>
+				<<elseif (_SlaveJ.ID == $FarmerID) && (_SlaveI.assignment == "work as a farmhand")>>
 					<<if _SlaveJ.rules.relationship != "restrictive">>
 						_SlaveI.slaveName manages to ingratiate $himself with the Farmer, _SlaveJ.slaveName. The two slaves have @@.lightgreen;struck up a friendship.@@
 						<<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID>>
@@ -163,7 +163,7 @@
 							<<set _SlaveI.trust -= 5>>
 						<</if>>
 					<</if>>
-				<<elseif (_SlaveJ.ID == $Concubine.ID) && (_SlaveI.assignment == "serve in the master suite")>>
+				<<elseif (_SlaveJ.ID == $ConcubineID) && (_SlaveI.assignment == "serve in the master suite")>>
 					<<if _SlaveJ.rules.relationship != "restrictive">>
 						_SlaveI.slaveName becomes especially close to the Concubine, _SlaveJ.slaveName. The two slaves have @@.lightgreen;struck up a friendship.@@
 						<<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID>>
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index e78749e593765d34c85f894bb9d1522296ce685d..be87a0c0cecd73d8132238b7632c794a20dff4f5 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -4721,14 +4721,14 @@
 					<<if ($universalRulesConsent == 0)>>
 						<<if ($slaves[$i].devotion <= 20)>>
 							<<if ($slaves[$i].trust > -10)>>
-								<<if _L.dairy > 2 || $Milkmaid != 0>>
+								<<if _L.dairy > 2 || $MilkmaidID != 0>>
 									Under the rules, $he finds $himself constantly molested by other slaves, and lives $his life constantly @@.gold;afraid.@@
 								<<else>>
 									Under the rules, $he is free game for other slaves to molest, and lives $his life constantly @@.gold;afraid@@ of the day you assign more cows to $dairyName.
 								<</if>>
 								<<set $slaves[$i].trust -= 2>>
 							<<else>>
-								<<if _L.dairy > 2 || $Milkmaid != 0>>
+								<<if _L.dairy > 2 || $MilkmaidID != 0>>
 									Under the rules, $he finds $himself constantly molested by other slaves, but $he's already in such constant terror it doesn't seriously affect $him.
 								<<else>>
 									Under the rules, $he will someday find $himself constantly molested by other slaves, but $he's already in such constant terror it that it doesn't cross $his mind.
@@ -4762,7 +4762,7 @@
 						<</if>>
 					<<else>>
 						<<if ($slaves[$i].devotion <= 20) && ($slaves[$i].devotion >= -20)>>
-							<<if _L.dairy > 2 || $Milkmaid != 0>>
+							<<if _L.dairy > 2 || $MilkmaidID != 0>>
 								Since $he's low in the slave hierarchy, @@.mediumaquamarine;$he knows@@ that the rule that slaves must get consent before having sex with $him are all that protect $him from abuse.
 							<<else>>
 								Since $he's low in the slave hierarchy, @@.mediumaquamarine;$he knows@@ that the rule that slaves must get consent before having sex with $him are all that protect $him from abuse. Well, that and the fact $dairyName is rather empty.
@@ -5294,14 +5294,14 @@
 			<<if ($universalRulesConsent == 0)>>
 				<<if ($slaves[$i].devotion <= 20)>>
 					<<if ($slaves[$i].trust > -10)>>
-						<<if _L.farmyard > 2 || $Farmer != 0>>
+						<<if _L.farmyard > 2 || $FarmerID != 0>>
 							Under the rules, $he finds $himself constantly molested by other slaves, and lives $his life constantly @@.gold;afraid.@@
 						<<else>>
 							Under the rules, $he is free game for other slaves to molest, and lives $his life constantly @@.gold;afraid@@ of the day you assign more cows to $farmyardName.
 						<</if>>
 						<<set $slaves[$i].trust -= 2>>
 					<<else>>
-						<<if _L.farmyard > 2 || $Farmer != 0>>
+						<<if _L.farmyard > 2 || $FarmerID != 0>>
 							Under the rules, $he finds $himself constantly molested by other slaves, but $he's already in such constant terror it doesn't seriously affect $him.
 						<<else>>
 							Under the rules, $he will someday find $himself constantly molested by other slaves, but $he's already in such constant terror it that it doesn't cross $his mind.
@@ -5335,7 +5335,7 @@
 				<</if>>
 			<<else>>
 				<<if ($slaves[$i].devotion <= 20) && ($slaves[$i].devotion >= -20)>>
-					<<if _L.farmyard > 2 || $Farmer != 0>>
+					<<if _L.farmyard > 2 || $FarmerID != 0>>
 						Since $he's low in the slave hierarchy, @@.mediumaquamarine;$he knows@@ that the rule that slaves must get consent before having sex with $him are all that protect $him from abuse.
 					<<else>>
 						Since $he's low in the slave hierarchy, @@.mediumaquamarine;$he knows@@ that the rule that slaves must get consent before having sex with $him are all that protect $him from abuse. Well, that and the fact $farmyardName is rather empty.
@@ -5713,14 +5713,14 @@
 			<</if>>
 		<<case "live with your Head Girl">>
 			<<if $slaves[$i].devotion < -50>>
-				is so unhappy that $he has little interest in getting off, not that $HeadGirl.slaveName cares.
+				is so unhappy that $he has little interest in getting off, not that _S.HeadGirl.slaveName cares.
 				<<set $slaves[$i].need = 0>>
 			<<elseif $slaves[$i].energy <= 20>>
-				is frigid and has little interest in getting off, though it doesn't stop $HeadGirl.slaveName.
+				is frigid and has little interest in getting off, though it doesn't stop _S.HeadGirl.slaveName.
 				<<set $slaves[$i].need = 0>>
 			<<elseif $slaves[$i].need < $slaves[$i].needCap*0.5>>
 				<<if ($slaves[$i].devotion <= 20)>>
-					gets off with $HeadGirl.slaveName despite $his reluctance, @@.hotpink;habituating $him to sexual slavery.@@
+					gets off with _S.HeadGirl.slaveName despite $his reluctance, @@.hotpink;habituating $him to sexual slavery.@@
 					<<set $slaves[$i].devotion += 1>>
 					<<if ($slaves[$i].trust >= -20) && ($slaves[$i].devotion <= 20)>>
 						$He hates $himself for climaxing, and knows the mild aphrodisiacs in the food are forcing $his arousal, @@.gold;frightening $him.@@
@@ -5728,14 +5728,14 @@
 					<</if>>
 					<<set $slaves[$i].need -= 20>>
 				<<elseif (_release.masturbation === 0)>>
-					gets off with $HeadGirl.slaveName, so being forbidden to masturbate doesn't affect $him seriously.
+					gets off with _S.HeadGirl.slaveName, so being forbidden to masturbate doesn't affect $him seriously.
 					<<set $slaves[$i].need -= 20>>
 				<<else>>
-					gets off with $HeadGirl.slaveName, so $he doesn't feel the need for release that often.
+					gets off with _S.HeadGirl.slaveName, so $he doesn't feel the need for release that often.
 					<<set $slaves[$i].need -= 20>>
 				<</if>>
 			<<else>>
-				either gets off with $HeadGirl.slaveName or gets to put up with sexual frustration.
+				either gets off with _S.HeadGirl.slaveName or gets to put up with sexual frustration.
 			<</if>>
 
 			<<if ($slaves[$i].devotion <= 20)>>
@@ -5752,9 +5752,9 @@
 			<</if>>
 
 			<<if ($slaves[$i].devotion <= 20)>>
-				$He shares a room, and sometimes bed, with $HeadGirl.slaveName. Your Head Girl keeps it from going to $his head, however.
+				$He shares a room, and sometimes bed, with _S.HeadGirl.slaveName. Your Head Girl keeps it from going to $his head, however.
 			<<else>>
-				$He loves sharing a room, and sometimes bed, with $HeadGirl.slaveName.
+				$He loves sharing a room, and sometimes bed, with _S.HeadGirl.slaveName.
 			<</if>>
 
 			<<if ($slaves[$i].attrKnown == 0)>>
@@ -5766,7 +5766,7 @@
 			<</if>>
 
 			<<if $slaves[$i].rules.lactation == "induce">>
-				<<if $HeadGirl.fetish == "boobs">>
+				<<if _S.HeadGirl.fetish == "boobs">>
 					Your Head Girl enjoys playing with $his tits, making it an inevitability that $he'll begin lactating.
 				<<else>>
 					$He carries out $his daily tasks with a pair of automatic breast pumps attached to $his chest to help bring in $his lactation.
@@ -5775,7 +5775,7 @@
 				<<= induceLactation($slaves[$i])>>
 				<<if $slaves[$i].lactation == 1>><<set $slaves[$i].rules.lactation = "maintain">><</if>>
 			<<elseif $slaves[$i].rules.lactation == "maintain">>
-				<<if $HeadGirl.fetish == "boobs">>
+				<<if _S.HeadGirl.fetish == "boobs">>
 					Your Head Girl enjoys playing with $his tits, thoroughly draining $him of milk and encouraging $his continued lactation.
 				<<else>>
 					$He utilizes $his lactation as your Head Girl demands, and if it should not be needed, spends the evenings with a pair of automatic breast pumps.
@@ -5784,7 +5784,7 @@
 			<</if>>
 
 			<<if $slaves[$i].devotion > 50>>
-				$He does $his best for $HeadGirl.slaveName, and thus you, so $he frequently deserves a reward and never needs to be punished.
+				$He does $his best for _S.HeadGirl.slaveName, and thus you, so $he frequently deserves a reward and never needs to be punished.
 				<<set _punishments = 0>>
 				<<set _rewards = 3>>
 			<<elseif $slaves[$i].devotion > 20>>
@@ -5807,7 +5807,7 @@
 					<<set _punishments = 1>>
 					<<set _rewards = 0>>
 				<<else>>
-					$He hates you and $HeadGirl.slaveName too much to obey, so $he needs constant punishment.
+					$He hates you and _S.HeadGirl.slaveName too much to obey, so $he needs constant punishment.
 					<<set _punishments = 3>>
 					<<set _rewards = 0>>
 				<</if>>
@@ -5871,7 +5871,7 @@
 					<<run healthDamage($slaves[$i], _punishments)>>
 					<<set $slaves[$i].trust -= 2*_punishments>>
 				<<case "chastity">>
-					When $he disobeys, $HeadGirl.slaveName @@.gold;ruins $his next orgasm,@@ @@.red;reducing $his libido@@ but breaking $him to @@.hotpink;sexual obedience.@@
+					When $he disobeys, _S.HeadGirl.slaveName @@.gold;ruins $his next orgasm,@@ @@.red;reducing $his libido@@ but breaking $him to @@.hotpink;sexual obedience.@@
 					<<if $slaves[$i].energy > 2>><<set $slaves[$i].energy -= 2*_punishments>><</if>>
 					<<set $slaves[$i].devotion += _punishments>>
 					<<set $slaves[$i].trust -= _punishments>>
@@ -6067,10 +6067,10 @@
 					<<set $slaves[$i].trust += 2>>
 				<</if>>
 			<<else>>
-				<<if ($slaves[$i].ID == $HeadGirl.ID) && ($HGSuite == 1)>>
+				<<if ($slaves[$i].ID == $HeadGirlID) && ($HGSuite == 1)>>
 					$He is @@.hotpink;very happy@@ with $his suite and @@.mediumaquamarine;trusts@@ you a bit more for providing it.
 					<<set $slaves[$i].devotion += 1, $slaves[$i].trust += 1>>
-				<<elseif ($slaves[$i].ID == $Bodyguard.ID) && ($dojo <= 1)>>
+				<<elseif ($slaves[$i].ID == $BodyguardID) && ($dojo <= 1)>>
 					$He rarely leaves your company enough to make use of $his living area.
 				<<elseif ($slaves[$i].rules.living == "luxurious")>>
 					$He is @@.hotpink;very happy@@ with $his little room and @@.mediumaquamarine;trusts@@ you a bit more for providing it.
diff --git a/src/uncategorized/scheduledEvent.tw b/src/uncategorized/scheduledEvent.tw
index 45ae65c25e58740425d03e981382b1b232652ba1..38cadbed2828240f27d28a34f78366533cd2e474 100644
--- a/src/uncategorized/scheduledEvent.tw
+++ b/src/uncategorized/scheduledEvent.tw
@@ -129,9 +129,9 @@
 	<<if $week > 50 && $FCTV.remote < 2>> <<goto "SE FCTV Remote">>
 	<<else>> <<goto "SE FCTV Watch">>
 	<</if>>
-<<elseif ($Recruiter != 0 && $recruiterEugenics == 0 && $recruiterProgress >= 13)>>
+<<elseif ($RecruiterID != 0 && $recruiterEugenics == 0 && $recruiterProgress >= 13)>>
 	<<goto "SE recruiter success">>
-<<elseif $Recruiter != 0 && $recruiterEugenics == 1 && $recruiterProgress >= (13 + (policies.countEugenicsSMRs() * 6))>>
+<<elseif $RecruiterID != 0 && $recruiterEugenics == 1 && $recruiterProgress >= (13 + (policies.countEugenicsSMRs() * 6))>>
 	<<goto "SE recruiter success">>
 <<elseif ($customSlaveOrdered == 1 && $customSlaveOrderedReorder != 1)>>
 	<<goto "SE custom slave delivery">>
@@ -143,7 +143,7 @@
 	<<goto "SE coursing">>
 <<elseif $policies.raidingMercenaries == 1 && ($week > ($raided + 6))>>
 	<<goto "SE raiding">>
-<<elseif ((($fighterIDs.length > 1) && ($pitBG == 0)) || (($fighterIDs.length > 0) && ($Bodyguard != 0) && ($pitBG == 1)) || (($pitAnimal > 0) && ($fighterIDs.length > 0)) || ($killChoice == 2)) && ($pitFought == 0)>>
+<<elseif ((($fighterIDs.length > 1) && ($pitBG == 0)) || (($fighterIDs.length > 0) && ($BodyguardID != 0) && ($pitBG == 1)) || (($pitAnimal > 0) && ($fighterIDs.length > 0)) || ($killChoice == 2)) && ($pitFought == 0)>>
 	<<if $pitLethal == 1>><<goto "SE lethal pit">><<else>><<goto "SE nonlethal pit">><</if>>
 <<elseif ($bioreactorPerfectedID != 0) && ($bioreactorsAnnounced != 1)>>
 	<<goto "P bioreactor perfected">>
diff --git a/src/uncategorized/seLethalPit.tw b/src/uncategorized/seLethalPit.tw
index 6275d330b9b9ac084a85d082a00cd62e7261fa96..d3b2665c1d368fed1dccdb7b119c17b870a89d75 100644
--- a/src/uncategorized/seLethalPit.tw
+++ b/src/uncategorized/seLethalPit.tw
@@ -5,7 +5,7 @@
 <<if $killChoice == 2>>
 	<<set _fighterOne = $slaveFightingBG.ID>>
 	<<set _fighterOne = getSlave(_fighterOne)>>
-	<<set _fighterTwo = getSlave($Bodyguard.ID)>>
+	<<set _fighterTwo = getSlave($BodyguardID)>>
 	<<setLocalPronouns _fighterOne>>
 	<<setLocalPronouns _fighterTwo 2>>
 <<else>>
@@ -14,8 +14,8 @@
 		<<set _fighterOne = getSlave(_fighterOne)>>
 	<<else>>
 		/* BG should not be in here! */
-		<<run $fighterIDs.deleteWith((s) => s === $Bodyguard.ID)>>
-		<<set _fighterOne = getSlave($Bodyguard.ID)>>
+		<<run $fighterIDs.deleteWith( id => id === $BodyguardID)>>
+		<<set _fighterOne = _S.Bodyguard>>
 	<</if>>
 	<<setLocalPronouns _fighterOne>>
 	<<if $pitAnimal == 0>>
@@ -811,7 +811,7 @@ In any case, <<if $pitAnimal == 0>>both of the slaves have<<else>>the slave and
 	<<set $pitKillsTotal += 1>>
 
 	<<set $slaves[$slaveIndices[_winner.ID]] = _winner>>
-	<<if $pitBG == 0 || ($Bodyguard.ID != _winner.ID)>>
+	<<if $pitBG == 0 || ($BodyguardID != _winner.ID)>>
 		<<set $fighterIDs.push(_winner.ID)>>
 	<</if>>
 	<<if $pitAnimal == 0>>
@@ -823,4 +823,4 @@ In any case, <<if $pitAnimal == 0>>both of the slaves have<<else>>the slave and
 	<<= removeActiveSlave() >>
 <</if>>
 
-<<set $pitFightsTotal++>>
\ No newline at end of file
+<<set $pitFightsTotal++>>
diff --git a/src/uncategorized/seNicaeaPreperation.tw b/src/uncategorized/seNicaeaPreperation.tw
index 5bacd93f81f5eb50de6124cbf1a58e438444e0bf..6cb571b353caa1e34d1dec07d511e15c64c17f02 100644
--- a/src/uncategorized/seNicaeaPreperation.tw
+++ b/src/uncategorized/seNicaeaPreperation.tw
@@ -17,12 +17,12 @@ But you did win. Chattel Religionism will remain a free and open faith that acce
 <<else>>
 
 You have a busy week preparing for the $nicaeaName ahead of you. Planning the event itself is the easy part. Modern arcologies are designed to host big events, and it's not like you don't have a lot of labor available to assist you. Furthermore, one of $assistant.name's standard functions is event planning. _HeA helps manage the thousand details of hosting a group of rich, powerful, opinionated people, letting you focus on the most important matters.
-<<if $HeadGirl != 0>>
-	<<setLocalPronouns $HeadGirl>>
-	$HeadGirl.slaveName is also a great help. $He does $his best to supervise your other slaves even more thoroughly than usual, giving you precious time.
+<<if $HeadGirlID != 0>>
+	<<setLocalPronouns _S.HeadGirl>>
+	_S.HeadGirl.slaveName is also a great help. $He does $his best to supervise your other slaves even more thoroughly than usual, giving you precious time.
 <</if>>
-<<if $Concubine != 0>>
-	Of course, $Concubine.slaveName is always there to help you relax when you need it.
+<<if _S.Concubine>>
+	Of course, _S.Concubine.slaveName is always there to help you relax when you need it.
 <</if>>
 <br><br>
 The first major choice you have to make concerns the seats on the Council. There are some Chattel Religionists you simply have to invite; they're so prominent that if you don't, the Council's decisions will lack any weight. But that doesn't mean you don't have room to manipulate the list of people invited in order to enhance your influence in the council. It wouldn't be difficult to selectively invite Chattel Religionist slaveowners that have the reputation to support attendance, who you know to be philosophically aligned with your thoughts about the faith. On the other hand, managing the seats on the Council with perfect impartiality would definitely help acceptance of any creed the Council agrees upon.
diff --git a/src/uncategorized/seNonlethalPit.tw b/src/uncategorized/seNonlethalPit.tw
index 7176d4f877414fe12f9ac4e6153d76807462c73e..6175426d3bb2e29cd219fef8121873c2f5a78316 100644
--- a/src/uncategorized/seNonlethalPit.tw
+++ b/src/uncategorized/seNonlethalPit.tw
@@ -7,8 +7,8 @@
 	<<set _fighterOne = getSlave(_fighterOne)>>
 <<else>>
 	/* BG should not be in here! */
-	<<run $fighterIDs.deleteWith((s) => s === $Bodyguard.ID)>>
-	<<set _fighterOne = getSlave($Bodyguard.ID)>>
+	<<run $fighterIDs.deleteWith( id => id === $BodyguardID)>>
+	<<set _fighterOne = _S.Bodyguard>>
 <</if>>
 <<setLocalPronouns _fighterOne>>
 <<if $pitAnimal == 0>>
@@ -61,7 +61,7 @@
 <<else>>
 	This week, _fighterOne.slaveName was scheduled to be used by an animal, but is spared because no animal has been chosen.
 	<<set $slaves[$slaveIndices[_fighterOne.ID]] = _fighterOne>>
-	<<if $pitBG == 0 || ($Bodyguard.ID != _fighterOne.ID)>>
+	<<if $pitBG == 0 || ($BodyguardID != _fighterOne.ID)>>
 		<<set $fighterIDs.push(_fighterOne.ID)>>
 	<</if>>
 <</if>>
@@ -952,10 +952,10 @@
 
 	<<set $slaves[$slaveIndices[_winner.ID]] = _winner>>
 	<<set $slaves[$slaveIndices[_loser.ID]] = _loser>>
-	<<if $pitBG == 0 || ($Bodyguard.ID != _winner.ID)>>
+	<<if $pitBG == 0 || ($BodyguardID != _winner.ID)>>
 		<<set $fighterIDs.push(_winner.ID)>>
 	<</if>>
-	<<if $pitBG == 0 || ($Bodyguard.ID != _loser.ID)>>
+	<<if $pitBG == 0 || ($BodyguardID != _loser.ID)>>
 		<<set $fighterIDs.push(_loser.ID)>>
 	<</if>>
 
@@ -1031,9 +1031,9 @@
 		/* TODO: write an ending / post-fight message */
 	<</if>>
 	<<set $slaves[$slaveIndices[_fighterOne.ID]] = _fighterOne>>
-	<<if $pitBG == 0 || ($Bodyguard.ID != _fighterOne.ID)>>
+	<<if $pitBG == 0 || ($BodyguardID != _fighterOne.ID)>>
 		<<set $fighterIDs.push(_fighterOne.ID)>>
 	<</if>>
 <</if>>
 
-<<set $pitFightsTotal++>>
\ No newline at end of file
+<<set $pitFightsTotal++>>
diff --git a/src/uncategorized/seRecruiterSuccess.tw b/src/uncategorized/seRecruiterSuccess.tw
index 00ab9d919853b0e4b12e57ca342db07628118a11..57535f22625eaf8097d1b1db6592e37c6687156d 100644
--- a/src/uncategorized/seRecruiterSuccess.tw
+++ b/src/uncategorized/seRecruiterSuccess.tw
@@ -169,31 +169,31 @@
 <<set _slaveCost = slaveCost($activeSlave)>>
 <<set _slaveCost -= _ContractCost>>
 <<setLocalPronouns $activeSlave>>
-<<setLocalPronouns $Recruiter 2>>
+<<setLocalPronouns _S.Recruiter 2>>
 
 <<if $recruiterTarget == "young migrants">>
 
-Your recruiter $Recruiter.slaveName has succeeded; _he2's convinced a starving young migrant from the old world that $he'll have a better chance at survival as one of your slaves.
+Your recruiter _S.Recruiter.slaveName has succeeded; _he2's convinced a starving young migrant from the old world that $he'll have a better chance at survival as one of your slaves.
 
 <<elseif $recruiterTarget == "recent divorcees">>
 
-Your recruiter $Recruiter.slaveName has succeeded; _he2's convinced a recent divorcee from the old world that $he'll have a better quality of life as one of your slaves.
+Your recruiter _S.Recruiter.slaveName has succeeded; _he2's convinced a recent divorcee from the old world that $he'll have a better quality of life as one of your slaves.
 
 <<elseif $recruiterTarget == "reassignment candidates">>
 
-Your recruiter $Recruiter.slaveName has succeeded; _he2's convinced an old world person desperate for modern reassignment surgery that you'll provide it if $he agrees to be a sex slave after $he's recreated as a female.
+Your recruiter _S.Recruiter.slaveName has succeeded; _he2's convinced an old world person desperate for modern reassignment surgery that you'll provide it if $he agrees to be a sex slave after $he's recreated as a female.
 
 <<elseif $recruiterTarget == "dissolute sissies">>
 
-Your recruiter $Recruiter.slaveName has succeeded; _he2's convinced an old world sissy that $he'd be better off as a slave in a society that is so totally sexually libertine as to accept as female and respectable anyone who takes cock.
+Your recruiter _S.Recruiter.slaveName has succeeded; _he2's convinced an old world sissy that $he'd be better off as a slave in a society that is so totally sexually libertine as to accept as female and respectable anyone who takes cock.
 
 <<elseif $recruiterTarget == "expectant mothers">>
 
-Your recruiter $Recruiter.slaveName has succeeded; _he2's convinced an unhealthy expectant mother that you'll provide $him with modern medicine in return for $his enslavement.
+Your recruiter _S.Recruiter.slaveName has succeeded; _he2's convinced an unhealthy expectant mother that you'll provide $him with modern medicine in return for $his enslavement.
 
 <<else>>
 
-Your recruiter $Recruiter.slaveName has succeeded; _he2's convinced a desperate old world whore that $he'd be better off as a slave in $arcologies[0].name than as a free prostitute on the rough streets of a traditional city.
+Your recruiter _S.Recruiter.slaveName has succeeded; _he2's convinced a desperate old world whore that $he'd be better off as a slave in $arcologies[0].name than as a free prostitute on the rough streets of a traditional city.
 
 <</if>>
 
@@ -212,7 +212,7 @@ Your recruiter $Recruiter.slaveName has succeeded; _he2's convinced a desperate
 	<</replace>>
 <</link>> //This will cost <<print cashFormat(_ContractCost)>>//
 <br><<link "Sell $him immediately">>
-	<<run cashX(_slaveCost, "slaveTransfer", $Recruiter)>>
+	<<run cashX(_slaveCost, "slaveTransfer", _S.Recruiter)>>
 	<<replace "#result">>
 	$activeSlave.slaveName accepts being resold without much fuss. $He's merely exchanged one unknown owner for another. For all $he knows $his new buyer will be less abusive than you would have been. $He would be less complacent if $he knew who $his buyers are; $he'll be immured in an arcade within the hour.
 	<</replace>>
diff --git a/src/uncategorized/seRetirement.tw b/src/uncategorized/seRetirement.tw
index c38103479688aa2a09fe03b2a6431168674a2252..aac5a08c8d2d665431110ce41feaafd5afcf0c3a 100644
--- a/src/uncategorized/seRetirement.tw
+++ b/src/uncategorized/seRetirement.tw
@@ -90,7 +90,7 @@
 	<<else>>
 		<<set _toSearchAlt = $activeSlave.porn.prestigeDesc>>
 	<</if>>
-	<<if (_toSearch.indexOf("Head Girl") != -1) || ($HeadGirl.ID == $activeSlave.ID)>>
+	<<if (_toSearch.indexOf("Head Girl") != -1) || ($HeadGirlID == $activeSlave.ID)>>
 		<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">>
@@ -399,4 +399,3 @@
 	<<set $activeSlave = getSlave($retiree), $retiree = 0, $retired = 0>>
 	<<= removeActiveSlave()>>
 <</if>>
-
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index ea91b902be936fcf1f073f7a4aac7ec332f39665..5d3d7c8ae1643e9348b168af56d57eae35995ad6 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -958,7 +958,7 @@ As the remote surgery's long recovery cycle completes,
 	Even though creating an artificial scar is a trivial process, @@.red;$his health has been slightly affected.@@
 	<<if getSlave($AS).fetish != "mindbroken" && getSlave($AS).fuckdoll == 0>>
 		When $he exits the room, $he feels that $his face is numb,
-		<<if getSlave($AS).ID == $Bodyguard.ID>>
+		<<if getSlave($AS).ID == $BodyguardID>>
 			and upon <<if canSee(getSlave($AS))>>throwing a glance at the mirror<<else>>being informed of $his new scar<</if>>, $he frightens $himself, but is @@.hotpink;happier@@ with $his new look and @@.mediumaquamarine;more confident@@ that $he's the $girl for the job.
 			<<set getSlave($AS).devotion += 5>>
 			<<set getSlave($AS).trust += 5>>
diff --git a/src/uncategorized/universalRules.tw b/src/uncategorized/universalRules.tw
index d042ff535231b81f534657a0b0b928a6b7c4aa16..d07f4819b2d5cadcb4a1d9142ef8f90a28f9958c 100644
--- a/src/uncategorized/universalRules.tw
+++ b/src/uncategorized/universalRules.tw
@@ -516,7 +516,7 @@ Slave nicknames are
 ''Pregnant slaves''
 <br>
 <<if $universalRulesImpregnation == "HG">>
-	<<setLocalPronouns $HeadGirl>>
+	<<setLocalPronouns _S.HeadGirl>>
 	Fertile slaves will be ''systematically impregnated by your Head Girl,'' if $he is able to do so.
 	[[Cancel insemination regime|Universal Rules][($universalRulesImpregnation = "none"),($universalHGImpregnateMasterSuiteToggle = 0)]]
 	| [[Use a Stud for insemination|Universal Rules][($universalRulesImpregnation = "Stud")]]
diff --git a/src/utility/birthWidgets.tw b/src/utility/birthWidgets.tw
index d2e119dedf843a5aa16e21d350fb076c9114f5f0..05c23cf87e30733463bdd003b1f8ecf2ec25c4b7 100644
--- a/src/utility/birthWidgets.tw
+++ b/src/utility/birthWidgets.tw
@@ -144,7 +144,7 @@
 			<<set _roll = random(0, _animals.length)>>
 			$He shows no interest in $his coming birth as $he continues being rutted by a <<print _animals[_roll].species>>, so <<if _S.Farmer > 0>>_S.Farmer.slaveName<<else>>another slave<</if>> has to pull the animal off of $him and drag $him into the nearest birthing stall. $He also shows almost no reaction when $his child<<if $slaves[$i].pregType > 1>>ren<</if>> begin<<if $slaves[$i].pregType <= 1>>s<</if>> to come out, or when $he is subsequently hosed off before being led back to $farmyardName.
 		<<else>>
-			$He shows no interest in $his coming birth as $he continues <<print either("loading hay bales", "milking a cow", "pulling weeds")>>, until $his contractions become so strong that $he collapses to $his knees. <<if $Farmer > 0>>$Farmer.name<<else>>Another slave<</if>> is at $his side in an instant, pulling $him to $his feet and into a birthing stall. $He also shows almost no reaction when $his child<<if $slaves[$i].pregType > 1>>ren<</if>> begin<<if $slaves[$i].pregType <= 1>>s<</if>> to come out, or when $he is subsequently hosed off before being led back to $farmyardName.
+			$He shows no interest in $his coming birth as $he continues <<print either("loading hay bales", "milking a cow", "pulling weeds")>>, until $his contractions become so strong that $he collapses to $his knees. <<if $FarmerID > 0>>_S.Farmer.name<<else>>Another slave<</if>> is at $his side in an instant, pulling $him to $his feet and into a birthing stall. $He also shows almost no reaction when $his child<<if $slaves[$i].pregType > 1>>ren<</if>> begin<<if $slaves[$i].pregType <= 1>>s<</if>> to come out, or when $he is subsequently hosed off before being led back to $farmyardName.
 		<</if>>
 	<<else>>
 		<<if $farmyardShows && $seeBestiality>>
@@ -304,20 +304,20 @@
 	<</if>>
 
 <<case "live with your Head Girl">>
-	<<setLocalPronouns $HeadGirl 2>>
-	<<if $slaves[$i].pregSource == $HeadGirl.ID>>
-		$HeadGirl.slaveName makes sure that the mother of _his2 child<<if $slaves[$i].pregType > 1>>ren<</if>> is happy and comfortable for the upcoming birth, even if they won't be spending much time with their offspring. _He2 carefully undresses $slaves[$i].slaveName, all the while whispering sweet nothings in $his ear. $He begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>,<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>> convulsing with orgasms in the process,<</if>> and $his child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> carefully collected by their father. Once they are out of the way, $HeadGirl.slaveName moves in to fondle $slaves[$i].slaveName's tired body.
+	<<setLocalPronouns _S.HeadGirl 2>>
+	<<if $slaves[$i].pregSource == $HeadGirlID>>
+		_S.HeadGirl.slaveName makes sure that the mother of _his2 child<<if $slaves[$i].pregType > 1>>ren<</if>> is happy and comfortable for the upcoming birth, even if they won't be spending much time with their offspring. _He2 carefully undresses $slaves[$i].slaveName, all the while whispering sweet nothings in $his ear. $He begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>,<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>> convulsing with orgasms in the process,<</if>> and $his child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> carefully collected by their father. Once they are out of the way, _S.HeadGirl.slaveName moves in to fondle $slaves[$i].slaveName's tired body.
 	<<elseif !canWalk($slaves[$i])>>
 		<<if $slaves[$i].fetish == "mindbroken">>
-			$He is aided in finding $HeadGirl.slaveName, who undresses $him as $he instinctively begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, indifferent to _his2 wandering hands. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning, a fresh change of clothes, and some private time with your Head Girl, $he is taken back to $HeadGirl.slaveName's room.
+			$He is aided in finding _S.HeadGirl.slaveName, who undresses $him as $he instinctively begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, indifferent to _his2 wandering hands. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning, a fresh change of clothes, and some private time with your Head Girl, $he is taken back to _S.HeadGirl.slaveName's room.
 		<<else>>
-			$He is aided in seeking out $HeadGirl.slaveName, who undresses $him as $he dutifully begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, enjoying _his2 wandering hands and attention<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>> and convulsing with orgasms in the process<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning, a fresh change of clothes, and some private time with your Head Girl, $he is helped back to $HeadGirl.slaveName's room.
+			$He is aided in seeking out _S.HeadGirl.slaveName, who undresses $him as $he dutifully begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, enjoying _his2 wandering hands and attention<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>> and convulsing with orgasms in the process<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning, a fresh change of clothes, and some private time with your Head Girl, $he is helped back to _S.HeadGirl.slaveName's room.
 		<</if>>
 	<<else>>
 		<<if $slaves[$i].fetish == "mindbroken">>
-			$He wanders until $he finds $HeadGirl.slaveName, who undresses $him as $he instinctively begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, indifferent to _his2 wandering hands. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning, a fresh change of clothes, and some private time with your Head Girl, $he is lead back to $HeadGirl.slaveName's room.
+			$He wanders until $he finds _S.HeadGirl.slaveName, who undresses $him as $he instinctively begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, indifferent to _his2 wandering hands. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning, a fresh change of clothes, and some private time with your Head Girl, $he is lead back to _S.HeadGirl.slaveName's room.
 		<<else>>
-			$He seeks out $HeadGirl.slaveName, who undresses $him as $he dutifully begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, enjoying _his2 wandering hands and attention<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>> and convulsing with orgasms in the process<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning, a fresh change of clothes, and some private time with your Head Girl, $he returns to $HeadGirl.slaveName's room.
+			$He seeks out _S.HeadGirl.slaveName, who undresses $him as $he dutifully begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, enjoying _his2 wandering hands and attention<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>> and convulsing with orgasms in the process<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning, a fresh change of clothes, and some private time with your Head Girl, $he returns to _S.HeadGirl.slaveName's room.
 		<</if>>
 	<</if>>
 
@@ -580,13 +580,13 @@
 	<</if>>
 
 <<case "live with your Head Girl">>
-	<<setLocalPronouns $HeadGirl 2>>
-	<<if $slaves[$i].pregSource == $HeadGirl.ID>>
-		$HeadGirl.slaveName makes sure that the mother of _his2 child<<if $slaves[$i].pregType > 1>>ren<</if>> is happy and comfortable for the upcoming birth, even if they won't be spending much time with their offspring. _He2 carefully undresses $slaves[$i].slaveName, all the while whispering sweet nothings in $his ear. $He begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>,<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>> convulsing with orgasms in the process,<</if>> and $his child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> carefully collected by their father. Once they are out of the way, $HeadGirl.slaveName moves in to fondle $slaves[$i].slaveName's tired body.
+	<<setLocalPronouns _S.HeadGirl 2>>
+	<<if $slaves[$i].pregSource == $HeadGirlID>>
+		_S.HeadGirl.slaveName makes sure that the mother of _his2 child<<if $slaves[$i].pregType > 1>>ren<</if>> is happy and comfortable for the upcoming birth, even if they won't be spending much time with their offspring. _He2 carefully undresses $slaves[$i].slaveName, all the while whispering sweet nothings in $his ear. $He begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>,<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>> convulsing with orgasms in the process,<</if>> and $his child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> carefully collected by their father. Once they are out of the way, _S.HeadGirl.slaveName moves in to fondle $slaves[$i].slaveName's tired body.
 	<<elseif $slaves[$i].fetish == "mindbroken">>
-		$He is placed with $HeadGirl.slaveName. _He2 unwraps $him as $he instinctively begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, indifferent to _his2 wandering hands. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning, a fresh change of clothes, and some private time with your Head Girl, $he is carried back to $HeadGirl.slaveName's room.
+		$He is placed with _S.HeadGirl.slaveName. _He2 unwraps $him as $he instinctively begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, indifferent to _his2 wandering hands. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning, a fresh change of clothes, and some private time with your Head Girl, $he is carried back to _S.HeadGirl.slaveName's room.
 	<<else>>
-		$He is placed with $HeadGirl.slaveName. _He2 unwraps $him as $he dutifully begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>,<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>> convulsing with orgasms in the process and<</if>> enjoying _his2 wandering hands and attention. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning, a fresh change of clothes, and some private time with your Head Girl, $he is carried back to $HeadGirl.slaveName's room.
+		$He is placed with _S.HeadGirl.slaveName. _He2 unwraps $him as $he dutifully begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>,<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>> convulsing with orgasms in the process and<</if>> enjoying _his2 wandering hands and attention. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning, a fresh change of clothes, and some private time with your Head Girl, $he is carried back to _S.HeadGirl.slaveName's room.
 	<</if>>
 
 <<case "be confined in the arcade">>
@@ -861,22 +861,22 @@
 		<<if _birthScene > 50>>
 			While giving a slave oral service, $slaves[$i].slaveName's water breaks. $He disregards this development and continues working.
 			<<ClothingBirth>>
-			The slave gets off quite strongly to the show and shoves $him out of the way, leaving $him to clean up $his mess. Instead, $he draws $his child<<if $slaves[$i].pregType > 1>>ren<</if>> to $his breast<<if $slaves[$i].pregType > 1>>s<</if>> until <<if _S.Stewardess>>_S.Stewardess.slaveName<<elseif $HeadGirl != 0>>$HeadGirl.slaveName<<else>>$assistant.name<</if>>shouts at $him to move $his useless ass.
+			The slave gets off quite strongly to the show and shoves $him out of the way, leaving $him to clean up $his mess. Instead, $he draws $his child<<if $slaves[$i].pregType > 1>>ren<</if>> to $his breast<<if $slaves[$i].pregType > 1>>s<</if>> until <<if _S.Stewardess>>_S.Stewardess.slaveName<<elseif _S.HeadGirl != 0>>_S.HeadGirl.slaveName<<else>>$assistant.name<</if>>shouts at $him to move $his useless ass.
 		<<else>>
 			While scrubbing the penthouse floor, $slaves[$i].slaveName's water breaks. $He turns to clean this new spill, disregarding what it means.
 			<<ClothingBirth>>
-			Instead of cleaning the fresh mess $he made, $he draws $his child<<if $slaves[$i].pregType > 1>>ren<</if>> to $his breast<<if $slaves[$i].pregType > 1>>s<</if>> until <<if _S.Stewardess>>_S.Stewardess.slaveName<<elseif $HeadGirl != 0>>$HeadGirl.slaveName<<else>>$assistant.name<</if>>shouts at $him to move $his useless ass.
+			Instead of cleaning the fresh mess $he made, $he draws $his child<<if $slaves[$i].pregType > 1>>ren<</if>> to $his breast<<if $slaves[$i].pregType > 1>>s<</if>> until <<if _S.Stewardess>>_S.Stewardess.slaveName<<elseif _S.HeadGirl != 0>>_S.HeadGirl.slaveName<<else>>$assistant.name<</if>>shouts at $him to move $his useless ass.
 		<</if>>
 	<<else>>
 		<<if _birthScene > 50>>
 			While giving a slave oral service, $slaves[$i].slaveName's water breaks. $He desperately tries to pull away but they grab $his head and force $him back to their crotch.
 			<<set $humiliation = 1>>
 			<<ClothingBirth>>
-			The slave gets off quite strongly to the show and shoves $him out of the way, leaving $him to clean up $his mess. $He hurriedly tries to mop up the mess and collect $his child<<if $slaves[$i].pregType > 1>>ren<</if>> before <<if _S.Stewardess>>_S.Stewardess.slaveName<<elseif $HeadGirl != 0>>$HeadGirl.slaveName<<else>>$assistant.name<</if>> shouts at $him.
+			The slave gets off quite strongly to the show and shoves $him out of the way, leaving $him to clean up $his mess. $He hurriedly tries to mop up the mess and collect $his child<<if $slaves[$i].pregType > 1>>ren<</if>> before <<if _S.Stewardess>>_S.Stewardess.slaveName<<elseif _S.HeadGirl != 0>>_S.HeadGirl.slaveName<<else>>$assistant.name<</if>> shouts at $him.
 		<<else>>
 			While scrubbing the penthouse floor, $slaves[$i].slaveName's water breaks. $He panics at the thought of not cleaning up $his spill but $his worsening contractions force $him to find a secluded place to give birth.
 			<<ClothingBirth>>
-			Collecting $his child<<if $slaves[$i].pregType > 1>>ren<</if>>, $he exits $his hiding place before coming under the eye of <<if _S.Stewardess>>the glaring _S.Stewardess.slaveName<<elseif $HeadGirl != 0>>the glaring $HeadGirl.slaveName<<else>>$assistant.name<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren<</if>> are promptly taken by other servants following a lecture about priorities and time management.
+			Collecting $his child<<if $slaves[$i].pregType > 1>>ren<</if>>, $he exits $his hiding place before coming under the eye of <<if _S.Stewardess>>the glaring _S.Stewardess.slaveName<<elseif $HeadGirlID != 0>>the glaring _S.HeadGirl.slaveName<<else>>$assistant.name<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren<</if>> are promptly taken by other servants following a lecture about priorities and time management.
 		<</if>>
 	<</if>>
 
@@ -886,13 +886,13 @@
 			<<if $masterSuiteUpgradeLuxury == 1>>
 				While awaiting your return on the big bed in the master suite, $slaves[$i].slaveName's water breaks thoroughly soaking the sheets. Ignoring the mess, $he shifts into a more comfortable position.
 				<<ClothingBirth>>
-				Resting in your bed, $he draws $his child<<if $slaves[$i].pregType > 1>>ren<</if>> to $his breast<<if $slaves[$i].pregType > 1>>s<</if>> and resumes waiting for you. <<if $Concubine != 0>>$Concubine.slaveName furiously orders $his child<<if $slaves[$i].pregType > 1>>ren<</if>> removed, and $him forcefully ejected from the bed so it can be cleaned before your return.<</if>>
+				Resting in your bed, $he draws $his child<<if $slaves[$i].pregType > 1>>ren<</if>> to $his breast<<if $slaves[$i].pregType > 1>>s<</if>> and resumes waiting for you. <<if _S.Concubine>>_S.Concubine.slaveName furiously orders $his child<<if $slaves[$i].pregType > 1>>ren<</if>> removed, and $him forcefully ejected from the bed so it can be cleaned before your return.<</if>>
 			<<elseif $masterSuiteUpgradeLuxury == 2>>
 				While at the bottom of the master suite's fuckpit, $slaves[$i].slaveName's water breaks. While $he doesn't stop having sex, the fucktoys using $him do and drag $him from the pit to give birth. Instinctively, $he begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, indifferent to who may be watching $his naked crotch. Without a second thought about $his child<<if $slaves[$i].pregType > 1>>ren<</if>>, $he slips back into the fuckpit.
 			<<else>>
 				While awaiting your return in the master suite, $slaves[$i].slaveName's water breaks. $He pays it no heed and continues blankly waiting.
 				<<ClothingBirth>>
-				Resting on the floor, $he draws $his child<<if $slaves[$i].pregType > 1>>ren<</if>> to $his breast<<if $slaves[$i].pregType > 1>>s<</if>> and resumes waiting for you. <<if $Concubine != 0>>$Concubine.slaveName furiously orders $his child<<if $slaves[$i].pregType > 1>>ren<</if>> removed and $him thoroughly cleaned before your return.<</if>>
+				Resting on the floor, $he draws $his child<<if $slaves[$i].pregType > 1>>ren<</if>> to $his breast<<if $slaves[$i].pregType > 1>>s<</if>> and resumes waiting for you. <<if _S.Concubine>>_S.Concubine.slaveName furiously orders $his child<<if $slaves[$i].pregType > 1>>ren<</if>> removed and $him thoroughly cleaned before your return.<</if>>
 			<</if>>
 		<<else>>
 			<<if $masterSuiteUpgradeLuxury == 1>>
@@ -915,13 +915,13 @@
 			<<if $masterSuiteUpgradeLuxury == 1>>
 				While awaiting your return on the big bed in the master suite, $slaves[$i].slaveName's water breaks thoroughly soaking the sheets. Ignoring the mess, $he shifts into a more comfortable position.
 				<<ClothingBirth>>
-				Resting in your bed, $he draws $his child<<if $slaves[$i].pregType > 1>>ren<</if>> to $his breast<<if $slaves[$i].pregType > 1>>s<</if>> and resumes waiting for you. <<if $Concubine != 0>>Concubine.slaveName furiously orders $his child<<if $slaves[$i].pregType > 1>>ren<</if>> removed, and $him forcefully ejected from the bed so it can be cleaned before your return.<</if>>
+				Resting in your bed, $he draws $his child<<if $slaves[$i].pregType > 1>>ren<</if>> to $his breast<<if $slaves[$i].pregType > 1>>s<</if>> and resumes waiting for you. <<if _S.Concubine>>_S.Concubine.slaveName furiously orders $his child<<if $slaves[$i].pregType > 1>>ren<</if>> removed, and $him forcefully ejected from the bed so it can be cleaned before your return.<</if>>
 			<<elseif $masterSuiteUpgradeLuxury == 2>>
 				While being the bottom of the master suite's fuckpit, $slaves[$i].slaveName's water breaks. While $he doesn't stop having sex, the fucktoys using $him do and drag $him from the pit to give birth. Instinctively, $he begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, indifferent to who may be watching $his naked crotch. Without a second thought about $his child<<if $slaves[$i].pregType > 1>>ren<</if>>, $he slips back into the fuckpit.
 			<<else>>
 				While awaiting your return in the master suite, $slaves[$i].slaveName's water breaks. $He pays it no heed and continues blankly waiting.
 				<<ClothingBirth>>
-				Resting on the floor, $he draws $his child<<if $slaves[$i].pregType > 1>>ren<</if>> to $his breast<<if $slaves[$i].pregType > 1>>s<</if>> and resumes waiting for you. <<if $Concubine != 0>>Concubine.slaveName furiously orders $his child<<if $slaves[$i].pregType > 1>>ren<</if>> removed, and $him thoroughly cleaned before your return.<</if>>
+				Resting on the floor, $he draws $his child<<if $slaves[$i].pregType > 1>>ren<</if>> to $his breast<<if $slaves[$i].pregType > 1>>s<</if>> and resumes waiting for you. <<if _S.Concubine>>_S.Concubine.slaveName furiously orders $his child<<if $slaves[$i].pregType > 1>>ren<</if>> removed, and $him thoroughly cleaned before your return.<</if>>
 			<</if>>
 		<<else>>
 			<<if $masterSuiteUpgradeLuxury == 1>>
@@ -1169,26 +1169,26 @@
 	<</if>>
 
 <<case "live with your Head Girl">>
-	<<setLocalPronouns $HeadGirl 2>>
+	<<setLocalPronouns _S.HeadGirl 2>>
 	<<if !canWalk($slaves[$i])>>
 		<<if $slaves[$i].fetish == "mindbroken">>
 			$slaves[$i].slaveName is awoken from $his rest by a strong contraction. $He rolls over and begins to fall back to sleep as another wracks $his body.
 			<<ClothingBirth>>
-			$He draws $his child<<if $slaves[$i].pregType > 1>>ren<</if>> to $his breast<<if $slaves[$i].pregType > 1>>s<</if>> and resumes resting before $HeadGirl.slaveName returns from _his2 duties.
+			$He draws $his child<<if $slaves[$i].pregType > 1>>ren<</if>> to $his breast<<if $slaves[$i].pregType > 1>>s<</if>> and resumes resting before _S.HeadGirl.slaveName returns from _his2 duties.
 		<<else>>
 			$slaves[$i].slaveName is awoken from $his rest by a moist sensation followed by a contraction. $He rolls over and clutches $his gravid belly as another wracks $his body.
 			<<ClothingBirth>>
-			$He collects $his newborn<<if $slaves[$i].pregType > 1>>s<</if>> and places them in the cradle readied for $him. $He is helped to the shower as your servants clean up and remove $his child<<if $slaves[$i].pregType > 1>>ren<</if>>. Freshened up, $he returns to resting knowing full well that $HeadGirl.slaveName will be eager to play with $his body upon returning.
+			$He collects $his newborn<<if $slaves[$i].pregType > 1>>s<</if>> and places them in the cradle readied for $him. $He is helped to the shower as your servants clean up and remove $his child<<if $slaves[$i].pregType > 1>>ren<</if>>. Freshened up, $he returns to resting knowing full well that _S.HeadGirl.slaveName will be eager to play with $his body upon returning.
 		<</if>>
 	<<else>>
 		<<if $slaves[$i].fetish == "mindbroken">>
 			$slaves[$i].slaveName is awoken from $his rest by a strong contraction. $He rolls over and begins to fall back to sleep as another wracks $his body.
 			<<ClothingBirth>>
-			$He draws $his child<<if $slaves[$i].pregType > 1>>ren<</if>> to $his breast<<if $slaves[$i].pregType > 1>>s<</if>> and resumes resting before $HeadGirl.slaveName returns from _his2 duties.
+			$He draws $his child<<if $slaves[$i].pregType > 1>>ren<</if>> to $his breast<<if $slaves[$i].pregType > 1>>s<</if>> and resumes resting before _S.HeadGirl.slaveName returns from _his2 duties.
 		<<else>>
 			$slaves[$i].slaveName is awoken from $his rest by a moist sensation followed by a contraction. $He rolls over and clutches $his gravid belly as another wracks $his body.
 			<<ClothingBirth>>
-			$He collects $his newborn<<if $slaves[$i].pregType > 1>>s<</if>> and places them in the cradle readied for $him. $He leaves to take a shower as your servants clean up and remove $his child<<if $slaves[$i].pregType > 1>>ren<</if>>. Freshened up, $he returns to resting knowing full well that $HeadGirl.slaveName will be eager to play with $his body upon returning.
+			$He collects $his newborn<<if $slaves[$i].pregType > 1>>s<</if>> and places them in the cradle readied for $him. $He leaves to take a shower as your servants clean up and remove $his child<<if $slaves[$i].pregType > 1>>ren<</if>>. Freshened up, $he returns to resting knowing full well that _S.HeadGirl.slaveName will be eager to play with $his body upon returning.
 		<</if>>
 	<</if>>