diff --git a/sanityCheck b/sanityCheck
index 1392ffad385ba3ffaf370e6c85fcafe0ffe2c69d..1db33d90dcf53ef83a2ccb6ac9f086afe8d56d3a 100755
--- a/sanityCheck
+++ b/sanityCheck
@@ -45,9 +45,9 @@ $GREP -e "<<[ a-zA-Z]\+[^()<>]*([^()]*([^()]*)[^()<>]*>>"  -- "src/*" | myprint
 $GREP -e "<<.*[(][^<>)]*[(][^<>)]*)\?[^<>)]*>>" -- "src/*" | myprint "MissingClosingBracket3"
 # Check for missing >>.  e.g.:   <<if $foo
 $GREP "<<[^<>]*[^,\"\[{"$'\r]\r'"\?$" -- 'src/*' | myprint "MissingClosingAngleBrackets"
-# Check for too many >>>.  e.g.: <</if>>> 
+# Check for too many >>>.  e.g.: <</if>>>
 $GREP "<<[^<>]*[<>]\?[^<>]*>>>" -- "src/*.tw" | myprint "TooManyAngleBrackets"
-# Check for too many <<<.  e.g.: <<</if>> 
+# Check for too many <<<.  e.g.: <<</if>>
 $GREP "<<<[^<>]*[<>]\?[^<>]*>>" -- "src/*.tw" | myprint "TooManyAngleBrackets"
 # Check for wrong capitalization on 'activeslave' and other common typos
 $GREP -e "\$act" --and --not -e "\$\(activeSlave\|activeArcology\|activeStandard\|activeOrgan\|activeLimbs\|activeUnits\)" -- "src/*" | myprint "WrongCapitilization"
@@ -79,7 +79,7 @@ $GREP -e "<<[a-zA-Z]* = *" -- src/*.tw | myprint "BadCommand"
 # Check for duplicate words, e.g. with with
 $GREP -e  " \(\b[a-zA-Z][a-zA-Z]\+\) \1\b " --and --not -e " her her " --and --not -e " you you " --and --not -e " New New " --and --not -e " that that " --and --not -e " in in " --and --not -e " is is " -- 'src/*' | myprint "Duplicate words"
 # Check for obsolete SugarCube macros
-$GREP -E "<<display|<<click|<<.*\.contains" -- src/*.tw | myprint "ObsoleteMacro" 
+$GREP -E "<<display|<<click|<<.*\.contains" -- src/*.tw | myprint "ObsoleteMacro"
 # Check for double articles
 $GREP -E "\Wa an\W" -- src/*.tw | myprint "DoubleArticle"
 # Check for incorrect articles
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 0c8ac1628ad13a4d8309f2fbcaa6cbe16369f40b..c228ff7c541bd1a4b497d15f8cfda4f86d83df21 100644
--- a/slave variables documentation - Pregmod.txt	
+++ b/slave variables documentation - Pregmod.txt	
@@ -606,9 +606,9 @@ accepts string
 "Fijian"
 "Filipina"
 "Finnish"
+"French"
 "French Guianan"
 "French Polynesian"
-"French"
 "Gabonese"
 "Gambian"
 "Georgian"
diff --git a/src/SecExp/edicts.tw b/src/SecExp/edicts.tw
index b62cabdc44a58e683527464c3b3c21acb9f23bb0..b61181fa2b8ad3f0a4911c014c6bb97ec9d3a17d 100644
--- a/src/SecExp/edicts.tw
+++ b/src/SecExp/edicts.tw
@@ -56,10 +56,10 @@
 		<br>''Troops detachment:'' $securityForceName has currently transferred troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel.
 		[[Repeal|edicts][$SFSupportLevel--, $SFSupportUpkeep -= 3000, $reqHelots += 5]]
 	<<elseif $SFSupportLevel == 4>>
-		<br>''Full support:''$securityForceName is currently providing it's full support to the security department, while transferring troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel.
+		<br>''Full support:''$securityForceName is currently providing its full support to the security department, while transferring troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel.
 		[[Repeal|edicts][$SFSupportLevel--, $SFSupportUpkeep -= 3000, $reqHelots += 5]]
 	<<elseif $SFSupportLevel == 5>>
-		<br>''Network assistance:''$securityForceName is currently assisting with a local install of it's custom network full support and has transferred troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel.
+		<br>''Network assistance:''$securityForceName is currently assisting with a local install of its custom network full support and has transferred troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel.
 		[[Repeal|edicts][$SFSupportLevel--, $SFSupportUpkeep -= 4000, $secHQUpkeep -= 1000, $reqHelots += 5]]
 	<</if>>
 <</if>>
@@ -334,7 +334,7 @@
 		<</if>>
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will lower the amount of personnel necessary to man the security HQ by a further 5, but will incur additional upkeep costs.//
 	<<elseif $SFSupportLevel == 3 && $securityForceArcologyUpgrades != 6 && $reqHelots > 5>>
-		<br>''Full Support:'' $securityForceName will give the security department it's full support.
+		<br>''Full Support:'' $securityForceName will give the security department its full support.
 		<<if $authority >= 1000>>
 			[[Implement|edicts][$SFSupportLevel++, $cash -=5000, $authority -= 1000, $SFSupportUpkeep += 3000, $reqHelots -= 5]]
 		<<else>>
diff --git a/src/events/gameover.tw b/src/events/gameover.tw
index ff4cfea5e93796852b7e81f6c1e81dc499411f6c..73398b51a44d39ef87140d5df555db78929712fa 100644
--- a/src/events/gameover.tw
+++ b/src/events/gameover.tw
@@ -79,7 +79,7 @@
 
 <<elseif $gameover == "Idiot Ball 2 The Dumbassening">>
 	<<set $ui = "start">>
-	As you leave your penthouse to conduct your daily rounds, you promptly get <<if $arcologyUpgrade.drones == 1>>tazed by the nearest drone<<else>>tackled hard against the wall<</if>>. When you awake, it hits you like a truck; you idiotically enslaved your $PC.origRace ass by decreeing all non-<<print $arcologies[0].FSSupremacistRace>>s slaves, and since you are now a slave, lack the authority to revert the policy. The story of your remaining years may be worth telling, as is your legendary blunder, but it must be told elsewhere.
+	As you leave your penthouse to conduct your daily rounds, you promptly get <<if $arcologyUpgrade.drones == 1>>tased by the nearest drone<<else>>tackled hard against the wall<</if>>. When you awake, it hits you like a truck; you idiotically enslaved your $PC.origRace ass by decreeing all non-<<print $arcologies[0].FSSupremacistRace>>s slaves, and since you are now a slave, lack the authority to revert the policy. The story of your remaining years may be worth telling, as is your legendary blunder, but it must be told elsewhere.
 
 	<br><br>
 	''GAME OVER''	
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 2fddbabb4adbe81ec8754cddf02f96491306b171..9197880a8947f89f9a0dfd4b579b2b4f88fe4eca 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -1,4 +1,4 @@
-:: Encyclopedia [nobr]
+:: Encyclopedia [nobr]
 
 <<switch $encyclopedia>>
 
@@ -2348,7 +2348,7 @@ LORE: INTERVIEWS
  <br>Nah. It'd be dumb to do anything to a newbie and then not enslave 'em. What, you're gonna rape somebody and then give 'em two-forty rounds, four frags, and a satchel charge? Fuck no.
 
  <br><br>//That's what you carry?//
- <br>Yeah fuck that subject anyway. And yeah, when taking prisoners isn't on the agenda. I'm a big girl, I can manage eight mags in a double deck chest rig. If we are taking prisoners, then swap out half the frags for gas and half the mags for an underslung S. G. with beanbags and tazer rounds. Though you never want to use any of that, nonlethals included.
+ <br>Yeah fuck that subject anyway. And yeah, when taking prisoners isn't on the agenda. I'm a big girl, I can manage eight mags in a double deck chest rig. If we are taking prisoners, then swap out half the frags for gas and half the mags for an underslung S. G. with beanbags and taser rounds. Though you never want to use any of that, nonlethals included.
 
  <br><br>//Because you might damage the merchandise?//
  <br>Because you might damage the merchandise. Did you know it's possible to burst an implant with a beanbag round? Well, it's possible to burst an implant with a beanbag round.
diff --git a/src/js/clothingSelectionJS.tw b/src/js/clothingSelectionJS.tw
index ed37e5253ad91b8a4542494da7a3f6689970bc98..24bef04793450abbb4f0589edcc542b7155afc2a 100644
--- a/src/js/clothingSelectionJS.tw
+++ b/src/js/clothingSelectionJS.tw
@@ -152,12 +152,12 @@ window.todaysOutfit = function(slave) {
 				wardrobeAssignment.push({text: "but goes nude to not be slowed down while moving between her charges.", clothes: "no clothing"});
 			} else {
 				wardrobeAssignment.push({text: "and wears a sturdy maid outfit, since anything else might be damaged by her hard work with the cows.", clothes: "a nice maid outfit"});
-				wardrobeAssignment.push({text: "and decides to call it casual friday and wear nothing but cutoffs and a t-shirt. Not like the cows will mind.", clothes: "cutoffs and a t-shirt"});
+				wardrobeAssignment.push({text: "and decides to call it Casual Friday and wear nothing but cutoffs and a t-shirt. Not like the cows will mind.", clothes: "cutoffs and a t-shirt"});
 				wardrobeAssignment.push({text: "and opts to don a cheerleader outfit to help cheer the cows on.", clothes: "a cheerleader outfit"});
 				wardrobeAssignment.push({text: "and dresses up as a succubus since she'll be drawing plenty of fluids.", clothes: "a succubus outfit"});
 				wardrobeAssignment.push({text: "and slips into some spats and a tank top since she feels a workout coming on.", clothes: "spats and a tank top"});
 				if(isItemAccessible("Western clothing")) {
-					wardrobeAssignment.push({text: "and wears an appropriate cowgirl outift. Her bare ass walking past is sure to amuse her charges.", clothes: "Western clothing"});
+					wardrobeAssignment.push({text: "and wears an appropriate cowgirl outfit. Her bare ass walking past is sure to amuse her charges.", clothes: "Western clothing"});
 				}
 				if(isItemAccessible("stretch pants and a crop-top")) {
 					wardrobeAssignment.push({text: "and slips into some comfy stretch pants to relax as she works the cows.", clothes: "stretch pants and a crop-top"});
@@ -496,7 +496,7 @@ window.todaysOutfit = function(slave) {
 					wardrobeTastes.push({text: "and wears shibari ropes to encourage others to dominate her.", clothes: "shibari ropes"});
 				} else if(slave.fetish == "dom") {
 					wardrobeTastes.push({text: "and wears a handsome suit, since she likes other slaves to look up to her.", clothes: "nice business attire"});
-					wardrobeTastes.push({text: "and wears a full body latex catsuit to look the part of the whip cracking domme.", clothes: "a latex catsuit"});
+					wardrobeTastes.push({text: "and wears a full body latex catsuit to look the part of the whip cracking dom.", clothes: "a latex catsuit"});
 				} else if(slave.fetish == "masochist") {
 					wardrobeTastes.push({text: "and wears painfully restrictive bondage gear, since she likes the torment.", clothes: "uncomfortable straps"});
 					if(isItemAccessible("chains")) {
diff --git a/src/npc/fAbuse.tw b/src/npc/fAbuse.tw
index 7de9d2184b979e61c6358557f7452be31a6dcab4..efbe9ad2bfc65fd5fb133f28f0d61010978611a3 100644
--- a/src/npc/fAbuse.tw
+++ b/src/npc/fAbuse.tw
@@ -245,7 +245,7 @@ from your victim.
 	The bitch's still a virgin and you don't mean to take that now, but you torture her with the threat of raping her virgin pussy for a while before settling for her gagging throat
 	<<set $activeSlave.oralCount++, $oralTotal++>>
 <<elseif $activeSlave.bellyPreg >= 600000>>
-	The bitch is on the brink of bursting, so hard intercourse will be painful and terrifying to her. You thrust hard into her causing her taut belly to bulge and making her children squirm within her straining womb.<<if ($PC.vagina == 1) && ($PC.dick == 1)>> Fortunately for her, this gets you so wet that some of your pussyjuice makes it down onto your shaft and serves as improvised lube.<</if>> You brutally fuck her as she pleads for you to stop until your at your edge. More cum won't make the bitch more pregnant, but you cum inside her anyway
+	The bitch is on the brink of bursting, so hard intercourse will be painful and terrifying to her. You thrust hard into her causing her taut belly to bulge and making her children squirm within her straining womb.<<if ($PC.vagina == 1) && ($PC.dick == 1)>> Fortunately for her, this gets you so wet that some of your pussyjuice makes it down onto your shaft and serves as improvised lube.<</if>> You brutally fuck her as she pleads for you to stop until you're at your edge. More cum won't make the bitch more pregnant, but you cum inside her anyway
 	<<VaginalVCheck>>
 <<elseif $activeSlave.bellyPreg >= 120000>>
 	The bitch is hugely pregnant, so hard intercourse will be uncomfortable and worrying for her. You have hard intercourse. She sobs as you rock the huge weight of her belly back and forth without mercy, forcing her already straining belly to bulge further, and whines as she feels your cockhead batter her womb.<<if ($PC.vagina == 1) && ($PC.dick == 1)>> Fortunately for her, this gets you so wet that some of your pussyjuice makes it down onto your shaft and serves as improvised lube.<</if>> More cum won't make the bitch more pregnant, but you cum inside her anyway
@@ -390,4 +390,3 @@ Even though she's in a somewhat bad shape, she still jumps back to her feet and
 <<if passage() !== "Slave Interact">>
 	<<set $nextLink = "AS Dump">>
 <</if>>
-
diff --git a/src/pregmod/fSlaveSlaveDickConsummate.tw b/src/pregmod/fSlaveSlaveDickConsummate.tw
index 81e5aae02e6c69cde1eb8d6c2cfa1174261808f1..68f235dea27e155c6a4f8c6acaa586667261daf0 100644
--- a/src/pregmod/fSlaveSlaveDickConsummate.tw
+++ b/src/pregmod/fSlaveSlaveDickConsummate.tw
@@ -73,7 +73,7 @@ You take a look at the bound cock toy.
 		<<set _bottomdrugged = 1>>
 	<</if>>
 <<elseif ($activeSlave.fetish == "mindbroken") && ($activeSlave.career == "a breeding bull")>>
-	$activeSlave.slaveName, as a good bull, was already erect while being tied down. It seems they know what's going to happen to them soon. Maybe someone at the Cattle Ranch has been sampling their bulls? 
+	$activeSlave.slaveName, as a good bull, was already erect while being tied down. It seems they know what's going to happen to them soon. Maybe someone at the Cattle Ranch has been sampling their bulls?
 <<else>>
 	<<if $activeSlave.devotion > -20>>
 		<<if $activeSlave.energy > 40>>
@@ -126,18 +126,18 @@ You call $slaverapistx.slaveName into the room.
 <br><br>
 
 <<if ($activeSlave.fetish == "mindbroken") && ($activeSlave.career != "a dairy cow") && ($activeSlave.career != "a breeding bull")>>
-	$activeSlave.slaveName doesn't even notice 
+	$activeSlave.slaveName doesn't even notice
 	<<if _isIncest == 1>>
 		<<if $activeSlave.father == $slaverapistx.ID && $activeSlave.mother == $slaverapistx.ID>>
-			the slave that is both her mother and her father, 
+			the slave that is both her mother and her father,
 		<<elseif $slaverapistx.mother == $activeSlave.ID>>
-			her own daughter, 
+			her own daughter,
 		<<elseif $activeSlave.mother == $slaverapistx.ID>>
-			her own mother, 
+			her own mother,
 		<<elseif $activeSlave.father == $slaverapistx.ID>>
-			the slave that fathered her, 
+			the slave that fathered her,
 		<<elseif (areSisters($activeSlave, $slaverapistx) > 0)>>
-			her <<if areTwins($activeSlave, $slaverapistx)>>twin <</if>>sister, 
+			her <<if areTwins($activeSlave, $slaverapistx)>>twin <</if>>sister,
 		<</if>>
 	<<else>>
 		the other slave,
@@ -145,36 +145,36 @@ You call $slaverapistx.slaveName into the room.
 	and simply lays still.
 <<elseif ($activeSlave.fetish == "mindbroken") && (($activeSlave.career == "a dairy cow") || ($activeSlave.career == "a breeding bull"))>>
 	<<if _isIncest == 1>>
-		$activeSlave.slaveName's simple mind does not even acknowledge that $slaverapistx.slaveName is 
+		$activeSlave.slaveName's simple mind does not even acknowledge that $slaverapistx.slaveName is
 		<<if $activeSlave.father == $slaverapistx.ID && $activeSlave.mother == $slaverapistx.ID>>
-			the slave that is both her mother and her father, 
+			the slave that is both her mother and her father,
 		<<elseif $slaverapistx.mother == $activeSlave.ID>>
-			her own daughter, 
+			her own daughter,
 		<<elseif $activeSlave.mother == $slaverapistx.ID>>
-			her own mother, 
+			her own mother,
 		<<elseif $activeSlave.father == $slaverapistx.ID>>
-			the slave that fathered her, 
+			the slave that fathered her,
 		<<elseif (areSisters($activeSlave, $slaverapistx) > 0)>>
-			her <<if areTwins($activeSlave, $slaverapistx)>>twin <</if>>sister, 
+			her <<if areTwins($activeSlave, $slaverapistx)>>twin <</if>>sister,
 		<</if>>
 	<<else>>
-		$activeSlave.slaveName sees the newcomer, and with her simple mind 
+		$activeSlave.slaveName sees the newcomer, and with her simple mind
 	<</if>>
 	she only knows that they have a pussy and her <<if ($activeSlave.clit >= 4)>>swollen clit<<else>>_dicksize penis<</if>> is erect. Naturally, she seems quite eager to put them together.
 	<<set _incestMood = "Bottom">>
 <<else>>
 	<<if _isIncest == 1>>
-		$activeSlave.slaveName is fully naked and <<if canSee($activeSlave)>>looking up at<<else>>waiting in front of<</if>> 
+		$activeSlave.slaveName is fully naked and <<if canSee($activeSlave)>>looking up at<<else>>waiting in front of<</if>>
 		<<if $activeSlave.father == $slaverapistx.ID && $activeSlave.mother == $slaverapistx.ID>>
-			the slave that is both her mother and her father, 
+			the slave that is both her mother and her father,
 		<<elseif $slaverapistx.mother == $activeSlave.ID>>
-			her own daughter, 
+			her own daughter,
 		<<elseif $activeSlave.mother == $slaverapistx.ID>>
-			her own mother, 
+			her own mother,
 		<<elseif $activeSlave.father == $slaverapistx.ID>>
-			the slave that fathered her, 
+			the slave that fathered her,
 		<<elseif (areSisters($activeSlave, $slaverapistx) > 0)>>
-			her <<if areTwins($activeSlave, $slaverapistx)>>twin <</if>>sister, 
+			her <<if areTwins($activeSlave, $slaverapistx)>>twin <</if>>sister,
 		<</if>>
 		<<if ($activeSlave.sexualQuirk == "perverted") || ($activeSlave.sexualQuirk == "sinful")>>
 			<<set _incestMood = "Bottom">>
@@ -188,13 +188,14 @@ You call $slaverapistx.slaveName into the room.
 				but her deep acceptance of slavery means she is eager to please you, <<if ($activeSlave.clit >= 4)>>leaving her massive clit flushed<<else>>making her _dicksize cock drip precum<</if>>.
 			<<elseif $activeSlave.devotion > 60>>
 				and is clearly struggling between keeping herself hard and acknowledging the incest. A small dose of vasodilators and her impressive desire to please you should keep her <<if ($activeSlave.clit >= 4)>>clit<<else>>penis<</if>> up for $slaverapistx.slaveName.
-				<<set _incestMood = "BottomFragile"
+				<<set _incestMood = "BottomFragile">>
 			<<else>>
 				<<if ndef _bottomdrugged>>
 					and once it becomes clear to her that her that $slaverapistx.slaveName will be the one mounting her, her <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize penis<</if>> shrinks away. A direct injection of vasodilators changes that, bringing her back to readiness to her horror.
 					<<set _bottomdrugged = 1>>
 				<<else>>
 					and to her own horror the drugs she was injected with keep her <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize penis<</if>> ready and waiting.
+				<</if>>
 			<</if>>
 		<</if>>
 	<</if>>
@@ -203,12 +204,12 @@ You call $slaverapistx.slaveName into the room.
 <br><br>
 
 <<if $slaverapistx.fetish == "mindbroken" && ($slaverapistx.career != "a dairy cow") && ($slaverapistx.career != "a breeding bull")>>
-	$slaverapistx.slaveName stares blankly, and needs to be deliberately guided to straddle $activeSlave.slaveName. 
+	$slaverapistx.slaveName stares blankly, and needs to be deliberately guided to straddle $activeSlave.slaveName.
 	<<if _isIncest == 1>>
 		Naturally, she isn't even aware of the impending incest.
 	<</if>>
 	<<if ($activeSlave.fetish == "mindbroken") && ($activeSlave.career != "a dairy cow") && ($activeSlave.career != "a breeding bull")>>
-		Since both slaves are essentially vegetables, this is shaping up to be a rather contrived sexual demonstration. The parts are all there, but the actors aren't going to contribute much to the show. 
+		Since both slaves are essentially vegetables, this is shaping up to be a rather contrived sexual demonstration. The parts are all there, but the actors aren't going to contribute much to the show.
 	<</if>>
 <<elseif $slaverapistx.fetish == "mindbroken" && ($slaverapistx.career == "a dairy cow")>>
 	$slaverapistx.slaveName sees the <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize penis<</if>> ready and waiting, and catches on to why she's here quickly. She takes it into her mouth before you stop her and tap her pussy, and after a few seconds of thinking she straddles $activeSlave.slaveName's hips with a moo.
@@ -222,7 +223,7 @@ You call $slaverapistx.slaveName into the room.
 	<</if>>
 <<else>>
 	<<if _isIncest == 1>>
-		$slaverapistx.slaveName sees 
+		$slaverapistx.slaveName sees
 		<<if $slaverapistx.father == $activeSlave.ID && $slaverapistx.mother == $activeSlave.ID>>
 			the slave that is both her mother and her father
 		<<elseif $activeSlave.mother == $slaverapistx.ID>>
@@ -234,14 +235,14 @@ You call $slaverapistx.slaveName into the room.
 		<<elseif (areSisters($slaverapistx, $activeSlave) > 0)>>
 			her <<if areTwins($slaverapistx, $activeSlave)>>twin <</if>>sister
 		<</if>>
-		tied to the bed, 
+		tied to the bed,
 		<<if ($slaverapistx.sexualQuirk == "perverted") || ($slaverapistx.sexualQuirk == "sinful")>>
 			<<if _incestMood == "Bottom">>
 				and can't hide her <<if ($slaverapistx.sexualQuirk == "perverted")>>perverted<<else>>sinful<</if>> arousal at the excited glances they share.
 				<<set _incestMood = "Both">>
 			<<else>>
 				<<set _incestMood = "Top">>
-				and becomes indecently aroused at their horrified expressions for the <<if ($slaverapistx.sexualQuirk == "perverted")>>perverted<<else>>sinful<</if>> incest to come. 
+				and becomes indecently aroused at their horrified expressions for the <<if ($slaverapistx.sexualQuirk == "perverted")>>perverted<<else>>sinful<</if>> incest to come.
 			<</if>>
 		<<elseif ($slaverapistx.relationshipTarget == $activeSlave.ID) && ($slaverapistx.relationship > 2)>>
 			and licks her lips involuntarily.
@@ -258,7 +259,7 @@ You call $slaverapistx.slaveName into the room.
 				<<if _incestMood == "BottomFragile"
 					<<unset _incestMood>>
 				<</if>>
-				and after figuring out they're just as superficially prepared as she is, resolves herself to forget they're related to stay aroused. 
+				and after figuring out they're just as superficially prepared as she is, resolves herself to forget they're related to stay aroused.
 			<<else>>
 				and can't hide the look of horror that crosses her face. You assure her this is what she needs to do.
 				<<if _incestMood == "Bottom">>
@@ -270,7 +271,7 @@ You call $slaverapistx.slaveName into the room.
 		<</if>>
 	<</if>>
 
-	<<if _incestMood == "Top" || _incestMood = ="Both" || ndef(_isIncest)>> 
+	<<if _incestMood == "Top" || _incestMood = ="Both" || ndef(_isIncest)>>
 		<<if ($slaverapistx.fetishKnown == 1)>>
 			<<if ($slaverapistx.fetish == "submissive")>>
 				$slaverapistx.slaveName usually prefers to be underneath someone with a <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize cock<</if>> like that, which is obvious in her expressions. Knowing she's riding it due to someone's orders is just about the only detail that plays to her fetish.
@@ -362,7 +363,7 @@ You call $slaverapistx.slaveName into the room.
 			By the end of the session $activeSlave.slaveName's abused, pent-up penis has shot a massive load, to her horror and resentment, into the blissfully satisfied $slaverapistx.slaveName.
 		<</if>>
 	<</if>>
-	
+
 <<elseif ($slaverapistx.fetish == "sadist") && ($slaverapistx.fetishStrength > 20) && ($activeSlave.devotion < -20)>>
 	You tell the grinning $slaverapistx.slaveName that $activeSlave.slaveName's <<if ($activeSlave.clit >= 4)>>massive clit<<else>>_dicksize dick<</if>> is all hers. The slave life has so affected $slaverapistx.slaveName that she is quite eager to hurt and rape another slave for her pleasure.
 	<<if ($slaverapistx.vagina == 0)>> /* losing virginity */
