diff --git a/src/Mods/SpecialForce/TrickShotNight.tw b/src/Mods/SpecialForce/TrickShotNight.tw
index 12dbf2f376173f9b8ee8f350c0a04d1d1e163aca..3d22fe69fb893bf66e8ed6d0d17d41b3ad9da332 100644
--- a/src/Mods/SpecialForce/TrickShotNight.tw
+++ b/src/Mods/SpecialForce/TrickShotNight.tw
@@ -27,7 +27,7 @@
 Despite your direct elevator, interaction with the majority of your security force is relatively scarce. Aside from mutually exchanged nods in the firebase and the occasional briefing, your $SF.Lower enjoy a degree of autonomy.
 
 <br><br>On a particularly lackadaisical evening, you find yourself alerted to a message alert by $assistant.name.
-<<if assistant.personality > 0>>
+<<if $assistant.personality > 0>>
 	"<<= properMaster()>>, a message from $SF.Lower." _HeA pauses before continuing. "It seems they're asking if you'd like to join their trick shot night."
 <<else>>
 	It informs you that $SF.Lower have sent a message asking you to join them at their trick shot night.
diff --git a/src/pregmod/fMarry.tw b/src/pregmod/fMarry.tw
index 0ea5767854e176bd1ab257d0ef26dd5979febca0..6f907c2219f8030b8dbfdc963b3db5e784c71e5b 100644
--- a/src/pregmod/fMarry.tw
+++ b/src/pregmod/fMarry.tw
@@ -352,11 +352,11 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
 			_HisA avatar gives _hisA medicine stick a shake.
 		<<elseif $assistant.appearance == "businesswoman">>
 			_HisA avatar snaps _hisA fingers.
