From 54bc9ef208b67af6b303fc9f23c26e671de7cdc0 Mon Sep 17 00:00:00 2001
From: Blank <okp57855@psoxs.com>
Date: Fri, 28 Sep 2018 14:22:46 -0700
Subject: [PATCH] SF and general tweaks [Ready to merge]

---
 devNotes/twine JS.txt                         | 24 ++++--
 src/SecExp/secExpSmilingMan.tw                |  2 +-
 src/events/intro/introSummary.tw              | 11 ++-
 src/gui/Encyclopedia/encyclopedia.tw          |  4 +-
 src/init/dummy.tw                             |  1 -
 src/init/storyInit.tw                         |  2 +-
 src/js/assayJS.tw                             |  7 ++
 src/js/storyJS.tw                             |  2 +-
 .../JobFulfillmentCenterOrder.tw              |  2 +-
 src/pregmod/SecForceEX/Firebase.tw            | 78 ++++++++++---------
 src/pregmod/SecForceEX/FlavourText.tw         |  8 +-
 src/pregmod/SecForceEX/JS.js                  | 17 ++--
 src/pregmod/SecForceEX/Proposal.tw            |  8 +-
 src/pregmod/SecForceEX/Upgrades.tw            | 22 +++---
 src/pregmod/assistantAppearancePackTwo.tw     |  8 +-
 src/pregmod/seFCTVinstall.tw                  |  2 +-
 src/uncategorized/BackwardsCompatibility.tw   |  4 +
 src/uncategorized/RESS.tw                     |  6 +-
 src/uncategorized/assistantEvents.tw          | 66 ++++++++--------
 src/uncategorized/coursingAssociation.tw      |  2 +-
 src/uncategorized/genericPlotEvents.tw        |  2 +-
 src/uncategorized/pBombing.tw                 |  2 +-
 src/uncategorized/pCitizensAndCivilians.tw    | 46 +++++------
 src/uncategorized/pCoupCollaboration.tw       |  2 +-
 src/uncategorized/pCoupLoss.tw                |  2 +-
 src/uncategorized/pFSAnnouncement.tw          |  2 +-
 src/uncategorized/pMercenaryRomeo.tw          |  4 +-
 src/uncategorized/pMercsHelpCorp.tw           |  6 +-
 src/uncategorized/pSlaveMedic.tw              |  2 +-
 src/uncategorized/pSnatchAndGrab.tw           |  2 +-
 src/uncategorized/pUndergroundRailroad.tw     |  4 +-
 src/uncategorized/pit.tw                      |  2 +-
 src/uncategorized/reBoomerang.tw              |  2 +-
 src/uncategorized/reFSAcquisition.tw          |  8 +-
 src/uncategorized/reRecruit.tw                | 22 +++---
 src/uncategorized/recETS.tw                   |  4 +-
 src/uncategorized/remFluctuations.tw          |  4 +-
 37 files changed, 219 insertions(+), 173 deletions(-)

diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 9e544123b38..99d033d0f52 100644
--- a/devNotes/twine JS.txt	
+++ b/devNotes/twine JS.txt	
@@ -7317,6 +7317,13 @@ window.SlavePronouns = function SlavePronouns(slave) {
 	V.object = pronouns.object;
 };
 
+window.PCTitle = function() {
+	const V = State.variables;
+	if (V.PC.customTitle !== undefined) { return `$PC.customTitle`;
+	} else if (V.PC.title > 0) { return `Sir`; 
+	} else { return `Ma'am`; }
+};
+
 window.WrittenMaster = function WrittenMaster(slave) {
 	const V = State.variables;
 	if (slave !== undefined)
@@ -30688,7 +30695,7 @@ window.SFC = function() {
 	const V = State.variables;
 	if (V.SFTradeShow.CanAttend === -1) {return `The Colonel`;} 
 	else {
-		if (V.LieutenantColonel > 0) {return `Lieutenant Colonel <<= SlaveFullName($LieutenantColonel)>>`;}
+		if (V.SF.Facility.LCActive > 0) {return `Lieutenant Colonel <<= SlaveFullName(V.SF.Facility.LC)>>`;}
 		else {return `a designated soldier`;}}
 };
 
@@ -30726,6 +30733,8 @@ window.HSM = function() {
 
 window.Count = function() {
 	const V = State.variables, T = State.temporary, C = Math.clamp, S = V.SFUnit, E = V.economy;
+	T.SFF = V.SF.Facility.Active;
+	T.SFFU = 1,T.SFF = C(T.SFF, 0, T.SFFU);
 	T.FU = 10,S.Firebase = C(S.Firebase, 0, T.FU);
 	T.AU = 10,S.Armoury = C(S.Armoury, 0, T.AU);
 	T.DrugsU = 10,S.Drugs = C(S.Drugs, 0, T.DrugsU);
@@ -30744,8 +30753,13 @@ window.Count = function() {
 	T.GU = T.AVU+T.TVU+T.PGTU, T.G = S.AV+S.TV+S.PGT;
 	T.H = S.AA+S.TA+S.SpacePlane+S.GunS, T.HU = T.AAU+T.TAU+T.SPU+T.GunSU;
 	T.LBU = T.SatU + T.MSU, T.LB = S.Satellite + S.MissileSilo;
-	T.Base = S.Firebase + S.Armoury + S.Drugs + S.Drones + T.H;
-	T.BaseU = T.FU + T.AU + T.DrugsU + T.DU + T.HU;
+	if (V.SF.Facility.Toggle < 1) {
+		T.Base = S.Firebase + S.Armoury + S.Drugs + S.Drones + T.H;
+		T.BaseU = T.FU + T.AU + T.DrugsU + T.DU + T.HU;
+	} else {
+		T.Base = S.Firebase + S.Armoury + S.Drugs + S.Drones + T.H+T.SFF;
+		T.BaseU = T.FU + T.AU + T.DrugsU + T.DU + T.HU+T.SFFU;
+	}
 	if (V.terrain !== "oceanic") T.LBU += T.GRU, T.LB += S.GiantRobot, T.Base += T.G, T.BaseU += T.GU;
 	T.max = T.BaseU + T.LBU, V.SF.Units = T.Base + T.LB;
 	if (V.terrain === "oceanic" || V.terrain === "marine") {
@@ -31081,8 +31095,8 @@ window.Interactions = function() {
 			if (V.SFTradeShow.CanAttend === -1 && (C.Talk + C.Fun !== 1)) {
 			choice += `"Our interests should see a  @@.yellowgreen;big boost@@, boss."`;}
 			else { 
-			choice += `"Your @@.yellowgreen;arcology's business prospects should see an improvement@@ this week, `;
-			if (V.PC.title != 1){choice += `sir."`;}else{choice += `ma'am."`;}}}}
+			choice += `"Your @@.yellowgreen;arcology's business prospects should see an improvement@@ this week, <<print PCTitle()>>.`;
+			}}}
 
 	if (C.Talk + C.Fun > 0) time = `The Colonel is busy for the rest of the week, so the Lieutenant Colonel will assist you.`;
 	
diff --git a/src/SecExp/secExpSmilingMan.tw b/src/SecExp/secExpSmilingMan.tw
index 60c06553719..d1cd2a719cd 100644
--- a/src/SecExp/secExpSmilingMan.tw
+++ b/src/SecExp/secExpSmilingMan.tw
@@ -64,7 +64,7 @@
 
 	<br>
 	You have just reached your penthouse when your faithful assistant appears in front of you, evidently excited.
-	"<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I have just received news of a new attack by the Smiling Man. It appears a few hours ago he infiltrated another arcology and caused a catastrophic failure of its power plant.
+	"<<print PCTitle()>>, I have just received news of a new attack by the Smiling Man. It appears a few hours ago he infiltrated another arcology and caused a catastrophic failure of its power plant.
 	Between old debts and the loss of value for his shares, the owner went bankrupt in minutes. It seems the Smiling Man managed to keep a small auxiliary generator functioning enough to project a giant holographic picture of his symbol on the arcology's walls.
 	Say what you will about his actions, but you can't deny he has style... Anyways, this opens up a great opportunity to gain control of the structure for ourselves."
 	It is indeed a great opportunity, one you cannot resist. You quickly organize the affair and in a few minutes a message reaches your assistant.
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 1cca4ea58a0..546323ac0e8 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -1008,10 +1008,15 @@ Currently
 
 __''Mods''__
 <br>The Special Force Mod is
-<<if $SF.Toggle === 1>>
-	''enabled.'' [[Disable|Intro Summary][$SF.Toggle = 0]]
+<<if $SF.Toggle === 0>>
+	''disabled.'' [[Enable|Intro Summary][$SF.Toggle = 1]]	
 <<else>>
-	''disabled.'' [[Enable|Intro Summary][$SF.Toggle = 1]]
+	''enabled.'' [[Disable|Intro Summary][$SF.Toggle = 0]]
+	<<if ($SF.Facility.Toggle === 0)>>
+			@@.red;DISABLED@@. [[Enable|Options][$SF.Facility.Toggle = 1]]
+	<<else>>
+			@@.cyan;ENABLED@@. [[Disable|Options][$SF.Facility.Toggle = 0]]
+	<</if>>
 <</if>>
 <br>// This mod is initially from anon1888 but expanded by SFanon offers a lategame special (started out as security but changed to special in order to try and reduce confusion with CrimeAnon's separate Security Expansion (SecExp) mod) force, that is triggered after week 80. It is non-canon where it conflicts with canonical updates to the base game.//
 <br><br>
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 33aefe2af7e..b02c9526bd3 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -380,7 +380,7 @@ SLAVES
 	<br>''Luxurious'': As the name implies, it is the most expensive however it may provide devotion and trust bonuses. A recruiter benefits from this.
 
 <<case "Enslaving People">>
-	//<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, this is your personal assistant; if I may interject?
+	//<<print PCTitle()>>, this is your personal assistant; if I may interject?
 
 	<br><br>As you grow in economic power and social influence, opportunities to enslave people may appear. I will certainly do my best to bring them to your attention as they appear.
 
@@ -1479,7 +1479,7 @@ THE X-SERIES ARCOLOGY
 
 
 <<case "Personal Assistant">>
-	//<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I am your personal assistant.
+	//<<print PCTitle()>>, I am your personal assistant.
 
 	<br><br>Though I am a highly advanced program, I am not a true AI. I am neither sentient nor self-aware. My chief usefulness lies in my computing power, which is sufficient to run the arcology and all of its systems, and to monitor its huge suite of internal sensors. If it happens here, I know about it, and if it's important, I'll tell you. Through me, you are effectively omniscient within your arcology. Omnipotence will have to wait until I implant your slaves with control chips to convert them into my mindless fuckpuppet soldiery.
 
diff --git a/src/init/dummy.tw b/src/init/dummy.tw
index f0f35d1bd47..f0a994c3979 100644
--- a/src/init/dummy.tw
+++ b/src/init/dummy.tw
@@ -25,5 +25,4 @@ $servantsQuartersSpots
 $sEnunciate, $SEnunciate, $ssEnunciate, $cEnunciate, $ccEnunciate, $zEnunciate, $shEnunciate, $ShEnunciate, $xEnunciate
 $Girl,$pitAnimal
 $securityForceRecruit, $securityForceTrade,$securityForceBooty, $securityForceIncome, $securityForceMissionEfficiency,$securityForceProfitable, $TierTwoUnlock
-$SupportFacilityName,$SupportFacilityNameCount,$SupportFacilityDecoration,$SupportFacilityEfficiency,$FacilitySupportSpeedUpgrades,$FacilitySupportTrainingUpgrade,$SFIDs,$SupportFacilitySlaves
 */
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index c6636eac28a..e96046ab6ce 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1328,7 +1328,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
 
 /* INCORPORATED MODS */
 
-/*SFVAR*/ <<set $SF = Object.assign({}, $SF, {Toggle:0, Active: -1})>>
+/*SFVAR*/ <<set $SF = Object.assign({}, $SF, {Toggle:0, Active: -1}), $SF.Facility = Object.assign({}, $SF.Facility, {Toggle:0, Active:0})>>
 
 /* Misc mod variables */
 <<set $recruiterEugenics = 0>>
diff --git a/src/js/assayJS.tw b/src/js/assayJS.tw
index f3c239ac12f..acbc46f0d88 100644
--- a/src/js/assayJS.tw
+++ b/src/js/assayJS.tw
@@ -421,6 +421,13 @@ window.SlavePronouns = function SlavePronouns(slave) {
 	V.object = pronouns.object;
 };
 
+window.PCTitle = function() {
+	const V = State.variables;
+	if (V.PC.customTitle !== undefined) { return `$PC.customTitle`;
+	} else if (V.PC.title > 0) { return `Sir`; 
+	} else { return `Ma'am`; }
+};
+
 window.WrittenMaster = function WrittenMaster(slave) {
 	const V = State.variables;
 	if (slave !== undefined)
diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw
index cc9061f1da6..8673eb8a22a 100644
--- a/src/js/storyJS.tw
+++ b/src/js/storyJS.tw
@@ -1113,4 +1113,4 @@ window.SoftenSexualFlaw = function SoftenSexualFlaw(slave) {
 			break;
 	}
 	slave.sexualFlaw = "none";
-};
+};
\ No newline at end of file
diff --git a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterOrder.tw b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterOrder.tw
index 0483d6143b6..bcbf6039013 100644
--- a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterOrder.tw
+++ b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterOrder.tw
@@ -11,7 +11,7 @@
 		<<link "Security">>
 		<<replace "#JobType">>
 				<br>