diff --git a/src/pregmod/widgets/assignmentFilterWidget.tw b/src/pregmod/widgets/assignmentFilterWidget.tw
index 4e1cd9dee849986e23cbadc95b5ffd356e27d5e6..fe7a46ad484d418b9619be30f1fe99af136298eb 100644
--- a/src/pregmod/widgets/assignmentFilterWidget.tw
+++ b/src/pregmod/widgets/assignmentFilterWidget.tw
@@ -43,6 +43,10 @@
 	<<set $slaves.map(function(y){y.assignmentVisible = 0})>><<set $slaves.filter(function(x){return x.assignment == "work in the dairy" || x.assignment == "be the Milkmaid"}).map(function(y){y.assignmentVisible = 1})>>
 <</widget>>
 
+<<widget "headgirlSuiteAssignmentFilter">>
+	<<set $slaves.map(function(y){y.assignmentVisible = 0})>><<set $slaves.filter(function(x){return x.assignment == "live with your Head Girl"}).map(function(y){y.assignmentVisible = 1})>>
+<</widget>>
+
 <<widget "penthouseAssignmentFilter">>
 	<<set $slaves.map(function(y){y.assignmentVisible = 0})>><<set $slaves.filter(function(x){return x.assignment == "rest" || x.assignment == "be a subordinate slave" || x.assignment == "whore" || x.assignment == "serve the public" || x.assignment == "work a glory hole" || x.assignment == "get milked" || x.assignment == "be a servant" || x.assignment == "please you"|| x.assignment == "stay confined" || x.assignment == "take classes" || x.assignment == "choose her own job" || x.assignment == "live with your Head Girl"}).map(function(y){y.assignmentVisible = 1})>>
 <</widget>>
diff --git a/src/pregmod/widgets/slaveTradePresetWidgets.tw b/src/pregmod/widgets/slaveTradePresetWidgets.tw
index 31a64e02f50f2760495e91a9b2e9d1bdcfada0d6..c1b89b2b819033b12a22877a5dd2ad226a774bed 100644
--- a/src/pregmod/widgets/slaveTradePresetWidgets.tw
+++ b/src/pregmod/widgets/slaveTradePresetWidgets.tw
@@ -141,7 +141,7 @@
 		Namibian: 1,
 		Nauruan: 1,
 		Nepalese: 2,
-		"a New Zealander": 2
+		"a New Zealander": 2,
 		"Ni-Vanuatu": 1,
 		Nicaraguan: 2,
 		Nigerian: 4,
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 60d47299c3f4cb3437a75dc78fc991dddf6a5cc1..f795a493043499534df7b60e1a5e82c1ba83e551 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -139,6 +139,9 @@
 <<if def $eventSlaves>>
 	<<unset $eventSlaves>>
 <</if>>
+<<if def $place>>
+	<<unset $place>>
+<</if>>
 
 /* pregmod stuff */
 
diff --git a/src/uncategorized/PETS.tw b/src/uncategorized/PETS.tw
index c81311c30b9fde663df9e978df681b67032071cc..2e5ee0973b61395527c4097b7bc58c26a23ca37d 100644
--- a/src/uncategorized/PETS.tw
+++ b/src/uncategorized/PETS.tw
@@ -58,12 +58,12 @@
 
 /* 000-250-006 */
 <<if $seeImages == 1>>
-    <div class="imageRef medImg">
-        <<SlaveArt $subSlave 2 0>>
-    </div>
-    <div class="imageRef medImg">
-        <<SlaveArt $activeSlave 2 0>>
-    </div>
+  <div class="imageRef medImg">
+	<<SlaveArt $subSlave 2 0>>
+  </div>
+  <div class="imageRef medImg">
+	<<SlaveArt $activeSlave 2 0>>
+  </div>
 <</if>>
 /* 000-250-006 */
 
@@ -305,7 +305,7 @@ You decide to knit up care's raveled sleeve with a break in the spa. You have yo
 <<link "Encourage the use of sleep deprivation as a breaking tool">>
 	<<replace "#name">>$activeSlave.slaveName<</replace>>
 	<<replace "#result">>