-		<<elseif ($assistant.appearance.includes("fairy")>>
+		<<elseif $assistant.appearance == "fairy">>
 			_HisA avatar claps _hisA hands twice, looking a bit disappointed at the lack of celebration.
-		<<elseif $assistant.appearance.includes("goddess")>>
+		<<elseif $assistant.appearance == "goddess">>
 			_HisA avatar makes a complex hand gesture, looking beatific.
-		<<elseif $assistant.appearance.includes("loli")>>
+		<<elseif $assistant.appearance == "loli">>
 			_HisA avatar claps _hisA hands together.
 		<<elseif $assistant.appearance == "schoolgirl">>
 			_HisA avatar snaps _hisA fingers and gives a little twirl.
diff --git a/src/pregmod/seFCTVremote.tw b/src/pregmod/seFCTVremote.tw
index b6dedfa109b110d40d31485dfec4b779c4e30b42..99f2636f82e3883c24d01668d8b4fb69ba8a9052 100644
--- a/src/pregmod/seFCTVremote.tw
+++ b/src/pregmod/seFCTVremote.tw
@@ -67,7 +67,7 @@
 	<<else>>
 	FCTV.
 	<</if>>
-	No sooner do you begin to watch a random show, than you have a notification that someone is here to see you. It seems to be a tech of some sort, complete with a small utility drone. A camera reveals the back of $his shirt, on which is written in block letters "FCTV SERVICE." Incredible. How do these people always find the worst time to stop in? <<if assistant.personality > 0>>Your assistant shrugs. At a gesture from you, _heA lets $him in.<<else>>You push a button to allow $him to come in.<</if>> This had better be good.
+	No sooner do you begin to watch a random show, than you have a notification that someone is here to see you. It seems to be a tech of some sort, complete with a small utility drone. A camera reveals the back of $his shirt, on which is written in block letters "FCTV SERVICE." Incredible. How do these people always find the worst time to stop in? <<if $assistant.personality > 0>>Your assistant shrugs. At a gesture from you, _heA lets $him in.<<else>>You push a button to allow $him to come in.<</if>> This had better be good.
 </p>
 
 <p>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 2a4b71963d2ee7fee66e07e50b403651ce8d1ea1..ebebb6f946b45dc3289e2340bbe42c5aa1847c9f 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -2693,7 +2693,7 @@ You decide to stop by to see $his method at work. By the time you arrive, $he's
 
 <<case "forbidden masturbation">>
 
-<<if assistant.personality > 0>>
+<<if $assistant.personality > 0>>
 	There is an alert from $assistant.name, in _hisA deliciously feminine voice: "$activeSlave.slaveName is masturbating, <<= properMaster()>>. Ooh, $he's breaking the rules, <<= properMaster()>>!" _HisA avatar
 	<<switch $assistant.appearance>>
 	<<case "monstergirl">>
@@ -3327,7 +3327,7 @@ $He doesn't phrase it quite like that, of course.
 <<setLocalPronouns _newSlaves[1] 3>>
 
 One evening, $assistant.name breaks in on your
-<<if assistant.personality > 0>>
+<<if $assistant.personality > 0>>
 	work, _hisA $assistant.appearance avatar looking uncharacteristically somber. "<<= properMaster()>>," _heA says, "a group of tourists are giving <<EventNameLink>> a bad time." Before you can ask why the security drones haven't addressed the situation, _heA continues, "They're not abusing $him physically or anything. But, look." _HeA
 <<else>>
 	work, announcing that a group of visitors to the arcology are being verbally abusive to <<EventNameLink>>. Before you can ask why _heA's bothering you with this, _heA continues, "An enslavement opportunity may exist," and
@@ -3631,7 +3631,7 @@ $He knows that that's not allowed, and keeps $his hands where they are, though i
 
 <<case "moist pussy">>
 
-Just as you're about to give <<EventNameLink>> $his weekly inspection, a minor business matter comes up and diverts your attention. So, for about ten minutes, $he has nothing at all to do other than <<if canWalk($activeSlave)>>stand<<elseif hasAnyLegs($activeSlave)>>kneel<<else>>sit<</if>> in front of your desk in your office, <<if canSee($activeSlave)>>watching<<elseif canHear($activeSlave)>>listening to<<else>>feeling the subtle vibrations from<</if>> you,<<if assistant.personality > 0>> $assistant.name's avatar,<</if>> the other slaves who come and go, and the general lewdness of the arcology, much of which is <<if canSee($activeSlave)>>visible<<elseif canHear($activeSlave)>>audible<<else>>apparent<</if>> from right here.
+Just as you're about to give <<EventNameLink>> $his weekly inspection, a minor business matter comes up and diverts your attention. So, for about ten minutes, $he has nothing at all to do other than <<if canWalk($activeSlave)>>stand<<elseif hasAnyLegs($activeSlave)>>kneel<<else>>sit<</if>> in front of your desk in your office, <<if canSee($activeSlave)>>watching<<elseif canHear($activeSlave)>>listening to<<else>>feeling the subtle vibrations from<</if>> you,<<if $assistant.personality > 0>> $assistant.name's avatar,<</if>> the other slaves who come and go, and the general lewdness of the arcology, much of which is <<if canSee($activeSlave)>>visible<<elseif canHear($activeSlave)>>audible<<else>>apparent<</if>> from right here.
 <<if ($activeSlave.attrXY > 50) && ($PC.boobs < 300)>>
 	$He finds your strong body attractive, and $his gaze rests most frequently <<if canSee($activeSlave)>>on<<else>>towards<</if>> you.
 <<elseif ($activeSlave.attrXX > 50) && ($PC.boobs >= 650)>>
@@ -4097,7 +4097,7 @@ As another long week draws to a close, <<EventNameLink>> happens to walk past yo
 <<case "nice guys">>
 
 One afternoon, $assistant.name informs you $he that $he has a non-urgent matter that you might be interested in overseeing personally.
-<<if assistant.personality > 0>>
+<<if $assistant.personality > 0>>
 	_HisA $assistant.appearance avatar looks unusually curious. "<<= properTitle()>>," _heA says, "a group of tourists have just entered the arcology. They seem strangely enthralled by <<EventNameLink>>." Before you can ask why _heA deemed this important enough news to draw your attention to, _heA continues, "They're not using $him or anything. Just look." _HeA
 <<else>>
 	It announces that a group of tourists have just entered the arcology, and seem unusually enthralled by <<EventNameLink>>. Before you can ask why _heA's bothering you with this, _heA continues, "A business opportunity may exist," and
@@ -8615,7 +8615,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 		There's no reason for $him to do that in a quiet corner. You interrupt $him and bring $him into your office, setting $him up on a machine so $he can have that dildo rammed up $his ass for as long as $he likes. Your office is filled with the rhythmic sounds of a sloppy anus being pounded for a good long while.
-		<<if assistant.personality > 0>>
+		<<if $assistant.personality > 0>>
 			The
 			<<switch $assistant.appearance>>
 			<<case "monstergirl">>
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index 5df22444098006b76714fa52bb273972cacb5038..de61595eaa7de4af42413f230a00fe4a8dcfcc39 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -236,7 +236,7 @@
 <<setAssistantPronouns>>
 
 One unfortunate consequence of existing in a global world is that business opportunities continue to crop up unabated by the onset of night in one corner of the world or another, an inconsiderate phenomenon for arcology owners who happen to be asleep when an event of importance takes place outside the walls of their arcology. This particular evening you are awoken by an alert from $assistant.name, unusually intense for this late hour.
-<<if assistant.personality > 0>>
+<<if $assistant.personality > 0>>
 	"<<= properMaster()>>, there is a time sensitive enslavement opportunity available if you're interested." _HeA pauses before continuing. "You're going to want to see this one <<= properMaster()>>."
 <<else>>
 	_HeA informs you that there is a time sensitive enslavement opportunity for you to peruse, and that _heA has calculated the potential rewards are worthy of your consideration even in the middle of the night.
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 4e9b5c0b073a1d79e3af8408d2a0870e93d7d6b5..590f069749ede3135875b8fd24446b12f77ec39b 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -1743,7 +1743,7 @@ You own
 <</if>>
 
 <<setAssistantPronouns>>
-<<if assistant.market && assistant.market.limit > 0>>
+<<if $assistant.market && $assistant.market.limit > 0>>
 <<silently>> <<= MenialPopCap()>> <</silently>>
 <<set _menialSlaveValue = menialSlaveCost()>>
 <br>
diff --git a/src/uncategorized/fsDevelopments.tw b/src/uncategorized/fsDevelopments.tw
index d9b75cb8168ffd2742cf638292940f87147e077c..46cea8182bdfa4dfe0e60107f9d56995298ac25c 100644
--- a/src/uncategorized/fsDevelopments.tw
+++ b/src/uncategorized/fsDevelopments.tw
@@ -272,9 +272,9 @@
 			<<set $arcologies[0].FSPaternalist += 0.1*$FSSingleSlaveRep>>
 			<<set _seed = 2>>
 		<</if>>
- <</if>>
- <<if $arcologies[0].FSDegradationist != "unset">>
-		<<if ["monstergirl", "businesswoman", "preggololi", "succubus", "incubus", "imp"].includes($assistant.appearance)
+	<</if>>
+	<<if $arcologies[0].FSDegradationist != "unset">>
+		<<if ["monstergirl", "businesswoman", "preggololi", "succubus", "incubus", "imp"].includes($assistant.appearance)>>
 			<<set $arcologies[0].FSDegradationist += 0.1*$FSSingleSlaveRep>>
 			<<set _seed = 1>>
 		<<elseif $assistant.fsAppearance == "degradationist">>
@@ -311,7 +311,7 @@
 		<</if>>
 	<</if>>
 	<<if $arcologies[0].FSTransformationFetishist != "unset">>
-		<<if ["businesswoman", "shemale", "succubus", incubus", "witch", "ERROR_1606_APPEARANCE_FILE_CORRUPT"].includes($assistant.fsAppearance)>>
+		<<if ["businesswoman", "shemale", "succubus", "incubus", "witch", "ERROR_1606_APPEARANCE_FILE_CORRUPT"].includes($assistant.fsAppearance)>>
 			<<set $arcologies[0].FSTransformationFetishist += 0.1*$FSSingleSlaveRep>>
 			<<set _seed = 1>>
 		<<elseif assistant.fsAppearance == "transformation fetishist">>
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index 516292330f0f13678a17839eeec6ad3fca5facf5..939542b7917ebfc0d7b3da1540ac16b3c02e681b 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -479,10 +479,10 @@
 		<</if>>
 	<</if>>
 
-	<<if assistant.personality > 0>>
+	<<if $assistant.personality > 0>>
 		<<setAssistantPronouns>>
 		<<= capFirstChar($assistant.name)>> is using an alternative personality setting, speaking in a sultry, sexual voice, and talking as though the penthouse's sex toys are _hisA body.
-		<<if assistant.personality > 1>>
+		<<if $assistant.personality > 1>>
 			_HeA also has charge of all smart piercings in the arcology, and is using _hisA adaptations to sexual duties to improve their effectiveness.
 		<</if>>
 	<</if>>
diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw
index 9c2590702870cef620a74349b09fbed91f36a5b6..38a26813c423ae21dbeb4f3407927988fa887376 100644
--- a/src/uncategorized/nonRandomEvent.tw
+++ b/src/uncategorized/nonRandomEvent.tw
@@ -131,10 +131,10 @@
 	<<goto "P peacekeepers intro">>
 <<elseif ($arcologies[0].prosperity > 80) && ($TSS.schoolPresent+$GRI.schoolPresent+$SCP.schoolPresent+$LDE.schoolPresent+$TGA.schoolPresent+$HA.schoolPresent+$TFS.schoolPresent+$TCR.schoolPresent+$NUL.schoolPresent == 0) && ($schoolSuggestion == 0)>>
 	<<goto "P school suggestion">>
-<<elseif def $assistant.fsOptions && assistant.personality > 0 && $assistant.appearance != "normal" && FutureSocieties.HighestDecoration() >= 40>>
+<<elseif def $assistant.fsOptions && $assistant.personality > 0 && $assistant.appearance != "normal" && FutureSocieties.HighestDecoration() >= 40>>
 	<<set $Event = "assistant FS">>
 	<<goto "Assistant Events">>
-<<elseif assistant.personality > 0 && ndef $assistant.name.announced && $assistant.power > 0>>
+<<elseif $assistant.personality > 0 && ndef $assistant.name && $assistant.power > 0>>
 	<<set $Event = "assistant name">>
 	<<goto "Assistant Events">>
 <<elseif !$assistant.market && $assistant.power > 1>>
diff --git a/src/uncategorized/officeDescription.tw b/src/uncategorized/officeDescription.tw
index 90c0ae3b68d8b24589cb62a9205af4e27ee871ff..9285a8b0b52caeeda008199566f6a0082cf6286c 100644
--- a/src/uncategorized/officeDescription.tw
+++ b/src/uncategorized/officeDescription.tw
@@ -71,7 +71,7 @@
 	<<elseif $week > (43-$nationHate)>>
 		Its plates bear scarring fairly won.
 	<</if>>
-	<<if assistant.personality > 0>>
+	<<if $assistant.personality > 0>>
 		The last time _heA had it maintained, $assistant.name added
 		<<switch $assistant.appearance>>
 		<<case "monstergirl">>
diff --git a/src/uncategorized/pBioreactorPerfected.tw b/src/uncategorized/pBioreactorPerfected.tw
index 5b8bf307a8d7f44da0bc7bac66d9c96b4ea4802b..046f7673266e29dcdcc8cdb03e89ab3606f38372 100644
--- a/src/uncategorized/pBioreactorPerfected.tw
+++ b/src/uncategorized/pBioreactorPerfected.tw
@@ -137,7 +137,7 @@ You stop and consider the cow, from $his titanic breasts to $his <<if ($activeSl
 		Your assistant pauses, and then says, "Redesignation complete, <<= properTitle()>>. This milking machine has been equipped with biological components. This combination is projected to produce approximately <<if $activeSlave.balls > 0>><<print 1000*Math.trunc((3*52*($retirementAge-$activeSlave.physicalAge))/1000)>> liters of cum,<</if>>
 		<<if $activeSlave.ovaries == 1>><<print 100*Math.trunc((52*($retirementAge-$activeSlave.physicalAge))/100)>> liters of vaginal secretions, <<print 5*($retirementAge-$activeSlave.physicalAge)>> slaves,<</if>>
 		and <<print 1000*Math.trunc((300*52*($retirementAge-$activeSlave.physicalAge))/1000)>> liters of milk over a <<print $retirementAge-$activeSlave.physicalAge>> year period before its biological components must be replaced."
-		<<if assistant.personality > 0>>
+		<<if $assistant.personality > 0>>
 			<<switch $assistant.appearance>>
 			<<case "monstergirl">>
 				_HisA avatar watches the new equipment with almost motherly affection, _hisA tentacle hair writhing obscurely.
diff --git a/src/uncategorized/pCitizensAndCivilians.tw b/src/uncategorized/pCitizensAndCivilians.tw
index 62bbad4194bd444b1b9068eb227dea20a638dd36..aa3f5385586b1942b66c7ee6f7e96bec96a0199b 100644
--- a/src/uncategorized/pCitizensAndCivilians.tw
+++ b/src/uncategorized/pCitizensAndCivilians.tw
@@ -9,7 +9,7 @@
 
 <<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event">>
 
-<<if assistant.personality > 0>>
+<<if $assistant.personality > 0>>
 	While working at your desk, you are accompanied by the luscious sound of $assistant.name humming to _himselfA, which _heA does to indicate _heA's working on a difficult task. After this goes on for a while,
 	<<switch $assistant.appearance>>
 	<<case "monstergirl">>
diff --git a/src/uncategorized/pCoupAftermath.tw b/src/uncategorized/pCoupAftermath.tw
index 4633108af82571558d26220ee9f792bb69e28511..4805a80b98db043764bad045582cbde4971fc62b 100644
--- a/src/uncategorized/pCoupAftermath.tw
+++ b/src/uncategorized/pCoupAftermath.tw
@@ -20,7 +20,7 @@
 
 <<if $mercenaries > 3>>Your $mercenariesTitle<<elseif $mercenaries > 0>>Your mercenaries<<elseif $arcologyUpgrade.drones > 0>>Your security drones<<else>>Private security teams<</if>> perform the grisly task of disposing of the bodies of the Daughters killed in the assault. They strip them of anything that might be of use in cleaning up after the attempted coup — communication devices, PDAs, computers, even handwritten notes. The raw intel is scanned and passed to $assistant.name. Most of it is rubbish.
 <br><br>
-Some of it is not. There is evidence of payments from a <<if $rivalSet == 0>>nearby Free City<<else>>neighboring arcology<</if>> to the leadership of the Daughters. <<= capFirstChar($assistant.name)>> is silent for a long time, crosschecking records to assemble a complete picture despite your enemies' attempts to disguise the transactions. Finally, $assistant.name finishes and displays a picture, using nearly the entire surface of your desk for effect. <<if assistant.personality > 0>>"This," _heA says in a tone of satisfaction, "is the <<if $rivalGender == 2>>bastard<<elseif $rivalGender == 1>>bitch<<else>>cunt<</if>> you want, <<= properTitle()>>."<<else>>"This," _heA says neutrally, "is the culprit, <<= properTitle()>>."<</if>>
+Some of it is not. There is evidence of payments from a <<if $rivalSet == 0>>nearby Free City<<else>>neighboring arcology<</if>> to the leadership of the Daughters. <<= capFirstChar($assistant.name)>> is silent for a long time, crosschecking records to assemble a complete picture despite your enemies' attempts to disguise the transactions. Finally, $assistant.name finishes and displays a picture, using nearly the entire surface of your desk for effect. <<if $assistant.personality > 0>>"This," _heA says in a tone of satisfaction, "is the <<if $rivalGender == 2>>bastard<<elseif $rivalGender == 1>>bitch<<else>>cunt<</if>> you want, <<= properTitle()>>."<<else>>"This," _heA says neutrally, "is the culprit, <<= properTitle()>>."<</if>>
 
 The face is vigorous, determined, and <<if $rivalGender == 2>>masculine. The very stereotype of the male arcology owner<<elseif ($rivalGender == 1)>>feminine. The very stereotype of the female arcology owner<<else>>androgynous. The very stereotype of the dissolute arcology owner<</if>>.
 <<if $rivalSet != 0>>
@@ -33,7 +33,7 @@ The face is vigorous, determined, and <<if $rivalGender == 2>>masculine. The ver
 	<</for>>
 	<br><br>
 <</if>>
-Your assistant continues, "_HeR came into an arcology about when you did, <<= properTitle()>>. It seems the Daughters originally planned to attack _himR, but _heR bought them off and sent them after you, instead."<<if assistant.personality > 0>> "I wonder," _heA teases, "if _heR thinks you're cute, or what?"<</if>>
+Your assistant continues, "_HeR came into an arcology about when you did, <<= properTitle()>>. It seems the Daughters originally planned to attack _himR, but _heR bought them off and sent them after you, instead."<<if $assistant.personality > 0>> "I wonder," _heA teases, "if _heR thinks you're cute, or what?"<</if>>
 <br><br>
 You inquire as to whether there's any identifiable cause for the evident dislike.
 <<if $rivalryFS != 0>>
diff --git a/src/uncategorized/pHackerSupport.tw b/src/uncategorized/pHackerSupport.tw
index 2b8f7a260484a0b0377289b8202aae27e1f7df8c..fe1ca328145fb13023a914a2b18632876961ef85 100644
--- a/src/uncategorized/pHackerSupport.tw
+++ b/src/uncategorized/pHackerSupport.tw
@@ -10,7 +10,7 @@ While you are reviewing your information security posture in light of the Daught
 <br><br>
 
 "Hi!" she says cheerfully. "I seen you been contacted by these Daughters cunts. They been after me too. They're pretty decent at cyberwarfare, but I'm fuckin' better." A momentary discomfort crosses her face, and she shifts a little in her seat. "They're building up for somethin' big. Wouldn't a' contacted you at all, let us both fight our own fights, but I gotta short fuse on this vulnerability and I need to bribe a weak link. Your money can get me in; my skills can fuck 'em up. What do you say?<<if $traitorType == "hostage">> If it sweetens the deal at all, I can even get $traitor.slaveName out of hot water. Not the brightest, that one.<</if>>"
-<<if assistant.personality > 0>>
+<<if $assistant.personality > 0>>
 	<<= capFirstChar($assistant.name)>> has been trying to track the contact, but fails horribly. The hacker glances at _hisA
 	<<switch $assistant.appearance>>
 	<<case "monstergirl">>
@@ -73,7 +73,7 @@ As she finishes speaking, another spasm distorts her expression, and then she su
 	<<set $nextButton = "Continue">><<UpdateNextButton>>
 	<<replace "#result">>
 	You transfer the funds. "Meh," she shrugs. <<if $seeDicks == 0>>She shudders again and there's a gasping sound from down below. She looks down again, and as she ends the video call, you hear her say "Good job. Ha ha, fuck you, slut, it's your asshole anyway. Get me my strap-on."<<else>>She shudders and there's a popping sound from down below, like a cockhead springing free of someone's mouth. Sure enough, a still-erect dickhead springs into view from the bottom of the screen; for that to be visible she has to be truly huge, almost as long as one of her forearms. She looks down again, and as she ends the video call, you hear her say "Good job. Ha ha, fuck you, bitch, it's your asshole anyway. Buttrape time!"<</if>>
-	<<if assistant.personality > 0>>
+	<<if $assistant.personality > 0>>
 		<<switch $assistant.appearance>>
 		<<case "monstergirl">>
 			She seems to have left a present for your poor personal assistant; _hisA little monster<<= _girlA>> avatar is visible in the bottom corner of a screen on the wall opposite you, and is writhing around, babbling and orgasming continuously.
diff --git a/src/uncategorized/pUndergroundRailroad.tw b/src/uncategorized/pUndergroundRailroad.tw
index 703e27445de9e5779354a3cfa348bff5949287f6..4852044a7281b9350ed17e442c2d4ef9670fc4d4 100644
--- a/src/uncategorized/pUndergroundRailroad.tw
+++ b/src/uncategorized/pUndergroundRailroad.tw
@@ -52,7 +52,7 @@ One fine day, as normal as any day surrounded by your slaves can be, you're sitt
 <</if>>
 
 _heA replies
-<<if assistant.personality > 0>>
+<<if $assistant.personality > 0>>
 	flirtatiously, "What message, <<= properTitle()>>?"
 	<<switch $assistant.appearance>>
 	<<case "monstergirl">>
diff --git a/src/uncategorized/reAWOL.tw b/src/uncategorized/reAWOL.tw
index 80d7ce148ba4ff2d568ae41f6326e8295b782245..62621ceb86fab1f5e23d8d29ddbfce83bac46f78 100644
--- a/src/uncategorized/reAWOL.tw
+++ b/src/uncategorized/reAWOL.tw
@@ -62,7 +62,7 @@ Human soldiers are superior to drones in a number of ways — they have the capa
 <br><br>
 
 On this particular evening, you find your work interrupted by an urgent alert from $assistant.name<<if $seeImages == 1>>, accompanied by a recent picture<</if>>.
-<<if assistant.personality > 0>>
+<<if $assistant.personality > 0>>
 	"<<= properMaster()>>, one of the $mercenariesTitle has gone AWOL." _HeA pauses before continuing. "$He's taken a number of weapons with $him."
 <<else>>
 	_HeA informs you that one of the $mercenariesTitle has disappeared, seemingly taking with $him a small stash of weapons.
diff --git a/src/uncategorized/rePokerNight.tw b/src/uncategorized/rePokerNight.tw
index a831c8c57cbb8d3a79d5202b91a899bd8bd06c55..27d42628506b207bffc5c0d23caecc31885c4628 100644
--- a/src/uncategorized/rePokerNight.tw
+++ b/src/uncategorized/rePokerNight.tw
@@ -12,7 +12,7 @@ Despite their persistent presence in your arcology, interaction with your mercen
 <br><br>
 
 On a particularly lackadaisical evening, you find yourself alerted to a message alert by $assistant.name.
-<<if assistant.personality > 0>>
+<<if $assistant.personality > 0>>
 	"<<= properMaster()>>, a message from your $mercenariesTitle." _HeA pauses before continuing. "It seems they're asking if you'd like to join their poker night."
 <<else>>
 	_HeA informs you that the $mercenariesTitle have sent a message asking you to join them at their poker night.
diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw
index c98cca054da2633ea23ae67f22cc888d06ee47a7..4ee0a5eb8e59e76c80a160f16bc8928010405c0b 100644
--- a/src/uncategorized/reShelterInspection.tw
+++ b/src/uncategorized/reShelterInspection.tw
@@ -74,8 +74,8 @@
 /* 000-250-006 */
 </span>
 
-Your assistant announces a visitor in the entryway of your penthouse, and adds<<if assistant.personality > 0>> with disapproval<</if>> that it's an inspector from the Slave Shelter.
-<<if assistant.personality > 0>>
+Your assistant announces a visitor in the entryway of your penthouse, and adds<<if $assistant.personality > 0>> with disapproval<</if>> that it's an inspector from the Slave Shelter.
+<<if $assistant.personality > 0>>
 	<<switch $assistant.appearance>>
 	<<case "monstergirl">>
 		_HisA avatar's cocks and tentacle hair are all hanging limply; _heA's a dejected little picture of a cockblocked monster<<= _girlA>>.
diff --git a/src/uncategorized/remFluctuations.tw b/src/uncategorized/remFluctuations.tw
index b0e2e09cb4470704b146f5a24fdef43e8a509c84..110e668fc798ba9702b8895fb4a1c8b6e9845073 100644
--- a/src/uncategorized/remFluctuations.tw
+++ b/src/uncategorized/remFluctuations.tw
@@ -11,7 +11,7 @@
 <<setAssistantPronouns>>
 
 <p>
-	<<if assistant.personality > 0>>
+	<<if $assistant.personality > 0>>
 		<<if $assistant.market>>
 			The market assistant's avatar appears on a wallscreen as you're going about your business.
 			<<switch $assistant.appearance>>