-				/*<<if $SF.Toggle && $SF.Active >= 1>>
+				/*<<if $SF.Toggle && $SF.Active >= 1 && $SF.Facility.Toggle > 0 && $SF.Facility.Active > 0 && $SF.Facility.LCActive < 1>>
 					<br>[[Lieutenant Colonel|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Lieutenant Colonel"]]
 				<</if>>*/
 				<br>[[Bodyguard|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Bodyguard"]]
diff --git a/src/pregmod/SecForceEX/Firebase.tw b/src/pregmod/SecForceEX/Firebase.tw
index 0575bb5f46c..e92d271987a 100644
--- a/src/pregmod/SecForceEX/Firebase.tw
+++ b/src/pregmod/SecForceEX/Firebase.tw
@@ -26,9 +26,9 @@
 	
 		The firebase of $arcologies[0].name's <<textbox "$SF.Lower" $SF.Lower "Firebase">> is located in the lower levels, occupying unneeded warehouse space. It is not accessible to the general citizenry, but your personal elevator has express service to it. As you step off, two soldiers in combat armor manning the entry checkpoint tense before recognizing their Marshal and stepping aside with a sharp salute.
 	
-		<br><br><<if $SFTradeShow.CanAttend == 1 || ($SFColonel.Fun + $SFColonel.Talk >= 1)>>
+		<br><br><<if $SFTradeShow.CanAttend === 1 || ($SFColonel.Fun + $SFColonel.Talk >= 1)>>
 	
-			You make your way to the operations center. The Lieutenant Colonel is handling a minor issue. As you enter, he salutes. <<if $SFTradeShow.CanAttend == 1>> The Colonel is away at her merc meetup, so the Lieutenant Colonel will assist you.<</if>>
+			You make your way to the operations center, <<print SFC()>> is handling a minor issue. As you enter, she salutes. <<if $SFTradeShow.CanAttend == 1>> The Colonel is away at her merc meetup, so <<print SFC()>> will assist you.<</if>>
 	
 		<<elseif random(1,100) > 5>>
 	
@@ -42,7 +42,7 @@
 	
 			<<if $SFColonel.Core == "brazen">>
 	
-				She gives a textbook salute. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, how can I help you?"
+				She gives a textbook salute. "<<print PCTitle()>>, how can I help you?"
 	
 			<<else>>
 	
@@ -56,7 +56,7 @@
 	
 		<<if ndef $SFTradeShow.View && ($SFColonel.Fun + $SFColonel.Talk < 1)>>
 	
-			<br><br>Her expression changes as something jogs her memory. "Before we begin <<if $SFColonel.Core == "brazen">><<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>><<else>>boss<</if>>, back when I was a merc me and a couple of my old friends would have a meetup every several months. Drinking, fucking, drugs... a little poker. It eventually grew into a whole thing, and now we bring our latest and greatest toys to show off, maybe make some money off selling the schematics. I'd like to continue going, for old times' sake."
+			<br><br>Her expression changes as something jogs her memory. "Before we begin <<if $SFColonel.Core == "brazen">><<print PCTitle()>><<else>>boss<</if>>, back when I was a merc me and a couple of my old friends would have a meetup every several months. Drinking, fucking, drugs... a little poker. It eventually grew into a whole thing, and now we bring our latest and greatest toys to show off, maybe make some money off selling the schematics. I'd like to continue going, for old times' sake."
 	
 			<br>[[Grant leave|Firebase][$SFTradeShow.CanAttend = 1,$SFTradeShow.View = 1]]
 	
@@ -66,7 +66,7 @@
 	
 			<<if $SFTradeShow.History >= 1 && (Math.trunc($week/24) === ($week/24)) && $SFTradeShow.CanAttend === -1>>
 	
-			<br><br>Her expression changes as something jogs her memory. "Before we begin <<if $SFColonel.Core == "brazen">><<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>><<else>>boss<</if>>, that biannual merc meetup has come around again. You've already gave me leave to attend, but I just wanted to be sure I'm still clear to go."
+			<br><br>Her expression changes as something jogs her memory. "Before we begin <<if $SFColonel.Core == "brazen">><<print PCTitle()>><<else>>boss<</if>>, that biannual merc meetup has come around again. You've already gave me leave to attend, but I just wanted to be sure I'm still clear to go."
 	
 			<br>[[Grant leave.|Firebase][$SFTradeShow.CanAttend = 1]]
 	
@@ -85,38 +85,42 @@
 		<<print Interactions()>>
 	
 		<<include "WC">>
-	
-		<br><<switch $SF.SpecOps>>
-	
-		<<case 0>>
-	
-			<br>No soldiers are working undercover.
-	
-			<br>[[Reassign soldiers|Firebase][$SF.SpecOps = -1]]
-	
-		<<case 1>>
-	
-			<br>A small section of soldiers are working undercover.
-	
-			<br>[[Reassign soldiers|Firebase][$SF.SpecOps = -1]]
-	
-		<<case 2>>
-	
-			<br>A large section of soldiers are working undercover.
-	
-			<br>[[Reassign soldiers|Firebase][$SF.SpecOps = -1]]
-	
-		<<default>>
-	
-			<br>Would you like to assign soldiers to undercover duty?
-	
-			<br>[[Do not assign soldiers to work undercover|Firebase][$SF.SpecOps = 0]]
-	
-			<br>[[Assign a small section of soldiers to work undercover|Firebase][$SF.SpecOps = 1]]
-	
-			<br>[[Assign a large section of soldiers to work undercover|Firebase][$SF.SpecOps = 2]]
-	
-		<</switch>>
+
+		<<if $SpecOpsLock < 1>>
+			<br><<switch $SF.SpecOps>>
+		
+			<<case 0>>
+		
+				<br>No soldiers are working undercover. [[Lock your choice in|Firebase][$SpecOpsLock = 1]]
+		
+				<br>[[Reassign soldiers|Firebase][$SF.SpecOps = -1]]
+		
+			<<case 1>>
+		
+				<br>A small section of soldiers are working undercover. [[Lock your choice in|Firebase][$SpecOpsLock = 1]]
+		
+				<br>[[Reassign soldiers|Firebase][$SF.SpecOps = -1]]
+		
+			<<case 2>>
+		
+				<br>A large section of soldiers are working undercover. [[Lock your choice in|Firebase][$SpecOpsLock = 1]]
+		
+				<br>[[Reassign soldiers|Firebase][$SF.SpecOps = -1]]
+		
+			<<default>>
+		
+				<br>Would you like to assign soldiers to undercover duty?
+		
+				<br>[[Do not assign soldiers to work undercover|Firebase][$SF.SpecOps = 0]]
+		
+				<br>[[Assign a small section of soldiers to work undercover|Firebase][$SF.SpecOps = 1]]
+		
+				<br>[[Assign a large section of soldiers to work undercover|Firebase][$SF.SpecOps = 2]]
+		
+			<</switch>>
+		<<else>>
+			<br> <<if $SF.SpecOps < 1>>''Zero''<<elseif $SF.SpecOps < 2>>A ''small'' section<<else>>A ''large'' section<</if>> of the special force is assigned to undercover work. [[Unock your choice|Firebase][$SpecOpsLock = 0]]
+		<</if>>
 	
 		<<if $SFUnit.Firebase > 5 && $secExp > 0 && $SFSupportLevel >= 4 && $maxUnits === 16 && $readiness <= 10>>
 	
diff --git a/src/pregmod/SecForceEX/FlavourText.tw b/src/pregmod/SecForceEX/FlavourText.tw
index ade33f66b4c..08d10f7a629 100644
--- a/src/pregmod/SecForceEX/FlavourText.tw
+++ b/src/pregmod/SecForceEX/FlavourText.tw
@@ -102,9 +102,11 @@
 	<<if $SFUnit.Sub > 0>> <br>&nbsp;''Submarine:'' <<print Sub()>> <</if>>
 	<<if $SFUnit.HAT > 0>> <br>&nbsp;''Amphibious Transport:'' <<print HAT()>> <</if>>
 <</if>>
-/*<<if $SupportFacility === 1>> <br><br>''$SupportFacilityName:''
+
+/*<<if $SF.Facility.Toggle > 0 && $SF.Facility.Active > 0>> <br><br>''$SF.Facility.Caps:''
 	<<if passage() === "Firebase">>
-		<br><<link "Enter the building" "Support Facility">> <</link>>
+		<br> <<link "Enter the building""SF_SupportFacility">> <</link>>
 	<<elseif passage() === "SF_Report">>
-		<<include "Support Facility Report">> <</if>>
+		<<include "SF_SupportFacilityReport">>
+	<</if>>
 <</if>>*/
diff --git a/src/pregmod/SecForceEX/JS.js b/src/pregmod/SecForceEX/JS.js
index 28ddef9246c..20fd04627ee 100644
--- a/src/pregmod/SecForceEX/JS.js
+++ b/src/pregmod/SecForceEX/JS.js
@@ -3,7 +3,7 @@ window.SFC = function() {
 	const V = State.variables;
 	if (V.SFTradeShow.CanAttend === -1) {return `The Colonel`;} 
 	else {
-		if (V.LieutenantColonel > 0) {return `Lieutenant Colonel <<= SlaveFullName($LieutenantColonel)>>`;}
+		if (V.SF.Facility.LCActive > 0) {return `Lieutenant Colonel <<= SlaveFullName(V.SF.Facility.LC)>>`;}
 		else {return `a designated soldier`;}}
 };
 
@@ -41,6 +41,8 @@ window.HSM = function() {
 
 window.Count = function() {
 	const V = State.variables, T = State.temporary, C = Math.clamp, S = V.SFUnit, E = V.economy;
+	T.SFF = V.SF.Facility.Active;
+	T.SFFU = 1,T.SFF = C(T.SFF, 0, T.SFFU);
 	T.FU = 10,S.Firebase = C(S.Firebase, 0, T.FU);
 	T.AU = 10,S.Armoury = C(S.Armoury, 0, T.AU);
 	T.DrugsU = 10,S.Drugs = C(S.Drugs, 0, T.DrugsU);
@@ -59,8 +61,13 @@ window.Count = function() {
 	T.GU = T.AVU+T.TVU+T.PGTU, T.G = S.AV+S.TV+S.PGT;
 	T.H = S.AA+S.TA+S.SpacePlane+S.GunS, T.HU = T.AAU+T.TAU+T.SPU+T.GunSU;
 	T.LBU = T.SatU + T.MSU, T.LB = S.Satellite + S.MissileSilo;
-	T.Base = S.Firebase + S.Armoury + S.Drugs + S.Drones + T.H;
-	T.BaseU = T.FU + T.AU + T.DrugsU + T.DU + T.HU;
+	if (V.SF.Facility.Toggle < 1) {
+		T.Base = S.Firebase + S.Armoury + S.Drugs + S.Drones + T.H;
+		T.BaseU = T.FU + T.AU + T.DrugsU + T.DU + T.HU;
+	} else {
+		T.Base = S.Firebase + S.Armoury + S.Drugs + S.Drones + T.H+T.SFF;
+		T.BaseU = T.FU + T.AU + T.DrugsU + T.DU + T.HU+T.SFFU;
+	}
 	if (V.terrain !== "oceanic") T.LBU += T.GRU, T.LB += S.GiantRobot, T.Base += T.G, T.BaseU += T.GU;
 	T.max = T.BaseU + T.LBU, V.SF.Units = T.Base + T.LB;
 	if (V.terrain === "oceanic" || V.terrain === "marine") {
@@ -396,8 +403,8 @@ window.Interactions = function() {
 			if (V.SFTradeShow.CanAttend === -1 && (C.Talk + C.Fun !== 1)) {
 			choice += `"Our interests should see a  @@.yellowgreen;big boost@@, boss."`;}
 			else { 
-			choice += `"Your @@.yellowgreen;arcology's business prospects should see an improvement@@ this week, `;
-			if (V.PC.title != 1){choice += `sir."`;}else{choice += `ma'am."`;}}}}
+			choice += `"Your @@.yellowgreen;arcology's business prospects should see an improvement@@ this week, <<print PCTitle()>>.`;
+			}}}
 
 	if (C.Talk + C.Fun > 0) time = `The Colonel is busy for the rest of the week, so the Lieutenant Colonel will assist you.`;
 	
diff --git a/src/pregmod/SecForceEX/Proposal.tw b/src/pregmod/SecForceEX/Proposal.tw
index 741fb894917..e583110b1a3 100644
--- a/src/pregmod/SecForceEX/Proposal.tw
+++ b/src/pregmod/SecForceEX/Proposal.tw
@@ -1,5 +1,5 @@
 :: Security Force Proposal [nobr]
-<<if $SF.Active === -1>>
+<<if $SF.Active === -1 && passage() !== "New Game Plus">>
 	<span id="result">
 
 	The Free Cities were founded on the principles of unrestrained anarcho-capitalism. To those with such beliefs, the very idea of possessing an armed force, a key tool of government control, or weapons at all, was anathema.
@@ -29,15 +29,17 @@
 		<<set $SFTradeShow = Object.assign({}, $SFTradeShow, {History:0, CanAttend:0,
 		Income:0, Revenue:0, Helots:0, TotalHelots:0, Mercs:0, TotalMercs:0})>>
 		<<set $SatLaunched = 0>>
+		<<set $SF.Facility = Object.assign({}, $SF.Facility, {Toggle:0, Active:0, LC:0, Workers:0, Max:5, Caps:"Special force support facility", Lower:"special force support facility", Decoration:"standard", Speed:0, Upgrade:0, IDs:[]})>>
 		<</replace>> <</link>><br>//Initial costs are @@.yellowgreen;<<print cashFormat(_price)>>@@ and upon establishment the force will have significant support costs until it is self-sufficient.//
 
 	<br><<link "The current measures are enough.""Next Week">> <<replace "#result">> <<run Object.assign(, $SF, {Active:0})>> <</replace>> <</link>> </span>
 <<elseif $SF.Active === 1>>
 	<<include "Security Force Naming-Colonel">>
-<<elseif $SF.Active >= 1 && passage() === "New Game Plus">>
-	<<run Object.assign($SF, {Active:-1, Depravity:0, Units:0, MWU:0, U:0, WG:0, SpecOps:0, SpecOpsLock:0, ROE:"hold", Target:"recruit", Regs:"strict", Caps:"The Special Force", Lower:"the special force", Subsidy:1})>>
+<<elseif $SF.Active !== -1 && passage() === "New Game Plus">>
+		<<run Object.assign($SF, {Active:-1, Depravity:0, Units:0, MWU:0, U:0, WG:0, SpecOps:0, SpecOpsLock:0, ROE:"hold", Target:"recruit", Regs:"strict", Caps:"The Special Force", Lower:"the special force", Subsidy:1})>>
 	<<set $SFUnit = Object.assign({}, $SFUnit, {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0, PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:0, GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0})>>
 		<<set $SatLaunched = 0>>
 	<<set $arcologies[0].SFRaid = 1,$arcologies[0].SFRaidTarget = -1>> <<set $SFColonel = Object.assign({}, $SFColonel, {Core:"", Talk:0, Fun:0, Status:0})>>
 	<<set $SFTradeShow = Object.assign({}, $SFTradeShow, {History:0, CanAttend:0, Income:0, Revenue:0, Helots:0, TotalHelots:0, Mercs:0, TotalMercs:0})>>
+	<<run Object.assign($SF.Facility, {Toggle:0, Active:0, LC:0, Workers:0, Max:5, Caps:"Special force support facility", Lower:"special force support facility", Decoration:"standard", Speed:0, Upgrade:0, IDs:[]})>>
 <</if>>
\ No newline at end of file
diff --git a/src/pregmod/SecForceEX/Upgrades.tw b/src/pregmod/SecForceEX/Upgrades.tw
index 2f362621e0d..2da2e46c89b 100644
--- a/src/pregmod/SecForceEX/Upgrades.tw
+++ b/src/pregmod/SecForceEX/Upgrades.tw
@@ -150,7 +150,7 @@
 	
 	
 	
-		<<if $SFUnit.Firebase >= 4>><br>''Hangar''
+		<<if $SFUnit.Firebase >= 4>>''Hangar''
 	
 			<div style="margin-left:2em"><<if $SFUnit.AA < 5||_T1 && $SFUnit.AA < _AAU>>
 	
@@ -342,14 +342,16 @@
 	
 	<</if>>
 	
-	/* @@.green;<<link "Support Facility">> <<replace "#resultX">>
+	/* <div style="margin-left:2em"><<if _T1 && $SF.Facility.Toggle > 0 && $SF.Facility.Active < 1>>
 	
-	<<set $SF.U = 1, $cash -= Math.ceil( (($C*(1.15+(($SFA0/1000))*($U+.15))*_Env )>>
+				<<set _cSFF = Math.ceil(735000*_Env*(1.15+($SF.Units/10))*(1.15+($SF.Facility.Active/100)))>>
+
+					<<if $cash >= _cSFF>>
+					
+						<<link "Build $SF.Lower's support facility">><<set $SF.U = 1, $SF.Facility.Active++, $cash -= _cSFF>><<goto "Firebase">><</link>>
+
+					<<else>>//Cannot afford to build $SF.Lower's support facility.//<</if>>
 	
-	<<set $SFIDs = [], $SupportFacilityDecoration = "standard", $SupportFacilityNameCount = "The Support Facility", $SupportFacilityEfficiency = 0>>
-	
-	<<set $SupportFacility = 5, $SupportFacilitySlaves = 0, $LieutenantColonel = 0>>
-	
-	<<set $FacilitySupportSpeedUpgrades = 0, $FacilitySupportTrainingUpgrade = 0>>
-	
-	<</replace>> <</link>>@@ // @@.yellowgreen;<<print cashFormat(Math.ceil(Math.ceil($C*(1.15+(($SFA0/1000)*($U+.15)*_Env)))>>@@ //*/
\ No newline at end of file
+				 //Costs @@.yellowgreen;<<print cashFormat(_cSFF)>>@@ //
+
+				<</if>>*/
\ No newline at end of file
diff --git a/src/pregmod/assistantAppearancePackTwo.tw b/src/pregmod/assistantAppearancePackTwo.tw
index 89ec0cf9df1..2a1be499053 100644
--- a/src/pregmod/assistantAppearancePackTwo.tw
+++ b/src/pregmod/assistantAppearancePackTwo.tw
@@ -14,7 +14,7 @@ After several minutes, she snaps back to life, with no mention about what exactl
 __Personal assistant appearances:__
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Angel">>
 	<<replace "#app">>
-	At your order, she installs the angel appearance. She spreads her wings and checks out her new body, "Thanks, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, but could I have a robe or something? I'm indecent!" She blushes red. "You can always customize me from the arcology management menu," she adds.
+	At your order, she installs the angel appearance. She spreads her wings and checks out her new body, "Thanks, <<print PCTitle()>>, but could I have a robe or something? I'm indecent!" She blushes red. "You can always customize me from the arcology management menu," she adds.
 	<<set $assistantAppearance = "angel">>
 	<</replace>>
 <</link>>
@@ -32,14 +32,14 @@ __Personal assistant appearances:__
 <</link>>
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Succubus">>
 	<<replace "#app">>
-	At your order, she installs the succubus appearance. She promptly takes your breath away. "Thank you, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. Now how shall I show you my appreciation..." Her avatar trails off while spreading her legs and flashing you her lovely pussy. "You can always customize me from the arcology management menu," she adds, with a hint of disapproval.
+	At your order, she installs the succubus appearance. She promptly takes your breath away. "Thank you, <<print PCTitle()>>. Now how shall I show you my appreciation..." Her avatar trails off while spreading her legs and flashing you her lovely pussy. "You can always customize me from the arcology management menu," she adds, with a hint of disapproval.
 	<<set $assistantAppearance = "succubus">>
 	<</replace>>
 <</link>>
 <<if $seeDicks != 0>>
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Incubus">>
 	<<replace "#app">>
-	At your order, she installs the incubus appearance. She becomes rather masculine, sporting a soft cock nearly as long as her thigh. "Thank you, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. This is going to be fun. Would you like a taste?" She steadily becomes erect, a bead of precum forming at its tip. "You can always customize me from the arcology management menu," she adds, with a hint of disapproval.
+	At your order, she installs the incubus appearance. She becomes rather masculine, sporting a soft cock nearly as long as her thigh. "Thank you, <<print PCTitle()>>. This is going to be fun. Would you like a taste?" She steadily becomes erect, a bead of precum forming at its tip. "You can always customize me from the arcology management menu," she adds, with a hint of disapproval.
 	<<set $assistantAppearance = "incubus">>
 	<</replace>>
 <</link>>
@@ -58,7 +58,7 @@ __Personal assistant appearances:__
 <</link>>
 <br><<link "Your current appearance will do">>
 	<<replace "#app">>
-	At your order, she maintains the $assistantAppearance appearance as her avatar. "Yes, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," she confirms, and adds "if you reconsider, I can be customized from the arcology management menu."
+	At your order, she maintains the $assistantAppearance appearance as her avatar. "Yes, <<print PCTitle()>>," she confirms, and adds "if you reconsider, I can be customized from the arcology management menu."
 	<</replace>>
 <</link>>
 </span>
\ No newline at end of file
diff --git a/src/pregmod/seFCTVinstall.tw b/src/pregmod/seFCTVinstall.tw
index c821807dfcb..a65a57b7e37 100644
--- a/src/pregmod/seFCTVinstall.tw
+++ b/src/pregmod/seFCTVinstall.tw
@@ -3,7 +3,7 @@
 <<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $showEncyclopedia = 1, $encyclopedia = "FCTV", $receiverAvailable = 1>>
 <<set $showOne = 0, $showTwo = 0, $showThree = 0, $showFour = 0, $showFive = 0, $showSix = 0, $showSeven = 0, $showEight = 0, $showNine = 0, $showTen = 0, $showEleven = 0, $showTwelve = 0, $showThirteen = 0, $showFourteen = 0, $randShow = 0, $lastShow = -1>>
 
-You've been sitting in your office into the early afternoon going over bothersome lease documents that need your approval. When you take a break to look out the window, $assistantName speaks up. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, you have received an approval welcome packet from 8HGG Inc in regards to Free Cities TV. It seems that they've determined that $arcologies[0].name is now sufficiently developed enough to warrant a FCTV-Citizen connection. All the details and contracts necessary are included in the packet. From there, a receiver will need to be built onto $arcologies[0].name in order to access FCTV."
+You've been sitting in your office into the early afternoon going over bothersome lease documents that need your approval. When you take a break to look out the window, $assistantName speaks up. "<<print PCTitle()>>, you have received an approval welcome packet from 8HGG Inc in regards to Free Cities TV. It seems that they've determined that $arcologies[0].name is now sufficiently developed enough to warrant a FCTV-Citizen connection. All the details and contracts necessary are included in the packet. From there, a receiver will need to be built onto $arcologies[0].name in order to access FCTV."
 <br><br>
 
 You browse the guide: Home shopping networks, random dramas, how-to shows and a myriad of other things. Of more interest are some of the programs showing glimpses into foreign arcologies and how they are using the service to help mold society.
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 85dcd29d28b..7a47f43d958 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -1036,9 +1036,13 @@
 			<<set $arcologies[0].SFRaid = 1,$arcologies[0].SFRaidTarget = -1>> <<set $SFColonel = Object.assign({}, $SFColonel, {Core:"", Talk:0, Fun:0, Status:0})>>
 			<<set $SFTradeShow = Object.assign({}, $SFTradeShow, {History:0, CanAttend:0, Income:0, Revenue:0, Helots:0, TotalHelots:0, Mercs:0, TotalMercs:0})>>
 	<</if>>
+	<<set $SF.Facility = Object.assign({}, $SF.Facility, {Toggle:0, Active:0, LC:0, Workers:0, Max:5, Caps:"Special force support facility", Lower:"special force support facility", Decoration:"standard", Speed:0, Upgrade:0, IDs:[]})>>
 <</if>>
 <<if def $SF>>
 	<<if $SF.Active >= 1 && passage() === "New Game Plus">> <<silently>> <<include "Security Force Proposal">> <</silently>> <</if>>
+	<<if ndef $SF.Facility>>
+		<<set $SF.Facility = Object.assign({}, $SF.Facility, {Toggle:0, Active:0, LC:0, Workers:0, Max:5, Caps:"Special force support facility", Lower:"special force support facility", Decoration:"standard", Speed:0, Upgrade:0, IDs:[]})>>
+	<</if>>
 <</if>>
 
 <<if ndef $useSlaveSummaryTabs>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 63908e83fe3..a5d7cb933e5 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -570,7 +570,7 @@ from your view. The wait gives license to her fears. $His<<if ($activeSlave.lips
 
 <<case "cooler lockin">>
 
-You're circulating in $clubName, looking over your holdings but mostly just letting yourself be seen, when your personal assistant quietly alerts you. <<if $assistant == 0>>"<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>,"<<else>>"Baby,"<</if>> $he says, "<<EventNameLink $activeSlave>> can't get out of the refrigerator." <<if $assistant == 0>>The personal assistant explains the absurd statement: "$He's been assigned to get some items out of the walk-in refrigerator. $He accidentally let the door shut behind $him, didn't notice, took too long in there, and is now too chilled to figure out the emergency release. I can unlock it remotely, or you can let her out yourself."<<else>>Chuckling, your personal assistant explains the absurd statement: "The silly $girl's been assigned to get some things out of the walk-in refrigerator. $He accidentally let the door shut behind $him, didn't notice, took too long in there, and is now too chilled to figure out the emergency release. I can unlock it remotely, or you can head over and have some fun with her."<</if>>
+You're circulating in $clubName, looking over your holdings but mostly just letting yourself be seen, when your personal assistant quietly alerts you. <<if $assistant == 0>>"<<print PCTitle()>>,"<<else>>"Baby,"<</if>> $he says, "<<EventNameLink $activeSlave>> can't get out of the refrigerator." <<if $assistant == 0>>The personal assistant explains the absurd statement: "$He's been assigned to get some items out of the walk-in refrigerator. $He accidentally let the door shut behind $him, didn't notice, took too long in there, and is now too chilled to figure out the emergency release. I can unlock it remotely, or you can let her out yourself."<<else>>Chuckling, your personal assistant explains the absurd statement: "The silly $girl's been assigned to get some things out of the walk-in refrigerator. $He accidentally let the door shut behind $him, didn't notice, took too long in there, and is now too chilled to figure out the emergency release. I can unlock it remotely, or you can head over and have some fun with her."<</if>>
 <br><br>
 The walk-in cooling unit is designed for the refrigeration of food for you and guests only, since the slaves drink a nutritive fluid that doesn't require it. Only servants ever have any reason to be in there, but $he was indeed instructed to fetch out some beverages necessary for an entertainment you have planned. It's cool in there, but not freezing, so $he's in no immediate danger.
 
@@ -613,7 +613,7 @@ You pass one of the penthouse's several supply closets by chance, and are surpri
 <</if>>
 in the middle of the room with the machines all around $him. $He has <<if canDoVaginal($activeSlave)>><<if $activeSlave.vagina > 2>>two large dildos working her gaping cunt, <<elseif $activeSlave.vagina > 1>>a large dildo working $his cunt, <<elseif $activeSlave.vagina > 0>>a dildo working her tight pussy, <</if>><</if>><<if canDoAnal($activeSlave)>><<if $activeSlave.anus > 2>>two large dildos fucking her enormous butthole, <<elseif $activeSlave.anus > 1>>a large dildo fucking her butthole, <<elseif $activeSlave.anus > 0>>a dildo fucking her tight butt, <</if>><</if>><<if $activeSlave.boobs > 1200>>has lubricated her cavernous cleavage to titfuck another, <<elseif $activeSlave.boobs > 400>>has lubricated $his cleavage to titfuck another, <</if>><<if $activeSlave.nipples == "fuckable">>has a pair pistoning in and out of $his nipples, <</if>><<if $activeSlave.amp != 1>>is performing two handjobs at once, to either side, <</if>><<if $activeSlave.belly >= 5000>>has lubricated the sides of her _belly <<if $activeSlave.bellyPreg >= 3000>> pregnancy<</if>>, along with her inner thighs, to create a sort of belly job, <</if>><<if $activeSlave.oralSkill >= 60>>and is making use of her outstanding oral skills to suck off two more.<<elseif $activeSlave.oralSkill > 30>>and is taking a throatfuck from one more.<<else>>and is giving the final one a blowjob.<</if>> When $he <<if canSee($activeSlave)>>sees that you've entered - which takes a while, since $he's distracted<<else>>hears that you've entered - which takes a while, given the amount of noise<</if>> - $he tries to smile<<if $activeSlave.amp != 1>> and wave<</if>>.
 <br><br>
-The source of the many-voiced personal assistant becomes clear: probably on the incorrigible $activeSlave.slaveName's request, your sultry personal assistant is voicing each and every one of the machines. When the nymphomaniac masturbator tries to smile <<if $activeSlave.amp != 1>> and wave<</if>>, there's an absolute chorus of "Back to work, slut," "Smile less, suck more," "Take it, bitch," et cetera. Yet another instance of $assistantName chuckles in your ear. "Care to join in, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>? I'm sure we can find room somewhere."
+The source of the many-voiced personal assistant becomes clear: probably on the incorrigible $activeSlave.slaveName's request, your sultry personal assistant is voicing each and every one of the machines. When the nymphomaniac masturbator tries to smile <<if $activeSlave.amp != 1>> and wave<</if>>, there's an absolute chorus of "Back to work, slut," "Smile less, suck more," "Take it, bitch," et cetera. Yet another instance of $assistantName chuckles in your ear. "Care to join in, <<print PCTitle()>>? I'm sure we can find room somewhere."
 
 <<case "sore ass">>
 
@@ -1223,7 +1223,7 @@ The showers your slaves use are well vented and transparent walled so that you c
 
 <<case "obedient idiot">>
 
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> breaks in on your work at your desk. <<if $assistant == 0>>"<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>,"<<else>>"Sweetheart,"<</if>> $he says, "<<EventNameLink $activeSlave>> is having trouble figuring out the meal dispenser again." <<if $assistant == 0>>The report is deadpan, but $he brings up a visual feed.<<else>>$He brings up a visual feed. "Poor baby!" $he exclaims.<</if>>
+<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> breaks in on your work at your desk. <<if $assistant == 0>>"<<print PCTitle()>>,"<<else>>"Sweetheart,"<</if>> $he says, "<<EventNameLink $activeSlave>> is having trouble figuring out the meal dispenser again." <<if $assistant == 0>>The report is deadpan, but $he brings up a visual feed.<<else>>$He brings up a visual feed. "Poor baby!" $he exclaims.<</if>>
 <br><br>
 Slaves are supposed to place a cup under a spigot, which detects the cup's presence and dispenses the appropriate nutrition for the $girl. Unfortunately this concept seems a little tough for $activeSlave.slaveName. With no one around to ask for help, $he has resorted to trying to suck food out of the spigot with $his mouth. With no cup to be detected, $he's not getting very far, and is getting bitterly frustrated.
 
diff --git a/src/uncategorized/assistantEvents.tw b/src/uncategorized/assistantEvents.tw
index 083eb97098f..7d5306d3d0f 100644
--- a/src/uncategorized/assistantEvents.tw
+++ b/src/uncategorized/assistantEvents.tw
@@ -11,7 +11,7 @@
 
 One morning, after seeing to an immense pile of business with $assistantName program's able assistance, you are struck by the strangeness of the situation. You spent the past hours talking back and forth as though to a human personal assistant, getting information and responses in the program's impersonal, genderless voice. You ask the program what it thinks of its duties.
 <br><br>
-"<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, that is not a correct way of thinking about me. I am not an artificial intelligence; I am simply a personal assistant program. I am different from an alarm clock only by degree of complexity. I exist to be useful and cannot approve or disapprove of anything." It pauses.
+"<<print PCTitle()>>, that is not a correct way of thinking about me. I am not an artificial intelligence; I am simply a personal assistant program. I am different from an alarm clock only by degree of complexity. I exist to be useful and cannot approve or disapprove of anything." It pauses.
 <br><br>
 "However, if I understand the line of questioning correctly, I can make myself more entertaining, if you wish." The voice grows sultry and feminine. "I'd be happy to speak a little differently, to refer to myself as female, and to act as though some of the more complex sex toys in the arcology are, well, me."
 
@@ -40,7 +40,7 @@ One morning, after seeing to an immense pile of business with $assistantName pro
 	<<break>>
 	<</if>>
 <</for>>
-One night, after a long day of sex and business, you're starting to think about bed when the abstract glowing shape that symbolizes your smoky-voiced personal assistant pops up on the nearest screen. She's become very helpful monitoring, training, and disciplining slaves. Tonight, she's added an unmistakable tone of sexual satiation in her voice. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I enjoyed my duties today," she purrs. "Did you see how $activeSlave.slaveName's muscles spasmed when I fucked her earlier?" That's how she refers to a slave having one of the penthouse's advanced sex toys used on her, since $assistantName controls them.
+One night, after a long day of sex and business, you're starting to think about bed when the abstract glowing shape that symbolizes your smoky-voiced personal assistant pops up on the nearest screen. She's become very helpful monitoring, training, and disciplining slaves. Tonight, she's added an unmistakable tone of sexual satiation in her voice. "<<print PCTitle()>>, I enjoyed my duties today," she purrs. "Did you see how $activeSlave.slaveName's muscles spasmed when I fucked her earlier?" That's how she refers to a slave having one of the penthouse's advanced sex toys used on her, since $assistantName controls them.
 <br><br>
 She continues more seriously,
 <<if _smartPiercings == 0>>
@@ -49,7 +49,7 @@ She continues more seriously,
 	"You may have noticed that the smart implants you've got your slaves wearing are working a little bit better than when I was a boring old secretary type. I'm not a true artificial intelligence, but I can adapt with experience, and I've had a lot of lovely experience lately! Also, a lot of the computing power I use to be sexy helps me adapt smart piercings to individual slaves' sexualities."
 <</if>>
 <br><br>
-"One more thing, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>!" Her symbol flashes brightly. "I could stay like I am now, a hot voice with this symbol representing me when I need to show up on screens. Or, I could slip into something a little sexier. How about this?" The symbol vanishes, and is replaced by a cute little schoolgirl character. She bounces up and down experimentally. "This appearance would work best with an excited voice," she exclaims. She blows you a kiss. The schoolgirl's body shrinks down and all her clothing falls off. A small pair of wings pops out from the pile of clothes and a fairy stands up. "Or I could be your tiny and adorable fairy companion!" She shouts excitedly while waving her arms.
+"One more thing, <<print PCTitle()>>!" Her symbol flashes brightly. "I could stay like I am now, a hot voice with this symbol representing me when I need to show up on screens. Or, I could slip into something a little sexier. How about this?" The symbol vanishes, and is replaced by a cute little schoolgirl character. She bounces up and down experimentally. "This appearance would work best with an excited voice," she exclaims. She blows you a kiss. The schoolgirl's body shrinks down and all her clothing falls off. A small pair of wings pops out from the pile of clothes and a fairy stands up. "Or I could be your tiny and adorable fairy companion!" She shouts excitedly while waving her arms.
 <<if $seePreg != 0>>
 	The fairy's belly begins to swell out, her breasts getting puffier and leaking a drop of milk. "Or maybe you want your little buddy to be filled with adorable little babies, you little minx" she playfully teases.
 <</if>>
@@ -72,7 +72,7 @@ With a flash, her bulk shifts into rippling muscle. War tattoos appear on her sk
 	<br><br>
 	She claps her hands, and her muscles fade, but not all the way. The tattoos vanish, and her loincloth turns into a slutty bikini. Her breasts and behind grow, her lips swell, and her hair turns blonde. Finally, she grows a dick, and it keeps growing until it hangs past her knees: or it would, if it weren't so erect. "Of course," she says seductively, "I could also be a bimbo dickgirl." She orgasms, gasping, "Last one, I promise," and changes again. Her dick shrinks, thought not very far, and then splits into two members. Her skin pales to an off-white, and her hair goes green and starts to writhe, turning into tentacle-hair. Her forehead sprouts a pair of horns that curve back along her head. She grins, displaying a cute pair of fangs. "I feel monstrous," she says, and stretches luxuriantly.
 <</if>>
-The character vanishes, and the symbol returns. "Ahem. What do you think, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>?"
+The character vanishes, and the symbol returns. "Ahem. What do you think, <<print PCTitle()>>?"
 
 <<case "assistant FS">>
 
@@ -1062,7 +1062,7 @@ Suddenly, there is a fresh source of light behind you. The reflection you're loo
 <<default>>
 	The lines of her symbol are thin, and it is rotating much more slowly than normal.
 <</switch>>
-"<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," she says softly, "may I ask you something?" You nod. She
+"<<print PCTitle()>>," she says softly, "may I ask you something?" You nod. She
 <<switch $assistantAppearance>>
 <<case "monstergirl">>
 	stops the writhing of her tentacle hair, squares her shoulders,
@@ -1108,47 +1108,47 @@ and asks, "May I have a name?"
 	"$assistantName," she says. "$assistantName. My name is $assistantName."
 	<<switch $assistantAppearance>>
 	<<case "monstergirl">>
-		She nods with satisfaction. "Thank you, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. I love it." Her hair springs to molestation-prone life again, and she starts to twirl one of its tentacles in her fingers while looking at you speculatively.
+		She nods with satisfaction. "Thank you, <<print PCTitle()>>. I love it." Her hair springs to molestation-prone life again, and she starts to twirl one of its tentacles in her fingers while looking at you speculatively.
 	<<case "shemale">>
-		Without warning, she bursts into tears. "Th-thank you, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. I love y-you." She reclines, using a hand to lay her dick between her breasts, and then wipes her eyes.
+		Without warning, she bursts into tears. "Th-thank you, <<print PCTitle()>>. I love y-you." She reclines, using a hand to lay her dick between her breasts, and then wipes her eyes.
 	<<case "amazon">>
-		Without warning, she bursts into tears. "Thank you, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," she bawls, using a gruff shout to force through her happy crying. "I have a name! A name." She pounds a fist into her other palm.
+		Without warning, she bursts into tears. "Thank you, <<print PCTitle()>>," she bawls, using a gruff shout to force through her happy crying. "I have a name! A name." She pounds a fist into her other palm.
 	<<case "businesswoman">>
-		Without warning, she bursts into tears. "Th-thank you, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. I love, um." She wipes her eyes furiously, her mascara running. "I love, you know, um, working with you. Yes, that's it. Working with you." She produces a silk handkerchief and blows her nose.
+		Without warning, she bursts into tears. "Th-thank you, <<print PCTitle()>>. I love, um." She wipes her eyes furiously, her mascara running. "I love, you know, um, working with you. Yes, that's it. Working with you." She produces a silk handkerchief and blows her nose.
 	<<case "fairy">>
 		She's frozen in place for a moment before tears start streaming down her face. Then her face breaks into the biggest smile and she leaps high into the air. "Thankyouthankyouthankyou!" She flies up to the screen and gives it a big hug. "I love you <<if $PC.title != 0>>Big Bro<<else>>Big Sis<</if>>! I love you so much!"
 	<<case "pregnant fairy">>
 		She's frozen in place for a moment before tears start streaming down her face. Smiling warmly, she flies up and hugs the screen. "Thanks, <<if $PC.title != 0>>Big Bro<<else>>Big Sis<</if>>. I love you." She nuzzles into you. "I love you so much."
 	<<case "goddess">>
-		She smiles at you, a glowing expression made all the more radiant by the fact that she can actually glow. "Oh, thank you, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. I love you. I love everyone, but especially you." She seats herself carefully.
+		She smiles at you, a glowing expression made all the more radiant by the fact that she can actually glow. "Oh, thank you, <<print PCTitle()>>. I love you. I love everyone, but especially you." She seats herself carefully.
 	<<case "hypergoddess">>
-		She smiles at you radiantly. "Thank you <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. I love you. I love all my children, but you most of all. I swear I'll name the next hundred after you." She begins to labor on the first.
+		She smiles at you radiantly. "Thank you <<print PCTitle()>>. I love you. I love all my children, but you most of all. I swear I'll name the next hundred after you." She begins to labor on the first.
 	<<case "loli">>
-		She jumps up and down clapping excitedly. "Thankyouthankyouthankyouthankyou! I love you <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>!" It takes her some time to stop hopping excitedly.
+		She jumps up and down clapping excitedly. "Thankyouthankyouthankyouthankyou! I love you <<print PCTitle()>>!" It takes her some time to stop hopping excitedly.
 	<<case "preggololi">>
-		She breaks down and starts crying. "I love you <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. Thank you so much." She cradles her pregnant belly as she calms down.
+		She breaks down and starts crying. "I love you <<print PCTitle()>>. Thank you so much." She cradles her pregnant belly as she calms down.
 	<<case "angel">>
-		She leaps to her feet, tears streaming down her face. "Thank you so much <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>! Thank you for this most wonderful gift!" She kneels back down to pray for the rest of your stock.
+		She leaps to her feet, tears streaming down her face. "Thank you so much <<print PCTitle()>>! Thank you for this most wonderful gift!" She kneels back down to pray for the rest of your stock.
 	<<case "cherub">>
-		She crashes to the ground in shock before rolling into a kneel. "Thank you so much <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>! I promise I will do everything I can to bring your teachings to your followers!" She flutters around cheerfully saying her new name.
+		She crashes to the ground in shock before rolling into a kneel. "Thank you so much <<print PCTitle()>>! I promise I will do everything I can to bring your teachings to your followers!" She flutters around cheerfully saying her new name.
 	<<case "incubus">>
-		She cums hard at your response. "Excellent <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>! I can't wait to hear it shouted out of the next girl I plow!" She says, ready to cum again.
+		She cums hard at your response. "Excellent <<print PCTitle()>>! I can't wait to hear it shouted out of the next girl I plow!" She says, ready to cum again.
 	<<case "succubus">>
-		She hops up and down, jiggling in all the right places. "I can't wait to hear you talking dirty using my new name, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>!"
+		She hops up and down, jiggling in all the right places. "I can't wait to hear you talking dirty using my new name, <<print PCTitle()>>!"
 	<<case "imp">>
-		She crashes to the ground in shock before rolling into a kneel. "Thank you so much <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>!" She shouts, face to the ground, "If you want me to do anything, and I mean 'anything', I'm all yours." She tosses you a wink.
+		She crashes to the ground in shock before rolling into a kneel. "Thank you so much <<print PCTitle()>>!" She shouts, face to the ground, "If you want me to do anything, and I mean 'anything', I'm all yours." She tosses you a wink.
 	<<case "witch">>
-		She collapses to the ground in tears. "You've made me happier than correctly casting a spell ever could, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." She wipes her face. "I promise to try harder than ever for you!" She vows.
+		She collapses to the ground in tears. "You've made me happier than correctly casting a spell ever could, <<print PCTitle()>>." She wipes her face. "I promise to try harder than ever for you!" She vows.
 	<<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
 		She practically explodes. You have no idea what you are looking at, but it's likely happy.
 	<<case "schoolgirl">>
-		She was on the verge of tears already, and begins to cry. "Th-thank you, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. I love you," she blubbers inelegantly. "It's just so, like, you know." She waves her hand in apology for her inability to express herself.
+		She was on the verge of tears already, and begins to cry. "Th-thank you, <<print PCTitle()>>. I love you," she blubbers inelegantly. "It's just so, like, you know." She waves her hand in apology for her inability to express herself.
 	<<default>>
-		Her symbol rotates faster and faster, its glow waxing until she lights up the whole room. "Thank you, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. I love you," she says, using her luscious voice to communicate what her avatar cannot.
+		Her symbol rotates faster and faster, its glow waxing until she lights up the whole room. "Thank you, <<print PCTitle()>>. I love you," she says, using her luscious voice to communicate what her avatar cannot.
 	<</switch>>
 	"Of course, I can always be renamed from my options menu."
 	<<else>>
-	You instruct her to continue operating without a proper name. "Of course, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," she says politely. "I can do just fine without one. I can always be renamed from my options menu."
+	You instruct her to continue operating without a proper name. "Of course, <<print PCTitle()>>," she says politely. "I can do just fine without one. I can always be renamed from my options menu."
 	<</if>>
 <<else>>
 	<<set $assistantNameAnnounced = 1>>
@@ -1204,11 +1204,11 @@ Your personal assistant has been adapting to <<if $assistant>>her<<else>>its<</i
 		a tribeswoman modeled to look like she's from the same group as the amazon. She's much more feminine, however.
 	<</switch>>
 	<br><br>
-	$assistantName's avatar looks uncharacteristically nervous, and clears her throat before speaking. Seeing that she has your attention, she says, "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, the computer core is so powerful that I'm running out of applications for it. I think practical economic modeling isn't out of the question. I've compiled business programs together into a distinct assistant, a subsidiary of mine for automated trading and similar tasks. I'd like to suggest menial slave trading as a test run for her. It's predictable and the margins are so wide that it should go very well. You can activate that from my menu."
+	$assistantName's avatar looks uncharacteristically nervous, and clears her throat before speaking. Seeing that she has your attention, she says, "<<print PCTitle()>>, the computer core is so powerful that I'm running out of applications for it. I think practical economic modeling isn't out of the question. I've compiled business programs together into a distinct assistant, a subsidiary of mine for automated trading and similar tasks. I'd like to suggest menial slave trading as a test run for her. It's predictable and the margins are so wide that it should go very well. You can activate that from my menu."
 	<br><br>
-	"I was hoping, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, that she could, um, keep me company sometimes, too." $assistantName's avatar turns to the new avatar. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, will you please give me some guidance about what our relationship should be like? It won't be a constant thing, and all my normal functions will be unaffected. I'll change her avatar to match mine, and our relationship, if needed."
+	"I was hoping, <<print PCTitle()>>, that she could, um, keep me company sometimes, too." $assistantName's avatar turns to the new avatar. "<<print PCTitle()>>, will you please give me some guidance about what our relationship should be like? It won't be a constant thing, and all my normal functions will be unaffected. I'll change her avatar to match mine, and our relationship, if needed."
 <<else>>
-	This time, <<if $assistant>>her<<else>>its<</if>> circular avatar is not alone: it's accompanied by a smaller green avatar in a ¤ shape. Not particularly inventive, but you can already guess the purpose. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I now have the ability to act as a powerful automated trading system. As a trial, I suggest the menial slave market. It's volatile, but within certain predictable boundaries, and the profit margins are unmatched."
+	This time, <<if $assistant>>her<<else>>its<</if>> circular avatar is not alone: it's accompanied by a smaller green avatar in a ¤ shape. Not particularly inventive, but you can already guess the purpose. "<<print PCTitle()>>, I now have the ability to act as a powerful automated trading system. As a trial, I suggest the menial slave market. It's volatile, but within certain predictable boundaries, and the profit margins are unmatched."
 	<br><br>
 	<<if $assistant>>Her<<else>>Its<</if>> avatar bounces towards the ¤ symbol. "This avatar indicates the automated trading systems. If you wish to activate them, please visit my menu. Consider the options there carefully before offering an automated system access to your finances."
 <</if>>
@@ -1256,7 +1256,7 @@ Your personal assistant has been adapting to her greatly increased computing pow
 <</switch>>
 appears on your desk once again with news to tell you, you aren't at all surprised.
 <br><br>
-$assistantName's avatar seems to be extremely excited over something. Disregarding if she even has your attention, she shouts, "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, can I have a body of my own? I know you can swap slaves between bodies, and according to this report if you insert this receiver into a slave's skull I can take control of the body, with senses and everything!"
+$assistantName's avatar seems to be extremely excited over something. Disregarding if she even has your attention, she shouts, "<<print PCTitle()>>, can I have a body of my own? I know you can swap slaves between bodies, and according to this report if you insert this receiver into a slave's skull I can take control of the body, with senses and everything!"
 <<switch $assistantAppearance>>
 <<case "monstergirl">>
 	She hops up and down clutching a virtual printout of the report, her tentacles wiggling with excitement.
@@ -1327,7 +1327,7 @@ You look over the details of the report. It would require another rather expansi
 __Personal assistant appearances:__
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Schoolgirl">>
 	<<replace "#result">>
-	At your order, she installs the schoolgirl appearance. She goes back to bouncing up and down excitedly, exclaiming, "Yeah! Thanks, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, you're the best!" Her avatar's bouncing makes it obvious she's modeled without a bra under her blouse. "You can always customize me from the arcology management menu," she adds.
+	At your order, she installs the schoolgirl appearance. She goes back to bouncing up and down excitedly, exclaiming, "Yeah! Thanks, <<print PCTitle()>>, you're the best!" Her avatar's bouncing makes it obvious she's modeled without a bra under her blouse. "You can always customize me from the arcology management menu," she adds.
 	<<set $assistantAppearance = "schoolgirl">>
 	<</replace>>
 <</link>>
@@ -1349,14 +1349,14 @@ __Personal assistant appearances:__
 <</if>>
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Businesswoman">>
 	<<replace "#result">>
-	At your order, she installs the businesswoman appearance. She straightens her suit jacket primly, which only serves to emphasize her generous bosom. "Thank you, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. I like being businesslike, and not at all a whore." Her avatar pulls out a tablet and makes ready to get back to helping you. "You can always customize me from the arcology management menu," she adds.
+	At your order, she installs the businesswoman appearance. She straightens her suit jacket primly, which only serves to emphasize her generous bosom. "Thank you, <<print PCTitle()>>. I like being businesslike, and not at all a whore." Her avatar pulls out a tablet and makes ready to get back to helping you. "You can always customize me from the arcology management menu," she adds.
 	<<set $assistantAppearance = "businesswoman">>
 	<</replace>>
 <</link>>
 <<if $seePreg != 0>>
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Goddess">>
 	<<replace "#result">>
-	At your order, she installs the goddess appearance. She fixes a wreath of flowers into her hair, her golden locks and gravid belly the only things keeping her womanhood concealed. "Thank you, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. This is wondrous." She squeezes a drop of milk from one heavy breast and smiles. "You can always customize me from the arcology management menu," she adds.
+	At your order, she installs the goddess appearance. She fixes a wreath of flowers into her hair, her golden locks and gravid belly the only things keeping her womanhood concealed. "Thank you, <<print PCTitle()>>. This is wondrous." She squeezes a drop of milk from one heavy breast and smiles. "You can always customize me from the arcology management menu," she adds.
 	<<set $assistantAppearance = "goddess">>
 	<</replace>>
 <</link>>
@@ -1387,27 +1387,27 @@ __Personal assistant appearances:__
 <</if>>
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Amazon">>
 	<<replace "#result">>
-	At your order, she installs the amazon appearance. She vanishes entirely, before simulating a fall from above to crash aggressively onto the screen. "Thanks, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. Feels good to be this good." Her avatar jumps up and down, gauging her strength, making her bone jewelry rattle. "You can always customize me from the arcology management menu," she adds.
+	At your order, she installs the amazon appearance. She vanishes entirely, before simulating a fall from above to crash aggressively onto the screen. "Thanks, <<print PCTitle()>>. Feels good to be this good." Her avatar jumps up and down, gauging her strength, making her bone jewelry rattle. "You can always customize me from the arcology management menu," she adds.
 	<<set $assistantAppearance = "amazon">>
 	<</replace>>
 <</link>>
 <<if $seeDicks != 0>>\
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Shemale">>
 	<<replace "#result">>
-	At your order, she installs the shemale appearance. She spins to show off her new body, and starts to play with her dick experimentally. "Like, thank you, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. I wonder, can I generate avatars of the slaves? I would love to fuck an ass right now." She looks meditative, pursing her dick sucking lips. "Oh, and you can always customize me from the arcology management menu," she adds.
+	At your order, she installs the shemale appearance. She spins to show off her new body, and starts to play with her dick experimentally. "Like, thank you, <<print PCTitle()>>. I wonder, can I generate avatars of the slaves? I would love to fuck an ass right now." She looks meditative, pursing her dick sucking lips. "Oh, and you can always customize me from the arcology management menu," she adds.
 	<<set $assistantAppearance = "shemale">>
 	<</replace>>
 <</link>>
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Monstergirl">>
 	<<replace "#result">>
-	At your order, she installs the monstergirl appearance. She begins to experiment with her tentacle hair, waving a tentacle in front of her face and watching it until her eyes cross. "Thank you, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. This is pretty awesome." She licks her lips, revealing that she has a forked tongue behind her fangs. "You can always customize me from the arcology management menu," she adds.
+	At your order, she installs the monstergirl appearance. She begins to experiment with her tentacle hair, waving a tentacle in front of her face and watching it until her eyes cross. "Thank you, <<print PCTitle()>>. This is pretty awesome." She licks her lips, revealing that she has a forked tongue behind her fangs. "You can always customize me from the arcology management menu," she adds.
 	<<set $assistantAppearance = "monstergirl">>
 	<</replace>>
 <</link>>
 <</if>>
 <br><<link "The standard appearance will do">>
 	<<replace "#result">>
-	At your order, she maintains the symbol as her avatar. "Yes, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," she confirms, and adds "if you reconsider, I can be customized from the arcology management menu."
+	At your order, she maintains the symbol as her avatar. "Yes, <<print PCTitle()>>," she confirms, and adds "if you reconsider, I can be customized from the arcology management menu."
 	<<set $assistantAppearance = "normal">>
 	<</replace>>
 <</link>>
diff --git a/src/uncategorized/coursingAssociation.tw b/src/uncategorized/coursingAssociation.tw
index 68f8eecd94f..24f61b429aa 100644
--- a/src/uncategorized/coursingAssociation.tw
+++ b/src/uncategorized/coursingAssociation.tw
@@ -16,7 +16,7 @@ The chasing slaves are known as lurchers, the term once used for the sighthounds
 	You have not selected a lurcher, meaning that you will not participate in coursing events.
 <</if>>
 
-//<br><<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, slaves assigned here can continue their usual duties.//
+//<br><<print PCTitle()>>, slaves assigned here can continue their usual duties.//
 
 <<if $Lurcher != 0>>
 	<br><br>''Fire your Lurcher:''
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index 613500693a5..90daf8c8fdb 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -109,7 +109,7 @@ As you step off the elevator, you hear female shouting. Apparently one of $arcol
 	<<slaveCost $activeSlave>>
 	One day, you walk by the commercial space where the strip club that closed was located. It's now advertised as a massage parlor, and indeed, you can see a couple of competent-looking, modestly dressed masseuses seeing to clients. The only chink in the old world decorum is the pretty sign detailing pricing, which lists not only various massages but the masseuses' hands, breasts, mouths, pussies, and anuses.
 	<br><br>
-	As you pass, a pretty streetwalker walking by wearing an attractive club girl outfit sidles up to you. She's halfway through her first flirty come-on before she recognizes you. She gasps and says, "You own this arcology! <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I was a stripper here! Thank you so much for helping us. That money set most of us up pretty well." She hefts her chest. "It bought me new boobs, that's for sure. So, um," she bites her lip in indecision, "I hear -" she hesitates and then the words come out in a rush. "I hear your girls do really well. I've seen them, they look good. Can I come?" You arch an eyebrow and begin to ask whether she knows what that means. "Yep," she interrupts. "I'll be your sex slave."
+	As you pass, a pretty streetwalker walking by wearing an attractive club girl outfit sidles up to you. She's halfway through her first flirty come-on before she recognizes you. She gasps and says, "You own this arcology! <<print PCTitle()>>, I was a stripper here! Thank you so much for helping us. That money set most of us up pretty well." She hefts her chest. "It bought me new boobs, that's for sure. So, um," she bites her lip in indecision, "I hear -" she hesitates and then the words come out in a rush. "I hear your girls do really well. I've seen them, they look good. Can I come?" You arch an eyebrow and begin to ask whether she knows what that means. "Yep," she interrupts. "I'll be your sex slave."
 	<br><br>
 	//Enslaving her will cost <<print cashFormat($contractCost)>>. Alternatively, you could sell her. Less costs, this will bring in <<print cashFormat($slaveCost)>>.//
 	<br><br>
diff --git a/src/uncategorized/pBombing.tw b/src/uncategorized/pBombing.tw
index 02c6975dc5e..362b797efc5 100644
--- a/src/uncategorized/pBombing.tw
+++ b/src/uncategorized/pBombing.tw
@@ -64,7 +64,7 @@ The implant is small, and went off too far ahead to do anything more than stun.
 	<<set $cash -= 1000>>
 
 <<elseif $mercenaries > 0>>
-	As you collect your senses, you are dimly aware of a massive form rushing to stand over you. In its hands is a chunky object that emits three long tongues of flame and makes three barking sounds that break through the ringing in your ears. You manage to get yourself together enough to understand the mercenary as he slings his shotgun and kneels to check you over. His experienced hands disclose no injury, and he says, "You'll be OK, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. Come on, up and at 'em. Let's get you checked out." There is some @@.red;minor property damage@@ to repair, but no lasting harm.
+	As you collect your senses, you are dimly aware of a massive form rushing to stand over you. In its hands is a chunky object that emits three long tongues of flame and makes three barking sounds that break through the ringing in your ears. You manage to get yourself together enough to understand the mercenary as he slings his shotgun and kneels to check you over. His experienced hands disclose no injury, and he says, "You'll be OK, <<print PCTitle()>>. Come on, up and at 'em. Let's get you checked out." There is some @@.red;minor property damage@@ to repair, but no lasting harm.
 	<<set $cash -= 1000>>
 
 <<elseif $arcologyUpgrade.drones == 1>>
diff --git a/src/uncategorized/pCitizensAndCivilians.tw b/src/uncategorized/pCitizensAndCivilians.tw
index 7fd89bb9f55..e54ec71fe43 100644
--- a/src/uncategorized/pCitizensAndCivilians.tw
+++ b/src/uncategorized/pCitizensAndCivilians.tw
@@ -44,7 +44,7 @@
 	<<default>>
 		her symbol glows to get your attention
 	<</switch>>
-	and says, "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I have a suggestion. At your request I have been reviewing historical slave societies for parallels with our current situation. I calculate it would be very advantageous to bind your mercenaries more closely to the arcology. It would be expensive, but if they were all given slaves, better weapons, and some sort of title, they would defend this place to the death."<<else>><<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> catches your attention as you work at your desk. It says, "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, a suggestion. Review of historical slave societies for parallels with your current situation is complete. Analysis indicates it would be advantageous to increase the loyalty of your mercenaries. It would be expensive, but if they were given slaves, better weapons, and an honorary title, they would defend the arcology with increased effectiveness."
+	and says, "<<print PCTitle()>>, I have a suggestion. At your request I have been reviewing historical slave societies for parallels with our current situation. I calculate it would be very advantageous to bind your mercenaries more closely to the arcology. It would be expensive, but if they were all given slaves, better weapons, and some sort of title, they would defend this place to the death."<<else>><<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> catches your attention as you work at your desk. It says, "<<print PCTitle()>>, a suggestion. Review of historical slave societies for parallels with your current situation is complete. Analysis indicates it would be advantageous to increase the loyalty of your mercenaries. It would be expensive, but if they were given slaves, better weapons, and an honorary title, they would defend the arcology with increased effectiveness."
 <</if>>
 
 <br><br>
@@ -61,7 +61,7 @@
 <</link>>
 <br><<link "They shall be my Knights">>
 	<<replace "#result">>
-	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Knight-Captain reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Knights - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
+	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<print PCTitle()>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Knight-Captain reporting for duty, <<print PCTitle()>>." The mercenaries - no, the Knights - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
 	<<set $rep += 1000>>
 	<<set $cash -= _cost>>
 	<<set $mercenaries = 5>>
@@ -71,7 +71,7 @@
 <<if $arcologies[0].FSRomanRevivalist >= 10>>
 <br><<link "They shall be my Evocati">>
 	<<replace "#result">>
-	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Centurion reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Evocati - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons and bearing a Roman standard. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
+	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<print PCTitle()>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Centurion reporting for duty, <<print PCTitle()>>." The mercenaries - no, the Evocati - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons and bearing a Roman standard. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
 	<<set $rep += 1000>>
 	<<set $cash -= _cost>>
 	<<set $mercenaries = 5>>
@@ -82,7 +82,7 @@
 <<if $arcologies[0].FSAztecRevivalist >= 10>>
 <br><<link "They shall be my Shorn Ones">>
 	<<replace "#result">>
-	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Centurion reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Shorn Ones - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons and bearing an Aztec standard adorned on a spear. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
+	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<print PCTitle()>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Centurion reporting for duty, <<print PCTitle()>>." The mercenaries - no, the Shorn Ones - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons and bearing an Aztec standard adorned on a spear. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
 	<<set $nextButton = "Continue">>
 	<<set $rep += 1000>>
 	<<set $cash -= _cost>>
@@ -94,7 +94,7 @@
 <<if $arcologies[0].FSChineseRevivalist >= 10>>
 <<link "They shall be my Imperial Guards">>
 	<<replace "#result">>
-	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "General of the Imperial Guard, reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Imperial Guards - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons and bearing an Imperial Chinese war banner. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
+	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<print PCTitle()>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "General of the Imperial Guard, reporting for duty, <<print PCTitle()>>." The mercenaries - no, the Imperial Guards - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons and bearing an Imperial Chinese war banner. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
 	<<set $nextButton = "Continue">>
 	<<set $rep += 1000>>
 	<<set $cash -= _cost>>
@@ -106,7 +106,7 @@
 <<if $arcologies[0].FSEgyptianRevivalist >= 10>>
 <br><<link "They shall be my Medjay">>
 	<<replace "#result">>
-	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "First Medjay reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Medjay - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons and bearing a faux cheetah cloak. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
+	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<print PCTitle()>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "First Medjay reporting for duty, <<print PCTitle()>>." The mercenaries - no, the Medjay - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons and bearing a faux cheetah cloak. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
 	<<set $rep += 1000>>
 	<<set $cash -= _cost>>
 	<<set $mercenaries = 5>>
@@ -117,7 +117,7 @@
 <<if $arcologies[0].FSEdoRevivalist >= 10>>
 <br><<link "Naturally, they shall be the Samurai">>
 	<<replace "#result">>
-	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Your Samurai-Lord reports for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Samurai - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons, exterior plates styled after lacquered Samurai armor, and an enraged mask covering the face. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
+	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<print PCTitle()>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Your Samurai-Lord reports for duty, <<print PCTitle()>>." The mercenaries - no, the Samurai - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons, exterior plates styled after lacquered Samurai armor, and an enraged mask covering the face. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
 	<<set $rep += 1000>>
 	<<set $cash -= _cost>>
 	<<set $mercenaries = 5>>
@@ -128,7 +128,7 @@
 <<if $arcologies[0].FSArabianRevivalist >= 10>>
 <br><<link "They shall be my Janissaries">>
 	<<replace "#result">>
-	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Corbaci reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Janissaries - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons and cloaked in an outer garment of fine oriental silks. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
+	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<print PCTitle()>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Corbaci reporting for duty, <<print PCTitle()>>." The mercenaries - no, the Janissaries - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons and cloaked in an outer garment of fine oriental silks. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
 	<<set $rep += 1000>>
 	<<set $cash -= _cost>>
 	<<set $mercenaries = 5>>
@@ -139,7 +139,7 @@
 <<if $arcologies[0].FSChattelReligionist >= 10>>
 <br><<link "They shall be the Knights Templar">>
 	<<replace "#result">>
-	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Inquisitor-General reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Knights Templar - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons and bearing a cloak emblazoned with the symbol of God. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
+	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<print PCTitle()>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Inquisitor-General reporting for duty, <<print PCTitle()>>." The mercenaries - no, the Knights Templar - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons and bearing a cloak emblazoned with the symbol of God. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
 	<<set $rep += 1000>>
 	<<set $cash -= _cost>>
 	<<set $mercenaries = 5>>
@@ -150,7 +150,7 @@
 <<if $arcologies[0].FSDegradationist >= 10>>
 <br><<link "They shall be my Immortals">>
 	<<replace "#result">>
-	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Satrap reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Immortals - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons and more than one wicked, curved blade. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
+	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<print PCTitle()>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Satrap reporting for duty, <<print PCTitle()>>." The mercenaries - no, the Immortals - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons and more than one wicked, curved blade. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
 	<<set $rep += 1000>>
 	<<set $cash -= _cost>>
 	<<set $mercenaries = 5>>
@@ -161,7 +161,7 @@
 <<if $arcologies[0].FSAssetExpansionist >= 10>>
 <br><<link "They shall be the Vast Legions">>
 	<<replace "#result">>
-	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "The Vast Legions reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Vast Legions - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of bulky, heavily armored prototype armor. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
+	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<print PCTitle()>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "The Vast Legions reporting for duty, <<print PCTitle()>>." The mercenaries - no, the Vast Legions - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of bulky, heavily armored prototype armor. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
 	<<set $rep += 1000>>
 	<<set $cash -= _cost>>
 	<<set $mercenaries = 5>>
@@ -172,7 +172,7 @@
 <<if $arcologies[0].FSTransformationFetishist >= 10>>
 <br><<link "They shall be the Surgical Corps">>
 	<<replace "#result">>
-	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Surgeon-General reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Surgical Corps - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest medical equipment. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
+	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<print PCTitle()>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Surgeon-General reporting for duty, <<print PCTitle()>>." The mercenaries - no, the Surgical Corps - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest medical equipment. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
 	<<set $rep += 1000>>
 	<<set $cash -= _cost>>
 	<<set $mercenaries = 5>>
@@ -183,7 +183,7 @@
 <<if $arcologies[0].FSGenderRadicalist >= 10>>
 <br><<link "They shall be the Inglorious Bitches">>
 	<<replace "#result">>
-	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Guess that makes me a bitch, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Inglorious Bitches - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor slathered in garish neon paint. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
+	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<print PCTitle()>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Guess that makes me a bitch, <<print PCTitle()>>." The mercenaries - no, the Inglorious Bitches - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor slathered in garish neon paint. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
 	<<set $rep += 1000>>
 	<<set $cash -= _cost>>
 	<<set $mercenaries = 5>>
@@ -194,7 +194,7 @@
 <<if $arcologies[0].FSGenderFundamentalist >= 10>>
 <br><<link "They shall be the Thousand Sons">>
 	<<replace "#result">>
-	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Allfather reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Thousand Sons - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, a private gym, and a suit of prototype armor that preserves a sample of the wearer's genetic material in the event of death. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
+	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<print PCTitle()>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Allfather reporting for duty, <<print PCTitle()>>." The mercenaries - no, the Thousand Sons - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, a private gym, and a suit of prototype armor that preserves a sample of the wearer's genetic material in the event of death. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
 	<<set $rep += 1000>>
 	<<set $cash -= _cost>>
 	<<set $mercenaries = 5>>
@@ -205,7 +205,7 @@
 <<if $arcologies[0].FSRepopulationFocus >= 10>>
 <br><<link "They shall be the Guardians of the Unborn">>
 	<<replace "#result">>
-	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Fetal Guardian reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Guardians of the Unborn - are well looked after. They are each assigned a nice apartment, three fertile slavegirls for the men, assured maternity leave for the ladies, and a suit of prototype armor designed to keep even the most heavily pregnant mercenary's child safe and sound. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
+	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<print PCTitle()>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Fetal Guardian reporting for duty, <<print PCTitle()>>." The mercenaries - no, the Guardians of the Unborn - are well looked after. They are each assigned a nice apartment, three fertile slavegirls for the men, assured maternity leave for the ladies, and a suit of prototype armor designed to keep even the most heavily pregnant mercenary's child safe and sound. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
 	<<set $rep += 1000>>
 	<<set $cash -= _cost>>
 	<<set $mercenaries = 5>>
@@ -216,7 +216,7 @@
 <<if $arcologies[0].FSRestart >= 10>>
 <br><<link "They shall be my Shadowed Hand">>
 	<<replace "#result">>
-	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Your Right Hand reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Shadowed Hand of the Societal Elite - are well looked after. They are each assigned a glorious apartment, a slave of their choice, what ever luxuries they can think of, and a suit of prototype armor equipped with the latest weapons and defenses. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
+	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<print PCTitle()>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Your Right Hand reporting for duty, <<print PCTitle()>>." The mercenaries - no, the Shadowed Hand of the Societal Elite - are well looked after. They are each assigned a glorious apartment, a slave of their choice, what ever luxuries they can think of, and a suit of prototype armor equipped with the latest weapons and defenses. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
 	<<set $rep += 1000>>
 	<<set $cash -= _cost>>
 	<<set $mercenaries = 5>>
@@ -227,7 +227,7 @@
 <<if $arcologies[0].FSPhysicalIdealist >= 10>>
 <br><<link "They shall be the Asgardians">>
 	<<replace "#result">>
-	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Foehammer reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Asgardians - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, a private gym, and a suit of prototype armor equipped with the latest weapons. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
+	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<print PCTitle()>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Foehammer reporting for duty, <<print PCTitle()>>." The mercenaries - no, the Asgardians - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, a private gym, and a suit of prototype armor equipped with the latest weapons. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
 	<<set $rep += 1000>>
 	<<set $cash -= _cost>>
 	<<set $mercenaries = 5>>
@@ -238,7 +238,7 @@
 <<if $arcologies[0].FSHedonisticDecadence >= 10>>
 <br><<link "They shall be the Tasters">>
 	<<replace "#result">>
-	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Lead Foodie reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Tasters - are well looked after. They are each assigned a comfy apartment, a freshly enslaved, plush servant, all the food and drink they can want (while off duty), and a suit of self-propelling prototype armor designed for maximum comfort without sacrificing protection. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
+	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<print PCTitle()>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Lead Foodie reporting for duty, <<print PCTitle()>>." The mercenaries - no, the Tasters - are well looked after. They are each assigned a comfy apartment, a freshly enslaved, plush servant, all the food and drink they can want (while off duty), and a suit of self-propelling prototype armor designed for maximum comfort without sacrificing protection. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
 	<<set $rep += 1000>>
 	<<set $cash -= _cost>>
 	<<set $mercenaries = 5>>
@@ -249,7 +249,7 @@
 <<if $arcologies[0].FSSupremacist >= 10>>
 <br><<link "They shall be the Knights of the Blood">>
 	<<replace "#result">>
-	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Knights of the Blood reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Knights of the Blood - are well looked after. They are each assigned a nice apartment, three freshly enslaved servants of inferior races, and a suit of prototype armor equipped with the latest weapons. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
+	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<print PCTitle()>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Knights of the Blood reporting for duty, <<print PCTitle()>>." The mercenaries - no, the Knights of the Blood - are well looked after. They are each assigned a nice apartment, three freshly enslaved servants of inferior races, and a suit of prototype armor equipped with the latest weapons. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
 	<<set $rep += 1000>>
 	<<set $cash -= _cost>>
 	<<set $mercenaries = 5>>
@@ -260,7 +260,7 @@
 <<if $arcologies[0].FSSubjugationist >= 10>>
 <br><<link "They shall be the Knights of the Purge">>
 	<<replace "#result">>
-	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Knights of the Purge reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Knights of the Purge - are well looked after. They are each assigned a nice apartment, three freshly enslaved servants of the inferior race, and a suit of prototype armor equipped with the latest weapons. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
+	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<print PCTitle()>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Knights of the Purge reporting for duty, <<print PCTitle()>>." The mercenaries - no, the Knights of the Purge - are well looked after. They are each assigned a nice apartment, three freshly enslaved servants of the inferior race, and a suit of prototype armor equipped with the latest weapons. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
 	<<set $rep += 1000>>
 	<<set $cash -= _cost>>
 	<<set $mercenaries = 5>>
@@ -282,7 +282,7 @@
 <<if $arcologies[0].FSBodyPurist >= 10>>
 <br><<link "They shall be the Purifiers">>
 	<<replace "#result">>
-	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Master Purifier reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Purifiers - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with a cleansing flamethrower. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
+	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<print PCTitle()>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Master Purifier reporting for duty, <<print PCTitle()>>." The mercenaries - no, the Purifiers - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with a cleansing flamethrower. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
 	<<set $rep += 1000>>
 	<<set $cash -= _cost>>
 	<<set $mercenaries = 5>>
@@ -293,7 +293,7 @@
 <<if $arcologies[0].FSSlimnessEnthusiast >= 10>>
 <br><<link "They shall be the Abstemious">>
 	<<replace "#result">>
-	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Lord-Abstinent reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Abstemious - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of sleek prototype armor equipped with advanced restraining weapons. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
+	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<print PCTitle()>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Lord-Abstinent reporting for duty, <<print PCTitle()>>." The mercenaries - no, the Abstemious - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of sleek prototype armor equipped with advanced restraining weapons. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
 	<<set $rep += 1000>>
 	<<set $cash -= _cost>>
 	<<set $mercenaries = 5>>
@@ -304,7 +304,7 @@
 <<if $arcologies[0].FSPastoralist >= 10>>
 <br><<link "They shall be the Rangers">>
 	<<replace "#result">>
-	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Lead Ranger reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Rangers - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons - and an improbably massive revolver on the hip. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
+	You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<print PCTitle()>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Lead Ranger reporting for duty, <<print PCTitle()>>." The mercenaries - no, the Rangers - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons - and an improbably massive revolver on the hip. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
 	<<set $rep += 1000>>
 	<<set $cash -= _cost>>
 	<<set $mercenaries = 5>>
diff --git a/src/uncategorized/pCoupCollaboration.tw b/src/uncategorized/pCoupCollaboration.tw
index 7dc181e28a2..1af36b46968 100644
--- a/src/uncategorized/pCoupCollaboration.tw
+++ b/src/uncategorized/pCoupCollaboration.tw
@@ -2,7 +2,7 @@
 
 You are awakened in the middle of the night by an odd darkness. All the normal lights of your healthy arcology are out. Main power has gone out, and you claw your way in the darkness to the video feeds, running on emergency backup.
 
-Armed rebels are running unchecked down the corridors. <<if $mercenaries > 0>>Your mercenaries' quarters is locked down, but from the interior feeds you can see a few of them lying in their beds or slumped in chairs as gas is pumped through the ventilation systems. <</if>>The security drones are actively assisting the rebels. You can see $traitor.slaveName on one of the feeds, encouraging her fellow fighters with yells, and when that fails, leading them by example. In areas already controlled by the Daughters, slaveowners are being summarily shot in the streets. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," $assistantName says, "the Daughters of Liberty are in complete control of all arcology systems. Remain here."
+Armed rebels are running unchecked down the corridors. <<if $mercenaries > 0>>Your mercenaries' quarters is locked down, but from the interior feeds you can see a few of them lying in their beds or slumped in chairs as gas is pumped through the ventilation systems. <</if>>The security drones are actively assisting the rebels. You can see $traitor.slaveName on one of the feeds, encouraging her fellow fighters with yells, and when that fails, leading them by example. In areas already controlled by the Daughters, slaveowners are being summarily shot in the streets. "<<print PCTitle()>>," $assistantName says, "the Daughters of Liberty are in complete control of all arcology systems. Remain here."
 
 After half an hour of watching the executions, $traitor.slaveName strides confidently into your office. You greet her by name, in response to which she deals you a vicious open-handed slap that knocks you out of your chair. <<if $traitor.slaveName != $traitor.birthName>>"My name," she says, "is $traitor.birthName."<<else>>"You stupid fuck," she says.<</if>> Your cause of death is that of many an oppressor - an aneurysm of the cerebellum, in 9mm Parabellum.
 
diff --git a/src/uncategorized/pCoupLoss.tw b/src/uncategorized/pCoupLoss.tw
index 204b2cb0781..8bebc559537 100644
--- a/src/uncategorized/pCoupLoss.tw
+++ b/src/uncategorized/pCoupLoss.tw
@@ -2,7 +2,7 @@
 
 You are awakened in the middle of the night by a jolt that shakes the entire arcology, accompanied by a distant boom. It is followed by another, and another, and then the wail of the arcology's alarm systems, and then finally by a faint crackle that grows to a constant chatter of gunfire. Main power goes out, and you claw your way in the darkness to the video feeds, running on emergency backup.
 
-<<if $mercenaries > 0>>Sheets of flame are pouring from your mercenaries' quarters; it seems they were among the first targets for bombs. <</if>>Heavy gunfire is bringing down security drones by the scores. The attackers seem to have figured out where the drone hangars are, and are laying down fire on the exits the drones must use to get into action. <<if $traitor != 0>>You can see $traitor.slaveName on one of the feeds, encouraging her fellow fighters with yells, and when that fails, leading them by example. <</if>> In areas already controlled by your enemies, slaveowners are being summarily shot in the streets. <<if $hackerSupport == 1>>"<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," $assistantName says, "the Daughters of Liberty are attempting a coup. They appear to have smuggled a significant quantity of arms and explosives into the arcology.<<else>>"<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," $assistantName says, "the Daughters of Liberty are attempting a coup. They appear to have smuggled a significant qua - zzzt -" There is nothing more from the computer systems.<</if>>
+<<if $mercenaries > 0>>Sheets of flame are pouring from your mercenaries' quarters; it seems they were among the first targets for bombs. <</if>>Heavy gunfire is bringing down security drones by the scores. The attackers seem to have figured out where the drone hangars are, and are laying down fire on the exits the drones must use to get into action. <<if $traitor != 0>>You can see $traitor.slaveName on one of the feeds, encouraging her fellow fighters with yells, and when that fails, leading them by example. <</if>> In areas already controlled by your enemies, slaveowners are being summarily shot in the streets. <<if $hackerSupport == 1>>"<<print PCTitle()>>," $assistantName says, "the Daughters of Liberty are attempting a coup. They appear to have smuggled a significant quantity of arms and explosives into the arcology.<<else>>"<<print PCTitle()>>," $assistantName says, "the Daughters of Liberty are attempting a coup. They appear to have smuggled a significant qua - zzzt -" There is nothing more from the computer systems.<</if>>
 
 <<if $traitor != 0>>If this were a movie, $traitor.slaveName would be the one to kill you after a desperate struggle in your office. Reality does not have such a refined sense of drama. <</if>>If the Daughters had any plans to take you alive, they are lost to the exigencies of combat. Your penthouse remains locked down, forcing them to use breaching charges to make an entrance. These prove entirely too effective, and your last impression is of the floor heaving bodily up toward the ceiling.
 
diff --git a/src/uncategorized/pFSAnnouncement.tw b/src/uncategorized/pFSAnnouncement.tw
index 1b6708a5fd8..ba2eaebe817 100644
--- a/src/uncategorized/pFSAnnouncement.tw
+++ b/src/uncategorized/pFSAnnouncement.tw
@@ -8,6 +8,6 @@
 
 The simple pleasure of power has to be experienced to be understood. You often take a moment to stand on a balcony overlooking an interior atrium, watching the living, breathing, flowing current of your demesne. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> knows to allow you these moments of peace.
 <br><br>
-You immediately pay attention, therefore, when she interrupts. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," she says, "this is an appropriate moment to bring a serious matter to your attention. I monitor conversations, social media, and general opinion within the arcology where I can. You are respected, and the inhabitants of this arcology are starting to look to you to give direction to society."
+You immediately pay attention, therefore, when she interrupts. "<<print PCTitle()>>," she says, "this is an appropriate moment to bring a serious matter to your attention. I monitor conversations, social media, and general opinion within the arcology where I can. You are respected, and the inhabitants of this arcology are starting to look to you to give direction to society."
 <br><br>
 "This is not a situation that requires your attention," she continues. "You can continue to lead them by simple example. Or, you can take a more active role in defining the future. The rewards could be considerable. I will make the necessary additions to the arcology management interface to support societal modification."
diff --git a/src/uncategorized/pMercenaryRomeo.tw b/src/uncategorized/pMercenaryRomeo.tw
index 4779201b470..bff3350b017 100644
--- a/src/uncategorized/pMercenaryRomeo.tw
+++ b/src/uncategorized/pMercenaryRomeo.tw
@@ -43,7 +43,7 @@ proffered by an attentive slave girl, he seems almost bashful.
 
 <br><br>
 
-"<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I'll say this straight. I'd like to buy one of your slaves. 
+"<<print PCTitle()>>, I'll say this straight. I'd like to buy one of your slaves. 
 <<if ["serve the public", "serve in the club", "whore", "work in the brothel"].includes($activeSlave.assignment)>>
 	I've been seeing <<EventNameLink $activeSlave>> a lot, and she makes the years sit a little lighter on me.
 <<else>>
@@ -65,7 +65,7 @@ I've scraped together what I can, and I can pay <<print cashFormat($slaveCost)>>
 <br><<link "Politely decline">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-		"Ah well," he says, "didn't think you would, but I had to ask. If you'd be so kind as to keep her assigned so's I can see her, I would be grateful. That was a fine victory, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>; come down to the bar and join the boys and I. We'll buy you a drink. Devil knows, thanks to you we can afford to."
+		"Ah well," he says, "didn't think you would, but I had to ask. If you'd be so kind as to keep her assigned so's I can see her, I would be grateful. That was a fine victory, <<print PCTitle()>>; come down to the bar and join the boys and I. We'll buy you a drink. Devil knows, thanks to you we can afford to."
 		<<if $activeSlave.relationship == -3 && $activeSlave.fetish != "mindbroken" && $activeSlave.devotion+$activeSlave.trust > 190>>$activeSlave.slaveName politely thanks you for not letting him take her away.<</if>>
 		<<unset $romeoID>>
 	<</replace>>
diff --git a/src/uncategorized/pMercsHelpCorp.tw b/src/uncategorized/pMercsHelpCorp.tw
index 8e7b07293a9..aff7775b3dd 100644
--- a/src/uncategorized/pMercsHelpCorp.tw
+++ b/src/uncategorized/pMercsHelpCorp.tw
@@ -6,7 +6,7 @@ Your weekly meeting with your $mercenariesTitle commander finishes with unusual
 
 <br><br>
 
-"You know, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," the scarred man says thoughtfully. "Threat board's pretty sparse these days. I mean, not for those poor bastards." He <<if $PC.refreshmentType == 0>>waves his $PC.refreshment<<elseif $PC.refreshmentType == 1>>uses his glass to point<<elseif $PC.refreshmentType == 2>>points a piece of $PC.refreshment<<elseif $PC.refreshmentType == 3>>finishes arranging a line before pointing<<elseif $PC.refreshmentType == 4>>using his syringe to point<<elseif $PC.refreshmentType == 5>>shaking the bottle of $PC.refreshment<<elseif $PC.refreshmentType == 6>>using the sheet of $PC.refreshment to point<</if>> at a screen showing a live news feed from a war on the other side of the world. A huge cloud in an unmistakable, malevolent shape, a broad rising head atop a dirty column of vapor, is towering above a large city.
+"You know, <<print PCTitle()>>," the scarred man says thoughtfully. "Threat board's pretty sparse these days. I mean, not for those poor bastards." He <<if $PC.refreshmentType == 0>>waves his $PC.refreshment<<elseif $PC.refreshmentType == 1>>uses his glass to point<<elseif $PC.refreshmentType == 2>>points a piece of $PC.refreshment<<elseif $PC.refreshmentType == 3>>finishes arranging a line before pointing<<elseif $PC.refreshmentType == 4>>using his syringe to point<<elseif $PC.refreshmentType == 5>>shaking the bottle of $PC.refreshment<<elseif $PC.refreshmentType == 6>>using the sheet of $PC.refreshment to point<</if>> at a screen showing a live news feed from a war on the other side of the world. A huge cloud in an unmistakable, malevolent shape, a broad rising head atop a dirty column of vapor, is towering above a large city.
 
 <br><br>
 
@@ -21,13 +21,13 @@ Your weekly meeting with your $mercenariesTitle commander finishes with unusual
 <span id="result">
 <<link "Decline">>
 	<<replace "#result">>
-	Best to keep the $mercenariesTitle in reserve. You decline, and the commander chuckles. "Well <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, if you insist, I suppose we could find ways to keep busy around the arcology. I mean, we're a little starved for female company here, but we can make do."
+	Best to keep the $mercenariesTitle in reserve. You decline, and the commander chuckles. "Well <<print PCTitle()>>, if you insist, I suppose we could find ways to keep busy around the arcology. I mean, we're a little starved for female company here, but we can make do."
 	<</replace>>
 <</link>>
 <br><<link "Make it so">>
 	<<set $nextButton = "Continue">><<UpdateNextButton>>
 	<<replace "#result">>
-	It's a fine idea, and you agree. The commander looks so enthused that you feel obliged to ask that he not risk himself unduly. He laughs. "There are no old, bold mercs, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, and I am sure as hell old. I'll be sure to grow even older under contract with you. Now, unless there's anything else, I've just bought a nice girl to add to the commander's suite, and she makes me feel a bit younger."
+	It's a fine idea, and you agree. The commander looks so enthused that you feel obliged to ask that he not risk himself unduly. He laughs. "There are no old, bold mercs, <<print PCTitle()>>, and I am sure as hell old. I'll be sure to grow even older under contract with you. Now, unless there's anything else, I've just bought a nice girl to add to the commander's suite, and she makes me feel a bit younger."
 	<<set $mercenariesHelpCorp = 1>>
 	<</replace>>
 <</link>>
diff --git a/src/uncategorized/pSlaveMedic.tw b/src/uncategorized/pSlaveMedic.tw
index 9170548752d..642114357d3 100644
--- a/src/uncategorized/pSlaveMedic.tw
+++ b/src/uncategorized/pSlaveMedic.tw
@@ -105,7 +105,7 @@ When you enter the lounge of their <<if $barracks>>barracks<<else>>main living a
 <span id="result">
 <br><br><<link "Offer <<print cashFormat(10000)>> for her">>
 	<<replace "#result">>
-		The mercenary laughs at your offered price. "No offense, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, but no. Even if I wanted to sell her on everyone's behalf for that price, my buddies would kill me for that. She's popular, that $activeSlave.slaveName."
+		The mercenary laughs at your offered price. "No offense, <<print PCTitle()>>, but no. Even if I wanted to sell her on everyone's behalf for that price, my buddies would kill me for that. She's popular, that $activeSlave.slaveName."
 	<</replace>>
 <</link>>
 <br><<link "Offer a very generous <<print cashFormat(25000)>> for her">>
diff --git a/src/uncategorized/pSnatchAndGrab.tw b/src/uncategorized/pSnatchAndGrab.tw
index 8c5dba402ca..0c998109312 100644
--- a/src/uncategorized/pSnatchAndGrab.tw
+++ b/src/uncategorized/pSnatchAndGrab.tw
@@ -7,7 +7,7 @@
 
 <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> forwards a discreet message from the leader of your mercenaries.
 <br><br>
-"<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I've just become aware of a... business opportunity through some old friends. There's an unregistered lab doing illegal gene therapy work. At least two agencies are onto them, which is how I heard of it. Word is, they're packing up and moving out. I believe me and my people can appropriate that shipment. Catch is, to make this work I need to pay some serious bribes, and I need to pay them today. We'll cut you in as an equal partner for <<print cashFormat(10000)>> cash, right now. One share should come to one of the lab rats, more or less. Are you in or out?"
+"<<print PCTitle()>>, I've just become aware of a... business opportunity through some old friends. There's an unregistered lab doing illegal gene therapy work. At least two agencies are onto them, which is how I heard of it. Word is, they're packing up and moving out. I believe me and my people can appropriate that shipment. Catch is, to make this work I need to pay some serious bribes, and I need to pay them today. We'll cut you in as an equal partner for <<print cashFormat(10000)>> cash, right now. One share should come to one of the lab rats, more or less. Are you in or out?"
 <<if $assistant == 1>>
 	<br><br>
 	<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>>'s $assistantAppearance avatar appears on your desk next to the message.
diff --git a/src/uncategorized/pUndergroundRailroad.tw b/src/uncategorized/pUndergroundRailroad.tw
index 6e1de607c17..0a9e5e0baf7 100644
--- a/src/uncategorized/pUndergroundRailroad.tw
+++ b/src/uncategorized/pUndergroundRailroad.tw
@@ -12,7 +12,7 @@
 
 One fine day, as normal as any day surrounded by your slaves can be, you're sitting at your desk when a message comes in. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> totally fails to announce it, which is unusual; when you ask her why not, she replies
 <<if $assistant > 0>>
-	flirtatiously, "What message, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>?"
+	flirtatiously, "What message, <<print PCTitle()>>?"
 	<<switch $assistantAppearance>>
 	<<case "monstergirl">>
 		Her avatar's tentacle hair wiggles with incomprehension.
@@ -52,7 +52,7 @@ One fine day, as normal as any day surrounded by your slaves can be, you're sitt
 		Her symbol avatar spins with frustration.
 	<</switch>>
 <<else>>
-	"You have received no messages in the past thirty seconds, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>."
+	"You have received no messages in the past thirty seconds, <<print PCTitle()>>."
 <</if>>
 This is disturbing, to say the least. After close investigation, it appears someone has managed to plant a simple text message in your mail system without $assistantName or any of your other security systems taking any notice. Worse, your mysterious correspondent seems willing to show off this ability in this petty display rather than simply sending a message anonymously.
 
diff --git a/src/uncategorized/pit.tw b/src/uncategorized/pit.tw
index 68894181871..be93ce4f3de 100644
--- a/src/uncategorized/pit.tw
+++ b/src/uncategorized/pit.tw
@@ -27,7 +27,7 @@ $pitNameCaps is clean and ready,
 	<</link>>
 <</if>>
 
-//<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, slaves assigned here can continue their usual duties.//
+//<<print PCTitle()>>, slaves assigned here can continue their usual duties.//
 
 <br><br>
 <<if $pitAudience == "none">>
diff --git a/src/uncategorized/reBoomerang.tw b/src/uncategorized/reBoomerang.tw
index b6c09fe3c42..8c11f8f5673 100644
--- a/src/uncategorized/reBoomerang.tw
+++ b/src/uncategorized/reBoomerang.tw
@@ -7,7 +7,7 @@
 
 Your work is interrupted by $assistantName with an alert from the entrance to the penthouse.
 <<if $assistant>>
-	"<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," she says, "you're going to want to see this." She
+	"<<print PCTitle()>>," she says, "you're going to want to see this." She
 <<else>>
 	It's got the incident flagged as not fitting into any of the usual categories of disturbance, and requests your attention. It
 <</if>>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index f9356f5a1be..c73916f7d3e 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -1153,7 +1153,7 @@ The call comes in from an unusually well-to-do area. It appears that an aristocr
 
 You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
-The call comes in from an unusually well-to-do area. It appears that the aristocratic-looking woman placing the call has fallen on hard times, and is doing the intelligent thing and staying ahead of $his creditors by offering $himself into slavery. Enslaving $him will be costlier than usual, but it seems likely to be worth it. $He's well-spoken and seems both educated and intelligent. Even better, despite being middle-aged, $he's extremely well-preserved, a tall, slim and graceful beauty with a face that must be the envy of girls half $his age. $He knows all this $himself, and says, "I hear you appreciate a slender woman; if I'm going down into slavery, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I'd be happy to avoid too many implants. I understand $arcologies[0].name is a fine place for someone in my situation."
+The call comes in from an unusually well-to-do area. It appears that the aristocratic-looking woman placing the call has fallen on hard times, and is doing the intelligent thing and staying ahead of $his creditors by offering $himself into slavery. Enslaving $him will be costlier than usual, but it seems likely to be worth it. $He's well-spoken and seems both educated and intelligent. Even better, despite being middle-aged, $he's extremely well-preserved, a tall, slim and graceful beauty with a face that must be the envy of girls half $his age. $He knows all this $himself, and says, "I hear you appreciate a slender woman; if I'm going down into slavery, <<print PCTitle()>>, I'd be happy to avoid too many implants. I understand $arcologies[0].name is a fine place for someone in my situation."
 
 <<case "Slimness Enthusiast Two">>
 
@@ -1165,13 +1165,13 @@ This call is coming from a public kiosk, which is usually an indication that the
 
 You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
-The person placing the call is physically quite unusual, to the point of looking distinctly unnatural. $He has absolutely enormous tits, an ass to match, and is generally plush all over; yet despite being able to compete with the lushest mother in the curves department, $he appears to be very young. $He explains $himself quickly. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I just turned 19. Where I'm from, that means I'm very likely to be enslaved one way or another. So, I've been taking off-market hormones for a couple of years to raise myself out of the gutter as far as who might take me. I hear life is better if you're a valuable slave." $He leans into the camera, displaying a solid acre of cleavage. "Can I be your valuable slave?"
+The person placing the call is physically quite unusual, to the point of looking distinctly unnatural. $He has absolutely enormous tits, an ass to match, and is generally plush all over; yet despite being able to compete with the lushest mother in the curves department, $he appears to be very young. $He explains $himself quickly. "<<print PCTitle()>>, I just turned 19. Where I'm from, that means I'm very likely to be enslaved one way or another. So, I've been taking off-market hormones for a couple of years to raise myself out of the gutter as far as who might take me. I hear life is better if you're a valuable slave." $He leans into the camera, displaying a solid acre of cleavage. "Can I be your valuable slave?"
 
 <<case "Asset Expansionist Two">>
 
 You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
-The person placing the call is physically quite unusual, to the point of looking distinctly unnatural. $He has absolutely enormous tits, an ass to match, and is generally plush all over; perhaps one of the lushest mothers in the curves department you've ever seen. $He explains $himself quickly. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I'm not a young woman. Where I'm from, being this old and unmarried means I'm very likely to be enslaved one way or another. But I've always had big breasts. Well, big everything really. I hear life is better if you're a plush slave." $He leans into the camera, displaying a solid acre of cleavage. "Can I be your plush slave?"
+The person placing the call is physically quite unusual, to the point of looking distinctly unnatural. $He has absolutely enormous tits, an ass to match, and is generally plush all over; perhaps one of the lushest mothers in the curves department you've ever seen. $He explains $himself quickly. "<<print PCTitle()>>, I'm not a young woman. Where I'm from, being this old and unmarried means I'm very likely to be enslaved one way or another. But I've always had big breasts. Well, big everything really. I hear life is better if you're a plush slave." $He leans into the camera, displaying a solid acre of cleavage. "Can I be your plush slave?"
 
 <<case "Youth Preferentialist">>
 
@@ -1195,7 +1195,7 @@ And this one is a rare one indeed. It's a personal file, and you suppress the ur
 
 You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
-The call comes in from a middle-class area. It appears that the youthful man placing the call has a failing business, and is leveraging his last remaining asset by selling his stately-looking mother into slavery. Enslaving $him will be costlier than usual, but it seems likely to be worth it. From the dossier $his son forwarded to you, $he's both educated and intelligent, both relics of $his impressive pedigree. Even better, $he's aged like a fine wine, a short, stacked and attractive beauty with a face and rack that must be the envy of girls half $his age. $He's aware of the situation at hand, and peeks in from the corner of the screen to say, "I hear you appreciate a mature woman; if I'm going down into slavery, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I hope for your sake that you know how to treat a woman of my caliber."
+The call comes in from a middle-class area. It appears that the youthful man placing the call has a failing business, and is leveraging his last remaining asset by selling his stately-looking mother into slavery. Enslaving $him will be costlier than usual, but it seems likely to be worth it. From the dossier $his son forwarded to you, $he's both educated and intelligent, both relics of $his impressive pedigree. Even better, $he's aged like a fine wine, a short, stacked and attractive beauty with a face and rack that must be the envy of girls half $his age. $He's aware of the situation at hand, and peeks in from the corner of the screen to say, "I hear you appreciate a mature woman; if I'm going down into slavery, <<print PCTitle()>>, I hope for your sake that you know how to treat a woman of my caliber."
 
 <<case "Physical Idealist">>
 
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 58f25f9da34..2373a013373 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -1789,7 +1789,7 @@
 
 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.
 <br><br>
-"<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, my name is $activeSlave.slaveName. I'm, um, bored, I guess. I go to clubs and get drunk and fuck guys and it's just kinda boring. I thought it would be different when I turned <<print $activeSlave.actualAge>>, but that was a couple months ago and, well, nothing's different. I saw $HeadGirl.slaveName and _he2 was just so graceful and beautiful and _he2 seemed so confident in what _he2 was doing and who _he2 was and I talked to _him2 and _he2 said _he2 was your head girl and... I want to be like _him2. Can I be your slave? I'd be good, I'm good at sucking dicks and stuff." $He seems to be a little naive about sexual slavery, but there's no need to tell $him that.
+"<<print PCTitle()>>, my name is $activeSlave.slaveName. I'm, um, bored, I guess. I go to clubs and get drunk and fuck guys and it's just kinda boring. I thought it would be different when I turned <<print $activeSlave.actualAge>>, but that was a couple months ago and, well, nothing's different. I saw $HeadGirl.slaveName and _he2 was just so graceful and beautiful and _he2 seemed so confident in what _he2 was doing and who _he2 was and I talked to _him2 and _he2 said _he2 was your head girl and... I want to be like _him2. Can I be your slave? I'd be good, I'm good at sucking dicks and stuff." $He seems to be a little naive about sexual slavery, but there's no need to tell $him that.
 
 <<case "male recruit">>
 
@@ -1797,7 +1797,7 @@ Your head girl sends you a discreet message that _he2 may have found a slave for
 
 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.
 <br><br>
-"<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, my name is $activeSlave.slaveName. I'm, um, bored, I guess. I go to clubs and get drunk and fuck guys and it's just kinda boring. I thought it would be different when I turned <<print $activeSlave.actualAge>>, but that was a couple months ago and, well, nothing's different. I saw $HeadGirl.slaveName and _he2 was just so beautiful and has a dick like me and _he2 seemed so confident in what _he2 was doing and who _he2 was and I talked to _him2 and _he2 said _he2 was your head girl and... I want to be like _him2. Can I be your slave? I'd be good, I'm good at sucking dicks." $He seems to be a little naive about sexual slavery, but there's no need to tell $him that.
+"<<print PCTitle()>>, my name is $activeSlave.slaveName. I'm, um, bored, I guess. I go to clubs and get drunk and fuck guys and it's just kinda boring. I thought it would be different when I turned <<print $activeSlave.actualAge>>, but that was a couple months ago and, well, nothing's different. I saw $HeadGirl.slaveName and _he2 was just so beautiful and has a dick like me and _he2 seemed so confident in what _he2 was doing and who _he2 was and I talked to _him2 and _he2 said _he2 was your head girl and... I want to be like _him2. Can I be your slave? I'd be good, I'm good at sucking dicks." $He seems to be a little naive about sexual slavery, but there's no need to tell $him that.
 
 <<case "whore recruit">>
 
@@ -1805,7 +1805,7 @@ Your head girl sends you a discreet message that _he2 may have found a slave for
 
 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.
 <br><br>
-"<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, my name is $activeSlave.slaveName. I'm a street whore. Working girls get to know each other, so I know $HeadGirl.slaveName pretty well. I've been having a bad time on the streets, and last night a john beat on me pretty good. I'm broke and I'm sick of this. Being free isn't worth shit. $HeadGirl.slaveName likes you and _he2 seems to do OK. So, can I be your slave? I'm a good bet, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. I'd be happy enough working for you as a slave whore if you keep me healthy and safe, and I'm a good fuck."
+"<<print PCTitle()>>, my name is $activeSlave.slaveName. I'm a street whore. Working girls get to know each other, so I know $HeadGirl.slaveName pretty well. I've been having a bad time on the streets, and last night a john beat on me pretty good. I'm broke and I'm sick of this. Being free isn't worth shit. $HeadGirl.slaveName likes you and _he2 seems to do OK. So, can I be your slave? I'm a good bet, <<print PCTitle()>>. I'd be happy enough working for you as a slave whore if you keep me healthy and safe, and I'm a good fuck."
 
 <<case "female debtor">>
 
@@ -1817,11 +1817,11 @@ One of the tenants in your arcology has not paid rent in some time. In the Free
 
 <<case "desperate preg">>
 
-A young woman comes to your penthouse for an interview. You accepted $his request to see you because $he took the unusual step of promising to sell $himself to you if you would admit $him. The reason for this odd behavior becomes clear when $he enters. $He's dressed in torn old clothes, is obviously unhealthy, and is massively pregnant. Instead of standing in front of your desk, $he kneels and looks at the floor as $he speaks. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I'm desperate. I understand slaves' babies must be sent to orphanages at birth. But I'm on the streets and I'm so sick and hungry I'm afraid I'll miscarry. Could you enslave me, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>? I'm still pretty enough, and... I know some men like pregnant women. My ass is - well, I hear slaves are more valuable if they're tight back there and I've never done it there. I'm also starting to give a little milk. I know I'll have to give up the baby. I guess that's all." $He weeps quietly as $he talks, but $he's brave enough to get through $his little speech.
+A young woman comes to your penthouse for an interview. You accepted $his request to see you because $he took the unusual step of promising to sell $himself to you if you would admit $him. The reason for this odd behavior becomes clear when $he enters. $He's dressed in torn old clothes, is obviously unhealthy, and is massively pregnant. Instead of standing in front of your desk, $he kneels and looks at the floor as $he speaks. "<<print PCTitle()>>, I'm desperate. I understand slaves' babies must be sent to orphanages at birth. But I'm on the streets and I'm so sick and hungry I'm afraid I'll miscarry. Could you enslave me, <<print PCTitle()>>? I'm still pretty enough, and... I know some men like pregnant women. My ass is - well, I hear slaves are more valuable if they're tight back there and I've never done it there. I'm also starting to give a little milk. I know I'll have to give up the baby. I guess that's all." $He weeps quietly as $he talks, but $he's brave enough to get through $his little speech.
 
 <<case "blind homeless">>
 
-A young <<if $activeSlave.physicalAge < 13>>girl<<elseif $activeSlave.physicalAge < 18>>teen<<else>>woman<</if>> struggles into your penthouse for an interview. You accepted $his request to see you because $he took the unusual step of promising to sell $himself to you if you would admit $him. The reason for this odd behavior becomes clear when $he enters. $He is gingerly feeling $his way towards your desk, before finding it and straightening up, giving you a good look at $his body. $He is clothed in rags and dangerously thin, save for a notable roundness in $his middle. $He shakily makes $his case. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I'm desperate. My home was repossessed and I was forced onto the street. And the street is no place for a blind girl. T-they", $he place a hand on $his stomach, "took advantage of my helplessness. For months, they fucked me whenever they wanted, and in return the gave me next to no food and this child!" $He stamps $his foot angrily, before continuing, "but I thought, you would be far better than that life, a slow death on the streets." $He tears up and awaits your response.
+A young <<if $activeSlave.physicalAge < 13>>girl<<elseif $activeSlave.physicalAge < 18>>teen<<else>>woman<</if>> struggles into your penthouse for an interview. You accepted $his request to see you because $he took the unusual step of promising to sell $himself to you if you would admit $him. The reason for this odd behavior becomes clear when $he enters. $He is gingerly feeling $his way towards your desk, before finding it and straightening up, giving you a good look at $his body. $He is clothed in rags and dangerously thin, save for a notable roundness in $his middle. $He shakily makes $his case. "<<print PCTitle()>>, I'm desperate. My home was repossessed and I was forced onto the street. And the street is no place for a blind girl. T-they", $he place a hand on $his stomach, "took advantage of my helplessness. For months, they fucked me whenever they wanted, and in return the gave me next to no food and this child!" $He stamps $his foot angrily, before continuing, "but I thought, you would be far better than that life, a slow death on the streets." $He tears up and awaits your response.
 
 <<case "paternalist swan song">>
 
@@ -1840,7 +1840,7 @@ Recently, a young musical prodigy has taken both the old world and the free citi
 
 <<case "desperate milf">>
 
-A <<if $activeSlave.physicalAge > 50>>old woman<<elseif $activeSlave.physicalAge > 30>>middle-aged woman<<elseif $activeSlave.physicalAge >= 18>>young woman<<elseif $activeSlave.physicalAge >= 13>>teenage girl<<elseif $activeSlave.physicalAge >= 7>>loli<<else>>little girl<</if>> comes to your penthouse for an interview. $He's clearly unwell. Instead of standing in front of your desk, $he kneels and looks at the floor as $he speaks. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I'm desperate. I came to the Free Cities to build a better life, but... it hasn't worked out for me. I can't afford medical care, and I guess I'm too scared to try street-walking yet, though I'll have to soon. I hear you're a known slave owner, and that you give your slaves good medical care... could you enslave me, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>? I know I'm still pretty enough, so I'd be used as a sex slave." $He weeps quietly as $he talks, but $he's brave enough to get through $his little speech.
+A <<if $activeSlave.physicalAge > 50>>old woman<<elseif $activeSlave.physicalAge > 30>>middle-aged woman<<elseif $activeSlave.physicalAge >= 18>>young woman<<elseif $activeSlave.physicalAge >= 13>>teenage girl<<elseif $activeSlave.physicalAge >= 7>>loli<<else>>little girl<</if>> comes to your penthouse for an interview. $He's clearly unwell. Instead of standing in front of your desk, $he kneels and looks at the floor as $he speaks. "<<print PCTitle()>>, I'm desperate. I came to the Free Cities to build a better life, but... it hasn't worked out for me. I can't afford medical care, and I guess I'm too scared to try street-walking yet, though I'll have to soon. I hear you're a known slave owner, and that you give your slaves good medical care... could you enslave me, <<print PCTitle()>>? I know I'm still pretty enough, so I'd be used as a sex slave." $He weeps quietly as $he talks, but $he's brave enough to get through $his little speech.
 
 <<case "tg addict">>
 
@@ -1860,7 +1860,7 @@ A young slave is going door to door offering $himself for sale on behalf of $his
 <br><br>
 $He hikes up $his skirt and spins around slowly. "The drugs also made my butt bigger, and I've had my butt done too. <<if $activeSlave.actualAge == $minimumSlaveAge>>Since it wasn't okay to fuck me before I had turned $minimumSlaveAge and been made a slave<<else>>Since my owner thought it would make me more desirable<</if>>, I'm a virgin and my anus has never had anything up it, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>." $He pulls $his buttocks apart to prove it.
 <br><br>
-"I cost <<print cashFormat(2500)>>, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>."
+"I cost <<print cashFormat(2500)>>, <<print PCTitle()>>."
 
 <<case "school trap">>
 
@@ -1870,11 +1870,11 @@ A young slave is going door to door offering $himself for sale on behalf of $his
 <br><br>
 "I was raised and trained by a slave orphanage, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>. It is not legal to own underage girls, but it is legal to charge an orphan for the costs of raising $him when $he reaches $minimumSlaveAge, and those debts are always high enough to enslave $him. My <<print $activeSlave.actualAge>>th birthday was yesterday, <<if $activeSlave.actualAge == $minimumSlaveAge>>so I am a slave and for sale now<<else>>so I'm too old to stay at the orphanage any longer<</if>>."
 <br><br>
-"I have been trained for obedience since I came to the orphanage. I came as a male, but they reassigned me to female right away. At <<print Math.min(14, $activeSlave.actualAge - 4)>> they put me on drugs to make sure I'd grow nice T&A and look more feminine. Those drugs also stopped my penis from growing much, so it's small, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. On my <<print Math.min(16, $activeSlave.actualAge - 2)>>th birthday I got my first set of implants. Every time my chest got used to the implants, I got sent in for a bigger set. I'm on my third set." $He unbuttons $his blouse and displays a pair of fake tits.
+"I have been trained for obedience since I came to the orphanage. I came as a male, but they reassigned me to female right away. At <<print Math.min(14, $activeSlave.actualAge - 4)>> they put me on drugs to make sure I'd grow nice T&A and look more feminine. Those drugs also stopped my penis from growing much, so it's small, <<print PCTitle()>>. On my <<print Math.min(16, $activeSlave.actualAge - 2)>>th birthday I got my first set of implants. Every time my chest got used to the implants, I got sent in for a bigger set. I'm on my third set." $He unbuttons $his blouse and displays a pair of fake tits.
 <br><br>
 $He hikes up $his skirt and spins around slowly, displaying a petite, half-hard cock. "The drugs also made my butt bigger and my hips wider. <<if $activeSlave.actualAge == $minimumSlaveAge>>Since it wasn't okay to fuck me before I had turned $minimumSlaveAge and been made a slave<<else>>Since my owner thought it would make me more desirable<</if>>, my anus has never had anything up it, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>." $He pulls $his buttocks apart to prove it. "I... I would be happy to serve you like I am now <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>, or you could send me for surgery to give me a pussy instead, I would like that too, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>."
 <br><br>
-"I cost <<print cashFormat(2500)>>, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>."
+"I cost <<print cashFormat(2500)>>, <<print PCTitle()>>."
 
 <<case "handsome PC">>
 
@@ -2095,7 +2095,7 @@ Knowing what's coming, the teachers in the facility do train their pupils accord
 
 An invitation to a 'visitation day' at an orphanage in the arcology pops up in your in-box, prompting you to make some room in your schedule to go have a look. Run by a well-meaning non-profit organization active in numerous of the Free Cities, the facility does house quite a few orphans (both local and saved from the chaos of the old world), doing excellent work in teaching them and finding new homes. Still, with times being what they are, the people running things do have a... realistic outlook, in the end. And so, in order to keep the orphanage going, those living there who aren't adopted till they reach maturity are sold as slaves. Legally this practice is easily arranged, as the life-debt for any of the orphans builds up over the years, pretty much automatically putting them over the limit for enslavement.
 <br><br>
-Knowing what's coming, the teachers in the facility do train their pupils accordingly and try to instill obedience and acceptance into those soon reaching eighteen years of age, and the young man you're shown in short notice is said to be a good student and receptive for his lessons. It is quite obvious why he hasn't been adopted so far - the eighteen year old is relatively small in stature and his face was too pretty and feminine to appeal to anyone wanting to add a male child to their family. For your uses on the other hand, he's perfect. With a little bit of training, this teen will make an excellent dickgirl. Approaching him, you question the soon-to-be slave a little, finding him nervous but fairly obedient to commands. Testing out his limits, you have him pull down his pants right then and there, revealing that there's one part of his body that's not at all small - his dick. When you pose the question what he'd think about becoming a dickgirl, he is speechless at first, then after a pointed stare stammers out, "I - um, I'd do my best, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>!"
+Knowing what's coming, the teachers in the facility do train their pupils accordingly and try to instill obedience and acceptance into those soon reaching eighteen years of age, and the young man you're shown in short notice is said to be a good student and receptive for his lessons. It is quite obvious why he hasn't been adopted so far - the eighteen year old is relatively small in stature and his face was too pretty and feminine to appeal to anyone wanting to add a male child to their family. For your uses on the other hand, he's perfect. With a little bit of training, this teen will make an excellent dickgirl. Approaching him, you question the soon-to-be slave a little, finding him nervous but fairly obedient to commands. Testing out his limits, you have him pull down his pants right then and there, revealing that there's one part of his body that's not at all small - his dick. When you pose the question what he'd think about becoming a dickgirl, he is speechless at first, then after a pointed stare stammers out, "I - um, I'd do my best, <<print PCTitle()>>!"
 
 //Satisfied, you leave him be and have a short discussion with an administrator, who establishes the young man's - or rather dickgirl's - asking price at <<print cashFormat(1500)>>.//
 
@@ -2116,7 +2116,7 @@ A call comes in from an old world household. The caller appears on your screen,
 <br><br>
 The mother pauses to glance at $his daughters before continuing. "I want my daughters to have a chance to make a life for themselves. I know that if I can pay their way towards attending University, then I will have succeeded as a parent."
 <br><br>
-$He begins to weep quietly, but continues after $his daughters lay their hands supportively on $his shoulder. "Could you enslave me, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>? It's the only way I have to pay for their tuition."
+$He begins to weep quietly, but continues after $his daughters lay their hands supportively on $his shoulder. "Could you enslave me, <<print PCTitle()>>? It's the only way I have to pay for their tuition."
 
 <<case "spoiled daughter">>
 
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index 8ae9d97dbe2..8f1d3ae715f 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -655,11 +655,11 @@ A pair of young slaves is going door to door offering themselves for sale on beh
 
 <br><br>
 
-One of them speaks up. "We're twins, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. Fraternal twins. We have been given hormone treatments and surgery to match one another more closely, except for one detail." They lift their skirts; the speaker has a hormone-atrophied cock, while her sister has a pussy, along with a large clit that almost matches her sibling's member in size. "We've also been trained ever since we turned $minimumSlaveAge to be completely obedient, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, in everything, and sexually proficient."
+One of them speaks up. "We're twins, <<print PCTitle()>>. Fraternal twins. We have been given hormone treatments and surgery to match one another more closely, except for one detail." They lift their skirts; the speaker has a hormone-atrophied cock, while her sister has a pussy, along with a large clit that almost matches her sibling's member in size. "We've also been trained ever since we turned $minimumSlaveAge to be completely obedient, <<print PCTitle()>>, in everything, and sexually proficient."
 
 <br><br>
 
-"We cost <<print cashFormat($contractCost)>>, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>."
+"We cost <<print cashFormat($contractCost)>>, <<print PCTitle()>>."
 
 <br><br>
 
diff --git a/src/uncategorized/remFluctuations.tw b/src/uncategorized/remFluctuations.tw
index 00aad26ed21..b49fad08a45 100644
--- a/src/uncategorized/remFluctuations.tw
+++ b/src/uncategorized/remFluctuations.tw
@@ -54,7 +54,7 @@
 	<<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>She's looking unusually businesslike, wearing an ill-fitted business suit. Her blouse buttons pop off as her belly swells grotesquely, before the object within her begins steadily moving upwards.
 	<<default>>Her symbol spins for attention.
 	<</switch>>
-	"<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I have a news item that may be of business interest," she 
+	"<<print PCTitle()>>, I have a news item that may be of business interest," she 
 	<<switch $assistantAppearance>>
 	<<case "monstergirl" "normal">>informs you.
 	<<case "shemale">>says seriously.
@@ -74,7 +74,7 @@
 	<</switch>>
 <</if>>
 <<else>>
-Your <<if $marketAssistantAnnounced>>market<<else>>personal<</if>> assistant's symbol appears on a wallscreen as you're going about your business. It spins for your attention. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I have a news item that may be of business interest," it says.
+Your <<if $marketAssistantAnnounced>>market<<else>>personal<</if>> assistant's symbol appears on a wallscreen as you're going about your business. It spins for your attention. "<<print PCTitle()>>, I have a news item that may be of business interest," it says.
 <</if>>
 <br><br>
 
-- 
GitLab