-	You let $activeSlave.slaveName know that as far as you're concerned, sleep is a privilege, not a right. She grins evilly and grinds herself into $subSlave.slaveName's mouth harder. The poor prisoner heard you, of course, and begins to produce muffled sobs as she realizes what this means for her. $activeSlave.slaveName reaches down and caresses her cheek.  "There, there," she croons. <<if SlaveStatsChecker.checkForLisp($activeSlave)>>"It'th not rape if you do it in return for thomething."<<else>>"It's not rape if you do it in return for something."<</if>> All the prisoners are all that much more @@.hotpink;broken@@ this week, though sleep deprivation @@.red;isn't healthy.@@
+	You let $activeSlave.slaveName know that as far as you're concerned, sleep is a privilege, not a right. She grins evilly and grinds herself into $subSlave.slaveName's mouth harder. The poor prisoner heard you, of course, and begins to produce muffled sobs as she realizes what this means for her. $activeSlave.slaveName reaches down and caresses her cheek. "There, there," she croons. <<if SlaveStatsChecker.checkForLisp($activeSlave)>>"It'th not rape if you do it in return for thomething."<<else>>"It's not rape if you do it in return for something."<</if>> All the prisoners are all that much more @@.hotpink;broken@@ this week, though sleep deprivation @@.red;isn't healthy.@@
 	<<run $slaves.forEach(function(s) {
 		if (s.assignment == "be confined in the cellblock") {
 			s.devotion += 10;
@@ -355,7 +355,7 @@ You decide to knit up care's raveled sleeve with a break in the spa. You have yo
 <<link "Meet with the Attendant later to see if the slave she's helping can be assisted further">>
 	<<replace "#name">>$activeSlave.slaveName<</replace>>
 	<<replace "#result">>
-	You meet $activeSlave.slaveName after $subSlave.slaveName leaves. She likes to take a cool shower after spending time in the steam, so you get under the refreshing water with her, encircling her <<if ($activeSlave.weight > 10)>>plush<<else>>taut<</if>> midriff with your arms and giving her a hug before asking her about $subSlave.slaveName.  In $activeSlave.slaveName's opinion, there's nothing really wrong with her: she's just having a little trouble accepting different expectations about human interactions. <<if SlaveStatsChecker.checkForLisp($activeSlave)>>"The girl jutht needth a little help accepting that her free dayth are over, and it'th her place to therve you, <<Master>>," she lisps. "Like I have!"<<else>>"She just needs a little help accepting that she's a slave and it's her place to serve you, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>," she says. "Like I have!"<</if>> She wriggles around in your arms and plants a wet kiss on your nose. She's clean now, so you release her and she steps over to her towel. As she does, you land a wet slap on her <<if ($activeSlave.butt > 5)>>massive<<elseif ($activeSlave.butt > 3)>>big<<else>>nice<</if>> butt, eliciting a @@.hotpink;delighted@@ squeal. You use the information to @@.hotpink;subtly address@@ $subSlave.slaveName's unhappiness.
+	You meet $activeSlave.slaveName after $subSlave.slaveName leaves. She likes to take a cool shower after spending time in the steam, so you get under the refreshing water with her, encircling her <<if ($activeSlave.weight > 10)>>plush<<else>>taut<</if>> midriff with your arms and giving her a hug before asking her about $subSlave.slaveName. In $activeSlave.slaveName's opinion, there's nothing really wrong with her: she's just having a little trouble accepting different expectations about human interactions. <<if SlaveStatsChecker.checkForLisp($activeSlave)>>"The girl jutht needth a little help accepting that her free dayth are over, and it'th her place to therve you, <<Master>>," she lisps. "Like I have!"<<else>>"She just needs a little help accepting that she's a slave and it's her place to serve you, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>," she says. "Like I have!"<</if>> She wriggles around in your arms and plants a wet kiss on your nose. She's clean now, so you release her and she steps over to her towel. As she does, you land a wet slap on her <<if ($activeSlave.butt > 5)>>massive<<elseif ($activeSlave.butt > 3)>>big<<else>>nice<</if>> butt, eliciting a @@.hotpink;delighted@@ squeal. You use the information to @@.hotpink;subtly address@@ $subSlave.slaveName's unhappiness.
 	<<set $activeSlave.devotion += 4>>
 	<<set $subSlave.devotion += 4>>
 	<<set _i = $slaves.findIndex(function(s) { return s.ID == $subSlave.ID; })>>
diff --git a/src/uncategorized/headGirlSuite.tw b/src/uncategorized/headGirlSuite.tw
index d5b880ea29d9bf42c161dbd079953698f791a24f..5ddc209624814256efad65075a94489ac0d0195e 100644
--- a/src/uncategorized/headGirlSuite.tw
+++ b/src/uncategorized/headGirlSuite.tw
@@ -1,11 +1,11 @@
 :: Head Girl Suite [nobr]
 
 <<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Head Girl Suite", $showEncyclopedia = 1, $encyclopedia = "Head Girl Suite", $HGSuiteSlaves = $HGSuiteiIDs.length, _SL = $slaves.length>>
-<<showallAssignmentFilter>>
+
 <<if $HGSuiteName != "the Head Girl Suite">>
 	<<set $HGSuiteNameCaps = $HGSuiteName.replace("the ", "The ")>>
 <</if>>
-
+<<headgirlSuiteAssignmentFilter>>
 <<set _i = $slaves.findIndex(function(s) { return s.assignment == "live with your Head Girl"; })>>
 
 <<if $HeadGirl == 0>>
@@ -45,8 +45,10 @@
 
 <<if $HGSuiteSlaves > 0>>
 	<br><br>''Bring the Head Girl's girl out of $HGSuiteName:''
+	<<headgirlSuiteAssignmentFilter>>
 	<<set $Flag = 1>>
 	<<include "Slave Summary">>
+	<<resetAssignmentFilter>>
 <</if>>
 
 <<if ($slaves.length > $HGSuiteSlaves) && ($HGSuiteSlaves < 1)>>
@@ -54,10 +56,9 @@
 	<br><br>
 	<<assignmentFilter>>
 	<span id="ComingGoing">
-		<<showallAssignmentFilter>>
+		<<resetAssignmentFilter>>
 		<<set $Flag = 0>>
 		<<include "Slave Summary">>
-		<<resetAssignmentFilter>>
 	</span>
 <</if>>
 
diff --git a/src/uncategorized/nextSlaveInLine.tw b/src/uncategorized/nextSlaveInLine.tw
index 26d49052a6ec35ce55485ec3c5ac51e9180731d8..8149ceb874272eefd16d1b25f04427b722d09daa 100644
--- a/src/uncategorized/nextSlaveInLine.tw
+++ b/src/uncategorized/nextSlaveInLine.tw
@@ -2,15 +2,11 @@
 
 <<silently>>
 
-<<set $i = $slaves.findIndex(function(s) { return s.ID == $activeSlave.ID; })>>
+<<set $i = $slaveIndices[$activeSlave.ID]>>
 <<ClearSummaryCache $activeSlave>>
 <<set $slaves[$i] = $activeSlave>> /* save changes before switching */
 
-<<if $place == $slavesInLine.length-1>>
-	<<set $activeSlave = $slavesInLine[0]>>
-<<else>>
-	<<set $activeSlave = $slavesInLine[$place+1]>>
-<</if>>
+<<set $activeSlave = $slaves[$slavesInLine[1]]>>
 
 <<goto "Slave Interact">>
 
diff --git a/src/uncategorized/pHackerSupport.tw b/src/uncategorized/pHackerSupport.tw
index 49cba18d6e8fbe004c7e0bb0f4ac95ec038f2fbd..752a3c02f7fd8d6e81965b297b46a469e2be538a 100644
--- a/src/uncategorized/pHackerSupport.tw
+++ b/src/uncategorized/pHackerSupport.tw
@@ -6,7 +6,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'ta 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?"
+"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'ta 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 $assistant > 0>>
 	<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been trying to track the contact, but fails horribly. The hacker glances at her
 	<<switch $assistantAppearance>>
@@ -127,7 +127,7 @@ As she finishes speaking, another spasm distorts her expression, and then she su
 		<<case "witch">>
 			She seems to have left a present for your poor personal assistant; her little witch avatar is visible in the bottom corner of a screen on the wall opposite you being assaulted by tentacles. They've already managed to rip her robes off and are currently forcing themselves into all her holes. Only once every orifice has two to three tentacles crammed into it does the beast start fucking her. Before long, 
 			<<if $seePreg != 0>>
-				half the tentacles are pumping the poor girl full of cum while the rest fill her with eggs; she struggles valiantly at first, but as her middle grows larger and heavier, she is forced to accept her fate. When the tentacles feel they can fit no more eggs into her, they pull her into a sitting position and spread her legs wide; just in time for the first hatched larva to begin squeezing its way from her packed womb. Moments later, another plops from her rear, and yet another squirms up her throat and out her mouth, flopping wetly onto her chest. With each path cleared, the rest of the larva begin to pour from her body.
+				half the tentacles are pumping the poor girl full of cum while the rest fill her with eggs; she struggles valiantly at first, but as her middle grows larger and heavier, she is forced to accept her fate. When the tentacles feel they can fit no more eggs into her, they pull her into a sitting position and spread her legs wide; just in time for the first hatched larva to begin squeezing its way from her packed womb. Moments later, another plops from her rear, and yet another squirms up her throat and out her mouth, flopping wetly onto her chest. With each path cleared, the rest of the larvae begin to pour from her body.
 			<<else>>
 				the tentacles begin pumping the poor girl full of cum; she struggles valiantly at first, but as her middle grows larger and heavier, she is forced to accept her fate. As they vacate her body, a large surge of fluid follows.
 			<</if>>
@@ -141,4 +141,3 @@ As she finishes speaking, another spasm distorts her expression, and then she su
 	<</replace>>
 <</link>> //This will cost <<print cashFormat(10000)>>//
 </span>
-
diff --git a/src/uncategorized/pInvasion.tw b/src/uncategorized/pInvasion.tw
index fe1437b333efbfb19a253a0b74e00dbe68f8d032..325b9efb9520fd8dd498b068b9c9fe439192fca5 100644
--- a/src/uncategorized/pInvasion.tw
+++ b/src/uncategorized/pInvasion.tw
@@ -63,11 +63,11 @@ The loose militia lately organized by the arcology owners has been called out to
 
 <br><br>
 
-<<if $personalArms == 0>>Since you are not well armed or armored, you stay back and oversee the defense of your own arcology.<<elseif $personalArms == 1>>Since you are well armed and armored, you take part in the counterattack. Your exoskeleton mounts a smart mortar system that independently targets and eliminates enemy groups even as you lay down fire from the guns mounted on your forearms.<<else>>Since you are well armed and armored and your drones are combat ready, you take part in the counterattack. You are preceded into combat by a wedge of your drones, who lack the intelligence to take good cover but are remorseless and highly accurate. Your exoskeleton mounts a smart mortar system that independently targets and eliminates enemy groups even as you lay down fire from the guns mounted on your forearms.<</if>>
+<<if $personalArms == 0>>Since you are not well armed or armored, you stay back and oversee the defense of your own arcology.<<elseif $personalArms == 1>>Since you are well armed and armored, you take part in the counterattack. Your exoskeleton mounts a smart mortar system that independently targets and eliminates enemy groups even as you lay down fire from the guns mounted on your forearms.<<else>>Since you are well armed and armored and your drones are combat ready, you take part in the counterattack. You are preceded into combat by a wedge of your drones, which lack the intelligence to take good cover but are remorseless and highly accurate. Your exoskeleton mounts a smart mortar system that independently targets and eliminates enemy groups even as you lay down fire from the guns mounted on your forearms.<</if>>
 
 <br><br>
 
-<<if $mercenaries == 0>>You are alone in contributing to the defense of your home.<<elseif $mercenaries == 1>>Your mercenaries see to the defense of $arcologies[0].name, ensuring that nothing that gets through will do truly serious damage.<<else>>Your mercenaries see to the defense of $arcologies[0].name, ensuring that nothing that gets through will do truly serious damage. There's enough of them that they can even spare a squad to accompany the counterattack. They're mostly old veterans of many bitter brush wars, and they go about the bloody business with the air of men and women who saw their first battlefield long before their hair was shot with grey.<</if>>
+<<if $mercenaries == 0>>You are alone in contributing to the defense of your home.<<elseif $mercenaries == 1>>Your mercenaries see to the defense of $arcologies[0].name, ensuring that nothing that gets through will do truly serious damage.<<else>>Your mercenaries see to the defense of $arcologies[0].name, ensuring that nothing that gets through will do truly serious damage. There are enough of them that they can even spare a squad to accompany the counterattack. They're mostly old veterans of many bitter brush wars, and they go about the bloody business with the air of men and women who saw their first battlefield long before their hair was shot with grey.<</if>>
 
 <br><br>
 
diff --git a/src/uncategorized/pPeacekeepersIndependence.tw b/src/uncategorized/pPeacekeepersIndependence.tw
index 963037167f42ec984a4b5d2f7295aa67d78683a6..2ecf9872cce85738afff4cba8fda2fedfaff0f5c 100644
--- a/src/uncategorized/pPeacekeepersIndependence.tw
+++ b/src/uncategorized/pPeacekeepersIndependence.tw
@@ -1,4 +1,4 @@
-:: P peacekeepers independence [nobr]
+:: P peacekeepers independence [nobr]
 
 <<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event", $peacekeepersFate = 1>>
 
@@ -44,7 +44,7 @@ General $peacekeepers.generalName contacts you again, looking more tired and bat
 <</if>>
 <br><<link "Decline to support him">>
 	<<replace "#result">>
-		You inform General $peacekeepers.generalName that you will not be providing assistance. He does not falter, but he looks suddenly older, as thought he prospect of a decisive stroke was giving him the strength to carry on. He expresses his regrets dully, and then ends the call.
+		You inform General $peacekeepers.generalName that you will not be providing assistance. He does not falter, but he looks suddenly older, as though the prospect of a decisive stroke was giving him the strength to carry on. He expresses his regrets dully, and then ends the call.
 	<</replace>>
 <</link>>
 </span>
diff --git a/src/uncategorized/placeInLine.tw b/src/uncategorized/placeInLine.tw
index 4cd42eb226f2ee4eee7a092830f24ab95277f9e8..30ac0fdf046b140a3945b03cfdc0216487c6860c 100644
--- a/src/uncategorized/placeInLine.tw
+++ b/src/uncategorized/placeInLine.tw
@@ -3,21 +3,52 @@
 <<silently>>
 
 <<set $slavesInLine = []>>
+<<set _activeSlaveIndex = $slaveIndices[$activeSlave.ID]>>
+<<set _SL = $slaves.length>>
 
 <<if ($activeSlave.assignmentVisible == 1)>>
-	<<for $i = 0; $i < $slaves.length; $i++>>
-	<<if ($slaves[$i].assignmentVisible == 1)>>
-		<<set $slavesInLine.push($slaves[$i])>>
-	<</if>>
+	<<for _pil = _activeSlaveIndex - 1; _pil != _activeSlaveIndex; _pil-->> /* loops backwards through the $slaves array */
+		<<if _pil < 0>>
+			<<set _pil = _SL - 1>>
+		<</if>>
+		<<if $slaves[_pil].assignmentVisible == 1>>
+			<<set $slavesInLine.push(_pil)>> /* index of the previous slave in line */
+			<<break>>
+		<</if>>
+	<</for>>
+	<<for _pil = _activeSlaveIndex + 1; _pil != _activeSlaveIndex; _pil++>> /* this loops forwards through the $slaves array */
+		<<if _pil == _SL>>
+			<<set _pil = 0>>
+		<</if>>
+		<<if $slaves[_pil].assignmentVisible == 1>>
+			<<set $slavesInLine.push(_pil)>> /* index of the next slave in line */
+			<<break>>
+		<</if>>
 	<</for>>
 <<else>>
-	<<for $i = 0; $i < $slaves.length; $i++>>
-	<<if ($slaves[$i].assignment == $activeSlave.assignment)>>
-		<<set $slavesInLine.push($slaves[$i])>>
-	<</if>>
+	<<for _pil = _activeSlaveIndex - 1; _pil != _activeSlaveIndex; _pil-->> /* loops backwards through the $slaves array */
+		<<if _pil < 0>>
+			<<set _pil = _SL - 1>>
+		<</if>>
+		<<if ($slaves[_pil].assignment == $activeSlave.assignment)>>
+			<<set $slavesInLine.push(_pil)>> /* index of the previous slave in line */
+			<<break>>
+		<</if>>
+	<</for>>
+	<<for _pil = _activeSlaveIndex + 1; _pil != _activeSlaveIndex; _pil++>> /* this loops forwards through the $slaves array */
+		<<if _pil == _SL>>
+			<<set _pil = 0>>
+		<</if>>
+		<<if ($slaves[_pil].assignment == $activeSlave.assignment)>>
+			<<set $slavesInLine.push(_pil)>> /* index of the next slave in line */
+			<<break>>
+		<</if>>
 	<</for>>
 <</if>>
 
-<<set $place = $slavesInLine.findIndex(function(s) { return s.ID == $activeSlave.ID; })>>
+<<if $slavesInLine.length == 0>> /* if there are no other slaves available, set previous/next slave to self */
+	<<set $slavesInLine[0] = _activeSlaveIndex>>
+	<<set $slavesInLine[1] = _activeSlaveIndex>>
+<</if>>
 
 <</silently>>
diff --git a/src/uncategorized/previousSlaveInLine.tw b/src/uncategorized/previousSlaveInLine.tw
index d8c858a33473f87f912b1b0221cd05dd9b0bc7a7..008ccb819a4a11d80f23e05299820fb4256d5d66 100644
--- a/src/uncategorized/previousSlaveInLine.tw
+++ b/src/uncategorized/previousSlaveInLine.tw
@@ -2,15 +2,11 @@
 
 <<silently>>
 
-<<set $i = $slaves.findIndex(function(s) { return s.ID == $activeSlave.ID; })>>
+<<set $i = $slaveIndices[$activeSlave.ID]>>
 <<ClearSummaryCache $activeSlave>>
 <<set $slaves[$i] = $activeSlave>> /* save changes before switching */
 
-<<if $place == 0>>
-	<<set $activeSlave = $slavesInLine[$slavesInLine.length-1]>>
-<<else>>
-	<<set $activeSlave = $slavesInLine[$place-1]>>
-<</if>>
+<<set $activeSlave = $slaves[$slavesInLine[0]]>>
 
 <<goto "Slave Interact">>
 
diff --git a/src/uncategorized/reBusyMasterSuite.tw b/src/uncategorized/reBusyMasterSuite.tw
index bba620787e1cfc0b81a48c1fa73c466e7e42128a..6fb9800e4c7fedb47ddaf0cad9b6c17b95ec1ed4 100644
--- a/src/uncategorized/reBusyMasterSuite.tw
+++ b/src/uncategorized/reBusyMasterSuite.tw
@@ -156,4 +156,3 @@ who has paused her thrusting to issue a peremptory order to the slaves to stay w
 </span>
 
 <</if>> /* closes eligibility check */
-
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index ae9155c4a8a4fec5eb6f564f0a6102e6ee11b818..680218779c22623985c6c6aa7642331db51a6111 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -1,4 +1,4 @@
-:: RE FS acquisition
+:: RE FS acquisition
 
 <<if Array.isArray($FSAcquisitionEvents)>>
   <<if $cheatMode == 1>><<nobr>>
@@ -1357,9 +1357,9 @@ The call comes in from an office, and you suppress the urge to check whether $as
 	<<case "Paternalist Two">>\
 	She speaks to you as a free woman throughout the enslavement process, but as soon as it is completed, she stops and waits for instruction before talking. She may not have had many prospects in her life back home, but if she remains this obedient she'll fit right in here in the Free Cities. When the purchasing agent arrives she is momentarily surprised but not alarmed, she figures she'll been sold to a citizen of $arcologies[0].name who shares paternalistic beliefs.
 	<<case "Degradationist">>\
-	When she arrives as part of the anonymous slave transfers that make up a good part of the inter-arcology commerce, she has clearly had some time to mull over her situation. As soon as she sees you, she blurts out, "Whatever that fucker told you, it isn't true. I'll be your little bitch bimbo, whatever you want. Just don't - just don't fucking hurt me." She sticks out her chest in a clear attempt to entice you with her fake tits, and is rewarded with a bag over her head, courtesy of the purchaser's agent who arrived in the meantime. The agent clearly felt that she would be a handful worth corralling quickly, and this proves correct. She goes limp after being tazed, though.
+	When she arrives as part of the anonymous slave transfers that make up a good part of the inter-arcology commerce, she has clearly had some time to mull over her situation. As soon as she sees you, she blurts out, "Whatever that fucker told you, it isn't true. I'll be your little bitch bimbo, whatever you want. Just don't - just don't fucking hurt me." She sticks out her chest in a clear attempt to entice you with her fake tits, and is rewarded with a bag over her head, courtesy of the purchaser's agent who arrived in the meantime. The agent clearly felt that she would be a handful worth corralling quickly, and this proves correct. She goes limp after being tased, though.
 	<<case "Degradationist Two">>\
-	When she arrives as part of the anonymous slave transfers that make up a good part of the inter-arcology commerce, she has clearly had some time to mull over her situation. As soon as she sees you, she glares deep into your eyes and addresses you directly, "Those fuckers threw everything they could at me, you can't break me. No one can." She is rewarded with a bag over her head, courtesy of the purchaser's agent who arrived in the meantime. The agent clearly felt that she would be a handful worth corralling quickly, and this proves correct. She goes limp after being tazed, though.
+	When she arrives as part of the anonymous slave transfers that make up a good part of the inter-arcology commerce, she has clearly had some time to mull over her situation. As soon as she sees you, she glares deep into your eyes and addresses you directly, "Those fuckers threw everything they could at me, you can't break me. No one can." She is rewarded with a bag over her head, courtesy of the purchaser's agent who arrived in the meantime. The agent clearly felt that she would be a handful worth corralling quickly, and this proves correct. She goes limp after being tased, though.
 	<<case "Body Purist">>\
 	When she arrives, it's obvious that she isn't particularly happy with the situation, but there is some evident relief to her. It vanishes when a purchaser's agent arrives to take her away. She looks at you desperately, begging to know who's purchased her. You tell her truthfully that a wealthy citizen one arcology over bought her as a house slave; you neglect to mention that he likes big tits, and he isn't particular about whether they're natural.
 	<<case "Body Purist Two">>\
@@ -1377,7 +1377,7 @@ The call comes in from an office, and you suppress the urge to check whether $as
 	<<case "Asset Expansionist Two">>\
 	When she arrives, it's clear she's nobody's fool. She comes without personal effects of any kind, and is wearing cheap, sturdy clothes to travel in, since she knows she'll be taking them off immediately. She does, without being told, just as soon as the enslavement formalities are out of the way. Her breasts are capped by titanic, puffy nipples; she notices you appreciating them and gives you a hesitant little smile, swaying her shoulders back and forth a little to set her flesh deliciously into motion. Her playfulness vanishes when a purchaser's agent arrives to take her away. She looks at you desperately, begging to know who's purchased her. You tell her truthfully that a wealthy citizen one arcology over bought her as a house slave; you neglect to mention that he likes big tits.
 	<<case "Physical Idealist">>\
-	She gets through the enslavement process without breaking anything, mostly due to your increasingly exasperated supervision. Her buyer's agent arrives to take her away, and it takes the poor man ten minutes to get the situation through her thick skull. He sees the beginnings of rage building in her as she realizes how she's been tricked, but he's a quick draw, and before she can do anything he's got his tazer unholstered and deployed. The bitch gives off an antediluvian roar as she goes stiff as a board and crashes to the floor.
+	She gets through the enslavement process without breaking anything, mostly due to your increasingly exasperated supervision. Her buyer's agent arrives to take her away, and it takes the poor man ten minutes to get the situation through her thick skull. He sees the beginnings of rage building in her as she realizes how she's been tricked, but he's a quick draw, and before she can do anything he's got his taser unholstered and deployed. The bitch gives off an antediluvian roar as she goes stiff as a board and crashes to the floor.
 	<<case "Physical Idealist Two">>\
 	When she arrives, you're impressed again. She's even more muscular in person than in her pictures. "<<Master>>," she growls, "I've done my very best to be the biggest, strongest slave before coming here. May I show you?" Though more than a little curious, the arrival of the purchasing agent cuts short any theatrics. Though initially confused, the promise of steroids and other drugs by her new owner has her follow the agent out of your penthouse without fuss.
 	<<case "Youth Preferentialist">>\
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index 873366659c0eac9b501be1873042c17bbbc413d2..1018a0471a27aee52a0d5e946b7db6bd6c207c2e 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -31,7 +31,7 @@
 <<set $activeSlave.clitPiercing = 1>>
 <<set $activeSlave.behavioralFlaw = "odd">>
 
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. Criminals are usually either too angry, too ignorant, or too stupid to understand the impossibility of successful petty crime. This is the latter situation; a girl suffering severe aphrodisiac withdrawal has attempted to break into a store that sells the stuff. She's now lying in a pool of her own urine with a tazer round stuck in her ass; the drone responsible is hovering helpfully nearby, hitting her with another shock whenever she does more than twitch.
+<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. Criminals are usually either too angry, too ignorant, or too stupid to understand the impossibility of successful petty crime. This is the latter situation; a girl suffering severe aphrodisiac withdrawal has attempted to break into a store that sells the stuff. She's now lying in a pool of her own urine with a taser round stuck in her ass; the drone responsible is hovering helpfully nearby, hitting her with another shock whenever she does more than twitch.
 
 <<elseif $malefactor == "escapee">>
 
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index 5cc75350583dd8f86ccd1a23852d876d732be2a6..d780ba4909a30cc393a5ba64c15e5edbd8e5097f 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -135,6 +135,9 @@
 <<if ($activeSlave.ID == $Schoolteacher.ID)>>
 	<<set $qualifiedNicknames.push("Schoolteacher")>>
 <</if>>
+<<if ($activeSlave.ID == $Nurse.ID)>>
+	<<set $qualifiedNicknames.push("Nurse")>>
+<</if>>
 <<if ($activeSlave.assignment == "be a subordinate slave")>>
 	<<set $qualifiedNicknames.push("server")>>
 <</if>>
@@ -242,434 +245,436 @@
 <<case "nationality">>
 	<<switch $activeSlave.nationality>>
 	<<case "Afghan">>
-		<<set $nickname = either("'Bactrian'", "'Chai Girl'", "'Kabul'", "'Pashtun'", "'Poppy'", "'Taliban'")>>
+		<<set $nickname = either("'Afghan'", "'Bactrian'", "'Chai Girl'", "'Kabul'", "'Kandahar'", "'Pashtun'", "'Poppy'", "'Taliban'")>>
 	<<case "Albanian">>
-		<<set $nickname = either("'Hoxha'", "'Sejdia'", "'Shiptar'", "'Tirana'")>>
+		<<set $nickname = either("'Albanian'", "'Durrës'", "'Hoxha'", "'Sejdia'", "'Shiptar'", "'Tirana'")>>
 	<<case "Algerian">>
-		<<set $nickname = either("'Algiers'", "'Casbah'", "'Corsair'", "'Djamila'", "'Harki'", "'Hassiba'", "'Pied-Noir'", "'Zhora'")>>
+		<<set $nickname = either("'Algerian'", "'Algiers'", "'Casbah'", "'Corsair'", "'Djamila'", "'Harki'", "'Hassiba'", "'Pied-Noir'", "'Zhora'")>>
 	<<case "American">>
-		<<set $nickname = either("'Amerifat'", "'Burger'", "'California'", "'Chicago'", "'Columbia'", "'Hollywood'", "'Lady Liberty'", "'Lone Star'", "'New York'", "'Septic'", "'Stars & Stripes'", "'Trump'", "'Washington'", "'Yankee'")>>
+		<<set $nickname = either("'American'", "'Amerifat'", "'Burger'", "'California'", "'Chicago'", "'Columbia'", "'Hollywood'", "'Lady Liberty'", "'Lone Star'", "'New York'", "'Septic'", "'Stars & Stripes'", "'Trump'", "'Washington'", "'Yank'", "'Yankee'")>>
 	<<case "Andorran">>
-		<<set $nickname = either("'La Vella'", "'Ski Trip'", "'Skossyreff'")>>
+		<<set $nickname = either("'Andorran'", "'La Vella'", "'Ski Trip'", "'Skossyreff'")>>
 	<<case "Angolan">>
-		<<set $nickname = either("'Cabinda'", "'Luanda'", "'Ndongo'")>>
+		<<set $nickname = either("'Angolan'", "'Cabinda'", "'Huambo'", "'Luanda'", "'Ndongo'")>>
 	<<case "Antiguan">>
-		<<set $nickname = either("'Barbuda'", "'Redonda'", "'St. John's'")>>
+		<<set $nickname = either("'Antiguan'", "'Barbuda'", "'Barbudan'", "'Redonda'", "'St. John's'")>>
 	<<case "Argentinian">>
-		<<set $nickname = either("'Argentine'", "'Argentinean'", "'Blanca'", "'Buenos Aires'", "'Evita'", "'Gaucha'", "'Macri'", "'Malvinas'")>>
+		<<set $nickname = either("'Argentine'", "'Argentinean'", "'Argentinian'", "'Blanca'", "'Buenos Aires'", "'Evita'", "'Gaucha'", "'Macri'", "'Malvinas'", "'Patagonia'", "'Perón'")>>
 	<<case "Armenian">>
-		<<set $nickname = either("'Armo'", "'Hachik'", "'Khorovats'", "'Rabiz'")>>
+		<<set $nickname = either("'Armenian'", "'Armo'", "'Hachik'", "'Hayastan'", "'Khorovats'", "'Rabiz'", "'Yerevan'")>>
 	<<case "Aruban">>
-		<<set $nickname = either("'Caquetio'", "'Croes'", "'Oranjestad'")>>
+		<<set $nickname = either("'Aruban'", "'Caquetio'", "'Croes'", "'Oranjestad'")>>
 	<<case "Australian">>
-		<<set $nickname = either("'Abo'", "'Aussie'", "'Bogan'", "'Convict'", "'Crikey'", "'Down Under'", "'Kangaroo'", "'Mad'", "'Sheila'", "'Skip'", "'Skippy'", "'Sydney'")>>
+		<<set $nickname = either("'Abo'", "'Aussie'", "'Australian'", "'Bogan'", "'Canberra'", "'Convict'", "'Crikey'", "'Down Under'", "'Kangaroo'", "'Mad'", "'Melbourne'", "'Sheila'", "'Skip'", "'Skippy'", "'Sydney'")>>
 	<<case "Austrian">>
-		<<set $nickname = either("'Fritzl'", "'Fut'", "'Maria'", "'Vienna'", "'Wiener'")>>
+		<<set $nickname = either("'Anschluss'", "'Austrian'", "'Fritzl'", "'Fut'", "'Maria'", "'Vienna'", "'Wiener'")>>
 	<<case "Azerbaijani">>
-		<<set $nickname = either("'Atropatene'", "'Baku'", "'Black January'")>>
+		<<set $nickname = either("'Atropatene'", "'Azerbaijani'", "'Azerbaijanian'", "'Azeri'", "'Baku'", "'Black January'", "'Ganja'")>>
 	<<case "Bahamian">>
-		<<set $nickname = either("'Columbus'", "'Lucayan'", "'Nassau'")>>
+		<<set $nickname = either("'Bahama Mama'", "'Bahamian'", "'Columbus'", "'Lucayan'", "'Nassau'")>>
 	<<case "Bahraini">>
-		<<set $nickname = either("'Manama'", "'Pearl'", "'Two Seas'")>>
+		<<set $nickname = either("'Bahraini'", "'Manama'", "'Pearl'", "'Two Seas'", "'Zubarah'")>>
 	<<case "Bangladeshi">>
-		<<set $nickname = either("'Bengali'", "'Bhibhi'", "'Dhaka'", "'Sweatshop'", "'Tiger'")>>
+		<<set $nickname = either("'Bangla'", "'Bangladeshi'", "'Bengalese'", "'Bengali'", "'Bengi'", "'Bengullie'", "'Bennie'", "'Bhibhi'", "'Deshi'", "'Dhaka'", "'Mujibnagar'", "'Sweatshop'", "'Tiger'")>>
 	<<case "Barbadian">>
-		<<set $nickname = either("'Bajan'", "'Bridgetown'", "'Sugar Cane'")>>
+		<<set $nickname = either("'Bajan'", "'Barbadian'", "'Bridgetown'", "'Sugar Cane'")>>
 	<<case "Belarusian">>
-		<<set $nickname = either("'Bulbash'", "'Minsk'", "'Shlyukha'", "'Å liucha'", "'Stalker'", "'White Russian'")>>
+		<<set $nickname = either("'Belarusian'", "'Bulbash'", "'Lukashenko'", "'Minsk'", "'Shlyukha'", "'Å liucha'", "'Stalker'", "'White Russian'")>>
 	<<case "Belgian">>
-		<<set $nickname = either("'Antwerp'", "'Brussels'", "'Sprout'", "'Straatmeid'", "'Truttemie'", "'Waffles'")>>
+		<<set $nickname = either("'Antwerp'", "'Belgian'", "'Brussels'", "'Sprout'", "'Straatmeid'", "'Truttemie'", "'Waffles'")>>
 	<<case "Belizean">>
-		<<set $nickname = either("'Belmopan'", "'Great Blue Hole'", "'Punta'")>>
+		<<set $nickname = either("'Belizean'", "'Belmopan'", "'Great Blue Hole'", "'Punta'")>>
 	<<case "Beninese">>
-		<<set $nickname = either("'Cotonou'", "'Dahomey'", "'Porto-Novo'")>>
+		<<set $nickname = either("'Abomey'", "'Beninese'", "'Beninois'", "'Cotonou'", "'Dahomey'", "'Porto-Novo'")>>
 	<<case "Bermudian">>
-		<<set $nickname = either("'Bermuda Triangle'", "'Hamilton'", "'St. George's'")>>
+		<<set $nickname = either("'Bermuda Triangle'", "'Bermudan'", "'Bermudian'", "'Hamilton'", "'Onion'", "'St. George's'")>>
 	<<case "Bhutanese">>
-		<<set $nickname = either("'Dragon Queen'", "'Druk'", "'Phuntsholing'", "'Thimphu'")>>
+		<<set $nickname = either("'Bhutanese'", "'Dragon Queen'", "'Druk'", "'Phuntsholing'", "'Punakha'", "'Thimphu'")>>
 	<<case "Bissau-Guinean">>
-		<<set $nickname = either("'Bissau'", "'Bolama'", "'Kriol'")>>
+		<<set $nickname = either("'Bissau'", "'Bissau-Guinean'", "'Bolama'", "'Kriol'")>>
 	<<case "Bolivian">>
-		<<set $nickname = either("'La Paz'", "'Sucre'", "'Titicaca'")>>
+		<<set $nickname = either("'Bolivian'", "'Chuquisaca'", "'La Paz'", "'Santa Cruz'", "'Sucre'", "'Titicaca'")>>
 	<<case "Bosnian">>
-		<<set $nickname = either("'Herzegovina'", "'Sarajevo'", "'Tvrtko'")>>
+		<<set $nickname = either("'Banja Luka'", "'Bosniak'", "'Bosnian'", "'Herzegovina'", "'Sarajevo'", "'Tvrtko'")>>
 	<<case "Brazilian">>
-		<<set $nickname = either("'7-1'", "'Amazon'", "'Bauru'", "'Brasília'", "'Bunda'", "'Carmen Miranda'", "'Dago'", "'Favelada'", "'Hue'", "'Ipanema'", "'Monkey'", "'Rio de Janeiro'", "'São Paulo'", "'Zika'")>>
+		<<set $nickname = either("'7-1'", "'Amazon'", "'Bauru'", "'Brasília'", "'Brazilian'", "'Bunda'", "'Carmen Miranda'", "'Dago'", "'Favelada'", "'Hue'", "'Ipanema'", "'Monkey'", "'Rio de Janeiro'", "'São Paulo'", "'Zika'")>>
 	<<case "British">>
-		<<set $nickname = either("'Brexit'", "'Brit'", "'Britannia'", "'Britbong'", "'Chav'", "'Fish'n'Chips'", "'Gov'nor'", "'Limey'", "'London'", "'Pikey'", "'Pommie'", "'Rosbif'", "'Scrubber'", "'Slag'", "'Slapper'")>>
+		<<set $nickname = either("'Brexit'", "'Brit'", "'Britannia'", "'Britbong'", "'British'", "'Briton'", "'Chav'", "'Fish'n'Chips'", "'Gov'nor'", "'Limey'", "'London'", "'Pikey'", "'Pommie'", "'Rosbif'", "'Scrubber'", "'Slag'", "'Slapper'")>>
 	<<case "Bruneian">>
-		<<set $nickname = either("'Abode of Peace'", "'Bandar Seri Begawan'", "'Bolkiah'", "'Sultan'")>>
+		<<set $nickname = either("'Abode of Peace'", "'Bandar Seri Begawan'", "'Bolkiah'", "'Bruneian'", "'Sultan'")>>
 	<<case "Bulgarian">>
-		<<set $nickname = either("'Bulgar'", "'Sofia'", "'Zhivkov'")>>
+		<<set $nickname = either("'Bulgar'", "'Bulgarian'", "'Nikopol'", "'Pliska'", "'Sofia'", "'Zhivkov'")>>
 	<<case "Burkinabé">>
-		<<set $nickname = either("'Ouagadougou'", "'Sankara'", "'Upper Volta'")>>
+		<<set $nickname = either("'Burkina Fasan'", "'Burkinabé'", "'Ouagadougou'", "'Sankara'", "'Upper Volta'")>>
 	<<case "Burmese">>
-		<<set $nickname = either("'Burma Shave'", "'Burmese Python'", "'Golden Triangle'", "'Myanmar'", "'Naypyidaw'", "'Rangoon'", "'Yangon'")>>
+		<<set $nickname = either("'Bamar'", "'Burma Shave'", "'Burmsese'", "'Burmese Python'", "'Golden Triangle'", "'Myanma'", "'Myanmar'", "'Myanmese'", "'Naypyidaw'", "'Pagan'", "'Rangoon'", "'Yangon'")>>
 	<<case "Burundian">>
-		<<set $nickname = either("'Bagaza'", "'Bujumbura'", "'Heha'")>>
+		<<set $nickname = either("'Bagaza'", "'Bujumbura'", "'Burundian'", "'Heha'", "'Umurundi'")>>
 	<<case "Cambodian">>
-		<<set $nickname = either("'Angkor Wat'", "'Holiday in Cambodia'", "'Khmer'", "'Phnom Penh'")>>
+		<<set $nickname = either("'Angkor Wat'", "'Cambodian'", "'Holiday in Cambodia'", "'Khmer'", "'Phnom Penh'", "'Pol Pot'")>>
 	<<case "Cameroonian">>
-		<<set $nickname = either("'Biya'", "'Douala'", "'Yaoundé'")>>
+		<<set $nickname = either("'Biya'", "'Cameroonian'", "'Douala'", "'Yaoundé'")>>
 	<<case "Canadian">>
-		<<set $nickname = either("'Canuck'", "'Leaf'", "'Loonie'", "'Maple Syrup'", "'Mountie'", "'Poutine'", "'Quebec'", "'Toronto'", "'Vancouver'", "'Yukon'")>>
+		<<set $nickname = either("'Canadian'", "'Canadienne'", "'Canuck'", "'Leaf'", "'Loonie'", "'Maple Syrup'", "'Mountie'", "'Ottawa'", "'Poutine'", "'Quebec'", "'Toronto'", "'Vancouver'", "'Yukon'")>>
 	<<case "Cape Verdean">>
-		<<set $nickname = either("'Cabo Verde'", "'Cap-Vert'", "'Praia'")>>
+		<<set $nickname = either("'Cabo Verde'", "'Cap-Vert'", "'Cape Verdean'", "'Praia'")>>
 	<<case "Catalan">>
-		<<set $nickname = either("'Barcelona'", "'Castell'", "'Catalufo'", "'Senyera'")>>
+		<<set $nickname = either("'Barcelona'", "'Castell'", "'Catalan'", "'Catalufo'", "'Senyera'", "'Spanish'")>>
 	<<case "Central African">>
-		<<set $nickname = either("'Bangui'", "'Bokassa'", "'Ubangi-Shari'")>>
+		<<set $nickname = either("'Abiras'", "'Bangui'", "'Bokassa'", "'Central African'", "'Ubangi-Shari'")>>
 	<<case "Chadian">>
-		<<set $nickname = either("'Chad'", "'Habré'", "'N'Djamena'", "'Tombalbaye'")>>
+		<<set $nickname = either("'Chad'", "'Chadian'", "'Habré'", "'N'Djamena'", "'Tombalbaye'")>>
 	<<case "Chilean">>
-		<<set $nickname = either("'Chela'", "'Chilote'", "'Pinochet'", "'Santiago'", "'Toya'")>>
+		<<set $nickname = either("'Chela'", "'Chilean'", "'Chilote'", "'Pinochet'", "'Santiago'", "'Toya'", "'Valparaíso'")>>
 	<<case "Chinese">>
-		<<set $nickname = either("'Beijing'", "'Chankoro'", "'Ching Chong'", "'Chink'", "'Cina'", "'Dim Sum'", "'Dragon'", "'Empress'", "'Great Wall'", "'Guangzhou'", "'Hong Kong'", "'Kowloon'", "'Kung Fu'", "'Lead Toys'", "'Lotus'", "'Made in China'", "'Manchu'", "'Nanking'", "'Renmenbi'", "'Shanghai'", "'Triad'")>>
+		<<set $nickname = either("'Beijing'", "'Chankoro'", "'Chinese'", "'Ching Chong'", "'Chink'", "'Cina'", "'Dim Sum'", "'Dragon'", "'Empress'", "'Great Wall'", "'Guangzhou'", "'Hong Kong'", "'Kowloon'", "'Kung Fu'", "'Lead Toys'", "'Lotus'", "'Macau'", "'Made in China'", "'Manchu'", "'Nanking'", "'Renmenbi'", "'Shanghai'", "'Triad'")>>
 	<<case "Colombian">>
-		<<set $nickname = either("'Bogotá'", "'Cafetera'", "'Coca'", "'Crystal'", "'FARC'", "'Pablita Escobar'")>>
+		<<set $nickname = either("'Bogotá'", "'Cafetera'", "'Coca'", "'Colombian'", "'Crystal'", "'FARC'", "'Pablita Escobar'")>>
 	<<case "Comorian">>
-		<<set $nickname = either("'Karthala'", "'Mayotte'", "'Moroni'")>>
+		<<set $nickname = either("'Comoran'", "'Comorian'", "'Karthala'", "'Mayotte'", "'Moroni'")>>
 	<<case "Congolese">>
-		<<set $nickname = either("'Brazzaville'", "'Ngouabi'", "'Nguesso'")>>
+		<<set $nickname = either("'Brazzaville'", "'Congolese'", "'Ngouabi'", "'Nguesso'")>>
 	<<case "a Cook Islander">>
-		<<set $nickname = either("'Avarua'", "'Cook'", "'Rarotonga'")>>
+		<<set $nickname = either("'Avarua'", "'Cook'", "'Cook Islander'", "'Rarotonga'")>>
 	<<case "Costa Rican">>
-		<<set $nickname = either("'Cartago'", "'Ferrer'", "'Oxcart'", "'San José'", "'Tica'")>>
+		<<set $nickname = either("'Cartago'", "'Costa Rican'", "'Ferrer'", "'Oxcart'", "'San José'", "'Tica'")>>
 	<<case "Croatian">>
-		<<set $nickname = either("'Croat'", "'Tito'", "'Zagreb'")>>
+		<<set $nickname = either("'Croat'", "'Croatian'", "'Tito'", "'Zagreb'")>>
 	<<case "Cuban">>
-		<<set $nickname = either("'Blockade'", "'Castro'", "'Commie'", "'Guantanamo'", "'Havana'", "'Scarface'")>>
+		<<set $nickname = either("'Blockade'", "'Castro'", "'Cigars'", "'Commie'", "'Cuban'", "'Guantanamo'", "'Havana'", "'Scarface'")>>
 	<<case "Cypriot">>
-		<<set $nickname = either("'Atilla'", "'Enosis'", "'Nicosia'")>>
+		<<set $nickname = either("'Atilla'", "'Cyprian'", "'Cypriot'", "'Enosis'", "'Nicosia'")>>
 	<<case "Czech">>
-		<<set $nickname = either("'Bohemian'", "'Czechnya'", "'Kunda'", "'Moravian'", "'Prague'", "'Silesian'")>>
+		<<set $nickname = either("'Bohemian'", "'Bohunk'", "'Czech'", "'Czechnya'", "'Kunda'", "'Moravian'", "'Prague'", "'Silesian'", "'Velvet'")>>
 	<<case "Danish">>
-		<<set $nickname = either("'Copenhagen'", "'Dane'", "'Ludertæve'", "'Tøs'", "'Viking'")>>
+		<<set $nickname = either("'Copenhagen'", "'Dane'", "'Danish'", "'Ludertæve'", "'Tøs'", "'Viking'")>>
 	<<case "Djiboutian">>
-		<<set $nickname = either("'Afar'", "'Ifat'", "'Punt'", "'Tadjoura'")>>
+		<<set $nickname = either("'Afar'", "'Djiboutian'", "'Ifat'", "'Obock'", "'Punt'", "'Tadjoura'")>>
 	<<case "Dominican">>
-		<<set $nickname = either("'Caribbean'", "'Domingo'", "'Palo'", "'Santo Domingo'", "'Taíno'", "'Trinitaria'")>>
+		<<set $nickname = either("'Caribbean'", "'Domingo'", "'Dominican'", "'Palo'", "'Quisqueyana'", "'Santo Domingo'", "'Taíno'", "'Trinitaria'", "'Trujillo'")>>
 	<<case "Dominiquais">>
-		<<set $nickname = either("'Red Dog'", "'Roseau'", "'Sisserou'")>>
+		<<set $nickname = either("'Dominican'", "'Dominiquais'", "'Red Dog'", "'Roseau'", "'Sisserou'")>>
 	<<case "Dutch">>
-		<<set $nickname = either("'Amsterdam'", "'Cheesehead'", "'Dutchie'", "'Slaaf'", "'Slet'")>>
+		<<set $nickname = either("'Amsterdam'", "'Cheesehead'", "'Dutch'", "'Dutchie'", "'Holland'", "'Netherlander'", "'Slaaf'", "'Slet'")>>
 	<<case "East Timorese">>
-		<<set $nickname = either("'27th Province'", "'Dili'", "'Timor Leste'")>>
+		<<set $nickname = either("'27th Province'", "'Dili'", "'East Timorese'", "'Lifau'", "'Maubere'", "'Timor Leste'", "'Timorese'")>>
 	<<case "Ecuadorian">>
-		<<set $nickname = either("'Galápagos'", "'Guayaquil'", "'Quito'")>>
+		<<set $nickname = either("'Ecuadorian'", "'Galápagos'", "'Guayaquil'", "'Quito'")>>
 	<<case "Egyptian">>
-		<<set $nickname = either("'Cairo'", "'Cleopatra'", "'Misirlou'", "'Sinai'", "'Sphinx'", "'Suez'")>>
+		<<set $nickname = either("'Cairo'", "'Cleopatra'", "'Egyptian'", "'Misirlou'", "'Sinai'", "'Sphinx'", "'Suez'")>>
 	<<case "Emirati">>
-		<<set $nickname = either("'Abu Dhabi'", "'Bedouin'", "'Dubai'")>>
+		<<set $nickname = either("'Abu Dhabi'", "'Bedouin'", "'Dubai'", "'Emirati'", "'Emiri'", "'Emirian'")>>
 	<<case "Equatoguinean">>
-		<<set $nickname = either("'Bata'", "'Malabo'", "'Nguema'", "'Oyala'")>>
+		<<set $nickname = either("'Bata'", "'Equatoguinean'", "'Equatorial Guinean'", "'Malabo'", "'Nguema'", "'Oyala'")>>
 	<<case "Eritrean">>
-		<<set $nickname = either("'Asmara'", "'Medri Bahri'", "'Punt'", "'Red Sea'")>>
+		<<set $nickname = either("'Asmara'", "'Bahri Negash'", "'Eritrean'", "'Massawa'", "'Medri Bahri'", "'Punt'", "'Red Sea'")>>
 	<<case "Estonian">>
-		<<set $nickname = either("'Baltic'", "'Eesti'", "'Tallinn'")>>
+		<<set $nickname = either("'Baltic'", "'Eesti'", "'Estonian'", "'Tallinn'", "'Tartu'", "'Yestonian'")>>
 	<<case "Ethiopian">>
-		<<set $nickname = either("'Addis Ababa'", "'Oromo'", "'Rastafarian'")>>
+		<<set $nickname = either("'Addis Ababa'", "'Ethiopian'", "'Mengistu'", "'Oromo'", "'Rastafarian'")>>
 	<<case "Fijian">>
-		<<set $nickname = either("'Feejee'", "'Itaukei'", "'Suva'", "'Viti Levu'")>>
+		<<set $nickname = either("'Feejee'", "'Fijian'", "'Itaukei'", "'Levuka'", "'Suva'", "'Viti Levu'")>>
 	<<case "Filipina">>
-		<<set $nickname = either("'Flip'", "'Manila'", "'Pinoy'", "'Tagalog'")>>
+		<<set $nickname = either("'Filipina'", "'Flip'", "'Manila'", "'Marcos'", "'Philippine'", "'Pinay'", "'Pinoy'", "'Tagalog'")>>
 	<<case "Finnish">>
-		<<set $nickname = either("'Finn'", "'Helsinki'", "'Mämmi'", "'Perkele'", "'Saunagirl'", "'Winter War'")>>
+		<<set $nickname = either("'China Swede'", "'Chukhna'", "'Finn'", "'Finnic'", "'Finnish'", "'Finnish Maiden'", "'Finnjävel'", "'Helsinki'", "'Mämmi'", "'Perkele'", "'Saunagirl'", "'Suomi'", "'Winter War'")>>
 	<<case "French">>
-		<<set $nickname = either("'Belle'", "'Charlie Hebdo'", "'Crapaud'", "'Fille de Joie'", "'Frenchie'", "'Frog'", "'Gabacha'", "'Mademoiselle'", "'Marianne'", "'Marseille'", "'Paris'", "'Surrender Monkey'")>>
+		<<set $nickname = either("'Belle'", "'Charlie Hebdo'", "'Crapaud'", "'Fille de Joie'", "'Français'", "'French'", "'Frenchie'", "'Frog'", "'Gabacha'", "'Gaul'", "'Mademoiselle'", "'Marianne'", "'Marseille'", "'Napoleon'", "'Paris'", "'Surrender Monkey'")>>
 	<<case "French Guianan">>
-		<<set $nickname = either("'Cayenne'", "'ÃŽle du Diable'", "'Kourou'")>>
+		<<set $nickname = either("'Cayenne'", "'French Guianan'", "'ÃŽle du Diable'", "'Kourou'")>>
 	<<case "French Polynesian">>
-		<<set $nickname = either("'Faaa'", "'Fangataufa'", "'Moruroa'", "'Papeete'", "'Tahiti'")>>
+		<<set $nickname = either("'Faaa'", "'Fangataufa'", "'French Polynesian'", "'Moruroa'", "'Papeete'", "'Tahiti'")>>
 	<<case "Gabonese">>
-		<<set $nickname = either("'Bongo'", "'Libreville'", "'Orungu'")>>
-	<<case "Gambian")>>
-		<<set $nickname = either("'Banjul'", "'Jammeh'", "'Serekunda'")>>
+		<<set $nickname = either("'Bongo'", "'Gabonais'", "'Gabonese'", "'Libreville'", "'Orungu'")>>
+	<<case "Gambian">>
+		<<set $nickname = either("'Banjul'", "'Gambian'", "'Jammeh'", "'Jawara'", "'Serekunda'")>>
 	<<case "Georgian">>
-		<<set $nickname = either("'Kutaisi'", "'Mepe'", "'Tamar'", "'Tbilisi'")>>
+		<<set $nickname = either("'Georgian'", "'Kutaisi'", "'Mepe'", "'Tamar'", "'Tbilisi'")>>
 	<<case "German">>
-		<<set $nickname = either("'Bavarian'", "'Berlin'", "'Bratwurst'", "'Cabbage Eater'", "'Dresden'", "'Fraulein'", "'Jerry'", "'Hitler'", "'Hun'", "'Kraut'", "'Nazi'", "'Nuremberg'", "'Oktoberfest'", "'Piefke'", "'Prussian'", "'Saupreiß'", "'Valkyrie'")>>
+		<<set $nickname = either("'Bavarian'", "'Berlin'", "'Bratwurst'", "'Cabbage Eater'", "'Dresden'", "'Fraulein'", "'German'", "'Jerry'", "'Hitler'", "'Hun'", "'Kraut'", "'Nazi'", "'Nuremberg'", "'Oktoberfest'", "'Piefke'", "'Prussian'", "'Saupreiß'", "'Teuton'", "'Valkyrie'")>>
 	<<case "Ghanan">>
-		<<set $nickname = either("'Accra'", "'Akan'", "'Gold Coast'", "'Warrior Queen'", "'Shaman Queen'")>>
+		<<set $nickname = either("'Accra'", "'Akan'", "'Ghanan'", "'Gold Coast'", "'Warrior Queen'", "'Shaman Queen'")>>
 	<<case "Greek">>
-		<<set $nickname = either("'Athens'", "'Debts'", "'Ionian'", "'Spartan'")>>
+		<<set $nickname = either("'Athens'", "'Debts'", "'Greco'", "'Grecoman'", "'Greek'", "'Hellene'", "'Hellenic'", "'Ionian'", "'Nafplio'", "'Spartan'")>>
 	<<case "Greenlandic">>
-		<<set $nickname = either("'Eskimo'", "'Inuit'", "'Nuuk'")>>
+		<<set $nickname = either("'Eskimo'", "'Godthåb'", "'Greenlander'", "'Greenlandic'", "'Inuit'", "'Nuuk'")>>
 	<<case "Grenadian">>
-		<<set $nickname = either("'Grenada Dove'", "'Urgent Fury'", "'Woolie'")>>
+		<<set $nickname = either("'Grenada Dove'", "'Grenadian'", "'Urgent Fury'", "'Woolie'")>>
 	<<case "Guatemalan">>
-		<<set $nickname = either("'Chapín'", "'Guatemalan'", "'Mayan'")>>
+		<<set $nickname = either("'Carrera'", "'Chapín'", "'Guatemalan'", "'Mayan'")>>
 	<<case "Guinean">>
-		<<set $nickname = either("'Bauxite'", "'Conakry'", "'Toure'")>>
+		<<set $nickname = either("'Bauxite'", "'Conakry'", "'Guinean'", "'Toure'")>>
 	<<case "Guyanese">>
-		<<set $nickname = either("'Flavor Aid'", "'Georgetown'", "'Hoatzin'", "'Jonestown'")>>
+		<<set $nickname = either("'Flavor Aid'", "'Georgetown'", "'Guyanese'", "'Hoatzin'", "'Jonestown'")>>
 	<<case "Haitian">>
-		<<set $nickname = either("'Maîtresse'", "'Mama Doc'", "'Maman'", "'Port-au-Prince'", "'Voodoo'")>>
+		<<set $nickname = either("'Ayisyen'", "'Duvalier'", "'Haitian'", "'Maîtresse'", "'Mama Doc'", "'Maman'", "'Port-au-Prince'", "'Tortuga'", "'Voodoo'")>>
 	<<case "Honduran">>
-		<<set $nickname = either("'Anchuria'", "'Catracha'", "'Tegucigalpa'")>>
+		<<set $nickname = either("'Anchuria'", "'Catracha'", "'Honduran'", "'Tegucigalpa'")>>
 	<<case "Hungarian">>
-		<<set $nickname = either("'Bozgor'", "'Budapest'", "'Magyar'", "'Szuka'")>>
+		<<set $nickname = either("'Bozgor'", "'Budapest'", "'Hungarian'", "'Kádár'", "'Magyar'", "'Szuka'")>>
 	<<case "I-Kiribati">>
-		<<set $nickname = either("'Gilbert'", "'Tarawa'", "'Tungaru'")>>
+		<<set $nickname = either("'Bairiki'", "'Butaritari'", "'Gilbert'", "'I-Kiribati'", "'Tarawa'", "'Tungaru'")>>
 	<<case "Icelandic">>
-		<<set $nickname = either("'Penis Museum'", "'Reykjavík'", "'Sagas'")>>
+		<<set $nickname = either("'Bessastaðir'", "'Icelander'", "'Icelandic'", "'Penis Museum'", "'Reykjavík'", "'Sagas'", "'Þingvellir'")>>
 	<<case "Indian">>
-		<<set $nickname = either("'Bharat Mata'", "'Bhibhi'", "'Bhopal'", "'Bollywood'", "'Bombay'", "'Delhi'", "'Gandhi'", "'Hindi'", "'Mahatma'", "'Mumbai'", "'Punjabi'", "'Savita'", "'Street Shitter'", "'Taj Mahal'")>>
+		<<set $nickname = either("'Bharat Mata'", "'Bhibhi'", "'Bhopal'", "'Bollywood'", "'Bombay'", "'Delhi'", "'Gandhi'", "'Hindi'", "'Indian'", "'Mahatma'", "'Mumbai'", "'Punjabi'", "'Savita'", "'Street Shitter'", "'Taj Mahal'")>>
 	<<case "Indonesian">>
-		<<set $nickname = either("'Ibu Pertiwi'", "'Indon'", "'Jakarta'", "'Java'", "'Malay'", "'Sunda'")>>
+		<<set $nickname = either("'Ibu Pertiwi'", "'Indon'", "'Indonesian'", "'Jakarta'", "'Java'", "'Malay'", "'Suharto'", "'Sukarno'", "'Sunda'")>>
 	<<case "Iraqi">>
-		<<set $nickname = either("'Assyrian'", "'Baghdad'", "'Fallujah'", "'Fertile Crescent'", "'Hussein'", "'Mesopotamian'", "'Oilfields'", "'Whore of Babylon'")>>
+		<<set $nickname = either("'Assyrian'", "'Babylonian'", "'Baghdad'", "'Fallujah'", "'Fertile Crescent'", "'Hussein'", "'Iraqi'", "'Mesopotamian'", "'Oilfields'", "'Whore of Babylon'")>>
 	<<case "Iranian">>
-		<<set $nickname = either("'Ayatollah'", "'Iranian'", "'Majus'", "'Persian'", "'Tehran'")>>
+		<<set $nickname = either("'Ayatollah'", "'Iranian'", "'Iranic'", "'Khamenei'", "'Majus'", "'Persian'", "'Shah'", "'Tehran'")>>
 	<<case "Irish">>
-		<<set $nickname = either("'Carbomb'", "'Dublin'", "'Emerald'", "'Hibernia'", "'Jackeen'", "'Lassie'", "'Mick'", "'Paddy'", "'Potato Famine'", "'Sinn Féin'")>>
+		<<set $nickname = either("'Carbomb'", "'Culchie'", "'Dublin'", "'Emerald'", "'Hibernia'", "'Irish'", "'Irishwoman'", "'Jackeen'", "'Lassie'", "'Mick'", "'Paddy'", "'Potato Famine'", "'Sinn Féin'")>>
 	<<case "Israeli">>
-		<<set $nickname = either("'God's Chosen'", "'Hebrew'", "'Jaffa'", "'Jerusalem'", "'Levantine'", "'Tel Aviv'", "'Merchant'", "'Oven Dodger'", "'Shiksa'", "'Sharmuta'", "'Shekels'", "'Srulik'", "'Tel Aviv'", "'Zionist'")>>
+		<<set $nickname = either("'God's Chosen'", "'Hebrew'", "'Israeli'", "'Israelite'", "'Jaffa'", "'Jerusalem'", "'Levantine'", "'Tel Aviv'", "'Merchant'", "'Oven Dodger'", "'Shiksa'", "'Sharmuta'", "'Shekels'", "'Srulik'", "'Tel Aviv'", "'Zio'", "'Zionist'")>>
 	<<case "Italian">>
-		<<set $nickname = either("'Bologna'", "'Eytie'", "'Greaseball'", "'Latin'", "'Mafia'", "'Mussolini'", "'Napoli'", "'Renaissance'", "'Rome'", "'Salami'", "'Sicilian'", "'Spaghetti'", "'Terrone'", "'Wop'")>>
+		<<set $nickname = either("'Bologna'", "'Eytie'", "'Florence'", "'Greaseball'", "'Italian'", "'Latin'", "'Mafia'", "'Mussolini'", "'Napoli'", "'Renaissance'", "'Rome'", "'Salami'", "'Sicilian'", "'Spaghetti'", "'Terrone'", "'Wop'")>>
 	<<case "Ivorian">>
-		<<set $nickname = either("'Abidjan'", "'Ivory'", "'Yamoussoukro'")>>
+		<<set $nickname = either("'Abidjan'", "'Baoulé'", "'Houphouët-Boigny'", "'Ivorian'", "'Ivory'", "'Yamoussoukro'")>>
 	<<case "Jamaican">>
-		<<set $nickname = either("'Kingston'", "'Kush'", "'Rasta'", "'Reggae'", "'West Indies'", "'Yardie'")>>
+		<<set $nickname = either("'Arawak'", "'Jamaican'", "'Jamdown'", "'Jamrock'", "'Kingston'", "'Kush'", "'Port Royal'", "'Rasta'", "'Reggae'", "'Rock'", "'West Indies'", "'Xaymaca'", "'Yardie'")>>
 	<<case "Japanese">>
-		<<set $nickname = either("'Anime'", "'Banzai'", "'Bishoujo'", "'Fukushima'", "'Geisha Girl'", "'Hello Kitty'", "'Hirohito'", "'Hiroshima'", "'Hokkaido'", "'Ichiban'", "'Jap'", "'Kamikaze'", "'Kawasaki'", "'Kyoto'", "'Kyushu'", "'Nagano'", "'Nagasaki'", "'Nip'", "'Nipponese'", "'Osaka'", "'Sushi'", "'Tempura'", "'Tokyo'", "'Wasabi'", "'Xiao Riben'", "'Yakuza'", "'Yamaha'", "'Yamato Nadeshiko'")>>
+		<<set $nickname = either("'Anime'", "'Banzai'", "'Bishoujo'", "'Fukushima'", "'Geisha Girl'", "'Hello Kitty'", "'Hirohito'", "'Hiroshima'", "'Hokkaido'", "'Ichiban'", "'Jap'", "'Japanese'", "'Kamikaze'", "'Kawasaki'", "'Kyoto'", "'Kyushu'", "'Nagano'", "'Nagasaki'", "'Nip'", "'Nipponese'", "'Osaka'", "'Sushi'", "'Tempura'", "'Tokyo'", "'Wasabi'", "'Xiao Riben'", "'Yakuza'", "'Yamaha'", "'Yamato Nadeshiko'")>>
 	<<case "Jordanian">>
-		<<set $nickname = either("'Edomite'", "'Hashemite'", "'Mansaf'", "'Moab'", "'Petra'")>>
+		<<set $nickname = either("'Amman'", "'Edomite'", "'Hashemite'", "'Jordanian'", "'Mansaf'", "'Moab'", "'Petra'")>>
 	<<case "Kazakh">>
-		<<set $nickname = either("'Blue Hat'", "'Borat'", "'Khan'")>>
+		<<set $nickname = either("'Almaty'", "'Astana'", "'Blue Hat'", "'Borat'", "'Kazakh'", "'Kazakhstani'", "'Khan'", "'Nazarbayev'")>>
 	<<case "Kenyan">>
-		<<set $nickname = either("'Mau Mau'", "'Nairobi'", "'Safari'", "'Swahili'", "'Obama'")>>
+		<<set $nickname = either("'Kenyan'", "'Mau Mau'", "'Nairobi'", "'Obama'", "'Safari'", "'Swahili'", "'Tsavo'")>>
 	<<case "Kittitian">>
-		<<set $nickname = either("'Basseterre'", "'Liamuiga'", "'Nevis'")>>
+		<<set $nickname = either("'Basseterre'", "'Kittitian'", "'Liamuiga'", "'Nevis'", "'Nevisian'")>>
 	<<case "Korean">>
-		<<set $nickname = either("'Dokdo'", "'Gangnam'", "'K-Pop'", "'Kimchi'", "'Nida'", "'Pyongyang'", "'Samsung'", "'Seoul'")>>
+		<<set $nickname = either("'Dokdo'", "'Gangnam'", "'K-Pop'", "'Kimchi'", "'Korean'", "'Nida'", "'Pyongyang'", "'Samsung'", "'Seoul'")>>
 	<<case "Kosovan">>
-		<<set $nickname = either("'Kosovar'", "'Metohija'", "'Pristina'")>>
+		<<set $nickname = either("'Blackbird'", "'Kosovan'", "'Kosovar'", "'Metohija'", "'Pristina'")>>
 	<<case "Kurdish">>
-		<<set $nickname = either("'Ararat'", "'Kurd'", "'Mahabad'")>>
+		<<set $nickname = either("'Ararat'", "'Iraqi'", "'Kurd'", "'Kurdish'", "'Mahabad'")>>
 	<<case "Kuwaiti">>
-		<<set $nickname = either("'Burgan'", "'Gulf War'", "'Sabah'")>>
+		<<set $nickname = either("'Burgan'", "'Gulf War'", "'Kuwaiti'", "'Sabah'")>>
 	<<case "Kyrgyz">>
-		<<set $nickname = either("'Bishkek'", "'Forty'", "'Manas'", "'Osh'")>>
+		<<set $nickname = either("'Bishkek'", "'Forty'", "'Kyrgyz'", "'Kyrgyzstani'", "'Manas'", "'Osh'")>>
 	<<case "Laotian">>
-		<<set $nickname = either("'Lao'", "'Luang Prabang'", "'Muang Lao'", "'Vientiane'")>>
+		<<set $nickname = either("'Lao'", "'Laotian'", "'Luang Prabang'", "'Muang Lao'", "'Vientiane'")>>
 	<<case "Latvian">>
-		<<set $nickname = either("'Livonia'", "'Riga'", "'Ulmanis'")>>
+		<<set $nickname = either("'Latvian'", "'Lett'", "'Livonia'", "'Riga'", "'Ulmanis'")>>
 	<<case "Lebanese">>
-		<<set $nickname = either("'Beirut'", "'Cedar'", "'Druze'", "'Hezbollah'", "'Lebo'", "'Maronite'", "'Phoenician'")>>
+		<<set $nickname = either("'Beirut'", "'Cedar'", "'Druze'", "'Hezbollah'", "'Lebanese'", "'Lebo'", "'Maronite'", "'Phoenician'")>>
 	<<case "Liberian">>
-		<<set $nickname = either("'Mississippi-in-Africa'", "'Monrovia'", "'Taylor'")>>
+		<<set $nickname = either("'Liberian'", "'Mississippi-in-Africa'", "'Monrovia'", "'Taylor'")>>
 	<<case "Libyan">>
-		<<set $nickname = either("'Cyrene'", "'Gaddafi'", "'Silphium'", "'Tobruk'", "'Tripoli'", "'Zenga Zenga'")>>
+		<<set $nickname = either("'Benghazi'", "'Cyrene'", "'Gaddafi'", "'Libyan'", "'Silphium'", "'Tobruk'", "'Tripoli'", "'Zenga Zenga'")>>
 	<<case "a Liechtensteiner">>
-		<<set $nickname = either("'Rhine'", "'Schaan'", "'Vaduz'")>>
+		<<set $nickname = either("'Liechtensteiner'", "'Rhine'", "'Schaan'", "'Vaduz'")>>
 	<<case "Lithuanian">>
-		<<set $nickname = either("'Lugan'", "'Memel'", "'Mindaugas'", "'Pagan'", "'Vilnus'")>>
+		<<set $nickname = either("'Lithuanian'", "'Lugan'", "'Memel'", "'Mindaugas'", "'Pagan'", "'Vilnus'")>>
 	<<case "Luxembourgian">>
 		<<set $nickname = either("'Bureaucrat'", "'Luxembourger'", "'Luxembourgian'", "'Luxembourgish'", "'Passerelle'")>>
 	<<case "Macedonian">>
-		<<set $nickname = either("'Macedon'", "'Macedonist'", "'Sarissa'", "'Skopianoi'", "'Skopje'")>>
+		<<set $nickname = either("'Macedon'", "'Macedonian'", "'Macedonist'", "'Sarissa'", "'Serboman'", "'Skopianoi'", "'Skopje'")>>
 	<<case "Malagasy">>
-		<<set $nickname = either("'Antananarivo'", "'Lemur'", "'Madagascan'")>>
+		<<set $nickname = either("'Antananarivo'", "'Lemur'", "'Madagascan'", "'Malagasy'", "'Ranavalona'")>>
 	<<case "Malawian">>
-		<<set $nickname = either("'Lilongwe'", "'Nyasaland'", "'Warm Heart of Africa'", "'Zomba'")>>
+		<<set $nickname = either("'Banda'", "'Lilongwe'", "'Malawian'", "'Nyasaland'", "'Warm Heart of Africa'", "'Zomba'")>>
 	<<case "Malaysian">>
-		<<set $nickname = either("'Kuala Lumpur'", "'Malingsia'", "'Malay Girl'", "'Pirate'")>>
+		<<set $nickname = either("'Kuala Lumpur'", "'Malingsia'", "'Malay Girl'", "'Malaya'", "'Malaysian'", "'Pirate'")>>
 	<<case "Maldivian">>
-		<<set $nickname = either("'Dhivehi'", "'Dhoni'", "'Malé'")>>
+		<<set $nickname = either("'Dhivehi'", "'Dhoni'", "'Gayoom'", "'Maldivian'", "'Malé'")>>
 	<<case "Malian">>
-		<<set $nickname = either("'Azawad'", "'Bamako'", "'Mandinka'", "'Mansa Musa'", "'Sahel'", "'Timbuktu'", "'Trans-Sahara'")>>
+		<<set $nickname = either("'Azawad'", "'Bamako'", "'Malian'", "'Mandinka'", "'Mansa Musa'", "'Sahel'", "'Timbuktu'", "'Trans-Sahara'")>>
 	<<case "Maltese">>
-		<<set $nickname = either("'George Cross'", "'Maltese Falcon'", "'Valletta'")>>
+		<<set $nickname = either("'George Cross'", "'Maltese'", "'Maltese Falcon'", "'Valletta'")>>
 	<<case "Marshallese">>
-		<<set $nickname = either("'Bikini Atoll'", "'Majuro'", "'Marshall'", "'Stick Chart'")>>
+		<<set $nickname = either("'Bikini Atoll'", "'Enewetak'", "'Leroij'", "'Majuro'", "'Marshall'", "'Marshallese'", "'Stick Chart'")>>
 	<<case "Mauritanian">>
-		<<set $nickname = either("'Coppolani'", "'Daddah'", "'Nouakchott'")>>
+		<<set $nickname = either("'Coppolani'", "'Daddah'", "'Mauritanian'", "'Nouakchott'")>>
 	<<case "Mauritian">>
-		<<set $nickname = either("'Dodo'", "'Maurice'", "'Port Louis'")>>
+		<<set $nickname = either("'Dodo'", "'Maurice'", "'Mauritian'", "'Port Louis'")>>
 	<<case "Mexican">>
-		<<set $nickname = either("'Azteca'", "'Beaner'", "'Burrito'", "'Cartel'", "'Chiquita'", "'Fence Hopper'", "'Headless'", "'Juarez'", "'Malinche'", "'Mamacita'", "'Senorita'", "'Sinaloa'", "'Taco'", "'Tijuana'", "'Wetback'")>>
+		<<set $nickname = either("'Azteca'", "'Beaner'", "'Burrito'", "'Cartel'", "'Chiquita'", "'Fence Hopper'", "'Headless'", "'Juarez'", "'Malinche'", "'Mamacita'", "'Mexican'", "'Senorita'", "'Sinaloa'", "'Taco'", "'Tijuana'", "'Wetback'")>>
 	<<case "Micronesian">>
-		<<set $nickname = either("'Palikir'", "'Weno'", "'Yap'")>>
+		<<set $nickname = either("'Hailstone'", "'Micronesian'", "'Palikir'", "'Truk'", "'Weno'", "'Yap'")>>
 	<<case "Moldovan">>
-		<<set $nickname = either("'Bessarabia'", "'Chișinău'", "'Molda'")>>
+		<<set $nickname = either("'Bessarabia'", "'Chișinău'", "'Molda'", "'Moldovan'")>>
 	<<case "Monégasque">>
-		<<set $nickname = either("'Grace Kelly'", "'Grimaldi'", "'Monte Carlo'")>>
+		<<set $nickname = either("'Grace Kelly'", "'Grimaldi'", "'Monacan'", "'Monégasque'", "'Monte Carlo'")>>
 	<<case "Mongolian">>
-		<<set $nickname = either("'Death Worm'", "'Genghis Khan'", "'Mongol'", "'Ulaanbaatar'")>>
+		<<set $nickname = either("'Death Worm'", "'Genghis Khan'", "'Mongol'", "'Mongolian'", "'Ulaanbaatar'", "'Yumjaagiin'")>>
 	<<case "Montenegrin">>
-		<<set $nickname = either("'Black Mountain'", "'Crna Gora'", "'Podgorica'")>>
+		<<set $nickname = either("'Black Mountain'", "'Crna Gora'", "'Montenegrin'", "'Podgorica'")>>
 	<<case "Moroccan">>
-		<<set $nickname = either("'Casablanca'", "'Marrakesh'", "'Rabat'")>>
+		<<set $nickname = either("'Casablanca'", "'Marrakesh'", "'Moroccan'", "'Rabat'")>>
 	<<case "Mosotho">>
-		<<set $nickname = either("'Basutoland'", "'Maseru'", "'Moshoeshoe'")>>
+		<<set $nickname = either("'Basutoland'", "'Maseru'", "'Moshoeshoe'", "'Mosotho'")>>
 	<<case "Motswana">>
-		<<set $nickname = either("'Bechuanaland'", "'Gaborone'", "'Kalahari'")>>
+		<<set $nickname = either("'Bechuanaland'", "'Botswanan'", "'Gaborone'", "'Kalahari'", "'Mafeking'", "'Motswana'")>>
 	<<case "Mozambican">>
-		<<set $nickname = either("'Lourenço Marques'", "'Maputo'", "'Mussa Bin Bique'")>>
+		<<set $nickname = either("'Lourenço Marques'", "'Maputo'", "'Mozambican'", "'Mussa Bin Bique'")>>
 	<<case "Namibian">>
-		<<set $nickname = either("'Namib'", "'Walvis Bay'", "'Windhoek'")>>
+		<<set $nickname = either("'Caprivi'", "'Namib'", "'Namibian'", "'Walvis Bay'", "'Windhoek'")>>
 	<<case "Nauruan">>
-		<<set $nickname = either("'Meneng'", "'Phosphate'", "'Pleasant Island'", "'Yaren'")>>
+		<<set $nickname = either("'Meneng'", "'Nauruan'", "'Phosphate'", "'Pleasant Island'", "'Yaren'")>>
 	<<case "Nepalese">>
-		<<set $nickname = either("'Katmandu'", "'Kumari'", "'Nep'", "'Nepali'", "'Sherpa'")>>
+		<<set $nickname = either("'Katmandu'", "'Kumari'", "'Nep'", "'Nepalese'", "'Nepali'", "'Sherpa'")>>
 	<<case "a New Zealander">>
-		<<set $nickname = either("'All-Black'", "'Auckland'", "'Kiwi'", "'Sheep Shagger'", "'Wellington'")>>
+		<<set $nickname = either("'All-Black'", "'Auckland'", "'Kiwi'", "'New Zealander'", "'Sheep Shagger'", "'Wellington'")>>
 	<<case "Ni-Vanuatu">>
-		<<set $nickname = either("'Great Cyclade'", "'New Hebride'", "'Port Vila'")>>
+		<<set $nickname = either("'Bislama'", "'Cargo Cult'", "'Great Cyclade'", "'Jane Frum'", "'New Hebride'", "'Ni-Vanuatu'", "'Port Vila'")>>
 	<<case "Nicaraguan">>
-		<<set $nickname = either("'Contra'", "'Granada'", "'Managua'", "'Nica'")>>
+		<<set $nickname = either("'Contra'", "'Granada'", "'Managua'", "'Nica'", "'Nicaraguan'", "'Pinolera'")>>
 	<<case "Nigerian">>
-		<<set $nickname = either("'Abuja'", "'Kwara'", "'Lagos'", "'Scammer'")>>
+		<<set $nickname = either("'Abuja'", "'Biafra'", "'Kwara'", "'Lagos'", "'Naija'", "'Nigerian'", "'Scammer'")>>
 	<<case "Nigerien">>
-		<<set $nickname = either("'Kountché'", "'Niamey'", "'Sarraounia'")>>
+		<<set $nickname = either("'Kountché'", "'Niamey'", "'Nigerien'", "'Sarraounia'")>>
 	<<case "Niuean">>
-		<<set $nickname = either("'Alofi'", "'Patu-Iki'", "'Rock of Polynesia'")>>
+		<<set $nickname = either("'Alofi'", "'Niuean'", "'Patu-Iki'", "'Rock of Polynesia'")>>
 	<<case "Norwegian">>
-		<<set $nickname = either("'Black Metal'", "'Kuksuger'", "'Ludder'", "'Norse'", "'Norsk'", "'Oil Hog'", "'Ola'", "'Oslo'")>>
+		<<set $nickname = either("'Black Metal'", "'Kuksuger'", "'Ludder'", "'Norse'", "'Norsk'", "'Norwegian'", "'Oil Hog'", "'Ola'", "'Oslo'")>>
 	<<case "Omani">>
-		<<set $nickname = either("'Dhofar'", "'Empty Quarter'", "'Ibadi'", "'Khanjar'", "'Muscat'")>>
+		<<set $nickname = either("'Dhofar'", "'Empty Quarter'", "'Ibadi'", "'Khanjar'", "'Muscat'", "'Omani'")>>
 	<<case "Pakistani">>
-		<<set $nickname = either("'Indus'", "'Karachi'", "'Lahore'", "'Paki'")>>
+		<<set $nickname = either("'Indus'", "'Karachi'", "'Lahore'", "'Paki'", "'Pakistani'")>>
 	<<case "Palauan">>
-		<<set $nickname = either("'Koror'", "'Ngerulmud'", "'Peleliu'")>>
+		<<set $nickname = either("'Koror'", "'Ngerulmud'", "'Palauan'", "'Peleliu'")>>
 	<<case "Palestinian">>
-		<<set $nickname = either("'Gaza'", "'Hamas'", "'Intifada'", "'Jerusalem'", "'Pallywood'", "'Ramallah'", "'West Bank'")>>
+		<<set $nickname = either("'Gaza'", "'Hamas'", "'Intifada'", "'Jerusalem'", "'Palestinian'", "'Pallywood'", "'Ramallah'", "'West Bank'")>>
 	<<case "Panamanian">>
-		<<set $nickname = either("'Balboa'", "'Noriega'", "'Panama Canal'", "'Zonian'")>>
+		<<set $nickname = either("'Balboa'", "'Canalera'", "'Istmeña'", "'Noriega'", "'Pana'", "'Panama Canal'", "'Panamanian'", "'Zonian'")>>
 	<<case "Papua New Guinean">>
-		<<set $nickname = either("'Bougainville'", "'Papua'", "'Port Moresby'")>>
+		<<set $nickname = either("'Bougainville'", "'Papua'", "'Papua New Guinean'", "'Port Moresby'")>>
 	<<case "Paraguayan">>
-		<<set $nickname = either("'Asunción'", "'Guarani'", "'Stroessner'")>>
+		<<set $nickname = either("'Asunción'", "'Guaraní'", "'Paraguayan'", "'Stroessner'")>>
 	<<case "Peruvian">>
-		<<set $nickname = either("'Incan'", "'Lima'", "'Lorcha'", "'Perucha'", "'Trujillo'", "'Zampoña'")>>
+		<<set $nickname = either("'Incan'", "'Lima'", "'Lorcha'", "'Perucha'", "'Peruvian'", "'Trujillo'", "'Zampoña'")>>
 	<<case "Polish">>
-		<<set $nickname = either("'Hussar'", "'Krakow'", "'Kurwa'", "'Polack'", "'Pole'", "'Polonia'", "'Polski'", "'Pshek'", "'Warsaw'")>>
+		<<set $nickname = either("'Hussar'", "'Kraków'", "'Kurwa'", "'Polack'", "'Pole'", "'Polish'", "'Polonia'", "'Polski'", "'Pshek'", "'Warsaw'")>>
 	<<case "Portuguese">>
-		<<set $nickname = either("'Bunda'", "'Estado Novo'", "'Lisbon'", "'Portagee'")>>
+		<<set $nickname = either("'Bunda'", "'Carnation'", "'Estado Novo'", "'Lisbon'", "'Portagee'", "'Portuguese'", "'Tuga'")>>
 	<<case "Puerto Rican">>
-		<<set $nickname = either("'51st State'", "'Boricua'", "'Nuyorican'", "'P.R.'", "'Puertorriqueña'", "'San Juan'", "'West Side Story'")>>
+		<<set $nickname = either("'51st State'", "'Boricua'", "'Nuyorican'", "'P.R.'", "'Puerto Rican'", "'Puertorriqueña'", "'San Juan'", "'West Side Story'")>>
 	<<case "Qatari">>
-		<<set $nickname = either("'Al Jazeera'", "'Cadara'", "'Doha'")>>
+		<<set $nickname = either("'Al Jazeera'", "'Cadara'", "'Doha'", "'Qatari'")>>
 	<<case "Romanian">>
-		<<set $nickname = either("'Bucharest'", "'Ceausescu'", "'Dracula'", "'Gypsy'", "'Impaler'", "'Orphan'", "'Roma'", "'Transylvanian'", "'Vlad'")>>
+		<<set $nickname = either("'Bucharest'", "'Ceaușescu'", "'Dracula'", "'Gypsy'", "'Impaler'", "'Orphan'", "'Roma'", "'Romanian'", "'Transylvanian'", "'Vlad'")>>
 	<<case "Russian">>
-		<<set $nickname = either("'Bolshevik'", "'Cabbage Eater'", "'Commie'", "'Kacap'", "'Katsap'", "'Mafiya'", "'Moscow'", "'Moskal'", "'Red Banner'", "'Russkie'", "'Shlyukha'", "'Siberian Kitten'", "'Sickle & Hammer'", "'Slav'", "'Stalin'", "'Suchka'", "'Suka'", "'Tovarish'", "'Tsaritsa'", "'Vodka'")>>
+		<<set $nickname = either("'Bolshevik'", "'Cabbage Eater'", "'Commie'", "'Kacap'", "'Katsap'", "'Mafiya'", "'Moscow'", "'Moskal'", "'Red Banner'", "'Russian'", "'Russkie'", "'Saint Petersburg'", "'Shlyukha'", "'Siberian Kitten'", "'Sickle & Hammer'", "'Slav'", "'Soviet'", "'Stalin'", "'Suchka'", "'Suka'", "'Tovarish'", "'Tsaritsa'", "'Vodka'")>>
 	<<case "Rwandan">>
-		<<set $nickname = either("'Habyarimana'", "'Hotel Rwanda'", "'Kigali'")>>
+		<<set $nickname = either("'Habyarimana'", "'Hotel Rwanda'", "'Kigali'", "'Rwandan'", "'Rwandese'")>>
 	<<case "Sahrawi">>
-		<<set $nickname = either("'El-Aaiún'", "'Tifariti'", "'Western Saharan'")>>
+		<<set $nickname = either("'Abdelaziz'", "'El-Aaiún'", "'Moroccan'", "'Sahraouian'", "'Sahrawi'", "'Tifariti'", "'Western Saharan'")>>
 	<<case "Saint Lucian">>
-		<<set $nickname = either("'Castries'", "'Helen of the West Indies'", "'Lucia'")>>
+		<<set $nickname = either("'Castries'", "'Helen of the West Indies'", "'Saint Lucian'", "'Lucia'")>>
 	<<case "Salvadoran">>
-		<<set $nickname = either("'Duarte'", "'Indigo'", "'San Salvador'", "'Savior'")>>
+		<<set $nickname = either("'Duarte'", "'Guanaca'", "'Indigo'", "'Salvadoran'", "'Salvadoreña'", "'San Salvador'", "'Savior'")>>
 	<<case "Sammarinese">>
-		<<set $nickname = either("'Dogana'", "'Most Serene'", "'Saint Marinus'", "'Three Towers'")>>
+		<<set $nickname = either("'Dogana'", "'Most Serene'", "'Saint Marinus'", "'Sammarinese'", "'San Marinese'", "'Three Towers'")>>
 	<<case "Samoan">>
-		<<set $nickname = either("'Apia'", "'Navigator'", "'Wrestler'")>>
+		<<set $nickname = either("'Apia'", "'Navigator'", "'Samoan'", "'Wrestler'")>>
 	<<case "São Toméan">>
-		<<set $nickname = either("'Príncipe'", "'Roças'", "'Santomean'")>>
+		<<set $nickname = either("'Cocoa'", "'Príncipe'", "'Roças'", "'Santomean'", "'São Toméan'")>>
 	<<case "Saudi">>
-		<<set $nickname = either("'Al Qaeda'", "'Burqa'", "'Mecca'", "'Riyadh'", "'Sandy'", "'Saudi Arabian'")>>
+		<<set $nickname = either("'Al Qaeda'", "'Burqa'", "'Mecca'", "'Riyadh'", "'Sandy'", "'Saudi'", "'Saudi Arabian'")>>
 	<<case "Scottish">>
-		<<set $nickname = either("'Braveheart'", "'Edinburgh'", "'Glasgow'", "'Hadrian'", "'Jock'", "'Lass'", "'Ned'", "'Nessie'", "'Scot'", "'Teuchter'", "'Unicorn'")>>
+		<<set $nickname = either("'Braveheart'", "'Edinburgh'", "'Glasgow'", "'Hadrian'", "'Jock'", "'Lass'", "'Ned'", "'Nessie'", "'Scot'", "'Scotswoman'", "'Scottish'", "'Teuchter'", "'Unicorn'")>>
 	<<case "Senegalese">>
-		<<set $nickname = either("'Dakar'", "'Our Boat'", "'Wolof'")>>
+		<<set $nickname = either("'Casamance'", "'Dakar'", "'Our Boat'", "'Senegalese'", "'Wolof'")>>
 	<<case "Serbian">>
-		<<set $nickname = either("'Belgrade'", "'Picka'", "'Remove Kebab'", "'Serb'")>>
+		<<set $nickname = either("'Belgrade'", "'Picka'", "'Remove Kebab'", "'Serb'", "'Serbian'", "'Shkije'", "'Vlach'")>>
 	<<case "Seychellois">>
-		<<set $nickname = either("'Seabird'", "'Seselwa'", "'Victoria'")>>
+		<<set $nickname = either("'Seabird'", "'Seselwa'", "'Seychellois'", "'Victoria'")>>
 	<<case "Sierra Leonean">>
-		<<set $nickname = either("'Blood Diamond'", "'Freetown'", "'Hut Tax'")>>
+		<<set $nickname = either("'Blood Diamond'", "'Freetown'", "'Hut Tax'", "'Sierra Leonean'")>>
 	<<case "Singaporean">>
-		<<set $nickname = either("'Bedok'", "'Merlion'", "'Raffles'")>>
+		<<set $nickname = either("'Bedok'", "'Merlion'", "'Raffles'", "'Singaporean'")>>
 	<<case "Slovak">>
-		<<set $nickname = either("'Bratislava'", "'Bzdocha'", "'Shlapka'", "'Slovakian'")>>
+		<<set $nickname = either("'Bratislava'", "'Bzdocha'", "'Shlapka'", "'Slovak'", "'Slovakian'", "'Velvet'")>>
 	<<case "Slovene">>
-		<<set $nickname = either("'Ljubljana'", "'Prince's Stone'", "'Slovenian'")>>
+		<<set $nickname = either("'Ljubljana'", "'Prince's Stone'", "'Slovene'", "'Slovenian'")>>
 	<<case "a Solomon Islander">>
-		<<set $nickname = either("'Guadalcanal'", "'Honiara'", "'Solomon'")>>
+		<<set $nickname = either("'Guadalcanal'", "'Honiara'", "'Solomon'", "'Solomon Islander'")>>
 	<<case "Somali">>
-		<<set $nickname = either("'Black Hawk Down'", "'Mogadishu'", "'Skinnie'", "'Somalian'", "'The Captain Now'")>>
+		<<set $nickname = either("'Black Hawk Down'", "'Mogadishu'", "'Skinnie'", "'Somali'", "'Somalian'", "'The Captain Now'")>>
 	<<case "South African">>
-		<<set $nickname = either("'Afrikaner'", "'Apartheid'", "'Boer'", "'Cape Town'", "'Johannesburg'", "'Mandela'", "'Saffer'", "'Shaka'", "'Springbok'")>>
+		<<set $nickname = either("'Afrikaner'", "'Apartheid'", "'Boer'", "'Cape Town'", "'Johannesburg'", "'Mandela'", "'Saffer'", "'Shaka'", "'South African'", "'Springbok'")>>
+	<<case "South Sudanese">>
+		<<set $nickname = either("'Anyanya'", "'Juba'", "'Nilotic'", "'Nuba'", "'South Sudanese'", "'Sudd'")>>
 	<<case "Spanish">>
-		<<set $nickname = either("'Barcelona'", "'Jamon'", "'Madrid'", "'Monja'", "'Senora'", "'Siesta'", "'Spaniard'", "'Toreadora'")>>
+		<<set $nickname = either("'Barcelona'", "'Castellana'", "'Castilian'", "'Español'", "'Franco'", "'Gallega'", "'Jamon'", "'Madrid'", "'Monja'", "'Peninsular'", "'Senora'", "'Siesta'", "'Spaniard'", "'Spanish'", "'Toreadora'", "'Xarnega'")>>
 	<<case "Sri Lankan">>
-		<<set $nickname = either("'Ceylon'", "'Colombo'", "'Kotte'")>>
+		<<set $nickname = either("'Ceylon'", "'Colombo'", "'Kotte'", "'Sri Lankan'", "'Tamil'")>>
 	<<case "Sudanese">>
-		<<set $nickname = either("'Gordon's Revenge'", "'Khartoum'", "'Nubian'", "'Omdurman'")>>
+		<<set $nickname = either("'Darfur'", "'Gordon's Revenge'", "'Khartoum'", "'Nubian'", "'Omdurman'")>>
 	<<case "Surinamese">>
-		<<set $nickname = either("'Bouterse'", "'Paramaribo'", "'Surinam'")>>
+		<<set $nickname = either("'Bouterse'", "'Paramaribo'", "'Surinam'", "'Surinamese'")>>
 	<<case "Swazi">>
-		<<set $nickname = either("'Eswatini'", "'Lobamba'", "'Mbabane'")>>
+		<<set $nickname = either("'Eswatini'", "'Lobamba'", "'Mbabane'", "'Swazi'")>>
 	<<case "Swedish">>
-		<<set $nickname = either("'Ikea'", "'Norse'", "'Stockholm'", "'Swede'", "'Sweden Yes'")>>
+		<<set $nickname = either("'Ikea'", "'Norse'", "'Stockholm'", "'Swede'", "'Sweden Yes'", "'Swedish'")>>
 	<<case "Swiss">>
-		<<set $nickname = either("'Alpine'", "'Banker'", "'Geneva'", "'Neutral'", "'Numbered Account'", "'Schlampe'", "'Swiss Miss'", "'Zurich'")>>
+		<<set $nickname = either("'Alpine'", "'Banker'", "'Geneva'", "'Neutral'", "'Numbered Account'", "'Schlampe'", "'Swiss'", "'Swiss Miss'", "'Zurich'")>>
 	<<case "Syrian">>
-		<<set $nickname = either("'Aleppo'", "'Assad'", "'Damascus'")>>
+		<<set $nickname = either("'Aleppo'", "'Assad'", "'Damascus'", "'Syrian'")>>
 	<<case "Taiwanese">>
-		<<set $nickname = either("'Chiang'", "'Formosa'", "'Kuomintang'", "'Taipei'")>>
+		<<set $nickname = either("'Chiang'", "'Formosa'", "'Kuomintang'", "'Taipei'", "'Taiwanese'")>>
 	<<case "Tajik">>
-		<<set $nickname = either("'Dushanbe'", "'Rahmon'", "'Sarazm'")>>
+		<<set $nickname = either("'Dushanbe'", "'Rahmon'", "'Sarazm'", "'Tajik'", "'Tajikistani'")>>
 	<<case "Tanzanian">>
-		<<set $nickname = either("'Dar es Salaam'", "'Dodoma'", "'Wilderness'", "'Zanzibar'")>>
+		<<set $nickname = either("'Dar es Salaam'", "'Dodoma'", "'Tanzanian'", "'Wilderness'", "'Zanzibar'")>>
 	<<case "Thai">>
-		<<set $nickname = either("'Bangcock'", "'Bangkok'", "'Ladyboy'", "'Pattaya'", "'T-Girl'")>>
+		<<set $nickname = either("'Bangcock'", "'Bangkok'", "'Ladyboy'", "'Pattaya'", "'Siamese'", "'T-Girl'", "'Thai'")>>
 	<<case "Tibetan">>
-		<<set $nickname = either("'Dalai Lama'", "'Himalayan'", "'Lhasa'")>>
+		<<set $nickname = either("'Chinese'", "'Dalai Lama'", "'Himalayan'", "'Lhasa'", "'Tibetan'")>>
 	<<case "Togolese">>
-		<<set $nickname = either("'Eyadéma'", "'Lomé'", "'Togoland'")>>
+		<<set $nickname = either("'Eyadéma'", "'Lomé'", "'Togoland'", "'Togolese'")>>
 	<<case "Tongan">>
-		<<set $nickname = either("'Friendly'", "'Nuku'alofa'", "'Tu'i Tonga'")>>
+		<<set $nickname = either("'Friendly'", "'Nuku'alofa'", "'Tongan'", "'Tu'i Tonga'")>>
 	<<case "Trinidadian">>
-		<<set $nickname = either("'Chaguanas'", "'Tobago'", "'Trini'")>>
+		<<set $nickname = either("'Chaguanas'", "'Port of Spain'", "'San Fernando'", "'Tobago'", "'Tobagonian'", "'Trini'", "'Trinbagonian'", "'Trinidadian'")>>
 	<<case "Tunisian">>
-		<<set $nickname = either("'Barbary'", "'Carthaginian'", "'Ifriqiya'", "'Punic'")>>
+		<<set $nickname = either("'Barbary'", "'Bourguiba'", "'Carthaginian'", "'Ifriqiya'", "'Punic'", "'Tunis'", "'Tunisian'")>>
 	<<case "Turkish">>
-		<<set $nickname = either("'Ankara'", "'Harem'", "'Istanbul'", "'Kebab'", "'Ottoman'", "'Turk'", "'Turkette'", "'Turkish'", "'Turksmell'", "'ErdoÄŸan'")>>
+		<<set $nickname = either("'Ankara'", "'ErdoÄŸan'", "'Harem'", "'Istanbul'", "'Kebab'", "'Ottoman'", "'Turk'", "'Turkette'", "'Turkish'", "'Turksmell'", "'Young Turk'")>>
 	<<case "Turkmen">>
-		<<set $nickname = either("'Ashgabat'", "'Karakum'", "'Merv'")>>
+		<<set $nickname = either("'Ashgabat'", "'Karakum'", "'Merv'", "'Niyazov'", "'Turkmen'")>>
 	<<case "Tuvaluan">>
-		<<set $nickname = either("'Ellice'", "'Funafuti'", "'Nui'")>>
+		<<set $nickname = either("'Ellice'", "'Funafuti'", "'Nui'", "'Tuvaluan'")>>
 	<<case "Ugandan">>
-		<<set $nickname = either("'Bushbaby'", "'Cannibal'", "'Kampala'")>>
+		<<set $nickname = either("'Amin'", "'Buganda'", "'Bushbaby'", "'Cannibal'", "'Kampala'", "'Museveni'", "'Ugandan'")>>
 	<<case "Ukrainian">>
-		<<set $nickname = either("'Chernobyl'", "'Chiki Briki'", "'Cossack'", "'Crimea'", "'Donbass'", "'Euromaidan'", "'Hohlina'", "'Hohlushka'", "'Khokhol'", "'Kiev'", "'Kyiv'", "'Radioactive'", "'Salo'", "'Stalker'", "'Suchka'", "'Suka'", "'Svoboda'", "'Bandera'", "'Shlyukha'", "'Ukrop'")>>
+		<<set $nickname = either("'Chernobyl'", "'Chiki Briki'", "'Cossack'", "'Crimea'", "'Donbass'", "'Euromaidan'", "'Hohlina'", "'Hohlushka'", "'Khokhol'", "'Kiev'", "'Kyiv'", "'Radioactive'", "'Salo'", "'Stalker'", "'Suchka'", "'Suka'", "'Svoboda'", "'Bandera'", "'Shlyukha'", "'Ukrainian'", "'Ukrop'")>>
 	<<case "Uruguayan">>
-		<<set $nickname = either("'Bordaberry'", "'Garra Charrúa'", "'Montevideo'")>>
+		<<set $nickname = either("'Bordaberry'", "'Charrúa'", "'Garra Charrúa'", "'Montevideo'", "'Uruguayan'")>>
 	<<case "Uzbek">>
-		<<set $nickname = either("'Samarkand'", "'Silk Road'", "'Steppe Princess'", "'Steppe Queen'", "'Tashkent'")>>
+		<<set $nickname = either("'Samarkand'", "'Silk Road'", "'Steppe Princess'", "'Steppe Queen'", "'Tashkent'", "'Uzbek'", "'Uzbekistani'")>>
 	<<case "Vatican">>
-		<<set $nickname = either("'Catholic'", "'Holy See'", "'Pope Joan'", "'Swiss Guard'")>>
+		<<set $nickname = either("'Catholic'", "'Holy See'", "'Pope Joan'", "'Swiss Guard'", "'Vatican'")>>
 	<<case "Venezuelan">>
-		<<set $nickname = either("'Caracas'", "'Chavista'", "'Chola'", "'Revolutionary'", "'Socialist'")>>
+		<<set $nickname = either("'Bolívar'", "'Caracas'", "'Chavista'", "'Chola'", "'Revolutionary'", "'Socialist'", "'Venezuelan'")>>
 	<<case "Vietnamese">>
-		<<set $nickname = either("'Charlie'", "'VC'", "'Saigon'", "'Hanoi'", "'Me Love You Long Time'", "'Me So Horny'", "'Victor Charlie'", "'Viet'", "'Yuon'")>>
+		<<set $nickname = either("'Charlie'", "'Hanoi'", "'Ho Chi'", "'Me Love You Long Time'", "'Me So Horny'", "'Saigon'", "'VC'", "'Victor Charlie'", "'Viet Cong'", "'Viet'", "'Vietnamese'", "'Yuon'")>>
 	<<case "Vincentian">>
-		<<set $nickname = either("'Grenadine'", "'Kingstown'", "'Vincy'")>>
+		<<set $nickname = either("'Grenadine'", "'Kingstown'", "'Vincentian'", "'Vincy'")>>
 	<<case "Yemeni">>
-		<<set $nickname = either("'Khat'", "'Red Sea Pirate'", "'Queen of the Desert'")>>
+		<<set $nickname = either("'Khat'", "'Queen of the Desert'", "'Red Sea Pirate'", "'Sana'a'", "'Sheba'", "'Yemeni'")>>
 	<<case "Zairian">>
-		<<set $nickname = either("'Bongo'", "'Diamond'", "'Ebola'", "'Kinshasa'")>>
+		<<set $nickname = either("'Bongo'", "'Congolese'", "'Diamond'", "'Ebola'", "'Katanga'", "'Kinshasa'", "'Leopold'", "'Zairean'", "'Zairian'")>>
 	<<case "Zambian">>
-		<<set $nickname = either("'Livingstone'", "'Lusaka'", "'Victoria Falls'")>>
+		<<set $nickname = either("'Livingstone'", "'Lusaka'", "'Victoria Falls'", "'Zambian'")>>
 	<<case "Zimbabwean">>
 	    <<if $activeSlave.race == "white">>
-	        <<set $nickname = either("'Bush War'", "'Rhodie'", "'Salisbury'")>>
+	        <<set $nickname = either("'Altena'", "'Bush War'", "'Rhodesian'", "'Rhodie'", "'Salisbury'", "'Zimbabwean'")>>
 	    <<else>>
-	    	<<set $nickname = either("'Bobojan'", "'Grimmy'", "'Harare'", "'Kaffir'", "'Mugabe'", "'Mujiba'", "'Nyombie'", "'Zimbo'")>>
+	    	<<set $nickname = either("'Bobojan'", "'Chimurenga'", "'Grimmy'", "'Harare'", "'Kaffir'", "'Mugabe'", "'Mujiba'", "'Nyombie'", "'Zimbabwean'", "'Zimbo'")>>
 	    <</if>>
 	<<default>>
-		<<set $nickname = either("'International'", "'Refugee'", "'Stateless'")>>
+		<<set $nickname = either("'International'", "'Nomad'", "'Refugee'", "'Stateless'")>>
 	<</switch>>
-	<<set $situationDesc = "is $activeSlave.nationality. The slave trade is truly international, and no nation is unrepresented among the masses of sex slaves passed from hand to hand like the chattel they are. Most of the old nations are struggling, and even those still in great shape often find their citizens emigrating to the Free Cities. Some of these emigres do well, and others become human livestock.">>
+	<<set $situationDesc = "is $activeSlave.nationality. The slave trade is truly international, and no nation is unrepresented among the masses of sex slaves passed from hand to hand like the chattel they are. Most of the old nations are struggling, and even those still in great shape often find their citizens emigrating to the Free Cities. Some of these émigrés do well, and others become human livestock.">>
 	<<set $applyDesc = "is a little proud of her national nickname, as a reminder of who she was and a mark that she still has an identity.">>
 	<<set $notApplyDesc = "realizes that her new identity is truly stateless. In the Free Cities, it does not matter where a slave is from, so long as that slave has value. All slaves belong to the singular nation of the owned, the subordinated, the fucked.">>
 
 <<case "white">>
-	<<set $nickname = either("'Casper'", "'Caucasian'", "'Caucasoid'", "'Cracker'", "'Cumskin'", "'Dixie'", "'Down Home'", "'Duchess'", "'Euro Trash'", "'Europa'", "'European'", "'Farang'", "'Grits'", "'Gweilo'", "'Hick'", "'Hillbilly'", "'Hollywood'", "'Honky'", "'Ice Monkey'", "'Ice Queen'", "'Mayo'", "'Memphis'", "'Pale'", "'Paleface'", "'Pasty'", "'Peckerwood'", "'Princess'", "'Snowflake'", "'Top Dollar'", "'Valley Girl'", "'Vanilla'", "'Vegas'", "'White Bread'", "'White Devil'", "'White Trash'", "'White'", "'Whitey'", "'Wigger'", "'Yankee'")>>
+	<<set $nickname = either("'Ang Mo'", "'Casper'", "'Caucasian'", "'Caucasoid'", "'Cracker'", "'Cumskin'", "'Dixie'", "'Down Home'", "'Duchess'", "'Euro Trash'", "'Europa'", "'European'", "'Farang'", "'Grits'", "'Gweilo'", "'Hick'", "'Hillbilly'", "'Hollywood'", "'Honky'", "'Ice Monkey'", "'Ice Queen'", "'Mayo'", "'Memphis'", "'Pale'", "'Paleface'", "'Pasty'", "'Peckerwood'", "'Princess'", "'Snowflake'", "'Top Dollar'", "'Valley Girl'", "'Vanilla'", "'Vegas'", "'White Bread'", "'White Devil'", "'White Trash'", "'White'", "'Whitey'", "'Wigger'", "'Yankee'")>>
 	<<set $situationDesc = "is white, which is not uncommon given the collapse of many erstwhile first world nations into depression and the proximity of many Free Cities to majority white areas. Slaves casually reference race as much or more than free citizens. They absorb the racial peccadilloes of their owners, and many of them bring prejudices from the old world into their slave lives.">>
 	<<set $applyDesc = "now has a constant reminder that as a sex slave she is judged on her appearance first.">>
 	<<set $notApplyDesc = "may feel some gratitude due to your preference that she not be defined by her ethnicity, but this is counterbalanced by the increased independence your kindness inspires.">>
@@ -693,25 +698,25 @@
 	<<set $notApplyDesc = "may feel some gratitude due to your preference that she not be defined by her ethnicity, but this is counterbalanced by the increased independence your kindness inspires.">>
 
 <<case "indo-aryan">>
-	<<set $nickname = either("'Babu'", "'Bhabhi'", "'Bindi'", "'Bollywood'", "'Brown'", "'Curry Muncher'", "'Desi'", "'Dothead'", "'Durga'", "'Gypsy'", "'Indian'", "'Indo-Aryan'", "'Kali Maa'", "'Kama Sutra'", "'Kaur'", "'Mughal'", "'Sati'", "'Sepoy'", "'Shanti'", "'Sim Sim Salabim'", "'Snake Charmer'", "'Subcontinental'", "'Swami'", "'Tigress'", "'Untouchable'", "'Yoga'", "'Zoroastrian'")>>
+	<<set $nickname = either("'Aryan'", "'Babu'", "'Bhabhi'", "'Bindi'", "'Bollywood'", "'Brown'", "'Chandala'", "'Curry Muncher'", "'Desi'", "'Dothead'", "'Durga'", "'Gyp'", "'Gypsy'", "'Indian'", "'Indo-Aryan'", "'Kali Maa'", "'Kama Sutra'", "'Kaur'", "'Mughal'", "'Sati'", "'Sepoy'", "'Shanti'", "'Sim Sim Salabim'", "'Snake Charmer'", "'Subcontinental'", "'Swami'", "'Tigress'", "'Untouchable'", "'Yoga'", "'Zoroastrian'", "'Zott'")>>
 	<<set $situationDesc = "is indo-aryan, which is not uncommon given the poverty in many majority indo-aryan countries, and the near-submersion of some others due to rising sea levels. Slaves casually reference race as much as free citizens. Slaves casually reference race as much or more than free citizens. They absorb the racial peccadilloes of their owners, and many of them bring prejudices from the old world into their slave lives.">>
 	<<set $applyDesc = "now has a constant reminder that as a sex slave she is judged on her appearance first.">>
 	<<set $notApplyDesc = "may feel some gratitude due to your preference that she not be defined by her ethnicity, but this is counterbalanced by the increased independence your kindness inspires.">>
 
 <<case "middle eastern">>
-	<<set $nickname = either("'Arab'", "'Arabian Nights'", "'Arabush'", "'Bibi'", "'Bougnoule'", "'Caliph'", "'Camel Jockey'", "'Chai Girl'", "'Desert Sun'", "'Dune Coon'", "'Dune'", "'Durka Durka'", "'Flying Carpet'", "'Halal'", "'Harem Girl'", "'Hijabi'", "'Jasmine'", "'Kebab'", "'Middle Eastern'", "'Moromierda'", "'Raghead'", "'Sand Nigger'", "'Sand'", "'Sandy'", "'Scheherazade'", "'Soosmar-Khor'", "'Third Wife'", "'Towelhead'")>>
+	<<set $nickname = either("'Arab'", "'Arabian'", "'Arabian Nights'", "'Arabush'", "'Bibi'", "'Bougnoule'", "'Caliph'", "'Camel Jockey'", "'Chai Girl'", "'Desert Sun'", "'Dune Coon'", "'Dune'", "'Durka Durka'", "'Flying Carpet'", "'Halal'", "'Harem Girl'", "'Hijabi'", "'Jasmine'", "'Kebab'", "'Middle Eastern'", "'Moromierda'", "'Raghead'", "'Sand Nigger'", "'Sand'", "'Sandy'", "'Scheherazade'", "'Soosmar-Khor'", "'Third Wife'", "'Towelhead'")>>
 	<<set $situationDesc = "is middle eastern, which is not uncommon given the interminable wars and disruptions in that part of the world. Slaves casually reference race as much or more than free citizens. They absorb the racial peccadilloes of their owners, and many of them bring prejudices from the old world into their slave lives.">>
 	<<set $applyDesc = "now has a constant reminder that as a sex slave she is judged on her appearance first.">>
 	<<set $notApplyDesc = "may feel some gratitude due to your preference that she not be defined by her ethnicity, but this is counterbalanced by the increased independence your kindness inspires.">>
 
 <<case "mixed race">>
-	<<set $nickname = either("'Colonial'", "'Colored'", "'Creole'", "'Diverse'", "'Diversity'", "'Hāfu'", "'Half and Half'", "'Half-breed'", "'Half-caste'", "'Integration'", "'Interracial'", "'Melting Pot'", "'Melungeon'", "'Mestiza'", "'Miscegenation'", "'Mixed Race'", "'Mixed'", "'Mongrel'", "'Mulatto'", "'Multiracial'", "'Mutt'", "'Octaroon'", "'Pardo'", "'Quadroon'", "'Zambo'")>>
+	<<set $nickname = either("'Chola'", "'Colonial'", "'Colored'", "'Creole'", "'Diverse'", "'Diversity'", "'Hāfu'", "'Half and Half'", "'Half-breed'", "'Half-caste'", "'Integration'", "'Interracial'", "'Melting Pot'", "'Melungeon'", "'Mestiza'", "'Miscegenation'", "'Mixed Race'", "'Mixed'", "'Mongrel'", "'Mulatto'", "'Multiracial'", "'Mutt'", "'Octaroon'", "'Pardo'", "'Quadroon'", "'Zambo'")>>
 	<<set $situationDesc = "is mixed race, an ethnic makeup that has always been a target for abuse. Slaves of all races can find something about her to dislike. They absorb the racial peccadilloes of their owners, and many of them bring prejudices from the old world into their slave lives.">>
 	<<set $applyDesc = "now has a constant reminder that as a sex slave she is judged on her appearance first.">>
 	<<set $notApplyDesc = "may feel some gratitude due to your preference that she not be defined by her ethnicity, but this is counterbalanced by the increased independence your kindness inspires.">>
 
 <<case "semitic">>
-	<<set $nickname = either("'Abie'", "'Abrahamic'", "'Baal Worshipper'", "'Biblical'", "'Canaanite'", "'Dead Sea'", "'Golden Calf'", "'Good Samaritan'", "'Hebrew'", "'Heeb'", "'Holy land'", "'Hymie'", "'Inanna'", "'Ishtar'", "'Kike'", "'Kosher'", "'Lilith'", "'Lost Ark'", "'Nephilim'", "'Oven Dodger'", "'Oy Vey'", "'Philistine'", "'Qedesha'", "'Red Sea'", "'Salome'", "'Semite'", "'Semitic'", "'Sheeny'", "'Shylock'", "'Sodom and Gomorrah'", "'Whore of Babylon'", "'Yid'")>>
+	<<set $nickname = either("'Abie'", "'Abrahamic'", "'Baal Worshipper'", "'Biblical'", "'Canaanite'", "'Dead Sea'", "'Golden Calf'", "'Good Samaritan'", "'Hebrew'", "'Heeb'", "'Holy land'", "'Hymie'", "'Inanna'", "'Ishtar'", "'Kike'", "'Kosher'", "'Levantine'", "'Lilith'", "'Lost Ark'", "'Nephilim'", "'Oven Dodger'", "'Oy Vey'", "'Philistine'", "'Qedesha'", "'Red Sea'", "'Salome'", "'Semite'", "'Semitic'", "'Sheeny'", "'Shylock'", "'Sodom and Gomorrah'", "'Whore of Babylon'", "'Yid'")>>
 	<<set $situationDesc = "is semitic, which is not uncommon given the many conflicts in countries with semitic minorities. Slaves casually reference race as much or more than free citizens. They absorb the racial peccadilloes of their owners, and many of them bring prejudices from the old world into their slave lives.">>
 	<<set $applyDesc = "now has a constant reminder that as a sex slave she is judged on her appearance first.">>
 	<<set $notApplyDesc = "may feel some gratitude due to your preference that she not be defined by her ethnicity, but this is counterbalanced by the increased independence your kindness inspires.">>
@@ -729,7 +734,7 @@
 	<<set $notApplyDesc = "may feel some gratitude due to your preference that she not be defined by her ethnicity, but this is counterbalanced by the increased independence your kindness inspires.">>
 
 <<case "pacific islander">>
-	<<set $nickname = either("'Aloha'", "'Austronesian'", "'Boonga'", "'Breadfruit'", "'Coconut'", "'Conch Blower'", "'Grass Skirt'", "'Hori'", "'Hula Girl'", "'Islander'", "'Kanaka'", "'Melanesian'", "'Micronesian'", "'Longpig'", "'Outrigger'", "'Pacific Islander'", "'Pacific'", "'Paradise'", "'Pineapple'", "'Polynesian'", "'Sea'", "'Seashell'", "'South Pacific'", "'Tiki Torch'")>>
+	<<set $nickname = either("'Aloha'", "'Antipodean'", "'Austronesian'", "'Boonga'", "'Breadfruit'", "'Coconut'", "'Conch Blower'", "'Grass Skirt'", "'Hori'", "'Hula Girl'", "'Islander'", "'Kanaka'", "'Melanesian'", "'Micronesian'", "'Longpig'", "'Outrigger'", "'Pacific Islander'", "'Pacific'", "'Paradise'", "'Pineapple'", "'Polynesian'", "'Sea'", "'Seashell'", "'South Pacific'", "'Tiki Torch'")>>
 	<<set $situationDesc = "is a pacific islander, which is not uncommon given wholesale destruction of many countries in that area by the worsening climate. Slaves casually reference race as much or more than free citizens. They absorb the racial peccadilloes of their owners, and many of them bring prejudices from the old world into their slave lives.">>
 	<<set $applyDesc = "now has a constant reminder that as a sex slave she is judged on her appearance first.">>
 	<<set $notApplyDesc = "may feel some gratitude due to your preference that she not be defined by her ethnicity, but this is counterbalanced by the increased independence your kindness inspires.">>
@@ -753,19 +758,19 @@
 	<<set $notApplyDesc = "is a little grateful you've decided to protect her from the other slaves' mockery of her sore little asshole. She still wants to get better at buttsex, for her own sake.">>
 
 <<case "girlish">>
-	<<set $nickname = either("'Ano'", "'Girlish'", "'Girly'", "'Missie'", "'Runway'", "'Slender'", "'Slip'", "'Supermodel'", "'Tomboy'", "'Toothpick'", "'Zero'")>>
+	<<set $nickname = either("'Ano'", "'Girlish'", "'Girly'", "'Missie'", "'Runway'", "'Slender'", "'Slip'", "'Slim'", "'Supermodel'", "'Thin'", "'Tomboy'", "'Toothpick'", "'Zero'")>>
 	<<set $situationDesc = "has a trim form: her assets are quite modest. The slave society of the Free Cities tends to follow average male desires, which is to say that many slaves find themselves augmented to very large proportions. It's natural that slaves required to carry such burdens should resent her.">>
 	<<set $applyDesc = "is prouder of her lithe form that she was before, and is a little relieved at the added evidence that you don't plan to give her major implants any time soon.">>
 	<<set $notApplyDesc = "realizes that her form isn't necessarily due to some master plan and that you may see fit to change it; she begins to regard the remote surgery with apprehension.">>
 	
 <<case "flat">>
-	<<set $nickname = either("'A-Cup'", "'DFC'", "'Flat'", "'Flatty'", "'Ironing Board'", "'Itty Bitty'", "'Mosquito Bites'", "'Plank'", "'Undersized'")>>
+	<<set $nickname = either("'A-Cup'", "'DFC'", "'Flat'", "'Flatty'", "'Ironing Board'", "'Itty Bitty'", "'Mosquito Bites'", "'Pettanko'", "'Plank'", "'Undersized'")>>
 	<<set $situationDesc = "has barely any breasts to speak of, she is completely flat. The slave society of the Free Cities tends to follow average male desires, which is to say that many slaves find themselves carrying comically oversized breasts. It's natural that slaves required to carry such burdens should resent her.">>
 	<<set $applyDesc = "further believes that chests should be deliciously flat, and is a little relieved at the added evidence that you don't plan to give her breasts the size of her head any time soon.">>
 	<<set $notApplyDesc = "realizes that her form isn't necessarily due to some master plan and that you may see fit to change it; she begins to regard the remote surgery with apprehension.">>
 
 <<case "loose">>
-	<<set $nickname = either("'Accommodating'", "'Gaping'", "'Loose'", "'Loosey Goosey'", "'Noisy'", "'Open'", "'Relaxed'", "'Size Queen'", "'Sloppy'", "'Used'", "'Welcoming'")>>
+	<<set $nickname = either("'Accommodating'", "'Gaping'", "'Hallway'", "'Loose'", "'Loosey Goosey'", "'Noisy'", "'Open'", "'Relaxed'", "'Size Queen'", "'Slit'", "'Sloppy'", "'Used'", "'Welcoming'", "'Wideopen'")>>
 	<<set $situationDesc = "has taken a lot of dick. Enough dick that her overused holes really show the mileage. She can take the largest cock without a sigh.">>
 	<<set $applyDesc = "is proud of her mileage, now that you've countenanced adding it to your name. Every cock she's taken, she's taken at your command.">>
 	<<set $notApplyDesc = "realizes that she isn't special just because she's been fucked so much, and understands that she'll have to do her best to fuck like a fresh teenager no matter how loose she gets.">>
@@ -777,19 +782,19 @@
 	<<set $notApplyDesc = "will do her best to serve as a nice little sex slave without explicit reference to how she's put together, or she'll be punished.">>
 
 <<case "micropenis">>
-	<<set $nickname = either("'Baby Dick'", "'Bitchdick'", "'Boyclit'", "'Gherkin'", "'Inchworm'", "'Little Dick'", "'Micropenis'", "'Teenie Weenie'", "'Tiny'")>>
+	<<set $nickname = either("'Baby Dick'", "'Bitchdick'", "'Boyclit'", "'Gherkin'", "'Inchworm'", "'Little Dick'", "'Micro'", "'Micropenis'", "'Teenie Weenie'", "'Tiny'")>>
 	<<set $situationDesc = "is a Free Cities sex slave, which makes her female. It's not immediately obvious from many angles that she wasn't born that way, since her penis is almost comically small. For her, penetrative sex would be very limited, even if she weren't a Free Cities slave and therefore a perpetual receptacle for dick.">>
 	<<set $applyDesc = "accepts the implicit mockery.">>
 	<<set $notApplyDesc = "is a little relieved to be protected from the mockery, even though her tiny endowment mocks her as it flops around whenever she's used.">>
 
 <<case "implants">>
-	<<set $nickname = either("'Balloons'", "'Blowup Doll'", "'Bolted-On'", "'Implants'", "'Plastic'", "'Plastique'", "'Silicone'")>>
+	<<set $nickname = either("'Balloons'", "'Blowup Doll'", "'Bolted-On'", "'Enhanced'", "'Fake'", "'Implants'", "'Plastic'", "'Plastique'", "'Silicone'")>>
 	<<set $situationDesc = "is full of breast implants. They're so large it's quite obvious they're fake, and the implications are clear: She's a plastic slut, and the other slaves never tire of letting her know it.">>
 	<<set $applyDesc = "accepts the implicit mockery, knowing that her bimbo-esque body is what appeals to <<if def $PC.customTitle>>her $PC.customTitle<<elseif $PC.title != 0>>her master<<else>>her mistress<</if>>.">>
 	<<set $notApplyDesc = "is relieved to be protected from the other slaves' mockery over her implants, though she's also a little sad she can't take them as a kind of trademark.">>
 
 <<case "bimbo">>
-	<<set $nickname = either("'Barbie'", "'Bimbo'", "'Blowup Doll'", "'Brain Dead'", "'Fuck Toy'", "'Fuckmeat'", "'Plastic'", "'Plastique'", "'Silicone'")>>
+	<<set $nickname = either("'Barbie'", "'Bimbo'", "'Blowup Doll'", "'Brain Dead'", "'Fuck Toy'", "'Fuckmeat'", "'Plastic'", "'Plastique'", "'Sex Doll'", "'Silicone'")>>
 	<<set $situationDesc = "is full of implants, and stupid beyond stupid. It's obvious she's fake, and her idiocy only confirms it: She's a bimbo slut, and the other slaves never tire of mocking her for it, not caring that she doesn't notice.">>
 	<<set $applyDesc = "doesn't notice the mockery, only that she now has a cute little nickname.">>
 	<<set $notApplyDesc = "would be thankful for this protection from the other slaves' mockery if she saw it as such, or was smart enough to notice it.">>
@@ -807,25 +812,25 @@
 	<<set $notApplyDesc = "accepts that her intellect is merely of slight interest.">>
 
 <<case "chubby">>
-	<<set $nickname = either("'Ample'", "'Bloated'", "'Chubby'", "'Chunky'", "'Double Wide'", "'Feedee'", "'Hambeast'", "'Jabba'", "'Jiggles'", "'Jiggly'", "'Jumbo'", "'Landwhale'", "'Plump'", "'Plush'", "'Rotund'", "'Rubenesque'", "'Thicc'", "'Tubby'", "'Whale'")>>
+	<<set $nickname = either("'Ample'", "'BBW'", "'Bloated'", "'Chubby'", "'Chubster'", "'Chunky'", "'Double Wide'", "'Fat'", "'Feedee'", "'Hambeast'", "'Jabba'", "'Jiggles'", "'Jiggly'", "'Jumbo'", "'Landwhale'", "'Plump'", "'Plush'", "'Rotund'", "'Rubenesque'", "'Thicc'", "'Tubby'", "'Whale'")>>
 	<<set $situationDesc = "is carrying a little extra weight. The cruelty of life as a slave increases your property's willingness to do cruelty where they can get away with it - what is passed to them, they pass to others - so she finds herself mocked for her size.">>
 	<<set $applyDesc = "knows that being fat makes her less valuable on the market, but she begins to accept that she's going to have to put up with being chubby for now.">>
 	<<set $notApplyDesc = "believes that this means she's going to have to lose weight soon, causing her some trepidation.">>
 	
 <<case "fat">>
-	<<set $nickname = either("'Baluga'", "'Bed Breaker'", "'Bloated'", "'Buffet Closer'", "'Double Wide'", "'Fat'", "'Fatass'", "'Fatso'", "'Fatty'", "'Feedee'", "'Hambeast'", "'Jabba'", "'Jiggles'", "'Jiggly'", "'Jumbo'", "'Lap Crusher'", "'Lardy'", "'Piggy'", "'Roller'", "'Scale Breaker'", "'Smothers'", "'Thud'", "'Whale'")>>
+	<<set $nickname = either("'Baluga'", "'Bed Breaker'", "'Blimp'", "'Bloated'", "'Buffet Closer'", "'Cow'", "'Double Wide'", "'Fat'", "'Fatass'", "'Fatso'", "'Fatty'", "'Feedee'", "'Hambeast'", "'Jabba'", "'Jiggles'", "'Jiggly'", "'Jumbo'", "'Lap Crusher'", "'Lardy'", "'Piggy'", "'Roller'", "'Scale Breaker'", "'Smothers'", "'SSBBW'", "'Thud'", "'Whale'")>>
 	<<set $situationDesc = "is carrying a lot of extra weight. The cruelty of life as a slave increases your property's willingness to do cruelty where they can get away with it - what is passed to them, they pass to others - so she finds herself mocked for her size.">>
 	<<set $applyDesc = "knows that being obese makes her less valuable on the market, but she begins to accept that she's going to have to put up with being fat for now.">>
 	<<set $notApplyDesc = "believes that this means she's going to have to lose a lot of weight soon, causing her some trepidation, though deep down she hopes you'll just have it sucked out instead of making her run.">>
 
 <<case "muscles">>
-	<<set $nickname = either("'Amazon'", "'Gargantua'", "'Giant'", "'Gunshow'", "'Gymrat'", "'Muscle Barbie'", "'Muscles'", "'Prepare Yourself'", "'She-Hulk'", "'Snu-Snu'", "'Tank'", "'Wonder Woman'")>>
+	<<set $nickname = either("'Amazon'", "'Gargantua'", "'Giant'", "'Gunshow'", "'Gymrat'", "'Huge'", "'Muscle Barbie'", "'Muscles'", "'Prepare Yourself'", "'Ripped'", "'She-Hulk'", "'Snu-Snu'", "'Strong'", "'Tank'", "'Wonder Woman'")>>
 	<<set $situationDesc = "is a big girl. Her huge muscles aren't to everyone's taste, but they're quite eye-catching, and give her some interesting sexual possibilities that wouldn't work with, for example, a sex slave not capable of supporting her own body weight on one hand for long periods. She has become the object of mixed admiration and envy from your other stock.">>
 	<<set $applyDesc = "is happy with her nickname; any embarrassment she may have felt about looking like statuary becomes a jet of pride. She's confident that this is the way you want her.">>
 	<<set $notApplyDesc = "she is a sex slave first, last, and always, no matter what her one-rep max is.">>
 
 <<case "buttslut">>
-	<<set $nickname = either("'Anal Addict'", "'Ass Pussy'", "'Assgasm'", "'Back Door'", "'Bum-Love'", "'Butthole'", "'Buttslut'", "'Cornhole'", "'Greek'", "'Second Pussy'", "'Sodomy'", "'Sphincter'", "'Swedish'")>>
+	<<set $nickname = either("'Anal'", "'Anal Addict'", "'Ass Pussy'", "'Assgasm'", "'Back Door'", "'Bum-Love'", "'Butthole'", "'Buttslut'", "'Cornhole'", "'Greek'", "'Second Pussy'", "'Sodomy'", "'Sphincter'", "'Swedish'")>>
 	<<set $situationDesc = "loves it up the butt, and her tastes in sex are hard to miss. She's a sex slave and takes it however it's given, but honest enjoyment is hard to fake and it's pretty obvious how much fun she has when she's bent over and buttfucked. Her typical come-on is to bend over, reach around to spread her buttocks, and wink her anus by alternately clenching and relaxing her sphincter.">>
 	<<set $applyDesc = "knows that whatever the rest of her slave life holds, it will involve her slave rectum holding a lot of dick.">>
 	<<set $notApplyDesc = "understands that she'll have to take what buttsex she can get.">>
@@ -837,19 +842,19 @@
 	<<set $notApplyDesc = "understands that she'll have to take what butt play she can get.">>
 
 <<case "cumslut">>
-	<<set $nickname = either("'Bukkake'", "'Cocksucker'", "'Cumfiend'", "'Cumslut'", "'Deep Throat'", "'Facepussy'", "'Fellatio'", "'Gobbler'", "'Gokkun'", "'Guzzler'", "'Hoover'", "'Lip Service'", "'Meat Smoker'", "'No Gag Reflex'", "'Pearl Necklace'", "'Pole Smoker'", "'Semen Demon'", "'Succubus'", "'Sucker'", "'Swallows'", "'Third Pussy'", "'Throat Meat'", "'Throatclit'", "'Vacuum'", "'Vampire'")>>
+	<<set $nickname = either("'Bukkake'", "'Cocksucker'", "'Cum'", "'Cumfiend'", "'Cumslut'", "'Deep Throat'", "'Dicksuck'", "'Facepussy'", "'Fellatio'", "'Gobbler'", "'Gokkun'", "'Guzzler'", "'Hoover'", "'Lip Service'", "'Meat Smoker'", "'No Gag Reflex'", "'Pearl Necklace'", "'Pole Smoker'", "'Semen Demon'", "'Succubus'", "'Sucker'", "'Swallows'", "'Third Pussy'", "'Throat Meat'", "'Throatclit'", "'Vacuum'", "'Vampire'")>>
 	<<set $situationDesc = "loves her some cum. Most slaves have to put effort into showing enthusiasm when on their knees and presented with the second or third cock in a row. She, on the other hand, maintains such a fetish for the stuff that she'll often suck it out of other slaves' holes, if allowed.">>
 	<<set $applyDesc = "knows that as long as she's your slave, she'll get what she needs.">>
 	<<set $notApplyDesc = "understands that cum is a luxury and she'll have to savor what comes her way naturally.">>
 
 <<case "submissive">>
-	<<set $nickname = either("'Bootlicker'", "'Bottom'", "'Clinger'", "'Doormat'", "'Humble'", "'Meek'", "'Secondary'", "'Sub'", "'Submissive'")>>
+	<<set $nickname = either("'Bootlicker'", "'Bottom'", "'Clinger'", "'Doormat'", "'Fuckee'", "'Humble'", "'Meek'", "'Rapebait'", "'Secondary'", "'Sub'", "'Submissive'")>>
 	<<set $situationDesc = "loves sexual submission. Whatever she's doing, she likes to be on the bottom. She'd rather be face-fucked than suck, and would rather take a dick than ride one. Some slaves look down on her willingness to put herself even farther below others, while some envy her ability to enjoy things that they have to work to tolerate.">>
 	<<set $applyDesc = "pretends to accept her new nickname obediently, but is secretly pleased by recognition of her submissive nature.">>
 	<<set $notApplyDesc = "understands that being a submissive sex slave doesn't make her special. All sex slaves must submit.">>
 
 <<case "humiliation">>
-	<<set $nickname = either("'Attention Whore'", "'Display Model'", "'Exhibitionist'", "'Flasher'", "'Flaunter'", "'Humiliated'", "'Humiliation'", "'Nudist'", "'Pornstar'", "'Public Display'", "'Shameless'", "'Showboat'", "'Showgirl'", "'Showoff'")>>
+	<<set $nickname = either("'Attention Whore'", "'Display Model'", "'Exhibitionist'", "'Flasher'", "'Flaunter'", "'Humiliated'", "'Humiliation'", "'Nudist'", "'Pornstar'", "'Public Display'", "'Rape'", "'Rapebait'", "'Shameless'", "'Showboat'", "'Showgirl'", "'Showoff'")>>
 	<<set $situationDesc = "loves to show off. Where other slaves would blush, get embarrassed, and wish they could cover themselves, she blushes, gets aroused, and enjoys the stares. Most other slaves are jealous of her predilections. Not many slaves naturally enjoy being fucked in public, and she can get off on it.">>
 	<<set $applyDesc = "accepts her new nickname without even pretending not to enjoy it. She's proud to fuck in plain view, and she wants everyone to know it. And fuck her in plain view.">>
 	<<set $notApplyDesc = "understands that she's a sex slave first, and must fuck in private like she were fucking in public.">>
@@ -861,7 +866,7 @@
 	<<set $notApplyDesc = "understands that even though she's been fucked so much, she's still just meat; she isn't special.">>
 
 <<case "cow">>
-	<<set $nickname = either("'Bessie'", "'Cow'", "'Cowbell'", "'Creamy'", "'Dairy Queen'", "'Holstein'", "'Milk Cans'", "'Milk Factory'", "'Milk Fountain'", "'Milkmaid'", "'Milky Udders'")>>
+	<<set $nickname = either("'Bessie'", "'Bovine'", "'Cow'", "'Cowbell'", "'Creamy'", "'Dairy Queen'", "'Heifer'", "'Holstein'", "'Milk Cans'", "'Milk Factory'", "'Milk Fountain'", "'Milkmaid'", "'Milky Udders'", "'Udders'")>>
 	<<set $situationDesc = "is a good stock animal. Her body efficiently turns the cheap slave nutrition produced by your arcology into a never-ending river of rich milk.">>
 	<<set $applyDesc = "knows that her future involves many hours having her nipples gently tugged by a milking machine.">>
 	<<set $notApplyDesc = "understands that she must continue to be a good milking slave, but that such duties do not necessarily define her.">>
@@ -873,65 +878,71 @@
 	<<set $notApplyDesc = "understands that what matters is not what she did yesterday, or how much they liked it, but what she does today, and how much they like it.">>
 
 <<case "head girl">>
-	<<set $nickname = either("'Boss'", "'Bottom Bitch'", "'Favorite'", "'Head Girl'", "'Mistress'", "'Mrs.'", "'On Your Knees'", "'Perfect'", "'Top'")>>
+	<<set $nickname = either("'Boss'", "'Bottom Bitch'", "'Chief'", "'Favorite'", "'Head'", "'Head Girl'", "'Mistress'", "'Mrs.'", "'On Your Knees'", "'Perfect'", "'Top'")>>
 	<<set $situationDesc = "occupies a place in the hierarchy of your penthouse that is certainly one which encourages nicknaming. Your other slaves view her with mixed envy, adoration, emulation, and apprehension. She is someone to curry favor with, to offer sexual favors, and at times someone to avoid. To the devoted slave her closeness to you is enviable; to the rebellious slave her alliance with you is traitorous.">>
 	<<set $applyDesc = "was already proud of and happy with her exalted position, but now she is all the more so. She had always nursed the secret fear that this was temporary, but her place at your right hand is now part of her name.">>
 	<<set $notApplyDesc = "begins to fear a little that she may one day be supplanted, since you did not think it right to make her place a part of her name.">>
 
 <<case "Concubine">>
-	<<set $nickname = either("'Beauty'", "'Concubine'", "'Contessa'", "'Empress'", "'Missus'", "'Mrs.'", "'Princess'", "'Queen'")>>
+	<<set $nickname = either("'Beauty'", "'Bed'", "'Concubine'", "'Contessa'", "'Empress'", "'Master'", "'Missus'", "'Mrs.'", "'Princess'", "'Queen'")>>
 	<<set $situationDesc = "occupies a place in the hierarchy of your penthouse that is certainly one which encourages nicknaming. Your other slaves view her with mixed envy and admiration. She has much of the luxury of the Head Girl and none of the responsibility, and all she has to do for this exalted place is keep your sexual satisfaction as her prime goal.">>
 	<<set $applyDesc = "was already proud of and happy with her exalted position, but now she is all the more so. She had always nursed the secret fear that this was temporary, but her place in your bed is now part of her name.">>
 	<<set $notApplyDesc = "begins to fear a little that she may one day be supplanted, since you did not think it right to make her place a part of her name.">>
 
 <<case "Attendant">>
-	<<set $nickname = either("'Attendant'", "'Bath Girl'", "'Healer'", "'Healing Hand'", "'Helping Hand'", "'Mist Queen'", "'Misty'", "'Saunagirl'", "'Spa Day'", "'Spa Mother'", "'Steam Queen'", "'Warm Water'")>>
+	<<set $nickname = either("'Attendant'", "'Bath'", "'Bath Girl'", "'Bathing Beauty'", "'Healer'", "'Healing Hand'", "'Helping Hand'", "'Mist Queen'", "'Misty'", "'Saunagirl'", "'Spa'", "'Spa Day'", "'Spa Mother'", "'Steam Queen'", "'Warm Water'")>>
 	<<set $situationDesc = "is loved by almost every slave in your penthouse. Getting a chance to go and spend some time in her spa is a wonderful treat, for which slaves are willing to work very hard. She's very willing to help them find sexual release, but mostly just provides minor care and an understanding ear for their troubles.">>
 	<<set $applyDesc = "enjoys helping your girls, and is happy to learn that the role is part of her name now.">>
 	<<set $notApplyDesc = "is a bit sad that her role isn't part of her name, since she likes helping your girls and now wonders whether she'll be allowed to keep doing so.">>
 
 <<case "Madam">>
-	<<set $nickname = either("'Boss Bitch'", "'Brothel Queen'", "'Madam'", "'Miss Kitty'", "'Mother'", "'Pimp Hand'", "'Pimp Queen'", "'Pimparella'", "'Queen Bitch'", "'Whore Queen'")>>
+	<<set $nickname = either("'Boss Bitch'", "'Brothel Queen'", "'Madam'", "'Miss Kitty'", "'Mother'", "'Pimp'", "'Pimp Hand'", "'Pimp Queen'", "'Pimparella'", "'Queen Bitch'", "'Whore Queen'")>>
 	<<set $situationDesc = "is in an unusually responsible and pragmatic position, for a slave. She runs her whores' lives with almost total control, overseeing the sale of their bodies day in, day out. Some resent her, some love her, but all depend on her.">>
 	<<set $applyDesc = "enjoys running a whorehouse, and is happy to learn that the role is part of her name now.">>
 	<<set $notApplyDesc = "is a bit sad that her role isn't part of her name, since she likes running a whorehouse and now wonders whether she'll be allowed to keep doing so.">>
 
 <<case "DJ">>
-	<<set $nickname = either("'Arcology Idol'", "'Bass Slut'", "'Bassgirl'", "'Celebutante'", "'Club Idol'", "'Club Princess'", "'Club Queen'", "'DJ'", "'DJ Whore'", "'EP'", "'LP'", "'Subwoofers'", "'SuperBass'")>>
+	<<set $nickname = either("'Arcology Idol'", "'Bass'", "'Bass Slut'", "'Bassgirl'", "'Booth'", "'Celebutante'", "'Club Idol'", "'Club Princess'", "'Club Queen'", "'DJ'", "'DJ Whore'", "'EP'", "'LP'", "'Subwoofers'", "'SuperBass'")>>
 	<<set $situationDesc = "has a leadership role that requires decisiveness and discretion, but has to maintain a role of flirtatiousness and fun, at the same time. Other slaves marvel at how she must give another slut orders one moment, and girlishly giggle at a prominent citizen the next.">>
 	<<set $applyDesc = "enjoys being one of the most idolized girls in the arcology, and is happy to learn that the role is part of her name now.">>
 	<<set $notApplyDesc = "is a bit sad that her role isn't part of her name, since she likes being one of the most idolized girls in the arcology and now wonders whether she'll be allowed to keep doing so.">>
 
 <<case "Recruiter">>
-	<<set $nickname = either("'Cam Queen'", "'Camgirl'", "'Honeypot'", "'Honeytrap'", "'Recruiter'", "'Slavecatcher'", "'Slaver'", "'Snake'", "'Spider'", "'Trapper'")>>
+	<<set $nickname = either("'Cam'", "'Cam Queen'", "'Camgirl'", "'Honeypot'", "'Honeytrap'", "'Recruiter'", "'Slavecatcher'", "'Slaver'", "'Snake'", "'Spider'", "'Trapper'")>>
 	<<set $situationDesc = "is fundamentally a liar, in her role as recruiter. She must constantly lie by omission if not by commission, telling everyone interested in slavery all about everything good about being your slave, while leaving out the fundamental reality of sexual servitude.">>
 	<<set $applyDesc = "enjoys seeing girls go from faces on a screen to fellow fuckslaves, and is happy to learn that the role is part of her name now.">>
 	<<set $notApplyDesc = "is a bit sad that her role isn't part of her name, since she likes making girls go from faces on a screen to fellow fuckslaves and now wonders whether she'll be allowed to keep doing so.">>
 
 <<case "Wardeness">>
-	<<set $nickname = either("'Chief'", "'Inquisitrix'", "'Interrogatrix'", "'Jailoress'", "'Nightstick'", "'Rapist'", "'Snake'", "'Spider'", "'Stoolie'", "'Warden'", "'Wardeness'")>>
+	<<set $nickname = either("'Chief'", "'Cop'", "'Copper'", "'Inquisitrix'", "'Interrogatrix'", "'Jail'", "'Jailoress'", "'Nightstick'", "'Prison'", "'Rapist'", "'Screw'", "'Snake'", "'Spider'", "'Stoolie'", "'Turnkey'", "'Warden'", "'Wardeness'")>>
 	<<set $situationDesc = "has perhaps the most hated role among your slaves. Her charges hate her, of course. But almost every slave who was once one of her charges hates her too, for they have not forgotten how her whim was once the law to them.">>
 	<<set $applyDesc = "enjoys having a row of cells full of slaves to abuse, and is happy to learn that the role is part of her name now.">>
 	<<set $notApplyDesc = "is a bit sad that her role isn't part of her name, since she likes having a row of cells full of slaves to abuse and now wonders whether she'll be allowed to keep doing so.">>
 
 <<case "Milkmaid">>
-	<<set $nickname = either("'Cowgirl'", "'Cowhand'", "'Cowpoke'", "'Cream Queen'", "'Dairy Queen'", "'Milkmaid'", "'Milktugger'", "'Strong Hands'")>>
+	<<set $nickname = either("'Cowgirl'", "'Cowhand'", "'Cowpoke'", "'Cream Queen'", "'Dairy'", "'Dairy Queen'", "'Farm'", "'Milker'", "'Milkmaid'", "'Milktugger'", "'Strong Hands'")>>
 	<<set $situationDesc = "has a physically demanding and emotionally rewarding role. It's hard work, hauling milk and shifting cows all day, but her girls love her. It's hard not to love someone when you depend on them so totally.">>
 	<<set $applyDesc = "enjoys being a milkmaid, despite the tough work, and is happy to learn that the role is part of her name now.">>
 	<<set $notApplyDesc = "is a bit sad that her role isn't part of her name, since she likes being a milkmaid, despite the tough work, and now wonders whether she'll be allowed to keep doing so.">>
 
 <<case "Collectrix">>
-	<<set $nickname = either("'Buttfucker'", "'Collectrix'", "'Cum Queen'", "'Extractrix'", "'Orgasmotron'", "'Prostate Poker'", "'Sodomizer'")>>
+	<<set $nickname = either("'Buttfucker'", "'Collectrix'", "'Cum Queen'", "'Extractrix'", "'Fucker'", "'Milker'", "'Orgasmotron'", "'Prostate Poker'", "'Sodomizer'")>>
 	<<set $situationDesc = "is required to fuck more exhaustingly than any other slave in the arcology. It's one thing to take dick all day; it's quite another to be expected to constantly massage prostates to orgasm. Naturally, the other slaves notice.">>
 	<<set $applyDesc = "really enjoys being expected to bone butts constantly, and is happy to learn that the role is part of her name now.">>
 	<<set $notApplyDesc = "is a bit sad that her role isn't part of her name, since she likes being expected to bone butts constantly and now wonders whether she'll be allowed to keep doing so.">>
 
 <<case "Schoolteacher">>
-	<<set $nickname = either("'Dean'", "'Headmistress'", "'Principal'", "'Profesora'", "'Professor'", "'Ruler'", "'Schoolmarm'", "'Schoolmistress'", "'Schoolteacher'", "'Sensei'", "'Teach'")>>
+	<<set $nickname = either("'Classroom'", "'Dean'", "'Headmistress'", "'Principal'", "'Profesora'", "'Professor'", "'Ruler'", "'Schoolmarm'", "'Schoolmistress'", "'Schoolteacher'", "'Sensei'", "'Teach'", "'Teacher'")>>
 	<<set $situationDesc = "might consider her role boring, if she weren't allowed to use sexual abuse as a correction for poor attentiveness. As it is, her sexual aggressiveness draws much open comment and some private infatuation from the students.">>
 	<<set $applyDesc = "likes teaching, especially because she's allowed to use the students, and is happy to learn that the role is part of her name now.">>
 	<<set $notApplyDesc = "is a bit sad that her role isn't part of her name, since she likes teaching, especially because she's allowed to use the students, and now wonders whether she'll be allowed to keep doing so.">>
 
+<<case "Nurse">>
+	<<set $nickname = either("'Candy Striper'", "'Doc'", "'Doctor'", "'Healer'", "'Hospital Hottie'", "'M.D.'", "'Medic'", "'Medicine Woman'", "'Nurse'", "'Pill Peddler'", "'Pill Pusher'", "'Quack'", "'Sawbones'")>>
+	<<set $situationDesc = "might consider her role boring, if she weren't allowed to use sexual abuse as a correction for poor health. As it is, her sexual aggressiveness draws much open comment and some private infatuation from the patients.">>
+	<<set $applyDesc = "likes being a nurse, especially because she's allowed to use the patients, and is happy to learn that the role is part of her name now.">>
+	<<set $notApplyDesc = "is a bit sad that her role isn't part of her name, since she likes being a nurse, especially because she's allowed to use the patients, and now wonders whether she'll be allowed to keep doing so.">>
+
 <<case "Stewardess">>
 	<<set $nickname = either("'Concierge'", "'Head Maid'", "'Head Servant'", "'Housemistress'", "'Inspectrix'", "'Martinent'", "'Perfectionist'", "'Stewardess'", "'Top Mop'")>>
 	<<set $situationDesc = "might consider her role boring, if she weren't allowed to use sexual abuse as a correction for poor work. As it is, her sexual aggressiveness draws much open comment and some private infatuation from the servants.">>
@@ -939,7 +950,7 @@
 	<<set $notApplyDesc = "is a bit sad that her role isn't part of her name, since she likes being in charge of household tasks, especially because she's allowed to use the servants, and now wonders whether she'll be allowed to keep doing so.">>
 
 <<case "bodyguard">>
-	<<set $nickname = either("'Aegis'", "'Amazon'", "'Athena'", "'Bloody'", "'Bodyguard'", "'Diana'", "'Guard'", "'Gunsmoke'", "'Hired Gun'", "'Paladin'", "'Terminatrix'", "'Widow'")>>
+	<<set $nickname = either("'Aegis'", "'Amazon'", "'Athena'", "'Battle'", "'Bloody'", "'Bodyguard'", "'Diana'", "'Guard'", "'Gunsmoke'", "'Hired Gun'", "'Paladin'", "'Terminatrix'", "'Widow'")>>
 	<<set $situationDesc = "divides your other slaves. She is a physically intimidating sight, wearing normal slave attire and obviously sexually available, but also carrying a sword across her back and an automatic weapon at her hip. Some revere her unique position of responsibility, while others mock how far she steps outside the bounds of sexual slavery.">>
 	<<set $applyDesc = "knew a while ago that she was likely to spend some time shadowing your every move. But now, she understands that not only is your life in her hands, it is going to remain so. She is almost awed by the responsibility.">>
 	<<set $notApplyDesc = "realizes to her apprehension that she may someday be a simple sex slave again, respected for her holes rather than her swordswomanship.">>
@@ -975,25 +986,25 @@
 	<<set $notApplyDesc = "understands that she is expected to obey and fuck just like any of your other slaves, regardless of her status as a breeder.">>
 
 <<case "broodmother">>
-	<<set $nickname = either("'Baby Factory'", "'Bakery'", "'Breeder'", "'Broodmother'", "'Naedoko'", "'Nursery'")>>
+	<<set $nickname = either("'Baby Factory'", "'Bakery'", "'Bloated'", "'Breeder'", "'Broodmother'", "'Factory'", "'Naedoko'", "'Nursery'", "'Stuffed'")>>
 	<<set $situationDesc = "is a Broodmother. Her belly is enormous, unavoidable evidence that her life has been dedicated to carrying children. Her taut belly is stuffed with her brood and barely gets smaller with every child born from her.">>
 	<<set $applyDesc = "takes a bit of solace from her new hope in her nickname that she will be kept in good shape and not have to worry about her pregnancy draining her, but also a bit of fear from her suspicion that she'll remain this way until she's out of eggs.">>
 	<<set $notApplyDesc = "understands that she is expected to obey, work, and fuck just like any of your other slaves, regardless of how big her pregnancy is.">>
 	
 <<case "hyperbroodmother">>
-	<<set $nickname = either("'Baby Factory'", "'Broodmother'", "'Bursting'", "'Hyperbroodmother'", "'Naedoko'", "'Nursery'", "'Seedbed'", "'Tentacle Raped'")>>
+	<<set $nickname = either("'Baby Factory'", "'Broodmother'", "'Bursting'", "'Factory'", "'Hyperbroodmother'", "'Naedoko'", "'Nursery'", "'Seedbed'", "'Seeded'", "'Tentacle Raped'")>>
 	<<set $situationDesc = "is a Broodmother. Her belly is enormous, unavoidable evidence that her life has been dedicated to carrying children. Her taut belly constantly bulges and squirms from her brood writhing within her and it is a very real possibility that she may pop.">>
 	<<set $applyDesc = "takes a bit of solace from her new hope in her nickname that she will be kept in good shape and not have to worry about her pregnancy draining her, but also a bit of fear from her suspicion that she'll remain this way until she dies or her body is used up.">>
 	<<set $notApplyDesc = "understands that she is expected to obey, work, and fuck just like any of your other slaves, regardless of how big her pregnancy is.">>
 
 <<case "hyperpreg">>
-	<<set $nickname = either("'Balloon'", "'Bulgey'", "'Bursting'", "'Clown Car'", "'Hyperbreeder'", "'Hyperfertile'", "'Hyperpreg'", "'Squirmy'", "'Waterslide'")>>
+	<<set $nickname = either("'Balloon'", "'Bulgey'", "'Bulging'", "'Bursting'", "'Clown Car'", "'Hyperbreeder'", "'Hyperfertile'", "'Hyperpreg'", "'Squirming'", "'Squirmy'", "'Waterslide'")>>
 	<<set $situationDesc = "is a breeding slave. Her belly is huge, unavoidable evidence that she's very pregnant. Her taut belly constantly bulges and squirms from her brood writhing within her and it is a very real possibility that she may pop.">>
 	<<set $applyDesc = "takes a bit of solace from her new hope at her nickname that she will be kept in good shape and not have to worry about the size of her pregnancy, and a bit of fear from her suspicion that producing babies is her whole future.">>
 	<<set $notApplyDesc = "understands that she is expected to obey, work, and fuck just like any of your other slaves, regardless of how big her pregnancy is.">>
 
 <<case "babymaker">>
-	<<set $nickname = either("'Baby Maker'", "'Babymaker'", "'Baker'", "'Belly Popper'", "'Breeding Boar'", "'Breeding Bull'", "'Breeding Stallion'", "'Breeding Stud'", "'Cum Cannon'", "'Daddy'", "'Fire Hose'", "'Popper'", "'Potent'", "'Sirer'", "'Womb Filler'")>>
+	<<set $nickname = either("'Baby Maker'", "'Babymaker'", "'Baker'", "'Belly Popper'", "'Breeding Boar'", "'Breeding Bull'", "'Breeding Stallion'", "'Breeding Stud'", "'Cannon'", "'Cum Cannon'", "'Daddy'", "'Fire Hose'", "'Popper'", "'Potent'", "'Sirer'", "'Womb Filler'")>>
 	<<set $situationDesc = "is a terror to any fertile girl she fucks. Horrifically potent, she leaves a trail of pregnancies in her wake. A great deal of the babies in your slaves might just be hers.">>
 	<<set $applyDesc = "takes a bit of pride from her new nickname and hopes you'll keep letting her knock bitches up.">>
 	<<set $notApplyDesc = "understands that she is a slave and it is not her place to decide who gets pregnant and who doesn't.">>
@@ -1050,7 +1061,7 @@
 	<<set $notApplyDesc = "understands that she must learn to control herself and stop soaking her partners, clothes and bed.">>
 
 <<case "labia">>
-	<<set $nickname = either("'Blooming'", "'Flaps'", "'Flower'", "'Folds'", "'Labia'", "'Lips'", "'Lower Lips'", "'Meatflaps'", "'Petals'", "'Pussylips'", "'Roastie'")>>
+	<<set $nickname = either("'Blooming'", "'Curtains'", "'Flaps'", "'Flower'", "'Folds'", "'Labia'", "'Lips'", "'Lower Lips'", "'Meatflaps'", "'Petals'", "'Pussylips'", "'Roastie'")>>
 	<<set $situationDesc = "has pretty pussylips, larger than most girls'. When she's aroused they announce her state to the whole world, becoming engorged with lust. Other slaves can't help but notice, and mock her uniqueness down there.">>
 	<<set $applyDesc = "really starts to see the appearance of her pussy as a trademark. She's prouder of it than she was before, and she enjoys sex a bit more too, really appreciating it when she gets to feel another slave gently nibble her lovely folds.">>
 	<<set $notApplyDesc = "accepts that the most important part of her vagina is the warm, wet interior, not the generously endowed exterior.">>
@@ -1084,19 +1095,19 @@
 	<<set $notApplyDesc = "understands that despite her young age she must do her best to fuck like the most veteran of whores.">>
 
 <<case "trans">>
-	<<set $nickname = either("'Girly'", "'Kathoey'", "'Ladyboy'", "'Legs Crossed'", "'Missie'", "'Queen'", "'Shemale'", "'Surprise'", "'T-Girl'", "'Tranny'", "'Trans'", "'Transgender'", "'Trap'")>>
+	<<set $nickname = either("'Girly'", "'Kathoey'", "'Ladyboy'", "'Legs Crossed'", "'Missie'", "'Queen'", "'Shemale'", "'Surprise'", "'T-Girl'", "'Tranny'", "'Trans'", "'Transgender'", "'Trap'", "'Trick'")>>
 	<<set $situationDesc = "might have looked like a sissy or a trap at some point, but she no longer does. She has the curves and the face to be mistaken for a natural woman if she wears clothes that conceal her cock, which is an ability with all sorts of interesting uses. Mockery always fixes on what's unusual, of course, and some of your other slaves even envy her equipment.">>
 	<<set $applyDesc = "believes that you approve of her as she is now, and that she can treat her dick as an asset.">>
 	<<set $notApplyDesc = "understands that she must do her best to fuck like the natural girl she isn't.">>
 
 <<case "amp">>
-	<<set $nickname = either("'Amp'", "'Amputee'", "'Cocksock'", "'Dickholster'", "'Fleshlight'", "'Fucknugget'", "'Fucktoy'", "'Limbless'", "'Nubs'", "'Onahole'", "'Pocket Pussy'", "'Stumps'", "'Torso'")>>
+	<<set $nickname = either("'Amp'", "'Amputee'", "'Cocksock'", "'Cripple'", "'Dickholster'", "'Fleshlight'", "'Fucknugget'", "'Fucktoy'", "'Limbless'", "'Nubs'", "'Onahole'", "'Pocket Pussy'", "'Quadruple'", "'Stumps'", "'Stumpy'", "'Torso'")>>
 	<<set $situationDesc = "is a fun little fucktoy, a limbless torso with nice wet holes than can be used regardless of her feelings. Giving a poor quadruple amputee a nickname might seem like stooping to wanton cruelty, but other slaves are willing to call her anything to take their minds off their own status.">>
 	<<set $applyDesc = "takes a tiny bit of solace from her nickname, hoping that by accepting it, you were expressing an enjoyment of her attenuated body.">>
 	<<set $notApplyDesc = "understands that she would be a sex toy even if she still had arms and legs.">>
 
 <<case "blind">>
-	<<set $nickname = either("'Batty'", "'Blind'", "'Braille'", "'Crash'", "'Deadeye'", "'Eyeless'", "'No-Sight'", "'Sightless'", "'Stares'", "'White Cane'")>>
+	<<set $nickname = either("'Batty'", "'Blind'", "'Braille'", "'Cataracts'", "'Crash'", "'Deadeye'", "'Eyeless'", "'No-Sight'", "'Sightless'", "'Stares'", "'White Cane'")>>
 	<<set $situationDesc = "is blind. Her dull eyes reveal her condition. She has to feel her way between jobs and is at the mercy of everyone.">>
 	<<set $applyDesc = "accepts that her disability defines her. She keeps her eyes wide open, no longer fearing what others say about them.">>
 	<<set $notApplyDesc = "understands that she is expected to obey, work, and fuck just like any of your other slaves, regardless of her eyesight.">>
@@ -1108,7 +1119,7 @@
 	<<set $notApplyDesc = "understands that she is expected to obey, work, and fuck just like any of your other slaves, regardless of her pregnancy.">>
 
 <<case "hung">>
-	<<set $nickname = either("'Anaconda'", "'Bitchbreaker'", "'Hung'", "'Long Dong'", "'Long'", "'Shaft'", "'Swingin' Dick'", "'Tentpole'", "'Third Arm'", "'Third Leg'", "'Tripod'")>>
+	<<set $nickname = either("'Anaconda'", "'Bitchbreaker'", "'Dangle'", "'Hung'", "'Long Dong'", "'Long'", "'Shaft'", "'Swingin' Dick'", "'Tentpole'", "'Third Arm'", "'Third Leg'", "'Tripod'")>>
 	<<set $situationDesc = "is a Free Cities sex slave, which makes her a girl. The pretension is hard to maintain at times, however, as her massive member swings around, gets in the way, sticks out of clothing, and blows huge loads. Half the fun of using her butt is making her absurd dick slap around. It's an obvious target for a nickname, especially since more than one slave has personal experience with how she feels inside them.">>
 	<<set $applyDesc = "enjoys being nicknamed for her dick. She's special, her dick is special, and now that she's been nicknamed for it, she's confident she and her dick will be allowed to go on being special.">>
 	<<set $notApplyDesc = "realizes that she's just a slave girl behind, no matter what's dangling in front, and does her best to take it like one.">>
@@ -1120,25 +1131,25 @@
 	<<set $notApplyDesc = "realizes that the process of turning her from what she was into what she is did not make her special.">>
 
 <<case "short">>
-	<<set $nickname = either("'Cock Sock'", "'Fun Size'", "'Funsize'", "'Miniature'", "'Napoleon'", "'Petite'", "'Pipsqueak'", "'Pocket Pussy'", "'Short'", "'Shortstack'", "'Shortstuff'", "'Shorty'", "'Shrimp'", "'Tiny'", "'Waif'")>>
+	<<set $nickname = either("'Cock Sock'", "'Fun Size'", "'Funsize'", "'Midget'", "'Miniature'", "'Napoleon'", "'Petite'", "'Pipsqueak'", "'Pocket Pussy'", "'Short'", "'Shortstack'", "'Shortstuff'", "'Shorty'", "'Shrimp'", "'Stumpy'", "'Tiny'", "'Waif'")>>
 	<<set $situationDesc = "is fairly low to the ground. This makes her a bit different, sexually; she's better for several oral sex positions, but most standing positions turn into a game of how long her partner can hold her at the appropriate height.">>
 	<<set $applyDesc = "is a little proud that her diminutive stature, once nothing but a source of embarrassment, is apparently significant to you.">>
 	<<set $notApplyDesc = "realizes that she'll just have to reach higher to make up for her height, since you don't consider it special.">>
 
 <<case "tall">>
-	<<set $nickname = either("'Alpine'", "'B-Baller'", "'Basketballer'", "'Beanpole'", "'Beanstalk'", "'Everest'", "'Giant'", "'Giantess'", "'Giraffe'", "'Jumbo'", "'Lofty'", "'Mountain'", "'Redwood'", "'Skyscraper'", "'Slim'", "'Stretch'", "'Tall'", "'Tower'")>>
+	<<set $nickname = either("'Alpine'", "'B-Baller'", "'Basketballer'", "'Beanpole'", "'Beanstalk'", "'Everest'", "'Giant'", "'Giantess'", "'Giraffe'", "'Jumbo'", "'Lofty'", "'Mountain'", "'Redwood'", "'Skyscraper'", "'Slim'", "'Stretch'", "'Tall'", "'Top'", "'Tower'")>>
 	<<set $situationDesc = "is impressively tall for a girl. This makes her sexually convenient, since her holes are at convenient cock height. She spends many of her sexual encounters bent slightly at the waist to allow herself to be taken from behind.">>
 	<<set $applyDesc = "is quite proud of her impressive height, even more so than before. She resolves to tower over other slaves sexually as well as literally.">>
 	<<set $notApplyDesc = "realizes that being tall doesn't make her special, and understands that it's her holes that make her, not how high they are.">>
 
 <<case "boobs">>
-	<<set $nickname = either("'Airbags'", "'Bazookas'", "'Boobs'", "'Bosom'", "'Bouncing'", "'Bouncy'", "'Bristols'", "'Chounyuu'", "'Funbags'", "'Hooters'", "'Jugs'", "'Knockers'", "'Melons'", "'Norks'", "'Oppai'", "'Stacked'", "'Tatas'", "'Titties'")>>
+	<<set $nickname = either("'Airbags'", "'Bazookas'", "'Boob'", "'Boobs'", "'Bosom'", "'Bouncing'", "'Bouncy'", "'Bristols'", "'Chounyuu'", "'Funbags'", "'Hooters'", "'Jugs'", "'Knockers'", "'Melons'", "'Norks'", "'Oppai'", "'Stacked'", "'Tatas'", "'Titties'", "'Titty'")>>
 	<<set $situationDesc = "has large breasts. Pointing this out is about as observant as describing the sky as blue. When she enters a room, they precede her. When she takes it doggy style, they prop her up. Other slaves are envious of the attention she gets, and happy they don't have to carry such burdens.">>
 	<<set $applyDesc = "was of course proud of her huge breasts before this new nickname. Now, though, she accepts them as a sort of trademark.">>
 	<<set $notApplyDesc = "accepts that having titanic tits does not make her special, since what's important is her holes, not her boobs.">>
 
 <<case "butt">>
-	<<set $nickname = either("'Ass'", "'Backside'", "'Badonkadonk'", "'Big Ass'", "'Bootylicious'", "'Brazilian'", "'Bunda'", "'Buns'", "'Butt'", "'Buttocks'", "'Heiny'", "'Jiggly'", "'Milkshake'", "'Moneymaker'", "'Rear End'", "'Rump'", "'Thunder Thighs'", "'Tuckus'", "'Tushy'", "'Wide Load'")>>
+	<<set $nickname = either("'Ass'", "'Backside'", "'Badonkadonk'", "'Big Ass'", "'Bootylicious'", "'Bottom'", "'Brazilian'", "'Bunda'", "'Buns'", "'Butt'", "'Buttocks'", "'Heiny'", "'Jiggly'", "'Milkshake'", "'Moneymaker'", "'Rear End'", "'Rump'", "'Thunder Thighs'", "'Tuckus'", "'Tushy'", "'Wide Load'")>>
 	<<set $situationDesc = "has a large ass. Pointing this out is about as observant as describing the sky as blue. (Though impressive for other reasons, for her sexual partners, since they sometimes have difficulty drawing breath for such remarks.) When she enters a room, it follows her. When she takes it doggy style, it pads penetration to an almost inconvenient degree. Other slaves are envious of the attention she gets, and happy they don't have to carry such burdens.">>
 	<<set $applyDesc = "was of course proud of her huge ass before this new nickname. Now, though, she accepts it as a sort of trademark.">>
 	<<set $notApplyDesc = "accepts that having a massive ass does not make her special, since what's important is her holes, not her buttocks.">>
diff --git a/src/uncategorized/reShippingContainer.tw b/src/uncategorized/reShippingContainer.tw
index 81dbb1e366ca766c9fef172458bd431afb7225d9..bbe204ceaf557c17e2aee1b8915d9336eb0a7231 100644
--- a/src/uncategorized/reShippingContainer.tw
+++ b/src/uncategorized/reShippingContainer.tw
@@ -67,7 +67,7 @@ For now, the crowd around you is looking at the helpless human cargo with
 		<<set _newSlaves[_i].health -= 20>>
 		<<AddSlave _newSlaves[_i]>> /* skip New Slave Intro */
 	<</for>>
-	You use the container handling systems to segregate the obvious menials from the those with any potential as sex slaves. The menials go into a different container, which is whisked off, leaving a little shivering knot of frightened bodies, vulnerable and naked. The crowd watched all this with good humor, and there's silence enough that everyone hears your quiet announcement. You announce that the shipment is in violation of shipping and slave market regulations, and is being confiscated; however, you don't expect to see these particular slaves delivered to your penthouse for a couple of hours. Then you turn your back and walk away. The crowd gives a kind of @@.green;appreciative howl@@ which, understandably, produces a wail of terror from the slaves. As you head off, the sobbing turns into screaming. It sounds like your new slaves might be a bit stretched out, here and there.
+	You use the container handling systems to segregate the obvious menials from those with any potential as sex slaves. The menials go into a different container, which is whisked off, leaving a little shivering knot of frightened bodies, vulnerable and naked. The crowd watched all this with good humor, and there's silence enough that everyone hears your quiet announcement. You announce that the shipment is in violation of shipping and slave market regulations, and is being confiscated; however, you don't expect to see these particular slaves delivered to your penthouse for a couple of hours. Then you turn your back and walk away. The crowd gives a kind of @@.green;appreciative howl@@ which, understandably, produces a wail of terror from the slaves. As you head off, the sobbing turns into screaming. It sounds like your new slaves might be a bit stretched out, here and there.
 	<<set $rep += 200>>
 	<</replace>>
 <</link>>
diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw
index f7a9a3c18c8fec555826767d46a1085fe02cccc4..b7880d41a24f4f0c5a7293ba41c05049f8920aac 100644
--- a/src/uncategorized/saRecruitGirls.tw
+++ b/src/uncategorized/saRecruitGirls.tw
@@ -657,7 +657,7 @@
 			<<set _seed += (Math.min((($HeadGirl.entertainSkill/30)+$HeadGirl.intelligenceImplant+$HeadGirl.prestige), 4)+Math.min($Bodyguard.prestige, 1)), _FSdefend++, $arcologies[0].FSChineseRevivalist += 0.03*$FSSingleSlaveRep>>
 		<</if>>
 	<</if>>
-	/* and then there's aztec rivalist, completely forgotten */
+	/* and then there's Aztec revivalist, completely forgotten */
 
 	<<set $repGain += Math.trunc(_seed)>>
 
diff --git a/src/uncategorized/schoolroom.tw b/src/uncategorized/schoolroom.tw
index 30eaa9fcc0317f698d78eb0dde2bb0e734ed5e16..f059045f2a81fa5464a83e9f4329329a0dbb0bcf 100644
--- a/src/uncategorized/schoolroom.tw
+++ b/src/uncategorized/schoolroom.tw
@@ -1,7 +1,7 @@
 :: Schoolroom [nobr]
 
 <<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Schoolroom", $showEncyclopedia = 1, $encyclopedia = "Schoolroom", $schoolroomSlaves = $SchlRiIDs.length>>
-<<showallAssignmentFilter>>
+
 <<if $schoolroomName != "the Schoolroom">>
 	<<set $schoolroomNameCaps = $schoolroomName.replace("the ", "The ")>>
 <</if>>
diff --git a/src/uncategorized/servantsQuarters.tw b/src/uncategorized/servantsQuarters.tw
index e937096e9d19883be020d7e1268e5c4ab1164ebc..94ffaaf0900163638721d0af456adc5587adb67b 100644
--- a/src/uncategorized/servantsQuarters.tw
+++ b/src/uncategorized/servantsQuarters.tw
@@ -1,7 +1,7 @@
 :: Servants' Quarters [nobr]
 
 <<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Servants' Quarters", $showEncyclopedia = 1, $encyclopedia = "Servants' Quarters", $servantsQuartersSlaves = $ServQiIDs.length>>
-<<showallAssignmentFilter>>
+
 <<if $servantsQuartersName != "the Servants' Quarters">>
 	<<set $servantsQuartersNameCaps = $servantsQuartersName.replace("the ", "The ")>>
 <</if>>
diff --git a/src/uncategorized/spa.tw b/src/uncategorized/spa.tw
index 0343ba8e9c93d9256f8d4e62bab787a6dcddfe71..a1e9050838dabec612c3f7135973165f5062eb74 100644
--- a/src/uncategorized/spa.tw
+++ b/src/uncategorized/spa.tw
@@ -1,7 +1,7 @@
 :: Spa [nobr]
 
 <<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Spa", $showEncyclopedia = 1, $encyclopedia = "Spa", $spaSlaves = $SpaiIDs.length>>
-<<showallAssignmentFilter>>
+
 <<if $spaName != "the Spa">>
 	<<set $spaNameCaps = $spaName.replace("the ", "The ")>>
 <</if>>