diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 70f22992473467479916357d332787cd2d7502a6..d5465cc6ee51a9bd9a6c2de1aacdfa2866e2ea7f 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,8 +2,31 @@
 
 0.10.7.1-0.1.x
 
+4/01/2018
+
+	20
+	-various little fixes
+	-fixed slimming diet not lowering muscle
+	-many typo corrections
+
+3/31/2018
+
+	19
+	-fixes
+	-more nicknames
+
+	18
+	-bunch of bug fixes, typo corrections and scene oddity fixes
+	-also more nicknames
+
 3/30/2018
 
+	17
+	-major update to original embedded vector art
+	-shifted loli growth hormone check into saHormoneEffects to not supress feedback
+	-various little fixes
+	-added surname order control to description options
+
 	16
 	-various corrections to enslaved citizens not being the right race when the supremacist law is in play
 	-a certain policy is now properly enforced
diff --git a/devNotes/twine CSS b/devNotes/twine CSS
new file mode 100644
index 0000000000000000000000000000000000000000..ff811dbe2e625af3a4d9238f87cf314f404ab3e5
--- /dev/null
+++ b/devNotes/twine CSS	
@@ -0,0 +1,408 @@
+/*:: Main stylesheet [stylesheet]*/
+
+body {
+	overflow-x: hidden;
+}
+
+/* clears SugarCube's default transition */
+.passage {
+    transition: none;
+    -webkit-transition: none;
+}
+
+.passage-in {
+    opacity: 1 !important;
+}
+
+
+/* default is 54em */
+#passages {
+    max-width: 100%;
+}
+
+/* small trick to hide broken images */
+img {
+    text-indent: -10000px;
+}
+
+.imageRef {
+    display: flex;
+    flex-direction: column;
+    flex-wrap: wrap;
+    align-items: flex-start;
+    position: relative;
+	background-color: rgba(80, 80, 80, 0.5);
+	margin: 2px;
+}
+
+.tinyImg {
+    height: 120px;
+    width: 120px;
+    float: left;
+}
+
+.smlImg {
+    height: 150px;
+    width: 150px;
+    float: left;
+}
+
+.smlImg > img, .smlImg > video {
+	height: auto;
+}
+
+.medImg {
+    height: 300px;
+    width: 300px;
+    float: right;
+}
+
+.medImg > img, .medImg > video {
+	height: auto;
+}
+
+.lrgRender {
+    height: 531px;
+    width: 531px;
+	margin-right: -50px;
+	margin-left: -50px;
+    float: right;
+	z-index: -1;
+}
+
+.lrgVector {
+    height: 600px;
+    width: 600px;
+	margin-right: -125px;
+	margin-left: -125px;
+    float: right;
+	z-index: -1;
+}
+
+.lrgRender > div.mask {
+	width: 150px;
+	height: 100%;
+	background: linear-gradient(90deg, rgba(17,17,17,1), rgba(17,17,17,0.8) 60%, rgba(17,17,17,0));
+	z-index: 1;
+}
+
+.lrgRender > img, .lrgRender > video {
+	margin-left: -150px;
+	height: 531px;
+	width: auto;
+}
+
+.lrgVector > div.mask {
+	width: 150px;
+	height: 100%;
+	background: linear-gradient(90deg, rgba(17,17,17,1), rgba(17,17,17,0.8) 60%, rgba(17,17,17,0));
+	z-index: 1;
+}
+
+.lrgVector > img, .lrgVector > video {
+	margin-left: -150px;
+	height: 600px;
+	width: auto;
+}
+
+.lrgVector svg {
+    width: 336px;
+    height: 600px;
+}
+
+object {
+    object-fit: scale-down;
+    position: absolute;
+    top: 0;
+	left: 0;
+}
+
+img.paperdoll {
+    position: absolute;
+    top: 0;
+	left: 0;
+	margin-left: 0;
+}
+
+span.plusButton {
+	display: inline-block;
+	line-height: 25px;
+	width: 20px;
+	text-align: center;
+	border: 1px solid rgba(0, 139, 0, 0.3);
+	background: rgba(0, 139, 0, 0.2);
+	margin: 2px 0;
+}
+
+span.minusButton {
+	display: inline-block;
+	line-height: 25px;
+	width: 20px;
+	text-align: center;
+	border: 1px solid rgba(184, 0, 0, 0.3);
+	background: rgba(184, 0, 0, 0.2);
+	margin: 2px 0;
+}
+
+span.zeroButton {
+	display: inline-block;
+	line-height: 25px;
+	width: 20px;
+	text-align: center;
+	border: 1px solid rgba(0, 0, 255, 0.3);
+	background: rgba(0, 0, 255, 0.2);
+	margin: 2px 0;
+}
+
+span.plusButton:hover { background: rgba(0, 139, 0, 0.4); }
+span.minusButton:hover { background: rgba(184, 0, 0, 0.4); }
+span.zeroButton:hover { background: rgba(0, 0, 255, 0.4); }
+
+span.plusButton > a { display: block; }
+span.minusButton > a { display: block; }
+span.zeroButton > a { display: block; }
+
+span.plusButton > a:hover { text-decoration: none; }
+span.minusButton > a:hover { text-decoration: none; }
+span.zeroButton > a:hover { text-decoration: none; }
+
+/* Colors are made as css classes, to allow them to be
+   changed for a light color scheme (for example). */
+.link { color: #68D } /* link color */
+.aquamarine { color: aquamarine }
+.coral { color: coral }
+.cyan { color: cyan }
+.darkgoldenrod { color: darkgoldenrod }
+.darkred { color: darkred }
+.darkviolet { color: darkviolet }
+.deeppink { color: deeppink }
+.deepskyblue { color: deepskyblue }
+.gold { color: gold }
+.goldenrod { color: goldenrod }
+.gray { color: gray }
+.green { color: green }
+.hotpink { color: hotpink }
+.lawngreen { color: lawngreen }
+.lightcoral { color: lightcoral }
+.lightgreen { color: lightgreen }
+.lightpink { color: lightpink }
+.lightsalmon { color: lightsalmon }
+.lime { color: lime }
+.limegreen { color: limegreen }
+.magenta { color: magenta }
+.mediumaquamarine { color: mediumaquamarine }
+.mediumorchid { color: mediumorchid }
+.mediumseagreen { color: mediumseagreen }
+.orange { color: orange }
+.orangered { color: orangered }
+.orchid { color: orchid }
+.pink { color: pink }
+.red { color: red }
+.seagreen { color: seagreen }
+.springgreen { color: springgreen }
+.tan { color: tan }
+.yellow { color: yellow }
+.yellowgreen { color: yellowgreen }
+
+.link a { color: #68D } /* link color */
+.aquamarine a { color: aquamarine }
+.coral a { color: coral }
+.cyan a { color: cyan }
+.darkgoldenrod a { color: darkgoldenrod }
+.darkred a { color: darkred }
+.darkviolet a { color: darkviolet }
+.deeppink a { color: deeppink }
+.deepskyblue a { color: deepskyblue }
+.gold a { color: gold }
+.goldenrod a { color: goldenrod }
+.gray a { color: gray }
+.green a { color: green }
+.hotpink a { color: hotpink }
+.lawngreen a { color: lawngreen }
+.lightcoral a { color: lightcoral }
+.lightgreen a { color: lightgreen }
+.lightpink a { color: lightpink }
+.lightsalmon a { color: lightsalmon }
+.lime a { color: lime }
+.limegreen a { color: limegreen }
+.magenta a { color: magenta }
+.mediumaquamarine a { color: mediumaquamarine }
+.mediumorchid a { color: mediumorchid }
+.mediumseagreen a { color: mediumseagreen }
+.orange a { color: orange }
+.orangered a { color: orangered }
+.orchid a { color: orchid }
+.pink a { color: pink }
+.red a { color: red }
+.seagreen a { color: seagreen }
+.springgreen a { color: springgreen }
+.tan a { color: tan }
+.yellow a { color: yellow }
+.yellowgreen a { color: yellowgreen }
+
+/*! <<checkvars>> macro for SugarCube 2.x */
+#ui-dialog-body.checkvars{padding:1em}#ui-dialog-body.checkvars h1{font-size:1em;margin-top:0}#ui-dialog-body.checkvars table{border-collapse:collapse;border-spacing:0}#ui-dialog-body.checkvars thead tr{border-bottom:2px solid #444}#ui-dialog-body.checkvars tr:not(:first-child){border-top:1px solid #444}#ui-dialog-body.checkvars td,#ui-dialog-body.checkvars th{padding:.25em 1em}#ui-dialog-body.checkvars td:first-child,#ui-dialog-body.checkvars th:first-child{padding-left:.5em;border-right:1px solid #444}#ui-dialog-body.checkvars td:last-child,#ui-dialog-body.checkvars th:last-child{padding-right:.5em}#ui-dialog-body.checkvars th:first-child{text-align:center}#ui-dialog-body.checkvars td:first-child{font-weight:700;text-align:right}#ui-dialog-body.checkvars td{font-family:monospace,monospace;vertical-align:top;white-space:pre-wrap}#ui-dialog-body.checkvars .scroll-pad{margin:0;padding:0}
+
+/*! <<bugreport>> macro for SugarCube 2.x */
+#ui-dialog-body.bugreport #bugreport-info{margin-bottom:1em}#ui-dialog-body.bugreport #bugreport-data{display:block;overflow:auto;font-family:monospace,monospace;background-color:transparent;border:1px solid #444;margin:0;padding:6px;height:auto;min-height:200px;white-space:normal}#ui-dialog-body.bugreport .scroll-pad{margin:0;padding:0}
+
+div.output{
+width: 100%;
+width: 100vw;
+max-width: 100%;
+word-break: break-all;
+white-space: normal;
+}
+
+/*:: accordionStyleSheet [stylesheet]*/
+/* Accordion 000-250-006 */
+
+button.accordion {
+    cursor: pointer;
+    padding: 5px;
+    width: 100%;
+    margin-bottom: 10px;
+    border-bottom: 3px double;
+    border-right: 3px double;
+    border-left: none;
+    border-top: none;
+    text-align: left;
+    outline: none;
+    transition: 0.2s;
+    background-color: transparent;
+}
+
+button.accordion.active, button.accordion:hover {
+    background-color: transparent;
+}
+
+button.accordion:before {
+    content: '\002B';
+    color: #777;
+    font-weight: bold;
+    float: left;
+    margin-right: 5px;
+}
+
+.unStaffed {
+    background-color: transparent;
+    padding: .5em .2em;
+    margin-bottom: 1em;
+    border-bottom: thin inset grey;
+}
+
+.unStaffed:before {
+    content: '\00D7';
+    color: #777;
+    font-weight: bold;
+    color: red;
+    float: left;
+    margin-right: 5px;
+}
+
+.unStaffed:after {
+    content: attr(data-after);
+    float: right;
+    margin-left: 2em;
+    font-weight: strong;
+    color: green;
+}
+
+button.accordion:after {
+    content: attr(data-after);
+    float: right;
+    margin-left: 2em;
+    font-weight: normal;
+    color: green;
+}
+
+button.accordion.active:before {
+    content: "\2212";
+}
+
+.accHidden {
+    padding: 0 18px;
+	margin-top: 5px;
+	margin-bottom: 5px;
+    max-height: 0;
+    overflow: hidden;
+}
+
+/* begin efmCSS */
+
+#graph .linage {
+    fill: none;
+    stroke: white;
+}
+#graph .marriage {
+    fill: none;
+    stroke: white;
+}
+#graph .node {
+    background-color: lightblue;
+    border-style: solid;
+    border-width: 1px;
+}
+#graph .nodeText{
+    font: 10px sans-serif;
+    margin: 0;
+    padding: 0;
+    color: black;
+}
+#graph {
+    font: 10px sans-serif;
+    margin: -20px 0;
+    padding: 0;
+    color: black;
+}
+
+#graph div {
+    border-style: solid;
+    border-width: 1px;
+}
+
+#graph .XY {
+    background-color: lightblue;
+}
+
+#graph div.XX {
+    background-color: pink;
+}
+
+#graph div.unknown {
+    background-color: gray;
+}
+
+#graph div.unknownXY {
+    background-color: #808080;
+}
+
+#graph div.unknownXX {
+    background-color: #808080;
+}
+
+#graph .you {
+    background-color: red;
+}
+
+#graph .emphasis {
+    font-style: italic;
+    font-weight: bold;
+    margin: 0;
+    background: #ffffff88;
+    border: 2px solid Gold; 
+	white-space: nowrap;
+}
+
+#editFamily {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+}
+
+#editFamily #familyTable {
+}
+
+/* end extended family css */
+
+config.history.tracking = false;
diff --git a/devNotes/twine JS b/devNotes/twine JS
index b2545e3d95cba3884723d15797b9d8a415156346..f6809f4a75fe3c3c68eec941defeda745f0dd98a 100644
--- a/devNotes/twine JS	
+++ b/devNotes/twine JS	
@@ -4783,7 +4783,7 @@ if(eventSlave.fetish != "mindbroken") {
 			}
 		}
 
-		if(eventSlave.boobs > 1400) {
+		if(eventSlave.boobs >= 2000) {
 			if(eventSlave.boobsImplant == 0) {
 				if(eventSlave.nipples != "tiny") {
 					if(eventSlave.devotion > 20) {
diff --git a/src/SecExp/attackOptions.tw b/src/SecExp/attackOptions.tw
index e19c46956107af42b111d2bf40678ac9487bf889..3c9554c88a12559be40adb601a708f93b45cd163 100644
--- a/src/SecExp/attackOptions.tw
+++ b/src/SecExp/attackOptions.tw
@@ -516,7 +516,7 @@ Defensive tactics
 	<<set $chosenTactic = "Bait and Bleed">>
 	<<replace "#tactic">><strong><<print $chosenTactic>></strong><</replace>>
 <</link>>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;//Combines bait and switch tactics with guerriglia style assaults, with the objective of slowly bleed the enemy.//
+<br>&nbsp;&nbsp;&nbsp;&nbsp;//Combines bait and switch tactics with guerrilla style assaults, with the objective of slowly bleed the enemy.//
 <br>
 <<link "Guerrilla">>
 	<<set $chosenTactic = "Guerrilla">>
diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw
index 5f57a4812b33f02495f92002a6271eabd26fc4c3..cc562291a2b42fc262fe8918b1d5bc3749487877 100644
--- a/src/SecExp/attackReport.tw
+++ b/src/SecExp/attackReport.tw
@@ -698,150 +698,105 @@
 	<<if $leadingTroops == "PC">>
 		You decided to personally lead the defense of your arcology.
 		<<if $deployingMilitia == 1>>
-			<<if _oldRep <= 2500 && _oldRep > 1000>>
-				You're not particularly popular between the inhabitants of your arcology, so your presence does little to reassure the volunteers
-			<<elseif _oldRep <= 1000>>
-				As your low reputation proves, your volunteers do not particularly enjoy your company. As far as they are concerned your presence is more of an hindrance than an advantage
-			<</if>>
-			<<if $PC.career == "celebrity">>
-				, still your past celebrity does carry some weight, many do look forward to fight alongside a famous name.
-			<<elseif $PC.career == "capitalist">>
-				, still your past life as a famous venture capitalist does carry some weight, many trust in your cunning to save them in the incoming battle.
-			<<elseif $PC.career == "gang">>
-				, the situation is not made easier by your past. Many still remember you as the gang leader who used to be on the other side of their guns.
-			<<elseif $PC.career == "escort">>
-				, the situation is not made easier by your past. Many still remember your past career as an escort and doubt you'll be of any use during the fighting.
-			<<elseif $PC.career == "mercenary">>
-				, still your past merc works does carry some weight, many do look forward to fight alongside a battle hardened name.
-			<<else>>
-				.
-			<</if>>
-			<<if _oldRep >= 5000 && _oldRep < 15000>>
-				Your citizens are honored that their arcology owner is willing to put <<if $PC.title == 0>>her<<else>>his<</if>> life in danger
-			<<elseif _oldRep >= 15000>>
-				Many among the volunteers are awed by your presence, never would they have thought they would fight shoulder to shoulder with their famous arcology owner
-			<</if>>
-			<<if $PC.career == "celebrity">>
-				, not to mention the priceless opportunity of fighting together with someone with such a renowned past as yours. Your celebrity still does carry its weight.
-			<<elseif $PC.career == "capitalist">>
-				, not to mention the priceless opportunity of fighting together with one of the great capitalist sharks of their time. Such fine mind on their side can only bring victory!
-			<<elseif $PC.career == "gang">>
-				, your past, however, does not help you: many still remember you as the gang leader who used to be on the other side of their guns.
-			<<elseif $PC.career == "escort">>
-				, your past, however, does not help you: many still remember your past career as an escort and doubt you'll be of any use during the fighting.
-			<<elseif $PC.career == "mercenary">>
-				, still your past merc works does carry some weight, many do look forward to fight alongside a battle hardened name.
-			<<else>>
-				.
-			<</if>>
-		<</if>>
-		<<if $deployingSlaves == 1>>
-			<<if _oldAuth <= 2500 &&_oldAuth > 1000>>
-				Your slave soldiers do not feel bound to you as much as they should, as your authority is far from absolute
-				<<if $PC.career == "escort">>
-					, fortunately many feel some level of kinship with you, thanks to your past as an escort.
-				<<elseif $PC.career == "servant">>
-					, fortunately many feel some level of kinship with you, thanks to your past as a servant.
-				<<elseif $PC.career == "slaver">>
-					, things are made worse by your past as a notorious slaver.
+			<<if _oldRep <= 2500>>
+				<<if _oldRep > 1000>>
+					You're not particularly popular between the inhabitants of your arcology, so your presence does little to reassure the volunteers.
+				<<else>>
+					As your low reputation proves, your volunteers do not particularly enjoy your company. As far as they are concerned your presence is more of an hindrance than an advantage.
+				<</if>>
+				<<if $PC.career == "celebrity">>
+					Still, your past celebrity does carry some weight, and many look forward to fight alongside a famous name.
+				<<elseif $PC.career == "capitalist">>
+					Still, your past life as a famous venture capitalist does carry some weight, and many trust in your cunning to save them in the incoming battle.
+				<<elseif $PC.career == "gang">>
+					The situation is not made easier by your past. Many still remember you as the gang leader who used to be on the other side of their guns.
+				<<elseif $PC.career == "escort">>
+					The situation is not made easier by your past. Many still remember your past career as an escort and doubt you'll be of any use during the fighting.
 				<<elseif $PC.career == "mercenary">>
-					, still your past merc works does carry some weight, many do look forward to fight alongside a battle hardened name.
+					Still, your past mercenary work does carry some weight, and many look forward to fight alongside a battle hardened name.
+				<</if>>
+			<<elseif _oldRep >= 5000>>
+				<<if _oldRep < 15000>>
+					Your citizens are honored that their arcology owner is willing to put <<if $PC.title == 0>>her<<else>>his<</if>> life in danger.				
 				<<else>>
-					.
+					Many among the volunteers are awed by your presence; never would they have thought they would fight shoulder to shoulder with their famous arcology owner.
 				<</if>>
-			<<elseif _oldAuth <= 1000>>
-				Your slave soldiers are often openly rebellious. Only the threat of execution hold them in line
-				<<if $PC.career == "escort">>
-					, fortunately many feel some level of kinship with you, thanks to your past as an escort.
-				<<elseif $PC.career == "servant">>
-					, fortunately many feel some level of kinship with you, thanks to your past as a servant.
-				<<elseif $PC.career == "slaver">>
-					, things are made worse by your past as a notorious slaver.
+				<<if $PC.career == "celebrity">>
+					They consider it a priceless opportunity to fight together with someone with such a renowned past as yours. Your celebrity past still carries weight.
+				<<elseif $PC.career == "capitalist">>
+					They consider it a priceless opportunity to fight together with one of the great capitalist sharks of their time. Such a fine mind on their side can only bring victory!
+				<<elseif $PC.career == "gang">>
+					Your past, however, does not help you. Many still remember you as the gang leader who used to be on the other side of their guns.
+				<<elseif $PC.career == "escort">>
+					Your past, however, does not help you. Many still remember your past career as an escort and doubt you'll be of any use during the fighting.
 				<<elseif $PC.career == "mercenary">>
-					, still your past merc works does carry some weight, many do look forward to fight alongside a battle hardened name.
+					Your past mercenary work does carries some weight, and many look forward to fight alongside a battle hardened name.
+				<</if>>
+			<</if>>
+		<</if>>
+		<<if $deployingSlaves == 1>>
+			<<if _oldAuth <= 2500>>
+				<<if _oldAuth > 1000>>
+					Your slave soldiers do not feel bound to you as much as they should, as your authority is far from absolute.
 				<<else>>
-					.
+					Your slave soldiers are often openly rebellious. Only the threat of execution holds them in line.
 				<</if>>
-			<<elseif _oldAuth >= 5000 && _oldAuth < 15000>>
-				Your slave soldiers show a surprising amount of discipline, thanks to your high authority
 				<<if $PC.career == "escort">>
-					and the feeling of kinship they instinctively feel towards you, because of your past as an escort.
+					Fortunately many feel some level of kinship with you, thanks to your past as an escort.
 				<<elseif $PC.career == "servant">>
-					and the feeling of kinship they instinctively feel towards you, because of your past as a servant.
+					Fortunately many feel some level of kinship with you, thanks to your past as a servant.
 				<<elseif $PC.career == "slaver">>
-					. Still some rebellious looks can be spotted once in a while, in their eyes your slaver past will always paint you in a dark light.
+					Things are made worse by your past as a notorious slaver.
 				<<elseif $PC.career == "mercenary">>
-					, still your past merc works does carry some weight, many do look forward to fight alongside a battle hardened name.
+					Your past mercenary work carries some weight, and many look forward to fighting alongside a battle hardened name.
+				<</if>>
+			<<elseif _oldAuth >= 5000>>
+				<<if _oldAuth < 15000>>
+					Your slave soldiers show a surprising amount of discipline, thanks to your high authority.
 				<<else>>
-					.
+					Your slave soldiers show almost a fanatical level of martial discipline. Your absolute authority has a great effect on them.
 				<</if>>
-			<<elseif _oldAuth >= 15000>>
-				Your slave soldiers show almost a fanatical level of martial discipline. Your absolute authority has a great effect on them
 				<<if $PC.career == "escort">>
-					and the feeling of kinship they instinctively feel towards you, because of your past as an escort.
+					Many have an instinctual feeling of kinship towards you because of your past as an escort.
 				<<elseif $PC.career == "servant">>
-					and the feeling of kinship they instinctively feel towards you, because of your past as a servant.
+					Many have an instinctual feeling of kinship towards you because of your past as a servant.
 				<<elseif $PC.career == "slaver">>
-					. Still some rebellious looks can be spotted once in a while, in their eyes your slaver past will always paint you in a dark light.
+					Still, some rebellious looks can be spotted once in a while. In their eyes your slaver past will always paint you in a dark light.
 				<<elseif $PC.career == "mercenary">>
-					, still your past merc works does carry some weight, many do look forward to fight alongside a battle hardened name.
-				<<else>>
-					.
+					Your past mercenary work carries some weight, and many look forward to fighting alongside a battle hardened name.
 				<</if>>
 			<</if>>
 		<</if>>
 		<<if $deployingMercs == 1>>
 			<<if $mercLoyalty <= 25>>
-				Your presence does little to spur your mercenaries into action, their loyalty is straining and their performance suffers
-				<<if $PC.career == "mercenary">>
-					, thankfully they hold in high regard someone who made their fortune as a mercenary themselves.
-				<<elseif $PC.career == "wealth">>
-					and they do little to hide the contempt they have for someone who was born into wealth, rather than gaining it from their sweat.
-				<<elseif $PC.career == "servant">>
-					and they do little to hide their disgust at being ordered around by an ex-servant.
-				<<elseif $PC.career == "BlackHat">>
-					and they do little to hide their disgust at being ordered around by some unscrupulous code monkey.
+				<<if $mercLoyalty <= 10>>
+					Your mercenaries barely bother to pretend being loyal; their battle performance is obviously barely passable.
 				<<else>>
-					.
+					Your presence does little to spur your mercenaries into action; their loyalty is straining and their performance suffers.
 				<</if>>
-			<<elseif $mercLoyalty <= 10>>
-				Your mercenaries barely bother to pretend being loyal, their battle performance is obviously barely passable
 				<<if $PC.career == "mercenary">>
-					, thankfully they hold in high regard someone who made their fortune as a mercenary themselves.
+					Thankfully they hold in high regard someone who made their fortune as a mercenary themselves.
 				<<elseif $PC.career == "wealth">>
-					and they do little to hide the contempt they have for someone who was born into wealth, rather than gaining it from their sweat.
+					They do little to hide the contempt they have for someone who was born into wealth, rather than gaining it through blood, sweat, and tears.
 				<<elseif $PC.career == "servant">>
-					and they do little to hide their disgust at being ordered around by an ex-servant.
+					They do little to hide their disgust at being ordered around by an ex-servant.
 				<<elseif $PC.career == "BlackHat">>
-					and they do little to hide their disgust at being ordered around by some unscrupulous code monkey.
-				<<else>>
-					.
+					They do little to hide their disgust at being ordered around by some unscrupulous code monkey.
 				<</if>>
-			<<elseif $mercLoyalty >= 50 && $mercLoyalty < 75>>
-				Your mercenaries are ready to fight their hardest for you, their loyalty a testament to your capability as a leader
-				<<if $PC.career == "mercenary">>
-					, not to mention they're more than willing to follow someone who walked their same steps once as a gun for hire.
-				<<elseif $PC.career == "wealth">>
-					, unfortunately many do still resent you being born into your wealth and power, rather than having earned it with sweat and tears.
-				<<elseif $PC.career == "servant">>
-					, unfortunately some still resent the fact they are ordered around by an ex-servant.
-				<<elseif $PC.career == "BlackHat">>
-					, unfortunately some still resent the fact they are ordered around by an unscrupulous hacker.
+			<<elseif $mercLoyalty >= 50>>
+				<<if $mercLoyalty < 75>>
+					Your mercenaries are ready to fight their hardest for you, their loyalty a testament to your capability as a leader.
 				<<else>>
-					.
+					Your mercenaries fight with a martial fury worthy of religious fanatics. Their loyalty to you is absolute.
 				<</if>>
-			<<elseif $mercLoyalty >= 75>>
-				Your mercenaries fight with a martial fury worthy of religious fanatics. Their loyalty to you is absolute
 				<<if $PC.career == "mercenary">>
-					, not to mention they're more than willing to follow someone who walked their same steps once as a gun for hire.
+					They're more than willing to follow someone who walked their same steps once as a gun for hire.
 				<<elseif $PC.career == "wealth">>
-					, unfortunately many do still resent you being born into your wealth and power, rather than having earned it with sweat and tears.
+					Unfortunately many still resent you being born into your wealth and power, rather than having earned it through blood, sweat, and tears.
 				<<elseif $PC.career == "servant">>
-					, unfortunately some still resent the fact they are ordered around by an ex-servant.
+					Unfortunately some still resent the fact they are ordered around by an ex-servant.
 				<<elseif $PC.career == "BlackHat">>
-					, unfortunately some still resent the fact they are ordered around by a dubious incursion specialist.
-				<<else>>
-					.
+					Unfortunately some still resent the fact they are ordered around by an unscrupulous hacker.
 				<</if>>
 			<</if>>
 			<<if _oldRep >= 15000>>
@@ -1297,7 +1252,7 @@
 		<<elseif $chosenTactic == "Interior Lines">>
 			While the urban environment offers many highly defensive position, it does restrict movement and with it the advantages of exploiting interior lines.
 		<<elseif $chosenTactic == "Pincer Maneuver">>
-			The urban terrain does not allow for wide maneuvers, the attempts of your forces to encircle the assaulters are mostly unsuccessful.
+			The urban terrain does not allow for wide maneuvers, the attempts of your forces to encircle the attackers are mostly unsuccessful.
 		<<elseif $chosenTactic == "Defense In Depth">>
 			While the urban environment offers many defensive positions, it limits mobility, limiting the advantages of using a defense in depth tactic.
 		<<elseif $chosenTactic == "Blitzkrieg">>
diff --git a/src/SecExp/encyclopediaSecExpMain.tw b/src/SecExp/encyclopediaSecExpMain.tw
index 4a3451b10dd5c25841bf19623e9ee7f0050cf5b8..f676b188df69b64b01917aa0c9a8c9103e04bc8c 100644
--- a/src/SecExp/encyclopediaSecExpMain.tw
+++ b/src/SecExp/encyclopediaSecExpMain.tw
@@ -29,7 +29,7 @@ For a detailed outlook of how battles work see the relative page.
 <br><strong>The Barracks</strong>: This is where troops can be prepared and organized to respond to threats encroaching on the arcology's territory.
 <br><strong>The Security HQ</strong>: This is where your security department will manage the security of the arcology.
 <br><strong>The Propaganda Hub</strong>: This is where your propaganda department will expand and deepen your authority over the arcology.
-<br><strong>The transportHub</strong>: This is where trade happens. Mainly intended as a counter to proserity loss events.
-<br><strong>The riotControlCenter</strong>: Fairly self explanitory, will help you manage rebellions.
+<br><strong>The transportHub</strong>: This is where trade happens. Mainly intended as a counter to prosperity loss events.
+<br><strong>The riotControlCenter</strong>: Fairly self explanatory, will help you manage rebellions.
 <br>
 <hr>
\ No newline at end of file
diff --git a/src/SecExp/rebellionEvents.tw b/src/SecExp/rebellionEvents.tw
index c767324164d630e5c2209b222a21092a6dd89339..73093a64f9d543f67f27015a75bee76a4555a4df 100644
--- a/src/SecExp/rebellionEvents.tw
+++ b/src/SecExp/rebellionEvents.tw
@@ -25,9 +25,9 @@
 	<<if _rand == 0>>
 		This week several slaves were found plotting the death of their master. They were quickly dealt with, but their owner's choice of punishment did little to calm tensions in the arcology.
 	<<elseif _rand == 1>>
-		This week a large group of slaves attempted to escape. Several were recaptured, but others were deemed to dangerous and were shot on sight. The unfortunate circumstances raised the disapproval of many citizens, either because of the waste of good slaves or the brutality with which the operation was carried. With a bit of luck, however, the incident will be soon forgotten.
+		This week a large group of slaves attempted to escape. Several were recaptured, but others were deemed too dangerous and were shot on sight. The unfortunate circumstances raised the disapproval of many citizens, either because of the waste of good slaves or the brutality with which the operation was carried. With a bit of luck, however, the incident will be soon forgotten.
 	<<elseif _rand == 2>>
-		This week books of unknown origin and dangerous content were found in the possession of several slaves. They were mostly sociopolitical treaties, making it clear that the intent of the responsible was to fan the fire of rebellion. The books were quickly collected and archived, hopefully this affair will not have lasting consequences.
+		This week books of unknown origin and dangerous content were found in the possession of several slaves. They were mostly sociopolitical treaties, making it clear that the intent of the ones responsible was to fan the fire of rebellion. The books were quickly collected and archived, hopefully this affair will not have lasting consequences.
 	<<elseif _rand == 3>>
 		This week a citizen was caught giving refuge to an escaped slave. He was not able to pay for the value of the stolen goods, so he was processed as the case required and the slave returned to their rightful master. Many questions however remain without answers.
 	<<elseif _rand == 4>>
@@ -46,13 +46,13 @@
 	<<elseif _rand == 1>>
 		This week an underground railroad was discovered. The rebels did not go down without a fight, but in the end <<if $mercenaries >= 1>>your mercenaries<<else>>your security drones<</if>> managed to destroy the old tunnels they were using to ship out slaves out of the arcology. 
 	<<elseif _rand == 2>>
-		This week a famous citizen was assaulted and brutally murdered by his slaves. The responsible were apprehended and dealt with easily enough, but the mere fact something like this could have happened is concerning. Those slaves had to be aware of their certain doom.
+		This week a famous citizen was assaulted and brutally murdered by his slaves. The ones responsible were apprehended and dealt with easily enough, but the mere fact something like this could have happened is concerning. Those slaves had to be aware of their certain doom.
 	<<elseif _rand == 3>>
-		This week a group of slavers entering the arcology was assaulted. Many reported heavy injuries, but fortunately there were no casualties. The assaulters were disguised, but the security systems already identified several slaves who were likely part of the group, based on camera feeds.
+		This week a group of slavers entering the arcology was assaulted. Many reported heavy injuries, but fortunately there were no casualties. The attackers were disguised, but the security systems already identified several slaves who were likely part of the group, based on camera feeds.
 	<<elseif _rand == 4>>
 		This week the waterways were found infected by a virulent pathogen. The cause was later found to be a diseased slave that died while in the maintenance tunnels. It's not clear if the slave was there because of orders given to him or if he was trying to escape.
 	<<else>>
-		This week a sleeper cell of a famous anti slavery organization was discovered in the low levels of the arcology. The group however was aware of the coming security forces and repeated before they could be dealt with.
+		This week a sleeper cell of a famous anti slavery organization was discovered in the low levels of the arcology. The group however was aware of the coming security forces and retreated before they could be dealt with.
 	<</if>>
 	<<set $tension += random(5,10)>>
 <<case 3>>
@@ -63,7 +63,7 @@
 	<<elseif _rand == 1>>
 		This week a number of shops were burned to the ground by rioting slaves and sympathetic citizens. It took considerable effort for the security forces to take control of the situation. Harsh punishment is required and scheduled for the instigators.
 	<<elseif _rand == 2>>
-		This week a mass escape attempt was barely stopped before becoming a catastrophe. Many citizens were trampled by their terrorized peers of the desperate horde of slaves. It will take some time to restore the streets involved to working order.
+		This week a mass escape attempt was barely stopped before becoming a catastrophe. Many citizens were trampled by the desperate horde of slaves. It will take some time to restore the streets involved to working order.
 	<<elseif _rand == 3>>
 		This week a number of riots inflamed the arcology. Many slaves took violent actions against citizens and security personnel. The number of victims keeps getting higher as still now the last sparks of revolt are still active.
 	<</if>>
@@ -73,7 +73,7 @@
 	<<if _rand == 0>>
 		This week a citizen refused to pay rent, claiming ideological opposition to the arcology's owner policies. He was quickly dealt with, but his words might not have fallen silent yet.
 	<<elseif _rand == 1>>
-		This week books of unknown origin and dangerous content were found in the possession of several citizens. They were mostly sociopolitical treaties, making it clear that the intent of the responsible was to fan the fire of rebellion. Most of them were bought and archived, but a few are still circling between the citizens of the arcology.
+		This week books of unknown origin and dangerous content were found in the possession of several citizens. They were mostly sociopolitical treaties, making it clear that the intent of the ones responsible was to fan the fire of rebellion. Most of them were bought and archived, but a few are still circling between the citizens of the arcology.
 	<<elseif _rand == 2>>
 		This week a citizen was caught giving refuge to other citizens, who would be liable to be enslaved because of their debts. The situation was quickly resolved, but the misplaced generosity of that citizen might have inflamed a few souls.
 	<<elseif _rand == 3>>
@@ -89,9 +89,9 @@
 <<case 5>>
 	<<set _rand = random(0,5)>>
 	<<if _rand == 0>>
-		This week a factory was subject to a strike by a group of citizens protesting against the owner. They were promptly arrested and the factory returned to its rightful proprietor by our security department.
+		This week a factory was subject to a strike by a group of citizens protesting against the owner. They were promptly arrested and the factory returned to its rightful proprietor by your security department.
 	<<elseif _rand == 1>>
-		This week a group of citizens organized a protest against the systemic enslavement of the citizens of the arcology. Their little parade gathered a surprisingly large crowd, but it was nonetheless quickly suppressed by our forces.
+		This week a group of citizens organized a protest against the systemic enslavement of the citizens of the arcology. Their little parade gathered a surprisingly large crowd, but it was nonetheless quickly suppressed by your forces.
 	<<elseif _rand == 2>>
 		This week the security department registered the formation of several assemblies of citizens, whose purpose seems to be political in nature. For now no further steps were taken, but it's a worrying sign of further political opposition within the arcology.
 	<<elseif _rand == 3>>
@@ -109,7 +109,7 @@
 	<<elseif _rand == 1>>
 		This week several factories were set aflame by their workers. The security department worked day and night to control the fire and apprehend the criminals behind the act. Many are known dissidents, but there are a fair few new faces within them. This is a worrying sign.
 	<<elseif _rand == 2>>
-		This week numerous riots exploded all over the arcology. Many citizens went in the streets to protest against the arcology owner and its supporters. The security forces slowly managed to stop the rioters, with no little trouble and only through generous use of violence.
+		This week numerous riots exploded all over the arcology. Many citizens took to the streets to protest against the arcology owner and its supporters. The security forces slowly managed to stop the rioters, with no small amount of trouble and only through generous use of violence.
 	<<elseif _rand == 3>>
 		This week a massive protest of citizens and slaves gathered just outside the penthouse. The crowd was dispersed only after several hours. There were several victims from both sides and no shortage of injured.
 	<</if>>
diff --git a/src/SecExp/rebellionGenerator.tw b/src/SecExp/rebellionGenerator.tw
index 41e445f99956c4f4eaf46da0a23e485f8c763ae1..e7a1783168a8434c27bb088f824473cd05dc193e 100644
--- a/src/SecExp/rebellionGenerator.tw
+++ b/src/SecExp/rebellionGenerator.tw
@@ -111,7 +111,7 @@
 <</if>>
 <<if $arcologies[0].FSRestart != "unset">>
 	<<if _CSratio > 1>>
-		Your citizens are not happy with the noticeable lack of slaves compared to their numbers.<<set _citizen +=20>>
+		Your citizens are not happy with the noticeable lack of slaves compared to their numbers.<<set _citizen += 20>>
 	<<elseif _CSratio > 0.5>>
 		Your citizens are not happy with the lack of slaves compared to their numbers.<<set _citizen += 15>>
 	<<elseif _CSratio < 0.2>>
@@ -119,9 +119,9 @@
 	<</if>>
 <<elseif $arcologies[0].FSRepopulationFocus != "unset">>
 	<<if _CSratio < 0.5>>
-		Your citizens are not happy of being outbred by the slaves of the arcology<<set _citizen +=20>>
+		Your citizens are not happy about being outbred by the slaves of the arcology<<set _citizen += 20>>
 	<<elseif _CSratio < 1>>
-		Your citizens are not happy of being outbred by the slaves of the arcology<<set _citizen += 15>>
+		Your citizens are not happy about being outbred by the slaves of the arcology<<set _citizen += 15>>
 	<<elseif _CSratio > 1.4>>
 		<<set _citizen += 5>>
 	<</if>>
diff --git a/src/SecExp/rebellionReport.tw b/src/SecExp/rebellionReport.tw
index 62a752196c54b95347d683b32d7511ce25051721..ef83cc9584fcc30e8bf0127334e2df2857b59178 100644
--- a/src/SecExp/rebellionReport.tw
+++ b/src/SecExp/rebellionReport.tw
@@ -519,7 +519,7 @@
 					<<if $Concubine.health >= -60>>
 						<<set $Concubine.health -= 30>>
 					<<else>>
-						<<set $Concubine.health -= Math.abs(90 - $Concubine.health)>>
+						<<set $Concubine.health = -90>>
 					<</if>>
 				<</if>>
 			<</if>>
@@ -582,7 +582,7 @@
 				<<if $Bodyguard.health >= -60>>
 					<<set $Bodyguard.health -= 30>>
 				<<else>>
-					<<set $Bodyguard.health -= Math.abs(90 - $Bodyguard.health)>>
+					<<set $Bodyguard.health = -90>>
 				<</if>>
 			<</if>>
 		<</if>>
@@ -689,7 +689,7 @@
 					<<if $Concubine.health >= -60>>
 						<<set $Concubine.health -= 30>>
 					<<else>>
-						<<set $Concubine.health -= Math.abs(90 - $Concubine.health)>>
+						<<set $Concubine.health = -90>>
 					<</if>>
 				<</if>>
 			<</if>>
@@ -797,7 +797,7 @@
 					<<if $Concubine.health >= -60>>
 						<<set $Concubine.health -= 30>>
 					<<else>>
-						<<set $Concubine.health -= Math.abs(90 - $Concubine.health)>>
+						<<set $Concubine.health = -90>>
 					<</if>>
 				<</if>>
 			<</if>>
@@ -831,4 +831,4 @@
 <</if>>
 <<set $slaveRebellion = 0>>
 <<set $citizenRebellion = 0>>
-<<set $tension =  Math.clamp($tension - random(50,100), 0, 100)>>
+<<set $tension =  Math.clamp($tension - random(50,100), 0, 100)>>
\ No newline at end of file
diff --git a/src/SecExp/riotControlCenter.tw b/src/SecExp/riotControlCenter.tw
index f342a3c03a1ad2a542d9fbf399995f596c859cb5..962d9b99dbb97c9c379fb326d2021db0dd6bc3a4 100644
--- a/src/SecExp/riotControlCenter.tw
+++ b/src/SecExp/riotControlCenter.tw
@@ -150,17 +150,17 @@ The riot control center opens its guarded doors to you. The great chamber inside
 			<<set $riotUpkeep += 5000>>
 			<<goto "riotControlCenter">>
 		<</link>>
-		<br>//Will take weeks of work and will cost 10000 each, but once finished rebellions will progress a lot slower.//
+		<br>//Will take weeks of work and will cost 5000 each week, but once finished rebellions will progress a lot slower.//
 	<<elseif $brainImplantProject < 5>>
 		<<link "Invest more resources in the brain implant project">>
 			<<set $brainImplantProject += 1>>
 			<<set $cash -= 50000 * $upgradeMultiplierArcology * $brainImplantProject*$HackingSkillMultiplier>> 
 			<<set $PC.hacking += 1>>
-			<<set $riotUpkeep += $upgradeUpkeep * 100>>
+			<<set $riotUpkeep += 5000>>
 			<<goto "riotControlCenter">>
 		<</link>>
 		<br>Invest more resources into the project to increase its speed.
-		<br>//Costs <<print cashFormat(Math.trunc(50000 * $upgradeMultiplierArcology * $brainImplantProject*$HackingSkillMultiplier))>>. Will shorten the time required to complete the project.//
+		<br>//One-time cost of <<print cashFormat(Math.trunc(50000 * $upgradeMultiplierArcology * $brainImplantProject*$HackingSkillMultiplier))>> with an additional 5000 each week in maintenance. Will shorten the time required to complete the project.//
 	<<else>>
 		You sped up the project to its maximum.
 	<</if>>
@@ -180,7 +180,7 @@ The riot control center opens its guarded doors to you. The great chamber inside
 	<</link>>
 	<br>//Costs <<print cashFormat(30000)>>. Will allow the selection of advanced riot equipment in case of a rebellion, which will let your troops fight at full effectiveness while doing reduced collateral damage.//
 <<else>>
-	You developed advanced riot equipment, which allows your troops to fight within the confies of your arcology without the fear of doing major collateral damage.
+	You developed advanced riot equipment, which allows your troops to fight within the confines of your arcology without the fear of doing major collateral damage.
 <</if>>
 <br>
 <<if $fort.reactor == 0>>
diff --git a/src/SecExp/secBarracks.tw b/src/SecExp/secBarracks.tw
index d935c9b35c9d2b8497ad245cb46e48d55c051c75..ba68110ef72d2289859ef1fee5a5bf158567a28d 100644
--- a/src/SecExp/secBarracks.tw
+++ b/src/SecExp/secBarracks.tw
@@ -6,7 +6,7 @@ The Barracks
 <hr>
 __Upgrades__
 <br>
-While this a sore sight for many citiens of $arcologies[0].name, the barracks stand proud before you.
+While this a sore sight for many citizens of $arcologies[0].name, the barracks stand proud before you.
 <<if $secBarracksUpgrades.size == 0>>
 	The building is relatively small and able to house a limited number of units.
 <<elseif $secBarracksUpgrades.size == 1>>
diff --git a/src/SecExp/securityHQ.tw b/src/SecExp/securityHQ.tw
index 5a8f3bdbe3608953c45d1240bf50be7bae2a525e..ebadaa8d29c58893a04c87f61cbe03f231096342 100644
--- a/src/SecExp/securityHQ.tw
+++ b/src/SecExp/securityHQ.tw
@@ -217,7 +217,7 @@ Considering the current upgrades the maximum level of crime is <<print $crimeCap
 
 <<if $intelUpgrades.sensors == 0>>
 	[[Install perimeter	sensors|securityHQ][$cash -= Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $intelUpgrades.sensors = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]]
-	<br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will increase recon capabilites, but will require 5 extra slaves in the headquarters and increases upkeep.//
+	<br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will increase recon capabilities, but will require 5 extra slaves in the headquarters and increases upkeep.//
 <<else>>
 	You have installed perimeter seismic sensors able to detect movement with high accuracy.
 <</if>>
diff --git a/src/SecExp/securityReport.tw b/src/SecExp/securityReport.tw
index b3b38ffbf1ad036581c5d56f389b87e44966718e..09d1093144c1cadede025db68b06185f75185f2d 100644
--- a/src/SecExp/securityReport.tw
+++ b/src/SecExp/securityReport.tw
@@ -132,7 +132,7 @@
 	The training officers of $securityForceName assigned to the Security HQ improve its effectiveness.
 <</if>>
 <<if $SFSupportLevel >= 1>>
-	Providing your Security Department with equipment from $securityForceName slightly boosts the security of your arology.
+	Providing your Security Department with equipment from $securityForceName slightly boosts the security of your arcology.
 <</if>>
 
 /* resting point */
diff --git a/src/SecExp/unitsBattleReport.tw b/src/SecExp/unitsBattleReport.tw
index 7b39e0e1395c40744cb7880892cd47c5071aa365..e45d6025cf49963bb777f7397911350347a7466b 100644
--- a/src/SecExp/unitsBattleReport.tw
+++ b/src/SecExp/unitsBattleReport.tw
@@ -114,7 +114,7 @@
 			catastrophic casualties
 		<</if>>
 		suffered.
-		<<if $secBots.troops <= 0>>
+		<<if $secBots.troops <= 5>>
 			<<set $secBots.active = 0>>
 			Unfortunately the losses they took were simply too great, their effective combatants are in so small number you can no longer call them a deployable unit. It will take quite the investment to rebuild them. 
 		<<elseif $secBots.troops <= 10>>
@@ -175,7 +175,7 @@
 						<<set $militiaUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>>
 					<</if>>
 				<</if>>
-				<<if $militiaUnits[_j].troops <= 0>>
+				<<if $militiaUnits[_j].troops <= 5>>
 					<<set $militiaUnits[_j].active = 0>>
 					<br>Unfortunately the losses they took were simply too great, their effective combatants are in so small number you can no longer call them a deployable unit. The remnants will be sent home honored as veterans or reorganized in a new unit. 
 				<<elseif $militiaUnits[_j].troops <= 10>>
@@ -217,9 +217,9 @@
 						<<set $slaveUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>>
 					<</if>>
 				<</if>>
-				<<if $slaveUnits[_j].troops <= 0>>
+				<<if $slaveUnits[_j].troops <= 5>>
 					<<set $slaveUnits[_j].active = 0>>
-					<br>Unfortunately the losses they took were simply too great, their effective combatants are in so small number you can no longer call them a deployable unit. The sorvivors will be sent home honored as veterans or reorganized in a new unit. 
+					<br>Unfortunately the losses they took were simply too great, their effective combatants are in so small number you can no longer call them a deployable unit. The survivors will be sent home honored as veterans or reorganized in a new unit. 
 				<<elseif $slaveUnits[_j].troops <= 10>>
 					<br>The unit has very few operatives left, it risks complete annihilation if deployed again.
 				<</if>>
@@ -259,7 +259,7 @@
 						<<set $mercUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>>
 					<</if>>
 				<</if>>					
-				<<if $mercUnits[_j].troops <= 0>>
+				<<if $mercUnits[_j].troops <= 5>>
 					<<set $mercUnits[_j].active = 0>>
 					<br>Unfortunately the losses they took were simply too great, their effective combatants are in so small number you can no longer call them a deployable unit. The remnants will be sent home honored as veterans or reorganized in a new unit. 
 				<<elseif $mercUnits[_j].troops <= 10>>
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index c8626f53a7720d8f6834dc146a2b668cd6bc8cf1..73d587adb15e07a2c6a013ec50988f4d16d11233 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -449,7 +449,11 @@ __''Player Character''__
 <<if $freshPC == 1 || $saveImported == 0>>
 
 	<<if ndef $PCCreationSex>>
-		<<set $PCCreationSex = "masculine ''Master''">>
+		<<if $PC.title == 1>>
+			<<set $PCCreationSex = "masculine ''Master''">>
+		<<else>>
+			<<set $PCCreationSex = "feminine ''Mistress''">>
+		<</if>>
 	<</if>>
 
 	<br>You are a $PCCreationSex.
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 4c4909dd5b2e62d512e771c9222c951eddb5c67e..1a0ad015dff05c6b4ab6a95ae3964a8224c1d5d5 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -2600,6 +2600,7 @@ __I do not give credit without explicit permission to do so.__ If you have contr
 <br>''anon'' for the slave mutiny event.
 <br>''onithyr'' for various little tweaks and additions.
 <br>''anonNeo'' for spellchecking.
+<br>''kopareigns'' for many text and bug fixes.
 <br>''Utopia'' for dirty dealings gang leader focus and updates to it.
 <br>''hexall90'' for height growth drugs, incubator organ farm support and detailing, the dispensary cleanup, the joint Eugenics bad end rework, the Hippolyta Academy, and the Security Expansion Mod.
 <br>''sensei'' for coding in support for commas and an excellent family tree rework.
@@ -2616,6 +2617,7 @@ __I do not give credit without explicit permission to do so.__ If you have contr
 <br>''Faraen'' for a full vector art variant.
 <br>''anon'' for more hair vectors for the external art.
 <br>''Vas'' for massive JS work.
+<br>''deepmurk'' for a massive expansion in conjuction with Nox to the original embedded vector art. Also more hairs and clothes.
 <br>''Bane70'' optimized huge swaths of code with notable professionalism.
 <br>''Circle Tritagonist'' provided several new collars and outfits.
 <br>''Qotsafan'' submitted bugfixes.
diff --git a/src/gui/css/mainStyleSheet.tw b/src/gui/css/mainStyleSheet.tw
index d2112a92ac26ed1cd382863d8ba0159a89e03450..a6d3dde4b8aa00f4f5ff92c334bc9b9b550c608d 100644
--- a/src/gui/css/mainStyleSheet.tw
+++ b/src/gui/css/mainStyleSheet.tw
@@ -84,7 +84,7 @@ img {
 	height: 100%;
 	background: linear-gradient(90deg, rgba(17,17,17,1), rgba(17,17,17,0.8) 60%, rgba(17,17,17,0));
 	z-index: 1;
-	position: absolute;
+	/*position: absolute;*/
 }
 
 .lrgRender > img, .lrgRender > video {
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index 46c5226ad5f30d0323b105fa8e7e16749b78474d..5508c6b50e6fc6a85c61b71a1563f6fdd6ee9237 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -260,34 +260,34 @@
 	"": {"white": 9, "mixed race": 1}, /* default mix */
 }>>
 
-<<set setup.servantMilkersJobs = ["be a servant", "work as a servant", "take classes", "please you", "be a subordinate slave", "stay confined", "recruit girls", "rest"]>>
+<<set setup.servantMilkersJobs = ["be a servant", "be a subordinate slave", "please you", "recruit girls", "rest", "stay confined", "take classes", "work as a servant"]>>
 
 
 
 <<set setup.fakeBellies = ["a small empathy belly", "a medium empathy belly", "a large empathy belly", "a huge empathy belly"]>> /* lets fake bellies be separated from other .bellyAccessory */
 
-<<set setup.modestClothes = ["a ball gown", "a bunny outfit", "a comfortable bodysuit", "a halter top dress", "a hijab and abaya", "a huipil", "a kimono", "a latex catsuit", "a leotard", "a maternity dress", "a military uniform", "a mini dress", "a nice maid outfit", "a nice nurse outfit", "a penitent nuns habit", "a schoolgirl outfit", "a slave gown", "a slutty maid outfit", "a slutty nurse outfit", "a slutty qipao", "a toga", "battledress", "conservative clothing", "cutoffs and a t-shirt", "nice business attire", "restrictive latex", "slutty business attire", "spats and a tank top"]>>
+<<set setup.modestClothes = ["a ball gown", "a bunny outfit", "a comfortable bodysuit", "a halter top dress", "a hijab and abaya", "a huipil", "a kimono", "a latex catsuit", "a leotard", "a maternity dress", "a military uniform", "a mini dress", "a nice maid outfit", "a nice nurse outfit", "a penitent nuns habit", "a schoolgirl outfit", "a slave gown", "a slutty maid outfit", "a slutty nurse outfit", "a slutty qipao", "a toga", "battledress", "conservative clothing", "cutoffs and a t-shirt", "nice business attire", "restrictive latex", "slutty business attire", "spats and a tank top", "stretch pants and a crop-top"]>>
 
 
 <<set setup.veryYoungCareers = ["a babysitter", "a beggar", "a beggar", "a cheerleader", "a child actress", "a child prostitute", "a child prostitute", "a child soldier", "a child soldier", "a club recruiter", "a cum dump", "a dropout", "a dropout", "a farmer's daughter", "a girl scout", "a girl scout", "a handmaiden", "a juvenile delinquent", "a juvenile delinquent", "a meat toilet", "a military brat", "a model-UN star", "a model", "a pageant star", "a paper girl", "a part-time farm laborer", "a pick-pocket", "a refugee", "a refugee", "a refugee", "a shrine maiden", "a street thug", "a street urchin", "a street urchin", "a street urchin", "a student council president", "a student from a boarding school", "a student from a private school", "a student from a public school", "a student from a public school", "a student from a public school", "a student from a public school", "a student from a public school", "a sweatshop worker", "a sweatshop worker", "a sweatshop worker", "a sweatshop worker", "an orphan", "an orphan", "an orphan", "an orphan", "an orphan", "being homeschooled by her parents", "captain of the kendo club", "from a lower class family", "from a lower class family", "from a lower class family", "from a middle class family", "from a middle class family", "from an upper class family", "homeless", "homeless", "homeless"]>> /* pregmod */
 
-<<set setup.youngCareers = ["a babysitter", "a ballerina", "a barista", "a bartender", "a camgirl", "a cashier", "a cheerleader", "a cook", "a courier", "a criminal", "a cum dump", "a factory worker", "a farm laborer", "a farm laborer", "a farmer's daughter", "a gang member", "a gang member", "a handmaiden", "a housesitter", "a housewife", "a maid", "a meat toilet", "a medical student", "a model", "a nurse", "a party girl", "a political activist", "a prisoner", "a prostitute", "a racing driver", "a refugee", "a ride attendant", "a saleswoman", "a secretary", "a security guard", "a service worker", "a shrine maiden", "a soldier", "a stripper", "a student", "a student", "a student", "a teaching assistant", "a truck driver", "a waitress", "a yoga instructor", "an air hostess", "an apprentice", "an arcade attendant", "an aspiring pop star", "an assassin", "an escort", "an exotic dancer", "an office worker", "unemployed", "unemployed", "unemployed", "unemployed", "unemployed"]>>
+<<set setup.youngCareers = ["a babysitter", "a ballerina", "a barista", "a bartender", "a beggar", "a camgirl", "a camp counselor", "a camwhore", "a cashier", "a cheerleader", "a cocktail waitress", "a cook", "a courier", "a criminal", "a cum dump", "a factory worker", "a farm laborer", "a farm laborer", "a farmer's daughter", "a gang member", "a gang member", "a handmaiden", "a housesitter", "a housewife", "a lifeguard", "a magician's assistant", "a maid", "a meat toilet", "a medical student", "a model", "a nurse", "a paramedic", "a party girl", "a political activist", "a prisoner", "a prostitute", "a racing driver", "a refugee", "a ride attendant", "a saleswoman", "a secretary", "a security guard", "a service worker", "a shrine maiden", "a soldier", "a street performer", "a stripper", "a student", "a student", "a student", "a teaching assistant", "a truck driver", "a video game streamer", "a waitress", "a yoga instructor", "an air hostess", "an apprentice", "an arcade attendant", "an aspiring pop star", "an assassin", "an escort", "an exotic dancer", "an intern", "an office worker", "homeless", "unemployed", "unemployed", "unemployed", "unemployed", "unemployed"]>>
 
-<<set setup.educatedCareers = ["a ballerina", "a banker", "a business owner", "a child actress", "a classical dancer", "a classical musician", "a college scout", "a corporate executive", "a counselor", "a criminal", "a cult leader", "a dean", "a director", "a dispatch officer", "a doctor", "a historian", "a journalist", "a journalist", "a judge", "a lawyer", "a librarian", "a madam", "a manager", "a mechanic", "a medical student", "a mercenary", "a military officer", "a military recruiter", "a nun", "a paramedic", "a photographer", "a pilot", "a police detective", "a political activist", "a politician", "a principal", "a prison warden", "a private detective", "a private instructor", "a procuress", "a producer", "a professional bartender", "a professor", "a programmer", "a psychologist", "a refugee", "a scholar", "a scientist", "a secretary", "a serial divorcee", "a shut-in", "a surgeon", "a teacher", "a teaching assistant", "a therapist", "a transporter", "a veterinarian", "a wedding planner", "a writer", "an actress", "an air hostess", "an archaeologist", "an assassin", "an astronaut", "an author", "an engineer", "an estate agent", "an investor", "an MS pilot", "an office worker", "unemployed"]>>
+<<set setup.educatedCareers = ["a ballerina", "a banker", "a business owner", "a chemist", "a child actress", "a classical dancer", "a classical musician", "a coach", "a college scout", "a coroner", "a corporate executive", "a counselor", "a criminal", "a cult leader", "a dean", "a dentist", "a director", "a dispatch officer", "a doctor", "a historian", "a journalist", "a journalist", "a judge", "a lawyer", "a librarian", "a lobbyist", "a madam", "a manager", "a mechanic", "a mediator", "a medical student", "a mercenary", "a military officer", "a military recruiter", "a nun", "a painter", "a paramedic", "a pharmacist", "a photographer", "a pilot", "a poet", "a police detective", "a police negotiator", "a political activist", "a politician", "a principal", "a prison warden", "a private detective", "a private instructor", "a procuress", "a producer", "a professional bartender", "a professor", "a programmer", "a prostitute", "a psychologist", "a refugee", "a scholar", "a scientist", "a secretary", "a serial divorcee", "a shut-in", "a surgeon", "a teacher", "a teaching assistant", "a therapist", "a transporter", "a veterinarian", "a wedding planner", "a writer", "a zookeeper", "an actress", "an animator", "an air hostess", "an archaeologist", "an assassin", "an astronaut", "an editor", "an engineer", "an escort", "an estate agent", "an investor", "an MS pilot", "an office worker", "unemployed"]>>
 
-<<set setup.uneducatedCareers = ["a barista", "a bartender", "a bodyguard", "a bouncer", "a bounty hunter", "a bus driver", "a butcher", "a camgirl", "a camwhore", "a caregiver", "a cashier", "a charity worker", "a cheerleader", "a clown", "a cocktail waitress", "a con artist", "a cook", "a criminal", "a croupier", "a cum dump", "a dairy worker", "a dancer", "a factory worker", "a farm laborer", "a farmer's daughter", "a farmer", "a firefighter", "a fisherwoman", "a handmaiden", "a house DJ", "a housewife", "a hunter", "a janitor", "a launderer", "a law enforcement officer", "a lifeguard", "a local news anchor", "a lumberjack", "a maid", "a mail carrier", "a masseuse", "a masseuse", "a meat toilet", "a medic", "a medic", "a milkmaid", "a mime", "a missionary", "a mistress", "a model", "a musician", "a nurse", "a paramedic", "a park ranger", "a party girl", "a pimp", "a pirate", "a plumber", "a political activist", "a prison guard", "a prisoner", "a procuress", "a prostitute", "a racing driver", "a radio show host", "a rancher", "a refugee", "a revolutionary", "a ride attendant", "a sailor", "a saleswoman", "a secretary", "a security guard", "a service worker", "a shrine maiden", "a soldier", "a stripper", "a student", "a taxi driver", "a teacher", "a trophy wife", "a truck driver", "a waitress", "a weathergirl", "an acrobat", "an actress", "an arcade attendant", "an aspiring pop star", "an athlete", "an electrician", "an enforcer", "an enforcer", "an escort", "an exotic dancer", "an innkeeper", "an office worker", "in a militia", "unemployed", "unemployed", "unemployed", "unemployed", "unemployed"]>>
+<<set setup.uneducatedCareers = ["a baker", "a barber", "a barista", "a bartender", "a beekeeper", "a beggar", "a bodyguard", "a bouncer", "a bounty hunter", "a brewer", "a bus driver", "a butcher", "a butler", "a camgirl", "a camp counselor", "a camwhore", "a candlestick maker", "a caregiver", "a carpenter", "a cashier", "a charity worker", "a chauffeur", "a cheerleader", "a chiropractor", "a clown", "a cocktail waitress", "a con artist", "a construction worker", "a cook", "a criminal", "a croupier", "a cum dump", "a dairy worker", "a dancer", "a delivery woman", "a factory worker", "a farm laborer", "a farmer's daughter", "a farmer", "a firefighter", "a fisherwoman", "a florist", "a fortune teller", "a gang leader", "a gang member", "a gardener", "a groomer", "a handmaiden", "a hotel manager", "a house DJ", "a housewife", "a hunter", "a janitor", "a landlady", "a launderer", "a law enforcement officer", "a lifeguard", "a local news anchor", "a lumberjack", "a magician's assistant", "a maid", "a mail carrier", "a masseuse", "a masseuse", "a meat toilet", "a medic", "a medic", "a medium", "a messenger", "a milkmaid", "a mime", "a missionary", "a mistress", "a model", "a mortician", "a musician", "a nurse", "a paramedic", "a park ranger", "a party girl", "a peddler", "a pimp", "a pirate", "a plumber", "a political activist", "a prison guard", "a prisoner", "a procuress", "a prostitute", "a racing driver", "a radio show host", "a rancher", "a refugee", "a revolutionary", "a ride attendant", "a roadie", "a sailor", "a saleswoman", "a secretary", "a security guard", "a service worker", "a shepherd", "a shrine maiden", "a soldier", "a stage magician", "a street performer", "a stripper", "a student", "a switchboard operator", "a talent scout", "a taxi driver", "a teacher", "a trophy wife", "a truck driver", "a waitress", "a weathergirl", "a whaler", "a zookeeper", "an acrobat", "an actress", "an arcade attendant", "an aspiring pop star", "an athlete", "an electrician", "an enforcer", "an enforcer", "an escort", "an exotic dancer", "an exterminator", "an innkeeper", "an office worker", "homeless", "in a militia", "unemployed", "unemployed", "unemployed", "unemployed", "unemployed"]>>
 
-<<set setup.gratefulCareers = ["a beggar", "a child soldier", "a pick-pocket", "a prisoner", "a refugee", "a shut-in", "a street urchin", "a student from a boarding school", "a sweatshop worker", "an orphan", "from a lower class family", "homeless", "unemployed"]>>
+<<set setup.gratefulCareers = ["a beggar", "a peddler", "a pick-pocket", "a prisoner", "a refugee", "a shut-in", "a street urchin", "a student from a boarding school", "a sweatshop worker", "an orphan", "from a lower class family", "homeless", "unemployed"]>>
 
-<<set setup.menialCareers = ["a babysitter", "a bus driver", "a cashier", "a cook", "a courier", "a dropout", "a factory worker", "a farm laborer", "a fisherwoman", "a handmaiden", "a housesitter", "a housewife", "a maid", "a mail carrier", "a mechanic", "a nun", "a paper girl", "a part-time farm laborer", "a pilot", "a producer", "a programmer", "a ride attendant", "a service worker", "a student from a private school", "a student from a public school", "a student", "a taxi driver", "a truck driver", "an apprentice", "an arcade attendant", "an athlete", "an engineer", "being homeschooled by her parents", "from a middle class family", "from an upper class family"]>>
+<<set setup.menialCareers = ["a babysitter", "a bus driver", "a butler", "a cashier", "a chauffeur", "a construction worker", "a cook", "a courier", "a delivery woman", "a dropout", "a factory worker", "a farm laborer", "a fisherwoman", "a handmaiden", "a housesitter", "a housewife", "a maid", "a mail carrier", "a mechanic", "a messenger", "a nun", "a paper girl", "a part-time farm laborer", "a pilot", "a producer", "a programmer", "a ride attendant", "a service worker", "a student from a private school", "a student from a public school", "a student", "a taxi driver", "a truck driver", "an apprentice", "an arcade attendant", "an athlete", "an engineer", "an intern", "being homeschooled by her parents", "from a middle class family", "from an upper class family"]>>
 
-<<set setup.entertainmentCareers = ["a camgirl", "a camwhore", "a cheerleader", "a child actress", "a cocktail waitress", "a journalist", "a local news anchor", "a party girl", "a racing driver", "a waitress", "a weathergirl", "a writer", "an actress"]>>
+<<set setup.entertainmentCareers = ["a camgirl", "a camwhore", "a cheerleader", "a child actress", "a cocktail waitress", "a journalist", "a local news anchor", "a magician's assistant", "a party girl", "a racing driver", "a stage magician", "a street performer", "a video game streamer", "a waitress", "a weathergirl", "a writer", "an actress"]>>
 
 <<set setup.whoreCareers = ["a child prostitute", "a criminal", "a cum dump", "a Futanari Sister", "a juvenile delinquent", "a meat toilet", "a mistress", "a model", "a pageant star", "a pirate", "a porn star", "a prostitute", "a saleswoman", "a serial divorcee", "a stripper", "a trophy wife", "an escort", "an exotic dancer"]>>
 
-<<set setup.HGCareers = ["a corporate executive", "a lawyer", "a leading arcology citizen", "a military officer", "a model-UN star", "a politician", "a Queen", "a student council president"]>>
+<<set setup.HGCareers = ["a corporate executive", "a gang leader", "a lawyer", "a leading arcology citizen", "a military officer", "a model-UN star", "a politician", "a Queen", "a student council president"]>>
 
-<<set setup.madamCareers = ["a business owner", "a madam", "a manager", "a pimp", "a procuress", "an innkeeper"]>>
+<<set setup.madamCareers = ["a business owner", "a camp counselor", "a hotel manager", "a landlady", "a madam", "a manager", "a pimp", "a procuress", "an innkeeper"]>>
 
 <<set setup.DJCareers = ["a classical dancer", "a classical musician", "a dancer", "a house DJ", "a musician", "a radio show host", "an aspiring pop star"]>>
 
@@ -295,17 +295,17 @@
 
 <<set setup.wardenessCareers = ["a bouncer", "a bounty hunter", "a gang member", "a mercenary", "a prison guard", "a prison warden", "a police detective", "a private detective", "a security guard", "a street thug", "an enforcer"]>>
 
-<<set setup.nurseCareers = ["a doctor", "a medic", "a medical student", "a nurse", "a paramedic"]>>
+<<set setup.nurseCareers = ["a doctor", "a medic", "a medical student", "a midwife", "a nurse", "a paramedic", "a pharmacist", "a surgeon"]>>
 
-<<set setup.attendantCareers = ["a counselor", "a dispatch officer", "a lifeguard", "a masseuse", "a psychologist", "a therapist", "a yoga instructor"]>>
+<<set setup.attendantCareers = ["a counselor", "a dispatch officer", "a lifeguard", "a masseuse", "a mediator", "a police negotiator", "a psychologist", "a therapist", "a yoga instructor"]>>
 
-<<set setup.milkmaidCareers = ["a dairy worker", "a farmer's daughter", "a farmer", "a milkmaid", "a rancher", "a veterinarian"]>>
+<<set setup.milkmaidCareers = ["a dairy worker", "a farmer's daughter", "a farmer", "a milkmaid", "a rancher", "a shepherd", "a veterinarian", "a zookeeper"]>>
 
 <<set setup.stewardessCareers = ["a barista", "a bartender", "a caregiver", "a charity worker", "a professional bartender", "a secretary", "a wedding planner", "an air hostess", "an estate agent", "an investor", "an office worker"]>>
 
 <<set setup.schoolteacherCareers = ["a dean", "a librarian", "a principal", "a private instructor", "a professor", "a scholar", "a scientist", "a teacher", "a teaching assistant"]>>
 
-<<set setup.recruiterCareers = ["a club recruiter", "a college scout", "a con artist", "a cult leader", "a girl scout", "a military recruiter", "a missionary", "a political activist", "a princess"]>> /* pregmod */
+<<set setup.recruiterCareers = ["a club recruiter", "a college scout", "a con artist", "a cult leader", "a girl scout", "a military recruiter", "a missionary", "a political activist", "a princess", "a talent scout"]>> /* pregmod */
 
 
 <<set setup.baseNationalities = ["Afghan", "Albanian", "Algerian", "American", "Andorran", "Angolan", "Antiguan", "Argentinian", "Armenian", "Aruban", "Australian", "Austrian", "Azerbaijani", "Bahamian", "Bahraini", "Bangladeshi", "Barbadian", "Belarusian", "Belgian", "Belizean", "Beninese", "Bermudian", "Bhutanese", "Bissau-Guinean", "Bolivian", "Bosnian", "Brazilian", "British", "Bruneian", "Bulgarian", "Burkinabé", "Burmese", "Burundian", "Cambodian", "Cameroonian", "Canadian", "Cape Verdean", "Catalan", "Central African", "Chadian", "Chilean", "Chinese", "Colombian", "Comorian", "Congolese", "a Cook Islander", "Costa Rican", "Croatian", "Cuban", "Cypriot", "Czech", "Danish", "Djiboutian", "Dominican", "Dominiquais", "Dutch", "East Timorese", "Ecuadorian", "Egyptian", "Emirati", "Equatoguinean", "Eritrean", "Estonian", "Ethiopian", "Fijian", "Filipina", "Finnish", "French Guianan", "French Polynesian", "French", "Gabonese", "Gambian", "Georgian", "German", "Ghanan", "Greek", "Greenlandic", "Grenadian", "Guatemalan", "Guinean", "Guyanese", "Haitian", "Honduran", "Hungarian", "I-Kiribati", "Icelandic", "Indian", "Indonesian", "Iranian", "Iraqi", "Irish", "Israeli", "Italian", "Ivorian", "Jamaican", "Japanese", "Jordanian", "Kazakh", "Kenyan", "Kittitian", "Korean", "Kosovan", "Kurdish", "Kuwaiti", "Kyrgyz", "Laotian", "Latvian", "Lebanese", "Liberian", "Libyan", "a Liechtensteiner", "Lithuanian", "Luxembourgian", "Macedonian", "Malagasy", "Malawian", "Malaysian", "Maldivian", "Malian", "Maltese", "Marshallese", "Mauritanian", "Mauritian", "Mexican", "Micronesian", "Moldovan", "Monégasque", "Mongolian", "Montenegrin", "Moroccan", "Mosotho", "Motswana", "Mozambican", "Namibian", "Nauruan", "Nepalese", "a New Zealander", "Ni-Vanuatu", "Nicaraguan", "Nigerian", "Nigerien", "Niuean", "Norwegian", "Omani", "Pakistani", "Palauan", "Palestinian", "Panamanian", "Papua New Guinean", "Paraguayan", "Peruvian", "Polish", "Portuguese", "Puerto Rican", "Qatari", "Romanian", "Russian", "Rwandan", "Sahrawi", "Saint Lucian", "Salvadoran", "Sammarinese", "Samoan", "São Toméan", "Saudi", "Scottish", "Senegalese", "Serbian", "Seychellois", "Sierra Leonean", "Singaporean", "Slovak", "Slovene", "a Solomon Islander", "Somali", "South African", "South Sudanese", "Spanish", "Sri Lankan", "Sudanese", "Surinamese", "Swazi", "Swedish", "Swiss", "Syrian", "Taiwanese", "Tajik", "Tanzanian", "Thai", "Tibetan", "Togolese", "Tongan", "Trinidadian", "Tunisian", "Turkish", "Turkmen", "Tuvaluan", "Ugandan", "Ukrainian", "Uruguayan", "Uzbek", "Vatican", "Venezuelan", "Vietnamese", "Vincentian", "Yemeni", "Zairian", "Zambian", "Zimbabwean"]>>
@@ -336,7 +336,7 @@
 
 
 
-<<set setup.whiteAmericanSlaveNames = ["Abigail", "Adalyn", "Addison", "Adeline", "Alaina", "Alexandra", "Alicia", "Allison", "Alyssa", "Amanda", "Amber", "Amelia", "Amy", "Andrea", "Angela", "Anna", "Annabelle", "Anne", "April", "Aria", "Arianna", "Ashley", "Aubrey", "Audrey", "Ava", "Avery", "Bailey", "Bethany", "Brandi", "Brandy", "Brittany", "Brittney", "Brooke", "Brooklyn", "Caitlin", "Callie", "Candice", "Caroline", "Carrie", "Cassandra", "Catherine", "Charlotte", "Chelsea", "Chloe", "Christina", "Christine", "Claire", "Clover", "Courtney", "Crystal", "Cynthia", "Dana", "Danielle", "Diana", "Elena", "Eliana", "Elizabeth", "Ella", "Ellie", "Emily", "Emma", "Erica", "Erika", "Erin", "Eva", "Evelyn", "Gabriella", "Grace", "Hailey", "Hannah", "Harper", "Heather", "Holly", "Isabella", "Isabelle", "Jacqueline", "Jade", "Jamie", "Jane", "Jasmine", "Jenna", "Jennifer", "Jenny", "Jessica", "Joan", "Julia", "Julie", "June", "Kaitlyn", "Karen", "Kate", "Katherine", "Kathleen", "Kathryn", "Katie", "Kayla", "Kaylee", "Keira", "Kelly", "Kennedy", "Kimberly", "Kristen", "Kristin", "Kristina", "Krystal", "Kylie", "Latoya", "Laura", "Lauren", "Laurie", "Layla", "Leah", "Leslie", "Lila", "Liliana", "Lillian", "Lily", "Lindsay", "Lindsey", "Lisa", "Lois", "Lucy", "Mackenzie", "Madelyn", "Madison", "Makayla", "Mandy", "Margaret", "Maria", "Mary", "Maya", "Megan", "Meghan", "Melanie", "Melissa", "Mia", "Michelle", "Mila", "Misty", "Monica", "Natalie", "Natasha", "Nicole", "Nora", "Olivia", "Patricia", "Penelope", "Peyton", "Rachel", "Reagan", "Rebecca", "Riley", "Rose", "Sadie", "Samantha", "Sandra", "Sara", "Sarah", "Savannah", "Scarlett", "Shannon", "Skyler", "Sophia", "Sophie", "Stacey", "Stacy", "Stella", "Stephanie", "Susan", "Tara", "Tiffany", "Tina", "Valerie", "Vanessa", "Veronica", "Victoria", "Violet", "Whitney", "Zoe"]>>
+<<set setup.whiteAmericanSlaveNames = ["Abigail", "Adalyn", "Addison", "Adeline", "Alaina", "Alexandra", "Alicia", "Allison", "Alyssa", "Amanda", "Amber", "Amelia", "Amy", "Andrea", "Angela", "Anna", "Annabelle", "Anne", "April", "Aria", "Arianna", "Ashley", "Aubrey", "Audrey", "Ava", "Avery", "Bailey", "Bethany", "Brandi", "Brandy", "Brittany", "Brittney", "Brooke", "Brooklyn", "Caitlin", "Callie", "Candice", "Caroline", "Carrie", "Cassandra", "Catherine", "Charlotte", "Chelsea", "Chloe", "Christina", "Christine", "Claire", "Clover", "Courtney", "Crystal", "Cynthia", "Dana", "Danielle", "Diana", "Elena", "Eliana", "Elizabeth", "Ella", "Ellen", "Ellie", "Emily", "Emma", "Erica", "Erika", "Erin", "Eva", "Evelyn", "Gabriella", "Gina", "Ginger", "Grace", "Hailey", "Hannah", "Harper", "Heather", "Holly", "Isabella", "Isabelle", "Jacqueline", "Jade", "Jamie", "Jane", "Jasmine", "Jenna", "Jennifer", "Jenny", "Jessica", "Joan", "Julia", "Julie", "June", "Kaitlyn", "Karen", "Kate", "Katherine", "Kathleen", "Kathryn", "Katie", "Kayla", "Kaylee", "Keira", "Kelly", "Kennedy", "Kimberly", "Kristen", "Kristin", "Kristina", "Krystal", "Kylie", "Latoya", "Laura", "Lauren", "Laurie", "Layla", "Leah", "Leslie", "Lila", "Liliana", "Lillian", "Lily", "Lindsay", "Lindsey", "Lisa", "Lois", "Lucy", "Lynch", "Lynette", "Lynn", "Mabel", "Mackenzie", "Madeleine", "Madeline", "Madelyn", "Madison", "Madora", "Mae", "Maeve", "Magdalena", "Magdaline", "Maggie", "Mahala", "Mahaley", "Maisie", "Makayla", "Malak", "Malinda", "Malissa", "Malka", "Malky", "Malvina", "Mamie", "Manda", "Mandy", "Manerva", "Marceline", "Marcia", "Marcy", "Marey", "Margaret", "Margarett", "Margaretta", "Margarette", "Margaux", "Marge", "Margot", "Margret", "Marguerite", "Maria", "Mariah", "Mariam", "Marian", "Maribeth", "Marie", "Marielle", "Marietta", "Marilla", "Marilyn", "Marina", "Marion", "Mariska", "Marissa", "Marjorie", "Marlene", "Martha", "Mary Alice", "Mary Anne", "Mary Jane", "Mary Lou", "Mary", "Maryam", "Matilda", "Mattie", "Maud", "Maude", "Mavis", "Maxine", "May", "Maya", "Medora", "Megan", "Meghan", "Megyn", "Mehitable", "Melanie", "Melinda", "Melissa", "Melvina", "Mena", "Menucha", "Mercy", "Mia", "Michaela", "Michal", "Michele", "Michelle", "Mikayla", "Mila", "Milana", "Mildred", "Milena", "Miley", "Milla", "Miller", "Milly", "Mina", "Mindy", "Minerva", "Minnie", "Mira", "Miranda", "Mirel", "Miri", "Miriam", "Missouri", "Misty", "Mollie", "Molly", "Monica", "Morgan", "Moriah", "Muffy", "Mushka", "Myra", "Myrtle", "Nadia", "Nancy", "Nannie", "Naoma", "Naomi", "Narcissa", "Natalia", "Natalie", "Natasha", "Nazz", "Nechama", "Nellie", "Nettie", "Nevaeh", "Nicole", "Nicolette", "Nicollette", "Nikki", "Nina", "Noa", "Noelle", "Noor", "Nora", "Norah", "Norma", "Octavia", "Olive", "Olivia", "Onza", "Opal", "Orpha", "Orvilla", "Pacifica", "Paige", "Pamela", "Pamelia", "Parker", "Parnethia", "Parthena", "Parthenia", "Pat", "Patience", "Patricia", "Patsey", "Patsy", "Paula", "Pauline", "Pearl", "Peg", "Peggy Sue", "Peggy", "Penelope", "Percilla", "Perel", "Perl", "Permelia", "Perry", "Persis", "Pessy", "Peyton", "Pheba", "Phebe", "Pheby", "Pheobe", "Philena", "Philinda", "Phoebe", "Phyllis", "Pinky", "Piper", "Polina", "Polley", "Polly", "Poppy", "Portia", "Priscilla", "Prudence", "Quinn", "Rachael", "Rachal", "Rachel", "Raina", "Raizel", "Raizy", "Raquel", "Rayleen", "Reagan", "Rebeca", "Rebecca", "Reem", "Reese", "Regina", "Reizy", "Rena", "Renee", "Rhoda", "Rhody", "Rhonda", "Rifka", "Rifky", "Riley", "Rita", "Rivka", "Rivky", "Roberta", "Robin", "Rochel", "Roda", "Roiza", "Roizy", "Romy", "Rosa", "Rosanna", "Rose of Sharon", "Rose", "Roseanne", "Rosella", "Rosemary", "Rosetta", "Rosie", "Rosina", "Rowan", "Roxanne", "Roxy", "Ruby", "Ruchel", "Ruchy", "Ruth", "Rutha", "Ryan", "Sabina", "Sabra", "Sabrina", "Sadie", "Samantha", "Sandra", "Sara", "Sarah", "Savannah", "Scarlett", "Shannon", "Skyler", "Sophia", "Sophie", "Stacey", "Stacy", "Stella", "Stephanie", "Susan", "Tara", "Tiffany", "Tina", "Valerie", "Vanessa", "Veronica", "Victoria", "Violet", "Whitney", "Zoe"]>>
 <<set setup.whiteAmericanSlaveSurnames = ["Adams", "Allen", "Allred", "Anderson", "Avery", "Bailey", "Baker", "Barnes", "Beckstead", "Bell", "Bennett", "Bennion", "Benson", "Bingham", "Bradshaw", "Brooks", "Brown", "Burns", "Butler", "Campbell", "Carr", "Carter", "Christensen", "Clark", "Clooney", "Cole", "Coleman", "Collins", "Cook", "Cooper", "Cox", "Cunningham", "Davis", "DeMille", "Donaldson", "Edwards", "Ellis", "Evans", "Feldsted", "Fisher", "Forbush", "Foster", "Fox", "Frank", "Franklin", "Gardner", "Gibson", "Graham", "Gray", "Green", "Gubler", "Hall", "Hamilton", "Hancock", "Hanks", "Hansen", "Hardward", "Harris", "Hartvigsen", "Hatch", "Hayes", "Hill", "Howard", "Hughes", "Hymas", "Izatt", "Jackson", "Jacobs", "Jacobsen", "Jacobson", "James", "Jensen", "Johnson", "Jones", "Jorgensen", "Kelly", "Kennedy", "Kimball", "King", "Larsen", "Lauritzen", "Lee", "Lewis", "Long", "MacDonald", "Marks", "Martin", "McDonald", "Mecham", "Meyer", "Michaels", "Miller", "Mitchell", "Moore", "Morgan", "Morris", "Murphy", "Murray", "Myers", "Naegle", "Nelson", "Olsen", "Olson", "Orwell", "Parker", "Patterson", "Perry", "Peterson", "Phelps", "Phillips", "Pitt", "Powell", "Price", "Pulsipher", "Rasmussen", "Reed", "Reynolds", "Richardson", "Rigby", "Roberts", "Robinson", "Robison", "Rogers", "Romney", "Ross", "Roth", "Russell", "Sanders", "Schmidt", "Scott", "Shumway", "Smith", "Smoot", "Snyder", "Sorensen", "Spendlove", "Stevens", "Stewart", "Stone", "Sullivan", "Talbot", "Taylor", "Thomas", "Thompson", "Thomson", "Turley", "Turner", "Wagner", "Walker", "Wallace", "Ward", "Watson", "West", "White", "Willem", "Williams", "Wilson", "Wood", "Wright", "Yorgensen", "Young", "Zabriskie", "Zollinger"]>>
 
 <<set setup.africanAmericanSlaveNames = ["Aaliyah", "Abigail", "Aisha", "Alyssa", "Angel", "Aniyah", "Arianna", "Ashley", "Ava", "Ayana", "Brianna", "Chelsea", "Chloe", "Destiny", "Fatoumata", "Gabrielle", "Hannah", "Heaven", "Imani", "Isis", "Ivory", "Jada", "Jade", "Jasmine", "Jayla", "Jordan", "Kayla", "Keisha", "Kennedy", "Kiara", "Kimani", "Kimora", "Laila", "Lakeisha", "Lakeshia", "Lakisha", "Lashawna", "Lashonda", "Latanya", "Latasha", "Latoya", "London", "Madison", "Makayla", "Malia", "Marquita", "Michelle", "Natisha", "Nevaeh", "Nikeisha", "Nyla", "Olivia", "Qiana", "Sarah", "Sasha", "Savannah", "Shanice", "Shanika", "Shaniqua", "Sydney", "Talisha", "Taneka", "Tanesha", "Tanika", "Taniqua", "Tanisha", "Taylor", "Tiana", "Trinity", "Victoria"]>>
@@ -414,17 +414,17 @@
 <<set setup.zairianSlaveNames = ["Aicha", "Amba", "Aminata", "Andreche", "Belcha", "Belinda", "Belvie", "Claire", "Claudia", "Clavidia", "Dan", "Delande", "Divine", "Dorsia", "Duchel", "Durcia", "Fiavina", "Franchelyn", "Frichnelle", "Genicka", "Grace", "Grasnie", "Ingrid", "Isabelle", "Japhet", "Jeanny", "Jodrey", "Julie", "Junelle", "Keicha", "Lady", "Léonie", "Liu", "Lolie", "Lylie", "Maguy", "Marvine", "Mayifa", "Merveille", "Mholie", "Mich", "Nada", "Nicole", "Nuptia", "Patrique", "Pauline", "Peniel", "Reine", "Rihanna", "Ruth", "Sabrina", "Sandra", "Sarah", "Sereine", "Sidorelle", "Stael", "Staelle", "Sylvie", "Valdinelle", "Valentina", "Valerie"]>>
 <<set setup.zairianSlaveSurnames = ["Amani", "Amisi", "Assani", "Augustin", "Badibanga", "Bahati", "Banza", "Banze", "Beya", "Bisimwa", "Bokese", "Bokungu", "Bondo", "Botende", "Buhendwa", "Bukasa", "Byamungu", "Congo", "Dieudonné", "Elia", "Fataki", "Ibaka", "Ilunga", "Jean", "Junior", "Kabala", "Kabamba", "Kabambi", "Kabanga", "Kabangu", "Kabasele", "Kabemba", "Kabengele", "Kabeya", "Kabila", "Kabongo", "Kabulo", "Kabuya", "Kabwe", "Kadima", "Kahindo", "Kakule", "Kalala", "Kalambay", "Kalenga", "Kalombo", "Kalonji", "Kalubi", "Kalume", "Kalunga", "Kamba", "Kambale", "Kanda", "Kandolo", "Kaniki", "Kankolongo", "Kanku", "Kanyinda", "Kapinga", "Kasereka", "Kashala", "Kasonga", "Kasongo", "Katanga", "Katembo", "Katende", "Kayembe", "Kayumba", "Kazadi", "Kazembe", "Kinkela", "Kitenge", "Kitoko", "Kongolo", "Kwete", "Kyenge", "Kyungu", "Landu", "Lelo", "Lubamba", "Luboya", "Lukusa", "Lumbala", "Lumbu", "Lutete", "Lutumba", "Luzolo", "Lwamba", "Mabiala", "Mafuta", "Makengo", "Malango", "Maloba", "Mamba", "Mambu", "Mampuya", "Manda", "Mande", "Masengo", "Masiala", "Massamba", "Masudi", "Mata", "Matadi", "Matondo", "Mavinga", "Mavungu", "Mbaki", "Mbala", "Mbaya", "Mbayo", "Mbikayi", "Mbiya", "Mbo", "Mboma", "Mbombo", "Mbula", "Mbumba", "Mbungu", "Mbuya", "Mbuyamba", "Mbuyi", "Mbuyu", "Mika", "Mirindi", "Moke", "Mondeko", "Monga", "Mpeko", "Mpiana", "Mpoyi", "Mputu", "Muamba", "Muanda", "Mubenga", "Muganza", "Mugisho", "Muhindo", "Mujinga", "Mukadi", "Mukalay", "Mukanya", "Mukeba", "Mukendi", "Mukenge", "Mukoko", "Mukuna", "Mulamba", "Mulenda", "Mulongo", "Mulumba", "Mulunda", "Mumba", "Mumbere", "Musafiri", "Mushagalusa", "Mutamba", "Muteba", "Mutombo", "Muyumba", "Mvouba", "Mwamba", "Mwanza", "Mwenze", "Mwepu", "Nawej", "Ndala", "Ndaya", "Ngalamulume", "Ngalula", "Ngandu", "Ngimbi", "Ngoie", "Ngoma", "Ngongo", "Ngoy", "Ngoyi", "Nkongolo", "Nkulu", "Nlandu", "Nsenga", "Nsimba", "Nsumbu", "Ntambwe", "Ntumba", "Numbi", "Nyembo", "Nzau", "Nzuzi", "Olomide", "Omari", "Omba", "Patel", "Ramazani", "Saidi", "Salumu", "Samba", "Sangwa", "Selemani", "Senga", "Shabani", "Tambwe", "Tsasa", "Tshibanda", "Tshibangu", "Tshilumba", "Tshimanga", "Tumba", "Umba", "Vangu", "Wa", "Youlou", "Yumba", "Zakuani", "Zola"]>>
 
-<<set setup.frenchSlaveNames = ["Aaliyah", "Abigael", "Adèle", "Adriana", "Adrienne", "Agathe", "Aicha", "Albane", "Alessia", "Alexandra", "Alexia", "Aleyna", "Alia", "Alice", "Alicia", "Alienor", "Aline", "Alix", "Aliya", "Aliyah", "Alizee", "Alya", "Alycia", "Alyssa", "Alyssia", "Amandine", "Ambre", "Ambrine", "Amel", "Amelia", "Amélie", "Amina", "Aminata", "Amira", "Amy", "Ana", "Anae", "Anaelle", "Anaïs", "Anastasia", "Andrea", "Angela", "Angèle", "Angelina", "Angeline", "Anissa", "Anna", "Annabelle", "Annaelle", "Anouk", "Apolline", "Ashley", "Asma", "Assia", "Assya", "Astrid", "Athénaïs", "Audrey", "Augustine", "Aurélie", "Aurore", "Ava", "Awa", "Axelle", "Aya", "Berenice", "Bertille", "Blanche", "Cali", "Calie", "Camelia", "Camille", "Candice", "Capucine", "Carla", "Carmen", "Caroline", "Cassandra", "Cassandre", "Cassie", "Cécile", "Cecilia", "Céleste", "Célestine", "Celia", "Céline", "Celya", "Chahinez", "Chaima", "Charlene", "Charlie", "Charline", "Charlotte", "Chayma", "Chiara", "Chloé", "Claire", "Clara", "Clarisse", "Clea", "Clelia", "Clémence", "Clementine", "Cleo", "Cloé", "Clotilde", "Coline", "Constance", "Coralie", "Cyrielle", "Daphné", "Deborah", "Diana", "Diane", "Dina", "Dounia", "Eden", "Ela", "Elea", "Eleana", "Elena", "Eléonore", "Elia", "Elif", "Elina", "Eline", "Elisa", "Élisabeth", "Élise", "Elissa", "Ella", "Eloane", "Élodie", "Éloïse", "Elona", "Elora", "Elsa", "Elya", "Elyna", "Elyne", "Ema", "Emeline", "Emie", "Émilie", "Emily", "Emma", "Emmanuelle", "Emmie", "Emmy", "Emna", "Emy", "Enola", "Enora", "Erine", "Estelle", "Esther", "Eugénie", "Eva", "Eve", "Eya", "Fanny", "Fantine", "Farah", "Fatima", "Fatma", "Fatoumata", "Faustine", "Flavie", "Fleur", "Flora", "Flore", "Florine", "Gabriella", "Gabrielle", "Gaëlle", "Garance", "Genevieve", "Giulia", "Grace", "Gwenaëlle", "Gwendoline", "Hafsa", "Hajar", "Halima", "Hana", "Hanae", "Hanna", "Hannah", "Hawa", "Helena", "Hélène", "Héloïse", "Hermine", "Hiba", "Hind", "Hortense", "Ibtissem", "Ilana", "Iliana", "Ilona", "Ilyana", "Imane", "Imen", "Imene", "Inaya", "Inès", "Irina", "Iris", "Isaure", "Isis", "Isra", "Izia", "Jade", "Jana", "Janelle", "Janna", "Jasmine", "Jeanne", "Jenna", "Jessica", "Jihane", "Joan", "Joana", "Johanna", "Joséphine", "Joy", "Joyce", "Judith", "Julia", "Julie", "Juliette", "Juline", "Justine", "Kahina", "Kaina", "Kamelia", "Kayla", "Kayna", "Kelia", "Kelly", "Kelya", "Kenza", "Kessy", "Khadija", "Kiara", "Kim", "Kimberley", "Kyara", "Laetitia", "Lalie", "Laly", "Lamia", "Lana", "Lara", "Laura", "Laure", "Laurine", "Layana", "Léa", "Leana", "Leane", "Leanne", "Leelou", "Leia", "Leila", "Leina", "Lena", "Leona", "Léonie", "Leyna", "Lia", "Liana", "Lila", "Lilas", "Lili", "Lilia", "Lilie", "LiliRose", "Lilly", "Lilou", "Lilwenn", "Lily", "Lilya", "LilyRose", "Lina", "Linda", "Lindsay", "Line", "Lisa", "Lise", "Lison", "Livia", "Liya", "Loane", "Loanne", "Lois", "Lola", "Lorena", "Lou", "Louane", "Louann", "LouAnn", "Louanne", "LouAnne", "Louisa", "Louise", "Louison", "Louna", "Luce", "Lucia", "Lucie", "Lucile", "Lucille", "Lucy", "Ludivine", "Luna", "Lya", "Lyana", "Lydia", "Lylia", "Lylou", "Lyna", "Madeleine", "Mae", "Maelia", "Maelie", "Maeline", "Maëlle", "Maelly", "Maellys", "Maely", "Maelyne", "Maëlys", "Maelyss", "Maeva", "Maia", "Maily", "Mailys", "Maimouna", "Maina", "Maissa", "Maissane", "Maiwenn", "Malak", "Malia", "Manel", "Manelle", "Manon", "Margaux", "Margot", "Maria", "Mariam", "Marie", "Marilou", "Marina", "Marine", "Marion", "Marwa", "Maryam", "Marylou", "Mathilde", "Maud", "Maya", "Maylis", "Mayssa", "Meissa", "Mélanie", "Melia", "Melina", "Melinda", "Méline", "Mélissa", "Mellina", "Melodie", "Melody", "Melyna", "Melyne", "Meriem", "Meryem", "Mia", "Mila", "Milla", "Mina", "Mona", "Morgane", "Mya", "Myriam", "Nada", "Naelle", "Naia", "Naila", "Naima", "Nais", "Naomi", "Naomie", "Nawel", "Naya", "Nayla", "Neila", "Nelia", "Nell", "Nesrine", "Neyla", "Nina", "Ninon", "Nisa", "Noa", "Noelie", "Noeline", "Noémie", "Nola", "Nora", "Norah", "Nour", "Océane", "Olivia", "Ophélie", "Oriane", "Orlane", "Ornella", "Paloma", "Paola", "Pauline", "Pénélope", "Perrine", "Philippine", "Philomène", "Prune", "Rachel", "Rahma", "Rania", "Raphaëlle", "Rébecca", "Romane", "Romy", "Rosalie", "Rose", "Roxane", "Sabrina", "Sacha", "Safa", "Safia", "Safiya", "Sakina", "Salma", "Salomé", "Samia", "Sana", "Sara", "Sarah", "Sasha", "Savannah", "Selena", "Selene", "Selma", "Serena", "Shaima", "Shaina", "Shana", "Shanna", "Shayna", "Sherine", "Sidonie", "Sirine", "Sixtine", "Sofia", "Solène", "Soline", "Sonia", "Sophia", "Sophie", "Soraya", "Soukaina", "Soumaya", "Stella", "Suzanne", "Suzie", "Syrine", "Taina", "Talia", "Tamara", "Tania", "Tatiana", "Tess", "Tessa", "Thais", "Thalia", "Thea", "Tiffany", "Tina", "Tiphaine", "Valentine", "Vanessa", "Victoire", "Victoria", "Violette", "Wendy", "Yael", "Yaelle", "Yasmina", "Yasmine", "Youna", "Yousra", "Yuna", "Yvette", "Yvonne", "Zahra", "Zelie", "Zia", "Zoé"]>>
-<<set setup.frenchSlaveSurnames = ["Andre", "Arnaud", "Arsenault", "Barbier", "Benoit", "Bernard", "Bertrand", "Blanc", "Blanchard", "Bonnet", "Bouvier", "Boyer", "Brun", "Chevalier", "Clement", "Cohen", "Cousteau", "David", "Denis", "Deschamps", "Dubois", "Dufour", "Dumas", "Dumont", "Dupont", "Durand", "Duval", "Fabre", "Faure", "Favreau", "Fontaine", "Fournier", "Francois", "Gaillard", "Garnier", "Gauthier", "Gautier", "Gerard", "Girard", "Giraud", "Guerin", "Henry", "Jean", "Joly", "Lacroix", "Lambert", "Laurent", "Leclerc", "Lefebvre", "Lefevre", "Legrand", "Lemaire", "Leroux", "Leroy", "Levy", "Lucas", "Marchand", "Marie", "Martin", "Masson", "Mathieu", "Mercier", "Meunier", "Michel", "Moreau", "Morel", "Morin", "Nicolas", "Noel", "Olivier", "Paris", "Perrin", "Petit", "Phillipe", "Picard", "Pierre", "Renaud", "Richard", "Robert", "Robin", "Roche", "Rousseau", "Roussel", "Roux", "Roy", "Simon", "Thomas", "Vidal", "Vincent"]>>
+<<set setup.frenchSlaveNames = ["Aaliyah", "Abigael", "Adèle", "Adriana", "Adrienne", "Agathe", "Aicha", "Albane", "Alessia", "Alexandra", "Alexia", "Aleyna", "Alia", "Alice", "Alicia", "Alienor", "Aline", "Alix", "Aliya", "Aliyah", "Alizee", "Alya", "Alycia", "Alyssa", "Alyssia", "Amandine", "Ambre", "Ambrine", "Amel", "Amelia", "Amélie", "Amina", "Aminata", "Amira", "Amy", "Ana", "Anae", "Anaelle", "Anaïs", "Anastasia", "Andrea", "Angela", "Angèle", "Angelina", "Angeline", "Anissa", "Anna", "Annabelle", "Annaelle", "Anouk", "Apolline", "Ashley", "Asma", "Assia", "Assya", "Astrid", "Athénaïs", "Audrey", "Augustine", "Aurélie", "Aurore", "Ava", "Awa", "Axelle", "Aya", "Belle", "Berenice", "Bertille", "Blanche", "Cali", "Calie", "Camelia", "Camille", "Candice", "Capucine", "Carla", "Carmen", "Caroline", "Cassandra", "Cassandre", "Cassie", "Cécile", "Cecilia", "Céleste", "Célestine", "Celia", "Céline", "Celya", "Chahinez", "Chaima", "Chantal", "Chantelle", "Charlene", "Charlie", "Charline", "Charlotte", "Chayma", "Chiara", "Chloé", "Claire", "Clara", "Clarisse", "Clea", "Clelia", "Clémence", "Clementine", "Cleo", "Cloé", "Clotilde", "Coline", "Constance", "Coralie", "Cyrielle", "Daphné", "Deborah", "Diana", "Diane", "Didi", "Dina", "Dounia", "Eden", "Ela", "Elea", "Eleana", "Elena", "Eléonore", "Elia", "Elif", "Elina", "Eline", "Elisa", "Élisabeth", "Élise", "Elissa", "Ella", "Eloane", "Élodie", "Éloïse", "Elona", "Elora", "Elsa", "Elya", "Elyna", "Elyne", "Ema", "Emeline", "Emie", "Émilie", "Emily", "Emma", "Emmanuelle", "Emmie", "Emmy", "Emna", "Emy", "Enola", "Enora", "Erine", "Estelle", "Esther", "Eugénie", "Eva", "Eve", "Eya", "Fanny", "Fantine", "Farah", "Fatima", "Fatma", "Fatoumata", "Faustine", "Flavie", "Fleur", "Flora", "Flore", "Florine", "Françoise", "Gabriella", "Gabrielle", "Gaëlle", "Garance", "Genevieve", "Giulia", "Grace", "Gwenaëlle", "Gwendoline", "Hafsa", "Hajar", "Halima", "Hana", "Hanae", "Hanna", "Hannah", "Hawa", "Helena", "Hélène", "Héloïse", "Hermine", "Hiba", "Hind", "Hortense", "Ibtissem", "Ilana", "Iliana", "Ilona", "Ilyana", "Imane", "Imen", "Imene", "Inaya", "Inès", "Irina", "Iris", "Isaure", "Isis", "Isra", "Izia", "Jade", "Jana", "Janelle", "Janna", "Jasmine", "Jeanne", "Jenna", "Jessica", "Jihane", "Joan", "Joana", "Johanna", "Joséphine", "Joy", "Joyce", "Judith", "Julia", "Julie", "Juliette", "Juline", "Justine", "Kahina", "Kaina", "Kamelia", "Kayla", "Kayna", "Kelia", "Kelly", "Kelya", "Kenza", "Kessy", "Khadija", "Kiara", "Kim", "Kimberley", "Kyara", "Laetitia", "Lalie", "Laly", "Lamia", "Lana", "Lara", "Laura", "Laure", "Laurine", "Layana", "Léa", "Leana", "Leane", "Leanne", "Leelou", "Leia", "Leila", "Leina", "Lena", "Leona", "Léonie", "Leyna", "Lia", "Liana", "Lila", "Lilas", "Lili", "Lilia", "Lilie", "LiliRose", "Lilly", "Lilou", "Lilwenn", "Lily", "Lilya", "LilyRose", "Lina", "Linda", "Lindsay", "Line", "Lisa", "Lise", "Lison", "Livia", "Liya", "Loane", "Loanne", "Lois", "Lola", "Lorena", "Lou", "Louane", "Louann", "LouAnn", "Louanne", "LouAnne", "Louisa", "Louise", "Louison", "Louna", "Luce", "Lucia", "Lucie", "Lucile", "Lucille", "Lucy", "Ludivine", "Luna", "Lya", "Lyana", "Lydia", "Lylia", "Lylou", "Lyna", "Madeleine", "Mae", "Maelia", "Maelie", "Maeline", "Maëlle", "Maelly", "Maellys", "Maely", "Maelyne", "Maelys", "Maëlys", "Maelyss", "Maeva", "Maia", "Maily", "Mailys", "Maimouna", "Maina", "Maissa", "Maissane", "Maiwenn", "Malak", "Malia", "Manel", "Manelle", "Manon", "Margaux", "Margot", "Maria", "Mariam", "Marianne", "Marie", "Marilou", "Marina", "Marine", "Marion", "Marwa", "Maryam", "Marylou", "Mathilde", "Maud", "Maya", "Maylis", "Mayssa", "Meissa", "Mélanie", "Melia", "Melina", "Melinda", "Méline", "Mélissa", "Mellina", "Melodie", "Melody", "Melyna", "Melyne", "Meriem", "Meryem", "Mia", "Mila", "Milla", "Mina", "Mona", "Morgane", "Mya", "Myriam", "Nada", "Naelle", "Naia", "Naila", "Naima", "Nais", "Naomi", "Naomie", "Natalie", "Nawel", "Naya", "Nayla", "Neila", "Nelia", "Nell", "Nesrine", "Neyla", "Nicole", "Nina", "Ninon", "Nisa", "Noa", "Noelie", "Noeline", "Noémie", "Nola", "Nora", "Norah", "Nour", "Océane", "Olivia", "Ophélie", "Oriane", "Orlane", "Ornella", "Paloma", "Paola", "Pauline", "Pénélope", "Perrine", "Philippine", "Philomène", "Prune", "Rachel", "Rahma", "Rania", "Raphaëlle", "Rébecca", "Romane", "Romy", "Rosalie", "Rose", "Roxane", "Sabrina", "Sacha", "Safa", "Safia", "Safiya", "Sakina", "Salma", "Salomé", "Samia", "Sana", "Sara", "Sarah", "Sasha", "Savannah", "Selena", "Selene", "Selma", "Serena", "Shaima", "Shaina", "Shana", "Shanna", "Shayna", "Sherine", "Sidonie", "Sirine", "Sixtine", "Sofia", "Solène", "Soline", "Sonia", "Sophia", "Sophie", "Soraya", "Soukaina", "Soumaya", "Stella", "Suzanne", "Suzie", "Syrine", "Taina", "Talia", "Tamara", "Tania", "Tatiana", "Tess", "Tessa", "Thais", "Thalia", "Thea", "Tiffany", "Tina", "Tiphaine", "Valentine", "Vanessa", "Victoire", "Victoria", "Violette", "Wendy", "Yael", "Yaelle", "Yasmina", "Yasmine", "Youna", "Yousra", "Yuna", "Yvette", "Yvonne", "Zahra", "Zelie", "Zia", "Zoé"]>>
+<<set setup.frenchSlaveSurnames = ["Adam", "Ait", "Alexandre", "Andre", "Antoine", "Arnaud", "Arsenault", "Aubert", "Aubry", "Bailly", "Barbier", "Baron", "Benoit", "Berger", "Bernard", "Bertin", "Bertrand", "Besson", "Blanc", "Blanchard", "Bonnet", "Boucher", "Bourgeois", "Bouvier", "Boyer", "Breton", "Brun", "Brunet", "Caron", "Carpentier", "Charles", "Charpentier", "Chauvin", "Chevalier", "Chevallier", "Clement", "Cohen", "Colin", "Collet", "Costa", "Cousin", "Cousteau", "da Silva", "Daniel", "David", "Delacroix", "Denis", "Deschamps", "Diallo", "Didier", "dos Santos", "Dubois", "Dufour", "Dumas", "Dumont", "Dupont", "Dupuis", "Dupuy", "Durand", "Duval", "Etienne", "Fabre", "Faure", "Favreau", "Fernandes", "Fernandez", "Ferreira", "Fleury", "Fontaine", "Fournier", "Francois", "Gaillard", "Garcia", "Garnier", "Gauthier", "Gautier", "Gerard", "Germain", "Gilbert", "Gillet", "Girard", "Giraud", "Gomez", "Gonzalez", "Guerin", "Guillaume", "Guillot", "Guyot", "Hamon", "Henry", "Herve", "Hubert", "Huet", "Jacob", "Jacques", "Jacquet", "Jean", "Joly", "Julien", "Klein", "Lacroix", "Lambert", "Lamy", "Langlois", "Laurent", "le Gall", "le Roux", "Le", "Leblanc", "Lebrun", "Leclerc", "Leclercq", "Lecomte", "Lefebvre", "Lefevre", "Leger", "Legrand", "Lemaire", "Lemoine", "Leroux", "Leroy", "Levy", "Li", "Lopez", "Louis", "Lucas", "Macron", "Maillard", "Mallet", "Maman", "Marchal", "Marchand", "Marie", "Martin", "Martinez", "Martins", "Marty", "Masson", "Mathieu", "Menard", "Mercier", "Meunier", "Meyer", "Michaud", "Michel", "Millet", "Moreau", "Morel", "Morin", "Moulin", "Muller", "Nguyen", "Nicolas", "Noel", "Null", "Olivier", "Paris", "Pascal", "Paul", "Pelletier", "Pereira", "Perez", "Perret", "Perrier", "Perrin", "Perrot", "Petit", "Philippe", "Phillipe", "Picard", "Pierre", "Poirier", "Pons", "Remy", "Renard", "Renaud", "Renault", "Rey", "Richard", "Riviere", "Robert", "Robin", "Roche", "Rodrigues", "Rodriguez", "Roger", "Rolland", "Rousseau", "Roussel", "Roux", "Roy", "Royer", "Ruiz", "Saint", "Sanchez", "Schmitt", "Schneider", "Simon", "Thierry", "Thomas", "Tran", "Vasseur", "Vidal", "Vincent", "Wang", "Weber"]>>
 
-<<set setup.thaiSlaveNames = ["A-Gun", "Amporn", "Aom", "Arisa", "Bam", "Beam", "Benyapa", "Bow", "Buppha", "Bussaba", "Chailai", "Chanchira", "Chimlin", "Chuenchai", "Dao", "Eve", "Fah", "Fai", "Fern", "Fon", "Hom", "Intira", "Jane", "Janjira", "Jenny", "Jira", "June", "Kamlai", "Kanokwan", "Kanya", "Karawek", "Kate", "Kosum", "Kulap", "Kwang", "Lamai", "Lawan", "Malee", "Mali", "May", "Min", "Mild", "Mind", "Mint", "Muk", "Nam", "Nan", "Nat", "Natcha", "Natchaya", "New", "Ngam-Chit", "Nick", "Ning", "Noon", "Nutcha", "Pakpao", "Pam", "Pang", "Pat", "Pen-Chan", "Pensri", "Phailin", "Phairoh", "Phawta", "Phueng", "Pim", "Ploy", "Pop", "Praew", "Ratana", "Saengdao", "Samorn", "Sanoh", "Sinee", "Sirada", "Solada", "Som", "Sroy", "Sudarat", "Sukanya", "Sukhon", "Taeng", "Tangmo", "Thanchanok", "Tidarat", "Toey", "Vanida", "Vipada", "View", "Waan", "Waen", "Wipada", "Yada", "Yanisa"]>>
-<<set setup.thaiSlaveSurnames = ["Aromdee", "Aung", "Bee", "Boon", "Boy", "Bunnag", "Cha", "Chai", "Chang", "Chin", "Fon", "Huang", "Ja", "Jang", "Jung", "Ka", "Kan", "Khan", "Ko", "Kong", "Kung", "Kurusarttra", "Leekpai", "Lek", "Li", "Lim", "Lin", "Liu", "Man", "Metharom", "Mon", "Moo", "Na", "Naka", "Narak", "Ng", "Nong", "Oo", "Ornlamai", "Pan", "Park", "Pattaya", "Pong", "Sa", "Sachdev", "Saenamuang", "Sakda", "Samui", "San", "Shinawatra", "Siri", "Sirisopa", "Som", "Somboon", "Song", "Su", "Sukbunsung", "Suwan", "Tan", "Tang", "Tee", "Thong", "Tong", "Wan", "Wang", "Win", "Yang", "Yuvaves", "Za", "Zaa", "Zhang"]>>
+<<set setup.thaiSlaveNames = ["A-Gun", "Amporn", "Aom", "Arisa", "Bam", "Beam", "Benyapa", "Bow", "Buppha", "Bussaba", "Chailai", "Chanchira", "Chanut", "Chimlin", "Chuenchai", "Dao", "Eve", "Fah", "Fai", "Fern", "Fon", "Hom", "Intira", "Jane", "Janjira", "Jarupan", "Jenny", "Jira", "June", "Kalaya", "Kamlai", "Kanokwan", "Kanya", "Karawek", "Kate", "Kosum", "Kulap", "Kwang", "Lamai", "Lawan", "Lursakdi", "Malee", "Mali", "May", "Mild", "Min", "Mind", "Mint", "Muk", "Nahathai", "Nam", "Nan", "Nat", "Natcha", "Natchaya", "New", "Ngam-Chit", "Nick", "Ning", "Noon", "Nutcha", "Orapin", "Pakpao", "Pam", "Pang", "Pat", "Pen-Chan", "Pensri", "Phailin", "Phairoh", "Phawta", "Phueng", "Pim", "Ploy", "Pop", "Praew", "Prateep", "Ratana", "Saengdao", "Samorn", "Sanoh", "Sinee", "Sirada", "Solada", "Som", "Sroy", "Sudarat", "Sukanya", "Sukhon", "Sukumol", "Taeng", "Tangmo", "Thanchanok", "Thita", "Tidarat", "Toey", "Vanida", "View", "Vipada", "Waan", "Waen", "Wipada", "Yada", "Yanisa", "Yingluck"]>>
+<<set setup.thaiSlaveSurnames = ["Ang", "Ann", "Aromdee", "Art", "Au", "Aung", "Ball", "Bank", "Bee", "Beer", "Bell", "Bird", "Boon", "Boonma", "Boonmee", "Bow", "Boy", "Bunnag", "Cha", "Chai", "Chaichana", "Chaimongkol", "Chaiwong", "Chang", "Charoensuk", "Chawla", "Cheng", "Chiangmai", "Chin", "Cho", "Choi", "Chong", "Chu", "Chung", "Da", "Dang", "Dao", "Dee", "Fon", "Han", "Hansen", "Ho", "Hong", "Hongsakul", "Huang", "Ja", "Jaidee", "Jain", "Jan", "Jang", "Jin", "Jira", "Jong", "Joy", "Jung", "Ka", "Kan", "Kang", "Keyuraphan", "Khan", "Ko", "Kob", "Koh", "Kong", "Korn", "Krishnakumar", "Ku", "Kung", "Kunplome", "Kurusarttra", "Kwan", "Lai", "Lam", "Lay", "Lee", "Leekpai", "Lek", "Li", "Lim", "Lin", "Liu", "Lo", "Lovely", "Lwin", "Ma", "Mai", "Mam", "Man", "Maneerat", "Manitkul", "Mba", "Mee", "Metharom", "Mohammed", "Mon", "Moo", "Myint", "na Nakorn", "Na", "Naja", "Naka", "Nam", "Nan", "Nana", "Narak", "Narula", "New", "Ng", "Ning", "Noi", "Nok", "Nong", "Noom", "Noon", "Nui", "Null", "Oh", "Ong", "Oo", "Ornlamai", "Pa", "Pan", "Pang", "Panich", "Panya", "Park", "Pattaya", "Pee", "Pim", "Piyaoui", "Pom", "Pong", "Poo", "Pop", "Por", "Pu", "Rat", "Rattana", "Rung", "Sa", "Sachdev", "Sae", "Saelee", "Saelim", "Saenamuang", "Saetang", "Sakda", "Sam", "Sampatisri", "Samui", "San", "Sang", "Sangthong", "Sethi", "Shaik", "Shinawatra", "Shrestha", "Siam", "Siri", "Sirisopa", "Smile", "So", "Soe", "Som", "Somboon", "Son", "Song", "Sophonpanich", "Sri", "Srisawat", "Srisuk", "Srisuwan", "Srithong", "Su", "Sukbunsung", "Suksawat", "Sun", "Suriya", "Suwan", "Suwannarat", "Sweet", "Ta", "Tai", "Tam", "Tan", "Tang", "Tee", "Than", "Thong", "Thongsuk", "Tom", "Ton", "Tong", "Top", "Toy", "Tran", "Tu", "Tuk", "Tum", "Tun", "Udom", "Wan", "Wang", "Wat", "Wattana", "Wee", "Win", "Wu", "Ya", "Yang", "Ying", "Yong", "Yu", "Yuvaves", "Za", "Zaa", "Zhang"]>>
 
 <<set setup.britishSlaveNames = ["Abbie", "Alice", "Amber", "Amy", "Anna", "Becky", "Beth", "Bethany", "Caitlin", "Charlie", "Charlotte", "Chloe", "Courtney", "Eleanor", "Ella", "Ellie", "Emily", "Emma", "Erin", "Georgia", "Grace", "Hannah", "Holly", "Jade", "Jasmine", "Jess", "Jessica", "Kate", "Katie", "Laura", "Lauren", "Leah", "Lily", "Louise", "Lucy", "Lydia", "Megan", "Mia", "Molly", "Natalie", "Niamh", "Olivia", "Phoebe", "Rachel", "Rebecca", "Rosie", "Sarah", "Shannon", "Sophie", "Zoe"]>>
 <<set setup.britishSlaveSurnames = ["Adams", "Allen", "Andrews", "Atkinson", "Bailey", "Baker", "Barker", "Barnes", "Bell", "Bennett", "Brown", "Cameron", "Carter", "Chapman", "Clark", "Clarke", "Cleese", "Cole", "Collins", "Cook", "Cooper", "Cox", "Davies", "Dawson", "Day", "Doyle", "Edwards", "Ellis", "Evans", "Fisher", "Foster", "Fox", "Gibson", "Gladstone", "Graham", "Gray", "Green", "Griffiths", "Hall", "Harris", "Harrison", "Harvey", "Hill", "Holmes", "Howard", "Hughes", "Hunter", "Idle", "Jackson", "James", "Johnson", "Jones", "Kelly", "King", "Knight", "Lee", "Lewis", "Lloyd", "Major", "Marshall", "Martin", "Mason", "Matthews", "May", "Mills", "Milne", "Mitchell", "Moore", "Morris", "Palin", "Palmer", "Parker", "Patel", "Pearce", "Pearson", "Powell", "Price", "Richards", "Richardson", "Roberts", "Robinson", "Rogers", "Russell", "Salisbury", "Scott", "Shaw", "Simpson", "Smith", "Stevens", "Stewart", "Taylor", "Thatcher", "Thomas", "Thompson", "Turner", "Walker", "Walpole", "Ward", "Watson", "Webb", "White", "Wilkinson", "Williams", "Wilson", "Wood", "Wright", "Young"]>>
 
-<<set setup.italianSlaveNames = ["Alessandra", "Alessia", "Alice", "Anna", "Annalisa", "Arianna", "Aurora", "Beatrice", "Benedetta", "Camilla", "Carlotta", "Caterina", "Chiara", "Claudia", "Cristina", "Eleonora", "Elisa", "Elisabetta", "Elèna", "Federica", "Francesca", "Gaia", "Giada", "Giorgia", "Giulia", "Greta", "Ilaria", "Irene", "Jessica", "Laura", "Lisa", "Lucrezia", "Ludovica", "Maria", "Marta", "Martina", "Michela", "Miriam", "Noemi", "Paola", "Rebecca", "Roberta", "Sara", "Serena", "Silvia", "Simona", "Sofia", "Valentina", "Valeria", "Veronica"]>>
-<<set setup.italianSlaveSurnames = ["Amato", "Barbieri", "Barone", "Basso", "Benedetti", "Beretta", "Berlusconi", "Berti", "Bevilacqua", "Bianchi", "Bianco", "Bruni", "Bruno", "Caputo", "Carbone", "Caruso", "Catalano", "Colombo", "Conte", "Conti", "Coppola", "Corleone", "Costa", "Costantini", "D'Agostino", "D'Alessandro", "D'Ambrosio", "D'Amico", "D'Angelo", "Dalla", "de Angelis", "de Luca", "de Rosa", "de Santis", "di Stefano", "Esposito", "Fabbri", "Ferrara", "Ferrari", "Ferri", "Fiore", "Fontana", "Franco", "Fumagalli", "Fusco", "Galli", "Gallo", "Garofalo", "Gatti", "Giordano", "Grassi", "Grasso", "Greco", "Leone", "Lombardi", "Lombardo", "Longo", "Mancini", "Marchetti", "Mariani", "Marini", "Marino", "Marra", "Martinelli", "Martini", "Martino", "Mele", "Messina", "Milani", "Monaco", "Montanari", "Monti", "Morelli", "Moretti", "Napoli", "Negri", "Neri", "Orsatti", "Palermo", "Palmieri", "Parisi", "Pellegrini", "Pinna", "Poli", "Pozzi", "Ricci", "Rinaldi", "Riva", "Rizzi", "Rizzo", "Romano", "Romeo", "Rossetti", "Rossi", "Russo", "Sala", "Salerno", "Sanna", "Santoro", "Sartori", "Serra", "Silvestri", "Sorrentino", "Spina", "Testa", "Valentini", "Villa", "Vitale", "Vitali", "Zanetti"]>>
+<<set setup.italianSlaveNames = ["Alessandra", "Alessia", "Alice", "Anna", "Annalisa", "Arianna", "Aurora", "Beatrice", "Benedetta", "Camilla", "Carlotta", "Caterina", "Chiara", "Claudia", "Cristina", "Elèna", "Eleonora", "Elisa", "Elisabetta", "Emma", "Federica", "Francesca", "Gaia", "Giada", "Giorgia", "Giulia", "Greta", "Ilaria", "Irene", "Jessica", "Laura", "Lisa", "Lucrezia", "Ludovica", "Maria", "Marta", "Martina", "Michela", "Miriam", "Noemi", "Paola", "Rebecca", "Roberta", "Sara", "Serena", "Silvia", "Simona", "Sofia", "Valentina", "Valeria", "Veronica"]>>
+<<set setup.italianSlaveSurnames = ["Agostini", "Aiello", "Alberti", "Amato", "Angelini", "Antonelli", "Arena", "Baldi", "Barbieri", "Barone", "Basile", "Bassi", "Basso", "Battaglia", "Bellini", "Benedetti", "Beretta", "Berlusconi", "Bernardi", "Berti", "Bevilacqua", "Bianchi", "Bianchini", "Bianco", "Brambilla", "Bruni", "Bruno", "Calabrese", "Caputo", "Carbone", "Carta", "Caruso", "Castelli", "Catalano", "Cattaneo", "Cavallo", "Colombo", "Conte", "Conti", "Coppola", "Corleone", "Costa", "Costantini", "D'Agostino", "D'Alessandro", "D'Ambrosio", "D'Amico", "D'Angelo", "Dalla", "de Angelis", "de Luca", "de Rosa", "de Santis", "de Simone", "di Stefano", "Donati", "Esposito", "Fabbri", "Farina", "Ferrante", "Ferrara", "Ferrari", "Ferraro", "Ferretti", "Ferri", "Ferro", "Fiore", "Fontana", "Forte", "Franco", "Fumagalli", "Fusco", "Galli", "Gallo", "Garofalo", "Gatti", "Gatto", "Gentile", "Giannini", "Giordano", "Giorgi", "Giuliani", "Grassi", "Grasso", "Greco", "Grillo", "Grimaldi", "Grossi", "Guerra", "Guidi", "Landi", "Leonardi", "Leone", "Leoni", "Locatelli", "Lombardi", "Lombardo", "Longo", "Maggi", "Manca", "Mancini", "Mancuso", "Mantovani", "Marchese", "Marchetti", "Marchi", "Mariani", "Marinelli", "Marini", "Marino", "Marra", "Martinelli", "Martini", "Martino", "Mauro", "Mazza", "Mele", "Melis", "Meloni", "Messina", "Milani", "Molinari", "Monaco", "Montanari", "Monti", "Morelli", "Moretti", "Moro", "Mosca", "Motta", "Napoli", "Napolitano", "Nardi", "Negri", "Neri", "Null", "Olivieri", "Orlandi", "Orlando", "Orsatti", "Pace", "Pagani", "Pagano", "Palermo", "Palmieri", "Palumbo", "Papa", "Parisi", "Pellegrini", "Pellegrino", "Pepe", "Perrone", "Piazza", "Piccolo", "Pinna", "Piras", "Poli", "Pozzi", "Proietti", "Pugliese", "Ricci", "Rinaldi", "Riva", "Rizzi", "Rizzo", "Romano", "Romeo", "Rosa", "Rosati", "Rossetti", "Rossi", "Rossini", "Rosso", "Rota", "Ruggeri", "Ruggiero", "Russo", "Sacco", "Sala", "Salerno", "Sanna", "Santini", "Santoro", "Sartori", "Serafini", "Serpieri", "Serra", "Silvestri", "Sorrentino", "Spina", "Spinelli", "Stella", "Testa", "Tosi", "Valente", "Valenti", "Valentini", "Vanzetti", "Ventura", "Villa", "Villani", "Viola", "Vitale", "Vitali", "Volpe", "Zanetti"]>>
 
 <<set setup.spanishSlaveNames = ["Abril", "Adriana", "Africa", "Aina", "Ainara", "Ainhoa", "Aitana", "Alba", "Alejandra", "Alexandra", "Alexia", "Alicia", "Alma", "Ana", "Ana", "Andrea", "Angela", "Anna", "Ariadna", "Aroa", "Aya", "Beatriz", "Berta", "Blanca", "Candela", "Carla", "Carlota", "Carmen", "Carolina", "Celia", "Clara", "Claudia", "Cristina", "Daniela", "Diana", "Elena", "Elsa", "Emma", "Erika", "Esther", "Eva", "Fatima", "Gabriela", "Helena", "Ines", "Irene", "Iria", "Iris", "Isabel", "Jana", "Jimena", "Julia", "Laia", "Lara", "Laura", "Leire", "Leyre", "Lidia", "Lola", "Lorena", "Lucia", "Luna", "Malak", "Manuela", "Mar", "Mara", "Maria", "Maria", "Marina", "Marta", "Martina", "Mireia", "Miriam", "Monica", "Nadia", "Naia", "Naiara", "Natalia", "Nayara", "Nerea", "Noa", "Noelia", "Nora", "Nuria", "Olivia", "Paola", "Patricia", "Paula", "Raquel", "Rocio", "Salma", "Sandra", "Sara", "Saray", "Silvia", "Sofia", "Teresa", "Valentina", "Valeria", "Vega", "Victoria", "Yaiza"]>>
 <<set setup.spanishSlaveSurnames = ["Alonso", "Alvarez", "Benitez", "Bernal", "Blanco", "Bravo", "Calvo", "Camacho", "Campos", "Cano", "Casado", "Casas", "Castillo", "Castro", "Cortes", "Cruz", "Delgado", "Diaz", "Diez", "Dominguez", "Escudero", "Esteban", "Fernandez", "Flores", "Franco", "Fuentes", "Gallego", "Garcia", "Garrido", "Gil", "Gomez", "Gonzalez", "Guerrero", "Gutierrez", "Hernandez", "Herrero", "Iglesias", "Izquierdo", "Jimenez", "Lara", "Lazano", "Lopez", "Marin", "Martin", "Martinez", "Mendez", "Mendoza", "Molina", "Morales", "Moreno", "Moya", "Muñoz", "Navarro", "Nieto", "Nuñez", "Ortega", "Ortiz", "Otero", "Perez", "Prieto", "Ramirez", "Ramos", "Rey", "Reyes", "Rico", "Rivera", "Robles", "Rodriguez", "Rojas", "Romero", "Rubio", "Ruiz", "Sanchez", "Santiago", "Santos", "Sanz", "Serrano", "Sierra", "Silva", "Suarez", "Torres", "Vasquez", "Vazquez", "Vega", "Vera", "Vidal"]>>
@@ -466,8 +466,8 @@
 <<set setup.greekSlaveNames = ["Aggeliki", "Aiketerine", "Alexandra", "Anastasia", "Anna", "Baslikike", "Calliope", "Demetra", "Despoina", "Dominique", "Eirene", "Eleni", "Evangelia", "Georgia", "Helen", "Ioanna", "Konstantina", "Kyriake", "Maria", "Panagiota", "Paraskevi", "Sofia", "Vasiliki"]>>
 <<set setup.greekSlaveSurnames = ["Adamopoulos", "Alexiou", "Anagnostopoulou", "Anagnostou", "Antoniou", "Antonopoulou", "Apostolopoulos", "Athanasiou", "Athanasopoulos", "Athanasopoulou", "Christodoulou", "Christopoulos", "Christou", "Diamantopoulos", "Dimitrakopoulos", "Dimitriadi", "Dimitriadis", "Dimitriou", "Dimitris", "Dimou", "Doukas", "Efstathiou", "Floros", "Fotiadis", "Galani", "Georgakopoulos", "George", "Georgiadi", "Georgiou", "Georgopoulos", "Georgopoulou", "Giannakopoulos", "Giannakopoulou", "Giannopoulos", "Giannopoulou", "Ioannidis", "Ioannou", "Ionnidi", "Kanellopoulos", "Karagianni", "Karagiiani", "Karras", "Katsaros", "Kollias", "Konstantinidi", "Konstantinidis", "Konstantinidou", "Konstantopoulos", "Kontos", "Kostas", "Kyriakopoulos", "Kyriakou", "Makri", "Makris", "Margaritis", "Maria", "Marinos", "Michalopoulos", "Moraitis", "Mylonas", "Nikolaidi", "Nikolaidis", "Nikolaidou", "Nikolaou", "Oikonomou", "Panagiotidis", "Panagiotopoulos", "Panou", "Pantazis", "Pap", "Papa", "Papadaki", "Papadakis", "Papadimitriou", "Papadopoulou", "Papageorgiou", "Papaioannou", "Papanikolaou", "Papas", "Papatheodorou", "Pappa", "Paraskevopoulos", "Pavlou", "Petrakis", "Petropoulos", "Petrou", "Rapti", "Raptis", "Rigas", "Rizos", "Roussos", "Sakellariou", "Samaras", "Sarris", "Sideri", "Sideris", "Sotiropoulos", "Spanis", "Stamatopoulos", "Stamou", "Stathopoulou", "Stavropoulou", "Stefanidis", "Stefanou", "Stergiou", "Theodoropoulos", "Thodorou", "Triantafillou", "Triantafyllou", "Vasilopoulos", "Vassiliou", "Vlachos", "Vlachou"]>>
 
-<<set setup.israeliSlaveNames = ["Abigail", "Adele", "Adi", "Agam", "Alia", "Alma", "Ariel", "Avigail", "Avigayil", "Aya", "Ayala", "Azubah", "Bathseva", "Batsheba", "Berura", "Carmela", "Chana", "Chasya", "Chaya", "Edel", "Elah", "Ella", "Emily", "Emma", "Esther", "Gal", "Golda", "Hanna", "Hila", "Hodaya", "Iris", "Leaane", "Leah", "Lia", "Lian", "Maayan", "Maya", "Michal", "Minah", "Miriam", "Naavah", "Nediva", "Nitza", "Noa", "Noam", "Noya", "Ora", "Orali", "Orna", "Ornette", "Rachel", "Rebecca", "Rivka", "Romi", "Roni", "Ruth", "Sara", "Sarah", "Shira", "Sima", "Simcha", "Sirka", "Tahel", "Talia", "Talya", "Tamar", "Vered", "Yael", "Yahel", "Yardenah", "Yente", "Zamora", "Zemora"]>>
-<<set setup.israeliSlaveSurnames = ["Abu", "Aharon", "Aharoni", "Almog", "Alon", "Amir", "Amit", "Arbel", "Asher", "Ashkenazi", "Aviv", "Avraham", "Azulay", "Bar", "Barak", "Baron", "ben Ami", "ben Ari", "ben David", "Berger", "Biton", "Caspi", "Chen", "Cohen", "Dagan", "Dahan", "Daniel", "David", "Dayan", "Dekel", "Dvir", "Elbaz", "Erez", "Ezra", "Feldman", "Fisher", "Fishman", "Frenkel", "Friedman", "Gal", "Gil", "Gilad", "Golan", "Gold", "Goldberg", "Goldenberg", "Goldman", "Goldstein", "Gordon", "Goren", "Green", "Greenberg", "Gross", "Grossman", "Gutman", "Hadar", "Haim", "Harel", "Inbar", "Israel", "Kaplan", "Katz", "Kaufman", "Klein", "Kogan", "Koren", "Landau", "Lavi", "Lev", "Levi", "Levin", "Levy", "Liberman", "Manor", "Meir", "Melamed", "Michaeli", "Miller", "Mizrahi", "Mor", "Moran", "Nir", "Ohana", "Ohayon", "Oren", "Ovadia", "Öz", "Paz", "Peer", "Peled", "Peretz", "Perry", "Rabinovich", "Raviv", "Raz", "Regev", "Rosen", "Rosenberg", "Rotem", "Rubin", "Rubinstein", "Schwartz", "Segal", "Sela", "Shachar", "Shaked", "Shaley", "Shapira", "Sharon", "Shemesh", "Sherman", "Shulman", "Solomon", "Stein", "Stern", "Tal", "Tzur", "Vaknin", "Weinstein", "Weiss", "Yosef", "Zamir", "Zilberman", "Ziv"]>>
+<<set setup.israeliSlaveNames = ["Abigail", "Adel", "Adele", "Adi", "Agam", "Alia", "Aline", "Alma", "Amit", "Ariel", "Assil", "Avigail", "Avigayil", "Aya", "Ayala", "Azubah", "Bathseva", "Batsheba", "Berura", "Carmela", "Celine", "Chana", "Chasya", "Chaya", "Daniel", "Edel", "Eden", "Elah", "Ella", "Emily", "Emma", "Esther", "Gal", "Golda", "Hanna", "Hila", "Hodaya", "Iris", "Jana", "Lea", "Leaane", "Leah", "Lia", "Lian", "Lin", "Lior", "Ma'ayan", "Maayan", "Malk", "Maria", "Maryam", "Maya", "Michal", "Minah", "Miral", "Miriam", "Miyar", "Naavah", "Natalie", "Nediva", "Nitza", "Noa", "Noam", "Noor", "Noya", "Nur", "Omer", "Ora", "Orali", "Orna", "Ornette", "Rachel", "Rebecca", "Rivka", "Romi", "Roni", "Ruth", "Sara", "Sarah", "Sha'im", "Shira", "Sillin", "Sima", "Simcha", "Sirka", "Tahel", "Tala", "Talia", "Talya", "Tamar", "Vered", "Yael", "Yahel", "Yahli", "Yardenah", "Yarin", "Yente", "Yuval", "Zamora", "Zemora"]>>
+<<set setup.israeliSlaveSurnames = ["Abu", "Adler", "Aharon", "Aharoni", "Almog", "Alon", "Aloni", "Amar", "Amir", "Amit", "Arad", "Arbel", "Asher", "Ashkenazi", "Assaf", "Avital", "Aviv", "Avni", "Avraham", "Azulay", "Bachar", "Bar", "Barak", "Baron", "Baruch", "ben Ami", "ben Ari", "ben David", "Berger", "Berman", "Biton", "Bitton", "Blum", "Caspi", "Chen", "Cohen", "Dagan", "Dahan", "Daniel", "David", "Dayan", "Dekel", "Dor", "Doron", "Dotan", "Dror", "Dvir", "Edri", "Elbaz", "Eliyahu", "Epstein", "Erez", "Ezra", "Feldman", "Fisher", "Fishman", "Frenkel", "Fridman", "Friedman", "Gabay", "Gal", "Gazit", "Geva", "Gil", "Gilad", "Gilboa", "Golan", "Gold", "Goldberg", "Goldenberg", "Goldman", "Goldstein", "Gönen", "Gordon", "Goren", "Green", "Greenberg", "Grinberg", "Gross", "Grossman", "Gur", "Gutman", "Hadad", "Hadar", "Haim", "Harari", "Harel", "Hazan", "Inbar", "Israel", "Kaplan", "Katz", "Kaufman", "Keren", "Khoury", "Klein", "Kogan", "Koren", "Lahav", "Landau", "Lavi", "Lerner", "Lev", "Levi", "Levin", "Levy", "Liberman", "Maimon", "Malka", "Maman", "Manor", "Maor", "Margalit", "Marom", "Mazor", "Meir", "Melamed", "Michaeli", "Miller", "Mizrachi", "Mizrahi", "Mor", "Moran", "Moshe", "Nahum", "Naor", "Netanyahu", "Nir", "Noy", "Ohana", "Ohayon", "Or", "Oren", "Ovadia", "Öz", "Paz", "Peer", "Peled", "Peleg", "Peretz", "Perez", "Perry", "Porat", "Rabinovich", "Raviv", "Raz", "Regev", "Reshef", "Ron", "Ronen", "Rosen", "Rosenberg", "Rotem", "Roth", "Rozen", "Rubin", "Rubinstein", "Saar", "Sabag", "Sagi", "Salomon", "Sapir", "Sasson", "Schwartz", "Segal", "Segev", "Sela", "Shachar", "Shahar", "Shaked", "Shalev", "Shaley", "Shalom", "Shamir", "Shani", "Shapira", "Shapiro", "Sharabi", "Sharon", "Shavit", "Shemesh", "Sherman", "Shitrit", "Shoham", "Shulman", "Sofer", "Solomon", "Stein", "Stern", "Tal", "Tamir", "Tzur", "Vaknin", "Weinstein", "Weiss", "Yogev", "Yosef", "Zamir", "Zilberman", "Ziv", "Zohar", "Zur"]>>
 
 <<set setup.armenianSlaveNames = ["Anahit", "Angelina", "Anna", "Annie", "Anush", "Arevik", "Armine", "Astghik", "Diana", "Elen", "Elina", "Emma", "Eva", "Gayane", "Gohar", "Hasmik", "Karina", "Karine", "Liana", "Lilit", "Lina", "Lusine", "Mane", "Margarita", "Mari", "Maria", "Mariam", "Marianna", "Marina", "Marina", "Merry", "Milena", "Monika", "Nare", "Narine", "Nataly", "Nelly", "Ruzanna", "Seda", "Sofi", "Sona", "Susanna", "Svetlana", "Syuzana", "Syuzi", "Tamara", "Viktoria", "Yana"]>>
 <<set setup.armenianSlaveSurnames = ["Abrahamyan", "Arakelyan", "Arshakuni", "Asatryan", "Avagyan", "Avetisyan", "Baghasaryan", "Barsamian", "Davtyan", "Eskandarian", "Galstyan", "Gasparyan", "Gevorgyan", "Ghazaryan", "Grigoryan", "Hakobyan", "Harutyunyan", "Hayrapetyan", "Hovhannisyan", "Hovsepyan", "Karapetyan", "Kardashian", "Keshishian", "Khachatryan", "Manukyan", "Margaryan", "Martirosyan", "Melkonyan", "Minasyan", "Mkrtchyan", "Muradyan", "Petrosyan", "Poghosyan", "Sahakyan", "Sarafian", "Sargsyan", "Simonyan", "Stepanyan", "Tumasyan", "Vardanyan"]>>
@@ -494,8 +494,8 @@
 <<set setup.cubanSlaveNames = ["Armena", "Belgis", "Chamayra", "Cheena", "Dayami", "Estelle", "JaJuan", "Javier", "Judith", "Laline", "Maela", "Magalys", "Maria", "Marisa", "Norma", "Vionaika", "Yaineris", "Yanire", "Yelina", "Yonaidys", "Yosdalkis", "Yuricema"]>>
 <<set setup.cubanSlaveSurnames = ["Acosta", "Alfonso", "Alonso", "Alvarez", "Avila", "Batista", "Bermudez", "Blanco", "Borges", "Brito", "Caballero", "Cabrera", "Castellanos", "Castro", "Crespo", "Cruz", "Cuba", "Delgado", "Diaz", "Dominguez", "Espinosa", "Estrada", "Fernandez", "Fonseca", "Fuentes", "Garcia", "Gil", "Gomez", "Gonzales", "Gonzalez", "Guerra", "Gutierrez", "Hernandez", "Herrera", "Hildalgo", "Iglesias", "Jimenez", "Leon", "Lopez", "Martin", "Martinez", "Medina", "Mendez", "Menendez", "Miranda", "Montero", "Morales", "Moreno", "Nuñez", "Oliva", "Ortega", "Ortiz", "Padron", "Pena", "Perez", "Pupo", "Quintana", "Quintero", "Ramirez", "Ramos", "Reyes", "Rivero", "Rodrguez", "Rodriguez", "Rojas", "Romero", "Ruiz", "Sanchez", "Santana", "Santos", "Silva", "Sosa", "Soto", "Suarez", "Torres", "Valdes", "Vazquez", "Vega", "Velazquez"]>>
 
-<<set setup.whiteSouthAfricanSlaveNames = ["Alletta", "Aneke", "Anje", "Behati", "Brunelda", "Charlize", "Corli", "Diani", "Elani", "Elize", "Emmarentia", "Gidea", "Hanneleen", "Hentie", "Imka", "Isabeau", "Kriszanne", "Liani", "Marlize", "Meriska", "Noeline", "Riana", "Saartjie", "Sonique", "Susara", "Tilana", "Trudene", "Wilona", "Yolandi", "Zandre"]>>
-<<set setup.whiteSouthAfricanSlaveSurnames = ["Adriaanse", "Badenhorst", "Barnard", "Bezuidenhout", "Booysen", "Cilliers", "Cronje", "de Beer", "de Jager", "de Klerk", "de Kok", "de Villiers", "de Wet", "du Toit", "Engelbrecht", "Erasmus", "Goosen", "Grobler", "Groenewald", "Harmse", "Jansen", "Johnson", "Jonker", "Kloppers", "Kruger", "Liebenberg", "Louw", "MalherbeKlerk", "Meyer", "Moolman", "Morkel", "Muller", "Naude", "Olivier", "Oosthuizen", "Pieterse", "Plessis", "Pretorius", "Rensburg", "Schoeman", "Smit", "Smith", "Smuts", "Steenkamp", "Steyn", "Strydom", "Swart", "Theron", "Uys", "van Biljon", "van den Berg", "van der Knaap", "van der Merwe", "van der Walt", "van Dyk", "van Niekerk", "van Rensburg", "van Rooyen", "van Schalkywk", "van Staden", "van Tonder", "van Wyk", "van Zyl", "ven Zyl", "Vermaak", "Vlok", "Vorster", "Witbooi"]>>
+<<set setup.whiteSouthAfricanSlaveNames = ["Alida", "Alletta", "Amelia", "Aneke", "Anje", "Barbara", "Beatrice", "Behati", "Betsie", "Brunelda", "Charlize", "Corli", "Cornelia", "Diani", "Dorothea", "Elani", "Elanza", "Elizabeth", "Elize", "Emmarentia", "Gidea", "Hanneleen", "Hentie", "Imka", "Isabeau", "Kriszanne", "Letta", "Liani", "Mabel", "Magdalena", "Marga", "Maria", "Marlize", "Martha", "Meriska", "Noeline", "Riana", "Rozanne", "Saartjie", "Sonique", "Susara", "Tilana", "Trudene", "Wilona", "Yolandi", "Zandre"]>>
+<<set setup.whiteSouthAfricanSlaveSurnames = ["Abrahams", "Adams", "Adriaanse", "Anderson", "Arendse", "Badenhorst", "Baloyi", "Barnard", "Basson", "Bekker", "Bester", "Beukes", "Bezuidenhout", "Booysen", "Boshoff", "Bosman", "Botes", "Botha", "Brink", "Brits", "Brown", "Burger", "Cele", "Chauke", "Chetty", "Cilliers", "Cloete", "Coetzee", "Coetzer", "Conradie", "Cronje", "Daniels", "Davids", "de Beer", "de Jager", "de Klerk", "de Kock", "de Kok", "de Lange", "de Villiers", "de Wet", "Delport", "Diederichs", "Dreyer", "du Plessis", "du Preez", "du Toit", "Dube", "Els", "Engelbrecht", "Erasmus", "Esterhuizen", "Ferreira", "Fouche", "Fouché", "Fourie", "Geldenhuys", "Gerber", "Goosen", "Gouws", "Govender", "Greyling", "Grobler", "Groenewald", "Gumede", "Harmse", "Harris", "Hattingh", "Hendricks", "Human", "Isaacs", "Ismail", "Jacobs", "James", "Janse", "Jansen", "Johnson", "Jones", "Jonker", "Jooste", "Jordaan", "Joubert", "King", "Klerk", "Kloppers", "Kotze", "Kriel", "Kruger", "Labuschagne", "le Roux", "Lewis", "Liebenberg", "Lombard", "Lourens", "Louw", "Lubbe", "Malherbe", "Marais", "Maritz", "Martin", "McDonald", "Meyer", "Miller", "Moodley", "Moolman", "Morkel", "Mostert", "Moyo", "Muller", "Myburgh", "Naicker", "Naidoo", "Naude", "Naudé", "Nel", "Olivier", "Oosthuizen", "Patel", "Petersen", "Phiri", "Pienaar", "Pieterse", "Pillay", "Plessis", "Potgieter", "Pretorius", "Prinsloo", "Reddy", "Rensburg", "Roberts", "Roos", "Rossouw", "Roux", "Scheepers", "Schoeman", "Scholtz", "Scott", "Sibanda", "Sibiya", "Singh", "Smit", "Smith", "Smuts", "Snyman", "Steenkamp", "Steyn", "Strydom", "Swanepoel", "Swart", "Taylor", "Terblanche", "Theron", "Thomas", "Thompson", "Tshabalala", "Uys", "van Biljon", "van den Berg", "van der Knaap", "van der Merwe", "van der Walt", "van der Westhuizen", "van Dyk", "van Heerden", "van Niekerk", "van Rensburg", "van Rooyen", "van Schalkwyk", "van Schalkywk", "van Staden", "van Tonder", "van Vuuren", "van Wyk", "van Zyl", "ven Zyl", "Venter", "Vermaak", "Vermeulen", "Verwoerd", "Viljoen", "Visagie", "Visser", "Vlok", "Vorster", "Wessels", "Williams", "Wilson", "Witbooi"]>>
 
 <<set setup.blackSouthAfricanSlaveNames = ["Amahle", "Amogelang", "Andile", "Ayanda", "Ayize", "Bokamoso", "Busisiwe", "Duduzile", "Dumisile", "Hlengiwe", "Iminathi", "Karabo", "Khethiwe", "Lesedi", "Lindiwe", "Mbali", "Minenhle", "Mlungisi", "Mthandeni", "Nandi", "Nobesuthu", "Nomathemba", "Nomzamo", "Qaqamba", "Rethabile", "Sibongiseni", "Sinenhlanhla", "Siphephelo", "Sisipho", "Thandolwethu", "Thenjiwe", "Thotyelwa", "Thozama", "Thumeka", "Tshegofatso", "Unathi", "Vathiswa", "Veliswa", "Vuyokazi", "Weziwe", "Xolisile", "Yandiswa", "Yonela", "Zandile", "Zanele", "Zimkhitha", "Zintle", "Ziyanda", "Zodwa", "Zukelwa"]>>
 <<set setup.blackSouthAfricanSlaveSurnames = ["Arendse", "Asante", "Bhembe", "Bhengani", "Bhengu", "Bhuyeni", "Biyase", "Biyela", "Blose", "Bophela", "Bukhosini", "Caluza", "Cebekhulu", "Cele", "Chamane", "Chenai", "Chili", "Chonco", "Chulu", "Cibane", "Cindi", "Dimba", "Dlamini", "Dubandlela", "Dube", "Gambushe", "Guliwe", "Hlomuka", "Khan", "Khathini", "Khoza", "Khumalo", "Khumbuza", "Linda", "Mahlaba", "Mahlangu", "Mahomed", "Maseko", "Mashinini", "Mawere", "Mdunge", "Menziwa", "Mguni", "Mkhize", "Molefe", "Moloi", "Mopantokobogo", "Mthembu", "Mthethwa", "Mtshali", "Naidoo", "Naude", "Ndelu", "Ndlovu", "Ndosi", "Nengomasha", "Ngcolosi", "Ngidi", "Ngubane", "Nkosi", "Nsele", "Ntshangase", "Ntuli", "Nxele", "Nyambawu", "Nzama", "Onai", "Ongai", "Phiri", "Shenge", "Shinga", "Shongololo", "Sigwaxa", "Singo", "Sithole", "Sokwalisa", "Tshabalala", "Vongai", "Wosiyane", "Ziqubu", "Zuva"]>>
@@ -519,13 +519,13 @@
 <<set setup.estonianSlaveSurnames = ["Aarma", "Aavik", "Abel", "Adamson", "Anderson", "Annus", "Berg", "Gross", "Ilves", "Ivanova", "Jakobson", "Järv", "Johanson", "Kaasik", "Kala", "Kallas", "Karu", "Kask", "Kivi", "Kõiv", "Koppel", "Kukk", "Kull", "Kuusik", "Kuusk", "Laane", "Lang", "Laur", "Lember", "Lepik", "Lepp", "Liiv", "Lill", "Lõhmus", "Luik", "Maasik", "Magi", "Martin", "Masing", "Mets", "Miller", "Mitt", "Must", "Nõmm", "Nurk", "Oja", "Orav", "Ots", "Ott", "Paju", "Pärn", "Peterson", "Petrova", "Post", "Puusepp", "Rand", "Raud", "Raudsepp", "Rebane", "Roos", "Rummo", "Saar", "Saks", "Sarapuu", "Sarv", "Sepp", "Sibul", "Sikk", "Smirnova", "Soosaar", "Tali", "Tamm", "Tamme", "Teder", "Tomingas", "Toom", "Tooming", "Uustalu", "Vaher"]>>
 
 <<set setup.slovakSlaveNames = ["Alžbeta", "Anna", "Ema", "Eva", "Helena", "Jana", "Katarína", "Kristína", "Laura", "Margita", "Marta", "Michaela", "Mária", "Natália", "Nela", "Nina", "Simona", "Sofia", "Viktória", "Zuzana"]>>
-<<set setup.slovakSlaveSurnames = ["Bachoríková", "Balážová", "Bartošová", "Bednářová", "Chovancová", "Chovanecová", "Danková", "Farkašová", "Farmanová", "Gajdošová", "Horváthová", "Hudáková", "Hudecová", "Ivanová", "Kiššová", "Kollárová", "Kovacikova", "Kováčová", "Kovacsova", "Kovová", "Krajčírová", "Králová", "Kučerová", "Lišková", "Lukacova", "Macková", "Marková", "Michálková", "Molnárová", "Nagyová", "Nečasová", "Němcová", "Némethová", "Nováková", "Oravecová", "Pavlíková", "Petříková", "Poláčková", "Poláková", "Sabová", "Sedláková", "Šimková", "Šoltésová", "Štefanková", "Straková", "Sýkorová", "Szabová", "Tóthová", "Urbanová", "Valentová", "Vargová", "Vodičková"]>>
+<<set setup.slovakSlaveSurnames = ["Antal", "Baca", "Bachoríková", "Balazova", "Balážová", "Balog", "Balogh", "Baran", "Bartko", "Bartošová", "Bednářová", "Benkova", "Beno", "Benova", "Bezak", "Bielik", "Blahová", "Blasko", "Cernak", "Chovancova", "Chovancová", "Chovanecová", "Danis", "Danková", "Daňková", "Durica", "Duris", "Fabian", "Farkasova", "Farkašová", "Farmanová", "Fekete", "Filo", "Gajdosova", "Gajdošová", "Galova", "Gaspar", "Gregor", "Homola", "Hornakova", "Horvathova", "Horváthová", "Horvth", "Hrasko", "Hric", "Hudak", "Hudakova", "Hudáková", "Hudecova", "Hudecová", "Husar", "Ivanova", "Ivanová", "Janik", "Janosik", "Juhas", "Jurik", "Kissova", "Kiššová", "Klein", "Kmetova", "Kohutova", "Kolesar", "Kollarova", "Kollárová", "Konečná", "Kov", "Kovacikova", "Kovacova", "Kováčová", "Kovacsova", "Kovářová", "Kovov", "Kovová", "Krajčírová", "Krajcovicova", "Král", "Kralikova", "Králová", "Krizan", "Kubik", "Kučerová", "Kuruc", "Lacko", "Lesko", "Liptakova", "Lišková", "Luk", "Lukacova", "Luptakova", "Macková", "Majer", "Mala", "Malik", "Marek", "Markova", "Marková", "Masar", "Matus", "Mészáros", "Michalek", "Michálek", "Michálková", "Mihalikova", "Mikulova", "Mikusova", "Minařík", "Molnarova", "Molnárová", "Moravcik", "Mraz", "Murin", "Nagyova", "Nagyová", "Nečasová", "Němcová", "Němec", "Nemethova", "Némethová", "Nováková", "Novk", "Novotná", "Oravcova", "Oravecová", "Pavlíková", "Peter", "Petras", "Petříková", "Poláčková", "Poláková", "Rusnakova", "Rybar", "Sabo", "Sabol", "Sabová", "Sedláková", "Ševčík", "Shaik", "Šimková", "Sipos", "Siskova", "Slavík", "Sloboda", "Slovak", "Sokol", "Šoltésová", "Stano", "Štefanková", "Straková", "Suchá", "Švecová", "Sýkorová", "Szabova", "Szabová", "Takacova", "Tkacova", "Tomko", "Tothova", "Tóthová", "Uhrin", "Urbanová", "Vajda", "Valach", "Valentová", "Valko", "Vargova", "Vargová", "Vaskova", "Viera", "Vodičková", "Vrabel", "Zachar", "Zajac", "Zatko", "Zeman"]>>
 
 <<set setup.kazakhSlaveNames = ["Aisha", "Alina", "Amina", "Aruzhan", "Ayala", "Ayana", "Ayaru", "Ayaulym", "Ayzere", "Darya", "Diana", "Inkar", "Inzhu", "Kausar", "Madina", "Nurai", "Sezim", "Sofia", "Victoria", "Zhanerke"]>>
 <<set setup.kazakhSlaveSurnames = ["Abdrakhmanova", "Abenova", "Abilova", "Adilova", "Ahmetova", "Akhmetova", "Alieva", "Amangeldi", "Amanzholova", "Andreeva", "Askarova", "Aubakirova", "Bolatova", "Ibraeva", "Ibragimova", "Isaeva", "Iskakova", "Ismailova", "Ivanova", "Kalieva", "Karimova", "Kasymova", "Khasenova", "Kolesnikova", "Kozhakhmetova", "Kravchenko", "Kusainova", "Kuznetsova", "Musina", "Mustafina", "Nazarova", "Nikitina", "Novikova", "Nurgalieva", "Nurzhanova", "Omarova", "Ospanova", "Petrova", "Rakhimova", "Rakhmetova", "Sadvakasova", "Sadykova", "Serikbaeva", "Shevchenko", "Smagulova", "Smirnova", "Sokolova", "Suleymenova", "Sultan", "Sultanova", "Ten", "Tsoaya", "Tulegenova", "Umarova", "Volkova", "Zhakupova", "Zhumabekova", "Zhumagulova", "Zhumbabaeva", "Zhunusova"]>>
 
 <<set setup.zimbabweanSlaveNames = ["Aneni", "Anodiwa", "Anokosha", "Batsirai", "Chenesai", "Chiedza", "Chiratidzo", "Chishamiso", "Chivaraidzo", "Dadisai", "Edzai", "Fadzai", "Haruperi", "Hazvinei", "Idai", "Ipaishe", "Kunashe", "Kundai", "Maitaishe", "Mawanda", "Mukudzei", "Mutsa", "Ndafadzwa", "Ngonidzashe", "Nyararai", "Paidamoyo", "Pamhidzai", "Panashe", "Ropafadzo", "Ruponeso", "Ruramisai", "Ruvarashe", "Ruwadzano", "Sarudzai", "Tanatswa", "Tanyaradzwa", "Tapiwanashe", "Timukudzei", "Tinaye", "Tsungirirai", "Varaidzo", "Vhenekerayi", "Vongai", "Wadzanai", "Watinoda", "Yananiso", "Yemurai", "Zviedzo", "Zvinodaishe"]>>
-<<set setup.zimbabweanSlaveSurnames = ["Banda", "Bhebhe", "Chauke", "Chuma", "Dhliwayo", "Dube", "Gumbo", "Hove", "Khumalo", "Makoni", "Mapfumo", "Maphosa", "Maposa", "Marufu", "Masuku", "Mathe", "Mbedzi", "Mhlanga", "Mlambo", "Mlilo", "Moyo", "Mpala", "Mpofu", "Mudenda", "Muleya", "Munsake", "Muyambo", "Ncube", "Ndebele", "Ndhlovu", "Ndlovu", "Ndou", "Ngwenya", "Nkomo", "Nyandoro", "Nyathi", "Nyoni", "Phiri", "Shoko", "Shumba", "Sibanda", "Sigauke", "Simango", "Sithole", "Siziba", "Takawira", "Tembo", "Tshuma", "Zhou", "Zulu"]>>
+<<set setup.zimbabweanSlaveSurnames = ["Asante", "Banda", "Bhebhe", "Chakanyuka", "Chari", "Chauke", "Chibanda", "Chibaya", "Chifamba", "Chikomo", "Chinyama", "Chirume", "Chiwara", "Chiwasa", "Chiweshe", "Chuma", "Dhlamini", "Dhliwayo", "Dlamini", "Dube", "Gatsi", "Gomo", "Gondo", "Goreraza", "Gumbo", "Gumede", "Gwenzi", "Hadebe", "Hove", "Hungwe", "James", "Jimu", "John", "Kamusewu", "Kaseke", "Katiyo", "Katsande", "Khumalo", "Khupe", "Kunaka", "Lunga", "Mabhena", "Mabika", "Machingura", "Madondo", "Madzinga", "Madziva", "Mafukidze", "Mafuta", "Magaya", "Mahachi", "Mahlangu", "Majoni", "Makaza", "Makombe", "Makoni", "Makore", "Makumbe", "Makuyana", "Mamvura", "Mandaza", "Mandizvidza", "Mangena", "Mangwiro", "Manyika", "Mapfumo", "Maphosa", "Maponga", "Maposa", "Mapuranga", "Maraire", "Marange", "Marimo", "Marowa", "Marufu", "Marume", "Masango", "Masawi", "Maseko", "Mashava", "Mashingaidze", "Mashiri", "Mashonganyika", "Masiya", "Masuka", "Masuku", "Masunda", "Matambo", "Matare", "Mathe", "Matsika", "Mawire", "Mbedzi", "Mbewe", "Mguni", "Mhaka", "Mhembere", "Mhlanga", "Mkandla", "Mkwananzi", "Mlalazi", "Mlambo", "Mlilo", "Mlotshwa", "Motsi", "Moyo", "Mpala", "Mphoko", "Mpofu", "Msipa", "Mtetwa", "Mubaiwa", "Muchemwa", "Muchena", "Muchenje", "Mudenda", "Mudimba", "Mudimu", "Mudzingwa", "Mugabe", "Mugadza", "Mugwagwa", "Mujuru", "Muleya", "Mumbengegwi", "Mumpande", "Munemo", "Munetsi", "Munkombwe", "Munkuli", "Munsaka", "Munsake", "Munyoro", "Murwira", "Musariri", "Musarurwa", "Musekiwa", "Mushonga", "Musonza", "Mutale", "Mutandwa", "Mutasa", "Mutema", "Mutero", "Mutize", "Muyambo", "Muza", "Muzamba", "Muzanenhamo", "Muzenda", "Muzondo", "Mwale", "Mwanza", "Mwembe", "Mwinde", "Ncube", "Ndebele", "Ndhlovu", "Ndiweni", "Ndlovu", "Ndoro", "Ndou", "Ngirazi", "Ngorima", "Ngulube", "Ngwenya", "Nhamo", "Nkala", "Nkiwane", "Nkomo", "Nyakudya", "Nyamadzawo", "Nyamande", "Nyandoro", "Nyathi", "Nyika", "Nyikadzino", "Nyoni", "Paradza", "Phiri", "Rusere", "Ruzvidzo", "Sande", "Shava", "Shereni", "Shoko", "Shonhiwa", "Shoniwa", "Shumba", "Sibanda", "Sibindi", "Sigauke", "Simango", "Sithole", "Siwela", "Siziba", "Suluma", "Taderera", "Tafirenyika", "Takawira", "Tapera", "Taruvinga", "Tavengwa", "Tembo", "Tigere", "Tshuma", "Tsuro", "Tungamirai", "Zhou", "Zulu", "Zuze"]>>
 
 <<set setup.ugandanSlaveNames = ["Alice", "Angelline", "Anifa", "Anne", "Annet", "Barbara", "Beatrice", "Betty", "Caroline", "Cecilia", "Christine", "Dorothy", "Emma", "Evelyn", "Femiar", "Flavia", "Florence", "Harriet", "Huda", "Idah", "Jacquiline", "Jalia", "Jesca", "Jessica", "Joy", "Judith", "Juliana", "Justine", "Kyabangi", "Lilly", "Lucy", "Lukia", "Lydia", "Lyndah", "Margaret", "Mary", "Nabilah", "Naome", "Peace", "Rebecca", "Rita", "Rose", "Rosemary", "Ruth", "Sarah", "Susan", "Sylivia", "Tophace", "Veronica", "Victoria"]>>
 <<set setup.ugandanSlaveSurnames = ["Agaba", "Akello", "Arinaitwe", "Asiimwe", "Bagum", "Birungi", "Bukenya", "Byaruhanga", "Godfrey", "Kasozi", "Kato", "Kiwanuka", "Kizito", "Lubega", "Lwanga", "Matovu", "Mbabazi", "Mirembe", "Moses", "Mubiru", "Mugabi", "Mugisha", "Muhumuza", "Mukasa", "Musinguzi", "Musoke", "Mutebi", "Mwesigwa", "Nsubuga", "Okello", "Opio", "Otim", "Ssali", "Tumusiime"]>>
@@ -670,8 +670,8 @@
 <<set setup.laotianSlaveNames = ["Boanam", "Bong", "Boutsaba", "Chanhthuem", "Chaola", "Chimmy", "Chitpasong", "Daraswan", "Hathavan", "Kanthong", "Keosaychay", "Ketsana", "Khamphouang", "Khanhthaly", "Khanthalack", "Khathana", "Lae", "Manivanh", "Meay", "Mithsa", "Moui", "Noi", "Nouanchan", "Onechanh", "Oudomphone", "Outhoumchanh", "Paneda", "Phayvanh", "Phetubon", "Phonemaly", "Phonesvanh", "Phonthong", "Phouang", "Pinmany", "Pothong", "Pouy", "Sakkal", "Sengchanh", "Sibounheuang", "Soudavanh", "Soumly", "Souny", "Souxada", "Sunisa", "Syphay", "Thang", "Thea", "Thiemta", "Thongmanivong", "Thongvankham", "Tukata", "Vassady"]>>
 <<set setup.laotianSlaveSurnames = ["Air", "Boupha", "Bui", "Chanthalangsy", "Chanthavong", "Chounlamany", "Inthasone", "Inthavong", "Keo", "Keomany", "Kham", "La", "Lao", "Lim", "Lor", "Luanglath", "Manivanh", "Manivong", "Moua", "Na", "Nanthavong", "Noy", "Pathammavong", "Phanouvong", "Phanthavong", "Philavong", "Phimmasone", "Pholsena", "Phommachanh", "Phommavong", "Phonesavanh", "Phongsavath", "Rasphone", "Rattanavong", "Say", "Sayasane", "Sayavong", "Seng", "Sengmany", "Siharath", "Sisavath", "Sisouvong", "Sivilay", "Sone", "Souksavath", "Soulivong", "Southammavong", "Souvannavong", "Tan", "Thammavong", "Thammavongsa", "Thao", "Thong", "Tong", "Tran", "Vang", "Vong", "Vongphachanh", "Vongxay", "Xayalath", "Xayavong", "Xiong", "Yang"]>>
 
-<<set setup.mongolianSlaveNames = ["Altantsetseg", "Biambasuren", "Bolormaa", "Enkhjargal", "Enkhtuya", "Enkhtuyaa", "Erdenechimeg", "Gerel", "Khulan", "Lkhagvasüren", "Mönkh-Erdene", "Mönkhtsetseg", "Munkhtsetseg", "Narantsetseg", "Nergüi", "Odtsetseg", "Otgonbayar", "Oyuunchimeg", "Sarnai", "Tsendiin"]>>
-<<set setup.mongolianSlaveSurnames = ["Altangerel", "Baatar", "Bat-Erdene", "Bat", "Bataa", "Batbayar", "Batbold", "Batchuluun", "Batjargal", "Batmunkh", "Batsaikhan", "Batsukh", "Battulga", "Bayar", "Bayaraa", "Bayarsaikhan", "Bold", "Boldbaatar", "Byambaa", "Chinbat", "Chuluunbaatar", "Chuluunbat", "Davaa", "Davaadorj", "Dorj", "Enkhbaatar", "Enkhbat", "Enkhbold", "Erdene", "Erdenebat", "Erdenebileg", "Ganbaatar", "Ganbat", "Ganbold", "Gankhuyag", "Gantumur", "Ganzorig", "Jargal", "Jargalsaikhan", "Lkhagva", "Lkhagvasuren", "Luvsandamdingiin", "Nergui", "Ochirbat", "Otgonbayar", "Purev", "Purevdorj", "Purevsuren", "Sukhbaatar", "Tsend", "Tserendorj", "Tumur", "Tumurbaatar", "Tuya", "Zorigt"]>>
+<<set setup.mongolianSlaveNames = ["Altantsetseg", "Bayarmaa", "Biambasuren", "Bolormaa", "Enkhjargal", "Enkhtuya", "Enkhtuyaa", "Erdenechimeg", "Gerel", "Khongordzol", "Khulan", "Lkhagvasüren", "Mönkh-Erdene", "Mönkhtsetseg", "Munkhtsetseg", "Narantsetseg", "Nergüi", "Odtsetseg", "Odval", "Otgonbayar", "Oyunbileg", "Oyuunchimeg", "Sarnai", "Tsendiin"]>>
+<<set setup.mongolianSlaveSurnames = ["Altangerel", "Altankhuyag", "Altansukh", "Amarjargal", "Amarsaikhan", "Amarsanaa", "Amgalan", "Avirmed", "Baasan", "Baasandorj", "Baasanjav", "Baasankhuu", "Baatar", "Baatarkhuu", "Badarch", "Baldan", "Baljinnyam", "Banzragch", "Bat-Erdene", "Bat-Ochir", "Bat", "Bataa", "Batbaatar", "Batbayar", "Batbold", "Batchuluun", "Batdelger", "Batdorj", "Baterdene", "Batjargal", "Batkhuu", "Batkhuyag", "Batmunkh", "Batnasan", "Batsaikhan", "Batsukh", "Batsuuri", "Battsengel", "Battulga", "Battumur", "Battur", "Bayar", "Bayaraa", "Bayarmagnai", "Bayarsaikhan", "Bayasgalan", "Bazar", "Bold", "Boldbaatar", "Bolormaa", "Bulgan", "Byamba", "Byambaa", "Byambadorj", "Byambajav", "Byambasuren", "Chimeddorj", "Chinbat", "Chuluun", "Chuluunbaatar", "Chuluunbat", "Dagvadorj", "Damba", "Damdin", "Damdindorj", "Damdinsuren", "Dash", "Dashdavaa", "Dashdorj", "Dashnyam", "Dashzeveg", "Davaa", "Davaadorj", "Davaajav", "Davaakhuu", "Davaanyam", "Davaasambuu", "Davaasuren", "Delger", "Demberel", "Dorj", "Dorjgotov", "Dorjpalam", "Dorjsuren", "Enebish", "Enkhbaatar", "Enkhbat", "Enkhbayar", "Enkhbold", "Enkhee", "Enkhjargal", "Enkhsaikhan", "Enkhtaivan", "Enkhtur", "Erdene", "Erdenebaatar", "Erdenebat", "Erdenebayar", "Erdenebileg", "Erdenechuluun", "Erdenetsogt", "Galbadrakh", "Gan", "Ganbaatar", "Ganbat", "Ganbold", "Gankhuyag", "Gansukh", "Gantulga", "Gantumur", "Ganzorig", "Gombo", "Gombosuren", "Jambal", "Jamsran", "Janchiv", "Jargal", "Jargalsaikhan", "Khan", "Khurelbaatar", "Lamjav", "Lkhagva", "Lkhagvaa", "Lkhagvadorj", "Lkhagvajav", "Lkhagvasuren", "Lkhamsuren", "Luvsan", "Luvsandamdingiin", "Mandakh", "Mendbayar", "Munkh", "Munkhbat", "Munkhbayar", "Munkhjargal", "Munkhuu", "Muugii", "Myagmar", "Myagmarjav", "Myagmarsuren", "Namsrai", "Naran", "Narangerel", "Narmandakh", "Natsagdorj", "Nergui", "Nina", "Nyam", "Nyamaa", "Nyamdavaa", "Nyamdorj", "Nyamjav", "Nyamsuren", "Ochir", "Ochirbat", "Orgil", "Otgonbaatar", "Otgonbayar", "Purev", "Purevdorj", "Purevjav", "Purevsuren", "Ragchaa", "Sambuu", "Sanjaa", "Shagdar", "Shagdarsuren", "Sharav", "Sodnom", "Sosorbaram", "Sukhbaatar", "Surenjav", "Tamir", "Terbish", "Tse", "Tsedendamba", "Tsegmid", "Tsend-Ayush", "Tsend", "Tseren", "Tserendorj", "Tseveen", "Tsogbadrakh", "Tsogoo", "Tsogt", "Tsogtsaikhan", "Tsolmon", "Tumenjargal", "Tumur", "Tumurbaatar", "Tungalag", "Turbat", "Tuul", "Tuya", "Ulambayar", "Urtnasan", "Uyanga", "Yondon", "Zaya", "Zorig", "Zorigt"]>>
 
 <<set setup.taiwaneseSlaveNames = ["Chia-hua", "Chia-hui", "Chia-jung", "Chia-ling", "Chia-ying", "Chia-yu", "Ching-yi", "En-chi", "Feng-ping", "Hsiao-han", "Hsin-yi", "Hsiu-ling", "hu-ling", "Hui-chun", "Hui-ju", "Hui-ting", "Hui-wen", "Jui-yu", "Mei-ling", "Pao-yu", "Pei-chun", "Pei-shan", "Pin-yen", "Pin-yu", "Shih-han", "Shih-ting", "Shu-chen", "Shu-chuan", "Shu-fen", "Shu-hua", "Shu-hui", "Shu-ying", "Ting-ting", "Ting-wei", "Tzu-ching", "Wan-ting", "Wei-ting", "Ya-chi", "Ya-chu", "Ya-fang", "Ya-han", "Ya-hui", "Ya-ling", "Ya-ping", "Ya-ting", "Ya-wen", "Yi-an", "Yi-chun", "Yi-hsuan", "Yi-ju", "Yi-ling", "Yi-ting", "Yu-ting", "Yu-tung", "Yu-wen", "Yung-ching"]>>
 <<set setup.taiwaneseSlaveSurnames = ["Chang", "Chao", "Chen", "Cheng", "Chi", "Chiang", "Chien", "Chin", "Ching", "Chiou", "Chiu", "Cho", "Chou", "Chu", "Chuang", "Chung", "Dong", "Fan", "Fang", "Feng", "Fu", "Guo", "Han", "Ho", "Hong", "Hou", "Hsiao", "Hsieh", "Hsu", "Hsueh", "Hu", "Huang", "Hung", "Hwang", "Jiang", "Kang", "Kao", "Ko", "Ku", "Kuan", "Kung", "Kuo", "Lai", "Lan", "Li", "Liang", "Liao", "Lien", "Lim", "Lin", "Liu", "Lo", "Lu", "Lung", "Luo", "Ma", "Mao", "Meng", "Ni", "Ou", "Pai", "Pan", "Peng", "Shen", "Shih", "Shu", "Su", "Sun", "Sung", "Tai", "Tan", "Tang", "Teng", "Ting", "Tsai", "Tsao", "Tseng", "Tu", "Tung", "Wang", "Wei", "Wen", "Weng", "Wu", "Xiao", "Ya", "Yang", "Yao", "Yeh", "Yen", "Yi", "Yin", "Yu", "Yuan", "Yung"]>>
@@ -808,7 +808,7 @@
 <<set setup.latvianSlaveNames = ["Agnese", "Agra", "Aiga", "Aija", "Aina", "Aiva", "Alma", "Anastasija", "Ance", "Anda", "Anete", "Anita", "Anna", "Antra", "Ausma", "Austra", "Baiba", "Biruta", "Dace", "Daiga", "Daina", "Dainuvīte", "Dzidra", "Dzintra", "Elena", "Elina", "Gundega", "Gunta", "Guntra", "Ieva", "Ildze", "Ilze", "Imanta", "Ināra", "Indra", "Inese", "Ineta", "Inga", "Inguna", "Inta", "Irbe", "Irina", "Iveta", "Ivita", "Kaiva", "Kristīne", "Laima", "Laimdota", "Lāsma", "Laura", "Lelde", "Liene", "Līga", "Lilija", "Lolita", "Māra", "Marija", "Marika", "Matilde", "Milda", "Minna", "Mirdza", "Modra", "Monika", "Mudrīte", "Olga", "Olita", "Rita", "Sanita", "Santa", "Sarma", "Sarmīte", "Saulcerīte", "Sigita", "Signe", "Silva", "Silvija", "Sinta", "Skaidrīte", "Smaida", "Sniedze", "Solvita", "Spodra", "Tekla", "Vaira", "Velga", "Velta", "Viera", "Vizma", "Zaiga", "Zanda", "Zane", "Zinta"]>>
 <<set setup.latvianSlaveSurnames = ["Abele", "Abolina", "Alksne", "Andersona", "Andersone", "Apine", "Apsite", "Auzina", "Avotina", "Balode", "Baumane", "Berga", "Bergmane", "Bergs", "Berzina", "Bite", "Bluma", "Blums", "Bogdanova", "Briede", "Broka", "Buls", "Caune", "Cirule", "Dombrovske", "Dreimane", "Dzene", "Egle", "Eglite", "Feldmane", "Fjodorovs", "Freiberga", "Freibergs", "Freimane", "Gaile", "Gailite", "Graudina", "Grigorjeva", "Grigorjevs", "Grinberga", "Grinbergs", "Gulbe", "Gutmane", "Ivanov", "Ivanova", "Ivanovs", "Jakobsone", "Jankovska", "Jansona", "Jansone", "Jaunzeme", "Jekabsona", "Jekabsone", "Kaleja", "Kalnina", "Karklina", "Kim", "Klavina", "Kokina", "Kozlovske", "Krastina", "Kraukle", "Krauze", "Krumina", "Lace", "Laizana", "Laizane", "Lapina", "Lasmane", "Lazdina", "Leja", "Li", "Liepa", "Liepina", "Linde", "Locmele", "Logina", "Luse", "Martina", "Martinsone", "Medne", "Mihailova", "Mihailovs", "Mikelsona", "Mikelsone", "Miller", "Millere", "Millers", "Mucenieks", "Muiznieks", "Murniece", "Murnieks", "Nagle", "Neimane", "Ose", "Ozola", "Ozolina", "Ozols", "Paegle", "Pastare", "Pavlovs", "Petersona", "Petersone", "Petrova", "Petrovs", "Plume", "Priede", "Priedite", "Purina", "Putnina", "Riekstina", "Riga", "Roze", "Rozenberga", "Rozentale", "Rozentals", "Rozite", "Rubene", "Rudzite", "Rutka", "Saulite", "Semjonova", "Semjonovs", "Silina", "Skuja", "Smilga", "Smirnova", "Smirnovs", "Smite", "Smits", "Sokolova", "Sproge", "Stepanova", "Stepanovs", "Straume", "Strazdina", "Strode", "Strods", "Udre", "Upeniece", "Upenieks", "Vaivode", "Valtere", "Vanaga", "Vanags", "Vasiljeva", "Vasiljevs", "Veide", "Veinberga", "Vevere", "Viksna", "Viksne", "Vilcane", "Vitola", "Vitols", "Zake", "Zalite", "Zarina", "Ziemele", "Zvaigzne", "Zvirbule"]>>
 
-<<set setup.seychelloisSlaveNames = ["Alexia", "Allisen", "Ange", "Angie", "Antoinette", "Aurélie", "Béryl", "Bessey", "Catherina", "Catherine", "Céline", "Clementina", "Cynthia", "Danielle", "Elke", "Endra", "Ginette", "Heather", "Hilda", "Jade", "Janet", "Jennifer", "Joanna", "Joanne", "Joevana", "Juliette", "Laura", "Lindy", "Lissa", "Louise", "Macsuzy", "Magie", "Marie-Ange", "Marie-Antoinette", "Marie-Louise", "Marie", "Mathilda", "May", "Natalie", "Pamela", "Sandra", "Sherin", "Shrone", "Sophie", "Vicky"]>>
+<<set setup.seychelloisSlaveNames = ["Alexia", "Allisen", "Ange", "Angie", "Antoinette", "Aurélie", "Béryl", "Bessey", "Catherina", "Catherine", "Céline", "Clementina", "Cynthia", "Danielle", "Elke", "Endra", "Geva", "Ginette", "Heather", "Hilda", "Jade", "Janet", "Jeanine", "Jennifer", "Joanna", "Joanne", "Joevana", "Juliette", "Laura", "Lindy", "Lissa", "Louise", "Macsuzy", "Magie", "Marie-Ange", "Marie-Antoinette", "Marie-Louise", "Marie", "Mathilda", "May", "Natalie", "Pamela", "Sandra", "Sarah", "Sherin", "Shrone", "Sophie", "Vicky"]>>
 <<set setup.seychelloisSlaveSurnames = ["Accouche", "Adam", "Adeline", "Afif", "Agathine", "Aglae", "Ah-Kong", "Ah", "Ahmed", "Albert", "Albest", "Alcindor", "Ally", "Alvis", "Anacoura", "Andre", "Antat", "Asba", "Auguste", "Azemia", "Balette", "Banane", "Barbe", "Barra", "Bastienne", "Belle", "Benoit", "Benoiton", "Benstrong", "Bibi", "Bijoux", "Bistoquet", "Boniface", "Bonne", "Bonnelame", "Bonte", "Brioche", "Bristol", "Cadeau", "Cafrine", "Camille", "Cedras", "Chang", "Charles", "Charlette", "Chetty", "Cole", "Confait", "Confiance", "Constance", "Cupidon", "D'Offay", "Delorie", "Delpech", "Denis", "Denousse", "Desaubin", "Desnousse", "Didon", "Dine", "Dodin", "Dogley", "Domingue", "Dugasse", "Duval", "Edmond", "Ekanayake", "Elizabeth", "Esparon", "Esther", "Estico", "Etienne", "Fanchette", "Faure", "Figaro", "Florentine", "Francois", "Francoise", "Francourt", "Fred", "Freminot", "Frichot", "Furneau", "Gabriel", "Gendron", "Georges", "Gilbert", "Gill", "Gonthier", "Henriette", "Hoarau", "Hoareau", "Houareau", "Isaac", "Jean", "Jean-Baptiste", "Jean-Louis", "Jeannevol", "Joseph", "Joubert", "Jules", "Julie", "Khan", "Kilindo", "Kong", "Kumar", "Labiche", "Lablache", "Labonte", "Labrosse", "Lafortune", "Laljee", "Laporte", "Larue", "Laurence", "Lawen", "Leon", "Lepathy", "Lesperance", "Lespoir", "Louis", "Louise", "Lucas", "Madeleine", "Malbrook", "Mancienne", "Marengo", "Marie", "Mathiot", "Matombe", "Melanie", "Michaud", "Michel", "Moncherry", "Mondon", "Monthy", "Morel", "Morin", "Moumou", "Moustache", "Mussard", "Naidoo", "Naiken", "Nair", "Nalletamby", "Nanty", "Nelson", "Nibourette", "Nicette", "Nourrice", "Padayachy", "Patel", "Payet", "Perera", "Philoe", "Pierre", "Pillay", "Pool", "Port-Louis", "Pothin", "Pouponneau", "Preá", "Quatre", "Radegonde", "Rajan", "Rassool", "Rath", "Renaud", "Rene", "Robert", "Rose", "Roucou", "Samson", "Savy", "Servina", "Shah", "Sharma", "Sicobo", "Simeon", "Simon", "Singh", "Sinon", "Smith", "Soomery", "Sophola", "Souris", "Stravens", "Talma", "Telemaque", "Thomas", "Tirant", "Toussaint", "Valentin", "Valmont", "Vel", "Victor", "Vidot", "Vital", "Volcere", "William", "Woodcock", "Zialor"]>>
 
 <<set setup.sloveneSlaveNames = ["Adriana", "Alenka", "Ana", "Ančka", "Cita", "Desa", "Draga", "Duša", "Eka", "Eleanore", "Elvira", "Ita", "Ivana", "Jasmina", "Jelica", "Jelka", "Julia", "Kamila", "Katarina", "Lela", "Lenore", "Lidija", "Lucija", "Majda", "Marija", "Marika", "Marina", "Marjanca", "Marlenka", "Melania", "Melita", "Milena", "Miranda", "Mirela", "Mojca", "Nina", "Nives", "Nuša", "Patricia", "Polona", "Rebeka", "Renata", "Roža", "Sanja", "Špela", "Spomenka", "Suzana", "Svetlana", "Tadeja", "Tanja", "Tina", "Tinca", "Tjaša", "Vesna", "Vida", "Vlasta", "Zalla", "Zdenka", "Živa"]>>
@@ -830,7 +830,7 @@
 <<set setup.azerbaijaniSlaveSurnames = ["Abasova", "Abbasova", "Abdullayeva", "Ağayeva", "Ahmadova", "Akbarova", "Alakbarova", "Alasgarova", "Alieva", "Aliyeva", "Alizadeh", "Allahverdiyeva", "Amirova", "Asadova", "Asgarova", "Aslanova", "Axundova", "Azimova", "Azizova", "Babayeva", "Badalova", "Bağirova", "Başirova", "Bayramova", "Cabbarova", "Cabrayilova", "Cafarova", "Calilova", "Cavadova", "Dadaşova", "Eliyeva", "Eyvazova", "Faracova", "Farzaliyeva", "Haciyeva", "Hamidova", "Hasanova", "Haşimova", "Heydarova", "Hümbatova", "Hüseynova", "Ibrahimova", "Imanova", "Isayeva", "Isgandarova", "Ismayilova", "Karimova", "Kazimova", "Maharramova", "Mahmudova", "Malikova", "Mamedova", "Mammadli", "Mammadova", "Mehdiyeva", "Memmedova", "Mikayilova", "Mirzayeva", "Muradova", "Musayeva", "Mustafayeva", "Nabiyeva", "Nacafova", "Nağiyeva", "Namazova", "Nasibova", "Nasirova", "Nazarova", "Novruzova", "Nuriyeva", "Orucova", "Osmanova", "Paşayeva", "Qadirova", "Qafarova", "Qahramanova", "Qarayeva", "Qasimova", "Qocayeva", "Quliyeva", "Quluyeva", "Qurbanova", "Rahimova", "Ramazanova", "Rasulova", "Rustamova", "Rüstamova", "Rzayeva", "Sadiqova", "Safarova", "Salimova", "Salmanova", "Samadova", "Seyidova", "Şirinova", "Şükürova", "Süleymanova", "Sultanova", "Tağiyeva", "Talibova", "Valiyeva", "Xalilova", "Yusifova", "Zeynalova"]>>
 
 <<set setup.bahrainiSlaveNames = ["Aaliyah", "Aiesha", "Alzain", "Ameenah", "Aqeela", "Asha", "Asima", "Ateefah", "Azza", "Dinah", "Farida", "Fatema", "Fatima", "Fawzia", "Ghada", "Hala", "Hanifah", "Hawa", "Hessa", "Hoda", "Jameela", "Khadija", "Lateefa", "Lela", "Lulwa", "Mamta", "Mouza", "Moza", "Munira", "Munirah", "Nada", "Naziya", "Rafia", "Rata", "Reem", "Rehana", "Sabah", "Sameah", "Sameera", "Sara", "Shahla", "Shahzaleen", "Shaila", "Siham", "Tahiyya", "Tanisha", "Yusra", "Zainab"]>>
-<<set setup.bahrainiSlaveSurnames = ["Abbas", "Abdul", "Abdulla", "Abdullah", "Abdulrahman", "Abraham", "Abu", "Ahamed", "Ahmad", "Ahmed", "Akbar", "Akhtar", "Al Kooheji", "Al Mahmood", "Al-Alawi", "Al-Ansari", "Al-Aradi", "Al-Awadhi", "Al-Haddad", "Al-Khalifa", "Al-Shaikh", "Alaali", "Alalawi", "Alam", "Alansari", "Alaradi", "Alasfoor", "Alawadhi", "Alawi", "Aldoseri", "Alhaddad", "Ali", "Alkhaja", "Alkhalifa", "Alkhan", "Alkooheji", "Almannai", "Almosawi", "Almulla", "Almutawa", "Alqassab", "Alsayed", "Alshaikh", "Althawadi", "Ameen", "Amin", "Ansari", "Antony", "Anwar", "Ashoor", "Ashraf", "Aziz", "Babu", "Baby", "Bader", "Baig", "Balakrishnan", "Baqer", "Bhatia", "Bucheeri", "Butt", "Chacko", "Chandran", "Cherian", "D'Souza", "Darwish", "Das", "Dhaif", "Dsouza", "Ebrahim", "Eid", "Faisal", "Fakhro", "Faraj", "Fardan", "Farooq", "Fernandes", "Ghuloom", "Gupta", "Habib", "Haider", "Haji", "Hamad", "Hameed", "Hammad", "Hasan", "Hashim", "Hassan", "Hubail", "Husain", "Hussain", "Ibrahim", "Iqbal", "Isa", "Islam", "Ismaeel", "Ismail", "Jacob", "Jaffar", "Jaffer", "Jamal", "Janahi", "Jassim", "Javed", "Jawad", "Juma", "Kamal", "Kazerooni", "Khalaf", "Khalid", "Khalifa", "Khalil", "Khamis", "Khan", "Koshy", "Krishna", "Krishnakumar", "Krishnan", "Kumar", "Lobo", "Madan", "Mahdi", "Mahmood", "Majeed", "Makki", "Malik", "Mani", "Mansoor", "Marhoon", "Mattar", "Menon", "Mirza", "Mohamed", "Mohammad", "Mohammed", "Mohan", "Moosa", "Mubarak", "Muhammad", "Murad", "Mustafa", "Nair", "Nambiar", "Narayanan", "Naser", "Nasser", "Noor", "Omar", "Patel", "Pereira", "Philip", "Pillai", "Pinto", "Prasad", "Qureshi", "Radhi", "Rahman", "Rai", "Raj", "Rajab", "Rajan", "Rana", "Rao", "Rasheed", "Rashid", "Reddy", "Saad", "Sabt", "Sadiq", "Saeed", "Saif", "Saleem", "Saleh", "Salem", "Salman", "Samuel", "Sanad", "Sarhan", "Sayed", "Shaban", "Shah", "Shaheen", "Shaik", "Shaikh", "Shams", "Sharaf", "Sharif", "Sharma", "Shehab", "Sheikh", "Shetty", "Siddiqui", "Singh", "Sultan", "Taqi", "Varghese", "Younis", "Yousif", "Yusuf", "Zainal"]>>
+<<set setup.bahrainiSlaveSurnames = ["Abbas", "Abdul", "Abdulaal", "Abdulla", "Abdullah", "Abdulrahman", "Abraham", "Abu", "Ahamed", "Ahmad", "Ahmed", "Akbar", "Akhtar", "Al Khalifa", "Al Kooheji", "Al Mahmood", "Al-Alawi", "Al-Ansari", "Al-Aradi", "Al-Awadhi", "Al-Haddad", "Al-Khalifa", "Al-Shaikh", "Alaali", "Alalawi", "Alam", "Alansari", "Alaradi", "Alasfoor", "Alawadhi", "Alawi", "Aldoseri", "Alhaddad", "Ali", "Alkhaja", "Alkhalifa", "Alkhan", "Alkooheji", "Almannai", "Almosawi", "Almulla", "Almutawa", "Alqassab", "Alsayed", "Alshaikh", "Althawadi", "Ameen", "Amin", "Ansari", "Antony", "Anwar", "Ashoor", "Ashraf", "Assoumi", "Aziz", "Babu", "Baby", "Bader", "Baig", "Balakrishnan", "Baqer", "Bhatia", "Bucheeri", "Bumajeed", "Butt", "Chacko", "Chandran", "Cherian", "D'Souza", "Darwish", "Das", "Dhaif", "Dsouza", "Ebrahim", "Eid", "Faisal", "Fakhro", "Faraj", "Fardan", "Farooq", "Fernandes", "Ghuloom", "Gupta", "Habib", "Haider", "Haji", "Hamad", "Hameed", "Hammad", "Hasan", "Hashim", "Hassan", "Hubail", "Husain", "Hussain", "Ibrahim", "Iqbal", "Isa", "Islam", "Ismaeel", "Ismail", "Jacob", "Jaffar", "Jaffer", "Jamal", "Janahi", "Jassim", "Javed", "Jawad", "Juma", "Kadhem", "Kamal", "Kazerooni", "Khalaf", "Khalid", "Khalifa", "Khalil", "Khamis", "Khan", "Koshy", "Krishna", "Krishnakumar", "Krishnan", "Kumar", "Lobo", "Madan", "Mahdi", "Mahmood", "Majeed", "Makki", "Malik", "Mani", "Mansoor", "Marhoon", "Mattar", "Menon", "Mihna", "Mirza", "Mohamed", "Mohammad", "Mohammed", "Mohan", "Moosa", "Mubarak", "Muhammad", "Murad", "Mustafa", "Nair", "Nambiar", "Narayanan", "Naser", "Nasser", "Noor", "Omar", "Patel", "Pereira", "Philip", "Pillai", "Pinto", "Prasad", "Qarata", "Qureshi", "Radhi", "Rahman", "Rai", "Raj", "Rajab", "Rajan", "Rana", "Rao", "Rasheed", "Rashid", "Reddy", "Saad", "Sabt", "Sadiq", "Saeed", "Saif", "Saleem", "Saleh", "Salem", "Salman", "Samuel", "Sanad", "Sarhan", "Sayed", "Shaban", "Shah", "Shaheen", "Shaik", "Shaikh", "Shams", "Shamtoot", "Sharaf", "Sharif", "Sharma", "Shehab", "Sheikh", "Shetty", "Siddiqui", "Singh", "Sultan", "Taqawi", "Taqi", "Varghese", "Younis", "Yousif", "Yusuf", "Zainal", "Zayed"]>>
 
 <<set setup.cypriotSlaveNames = ["Alexandra", "Alissa", "Anabel", "Andri", "Androula", "Androulla", "Anna", "Antri", "Athena", "Azina", "Christina", "Chrystalleni", "Dagmara", "Despina", "Dora", "Eleanna", "Eleftheria", "Elena", "Eleni", "Erato", "Evdokia", "Gavriella", "Georgia", "Helene", "Isi", "Işın", "Kalia", "Karolina", "Leontia", "Lia", "Lisa", "Maria", "Marianna", "Marilia", "Marlen", "Myrto", "Natalia", "Nektaria", "Nicole", "Niki", "Nora", "Nouritza", "Olga", "Panayiota", "Paraskevi", "Praxoula", "Ramona", "Sevgül", "Sophia", "Sotiria", "Stella", "Ziynet"]>>
 <<set setup.cypriotSlaveSurnames = ["Achilleos", "Adamou", "Agapiou", "Agathangelou", "Agathocleous", "Alexandrou", "Anastasiou", "Andreou", "Angelides", "Antoniades", "Antoniadou", "Antoniou", "Apostolou", "Argyrou", "Aristidou", "Aristodemou", "Aristotelous", "Athanasiou", "Avgousti", "Avraam", "Avraamides", "Charalambides", "Charalambous", "Charalampous", "Christodoulides", "Christodoulidou", "Christodoulou", "Christofi", "Christofides", "Christofidou", "Christoforou", "Christou", "Chrysanthou", "Chrysostomou", "Constantinides", "Constantinidou", "Constantinou", "Costa", "Damianou", "Demetriades", "Demetriadou", "Demetriou", "Demir", "Demosthenous", "Dimitriou", "Dionysiou", "Economides", "Economou", "Efstathiou", "Efthymiou", "Eleftheriou", "Elia", "Eliades", "Ellinas", "Eracleous", "Erotokritou", "Evagorou", "Evangelou", "Evripidou", "Filippou", "Fotiou", "Gavriel", "Georgiades", "Georgiadou", "Georgiou", "Gregoriou", "Hadjigeorgiou", "Hadjimichael", "Heracleous", "Herodotou", "Iacovides", "Iacovou", "Ioakim", "Ioannides", "Ioannidou", "Ioannou", "Jones", "Kallis", "Kaya", "Khan", "Kleanthous", "Kokkinos", "Konstantinou", "Kyprianou", "Kyriacou", "Kyriakides", "Kyriakidou", "Kyriakou", "Lambrou", "Lazarou", "Leonidou", "Loizides", "Loizidou", "Loizou", "Louca", "Louka", "Makrides", "Makris", "Manoli", "Marcou", "Markides", "Markou", "Matheou", "Mavrommatis", "Menelaou", "Michael", "Michaelides", "Michaelidou", "Miltiadou", "Miltiadous", "Mina", "Nearchou", "Neocleous", "Neofytou", "Neophytou", "Nicolaides", "Nicolaidou", "Nicolaou", "Nikolaou", "Odysseos", "Onisiforou", "Orphanides", "Panagi", "Panagiotou", "Panayi", "Panayides", "Panayiotou", "Panteli", "Pantelides", "Papadopoulos", "Papadopoulou", "Papageorgiou", "Papaioannou", "Papamichael", "Papanicolaou", "Papantoniou", "Papapetrou", "Papas", "Paraskeva", "Paschali", "Patsalides", "Pavlides", "Pavlidou", "Pavlou", "Pericleous", "Petrides", "Petridou", "Petrou", "Philippou", "Photiou", "Pieri", "Pitsillides", "Polycarpou", "Polydorou", "Polykarpou", "Procopiou", "Prodromou", "Prokopiou", "Protopapas", "Savva", "Savvides", "Savvidou", "Singh", "Smith", "Socratous", "Sofocleous", "Sofokleous", "Sofroniou", "Solomou", "Sophocleous", "Soteriou", "Sotiriou", "Spyrou", "Stavrou", "Stefanou", "Stephanou", "Stylianides", "Stylianou", "Symeonides", "Symeou", "Themistocleous", "Theocharous", "Theodorou", "Theodosiou", "Theodotou", "Theodoulou", "Theofanous", "Theophanous", "Thoma", "Varnava", "Vasiliou", "Vassiliades", "Vassiliou", "Xenofontos", "Xenophontos", "Yiangou", "Yiannakou", "Yilmaz", "Zachariou", "Zenonos"]>>
@@ -1441,15 +1441,15 @@ Then pick _namePool.random(), or display those names as possible choices, or do
 <<set setup.ArcologyNamesSupremacistAsian = ["Shambhala", "Shangri-La", "The Celestial Temple", "Tian"]>>
 <<set setup.ArcologyNamesSupremacistLatina = ["Alcázar de Segovia", "Alhambra", "Aztlan", "Ciudad Blanca", "La Sagrada", "Tenochtitlan"]>>
 <<set setup.ArcologyNamesSupremacistMiddleEastern = ["New Cairo", "The Caliphate", "Ubar", "Zerzura"]>>
-<<set setup.ArcologyNamesSupremacistBlack = ["Benin", "The Promised Land", "United Africa"]>>
-<<set setup.ArcologyNamesSupremacistIndoAryan = ["New New Delhi", "Swarga Loka"]>>
+<<set setup.ArcologyNamesSupremacistBlack = ["Benin", "The Promised Land", "Timbuktu", "United Africa"]>>
+<<set setup.ArcologyNamesSupremacistIndoAryan = ["Indus Valley", "New New Delhi", "Swarga Loka", "Ujjain"]>>
 <<set setup.ArcologyNamesSupremacistPacificIslander = ["Hawaiki", "Maui", "Rapa Nui"]>>
-<<set setup.ArcologyNamesSupremacistMalay = ["Brunei", "Patani", "Tanah Melayu"]>>
+<<set setup.ArcologyNamesSupremacistMalay = ["Brunei", "Patani", "Srivijaya", "Tanah Melayu"]>>
 <<set setup.ArcologyNamesSupremacistAmerindian = ["Cahokia", "Caral", "The Confederated Tribes"]>>
 <<set setup.ArcologyNamesSupremacistSouthernEuropean = ["New Athens", "Olympus", "Siglo de Oro"]>>
-<<set setup.ArcologyNamesSupremacistSemitic = ["Garden of Eden", "Olam Ha-Ba", "The Fifth Temple", "The Promised Land"]>>
+<<set setup.ArcologyNamesSupremacistSemitic = ["Garden of Eden", "Jericho", "Olam Ha-Ba", "The Fifth Temple", "The Promised Land"]>>
 <<set setup.ArcologyNamesSupremacistMixedRace = ["Fusion", "Hybrid Vigor", "Meltingpot"]>>
-<<set setup.ArcologyNamesSubjugationistWhite = ["Anticolonialism One", "Mayocide", "The World Turned Upside Down"]>>
+<<set setup.ArcologyNamesSubjugationistWhite = ["Anticolonialism One", "Mayocide", "The World Turned Upside Down", "White Flight"]>>
 <<set setup.ArcologyNamesSubjugationistAsian = ["Diyu", "Pearl of the Orient", "The East India Company"]>>
 <<set setup.ArcologyNamesSubjugationistLatina = ["Annual", "Fort Veracruz", "Los Conquistados", "Porvenir"]>>
 <<set setup.ArcologyNamesSubjugationistMiddleEastern = ["Constantinople", "La Reconquista", "Vlad's Castle"]>>
@@ -1458,11 +1458,11 @@ Then pick _namePool.random(), or display those names as possible choices, or do
 <<set setup.ArcologyNamesSubjugationistPacificIslander = ["Cargo Cult", "Castle Bravo", "Moro Castle"]>>
 <<set setup.ArcologyNamesSubjugationistMalay = ["Bencoolen", "Eastern Emporium", "Pulo Prabang"]>>
 <<set setup.ArcologyNamesSubjugationistAmerindian = ["Fort Laramie", "The Rez", "Wounded Knee"]>>
-<<set setup.ArcologyNamesSubjugationistSouthernEuropean = ["Al-Andalus", "Istanbul", "Parish Prison"]>>
+<<set setup.ArcologyNamesSubjugationistSouthernEuropean = ["Al-Andalus", "Carthage", "Istanbul", "Parish Prison"]>>
 <<set setup.ArcologyNamesSubjugationistSemitic = ["Exodus", "New Canaan", "Solomon's Lament"]>>
 <<set setup.ArcologyNamesSubjugationistMixedRace = ["Bloodlines", "Purity", "Segregation"]>>
 <<set setup.ArcologyNamesGenderRadicalist = ["Bacchanalia", "Gomorrah", "Saturnalia", "Sodom", "The Rosebud"]>>
-<<set setup.ArcologyNamesGenderFundamentalist = ["The Arbor", "The Rose", "The Source"]>>
+<<set setup.ArcologyNamesGenderFundamentalist = ["The Arbor", "The Flower", "The Rose", "The Source"]>>
 <<set setup.ArcologyNamesPaternalist = ["Asylum", "Glory", "Haven", "New Springfield", "Sanctuary", "Sanctum", "The Sanctuary"]>>
 <<set setup.ArcologyNamesDegradationist = ["Golgotha", "Hell", "Misery", "The Tower"]>>
 <<set setup.ArcologyNamesBodyPurist = ["Elysium", "New Eden", "Purity", "The Ark", "The Repository", "Walden"]>>
@@ -1482,10 +1482,10 @@ Then pick _namePool.random(), or display those names as possible choices, or do
 <<set setup.ArcologyNamesChineseRevivalist = ["Feng Huang", "Fusang", "Huangquan", "Huokang", "Jin Shan", "Jiuquan", "Mingfu", "Qi Lin", "The Forbidden Palace", "The Middle Kingdom", "Xin Hua", "Yinfu", "Youdu", "Youming"]>>
 
 /* pregmod FS */
-<<set setup.ArcologyNamesEugenics = ["Ascension", "Perfection", "Second Chance"]>>
-<<set setup.ArcologyNamesRepopulationist = ["Future", "Glorious Mother", "Haven of the Pregnant", "Holders of the Future", "Hope", "Sacred Womb", "The Womb"]>>
+<<set setup.ArcologyNamesEugenics = ["Ascension", "Galton City", "Perfection", "Second Chance"]>>
+<<set setup.ArcologyNamesRepopulationist = ["Future", "Glorious Mother", "Haven of the Pregnant", "Holders of the Future", "Hope", "Motherhood", "Sacred Womb", "The Womb"]>>
 <<set setup.ArcologyNamesHedonisticDecadence = ["All You Can Eat", "Decadence", "Gluttony", "Indulgence", "New Wisconsin", "Plumpland", "Sloth", "Stuffedtopia"]>>
-<<set setup.ArcologyNamesCummunism = ["Arscrotzka", "Crusty Cummies", "Cummunist Russwhore", "Cumstantine", "Cumstantinople", "Da Cumrade", "Free Slave Central", "Jizzington upon Wank", "Mother Cumtry"]>>
+<<set setup.ArcologyNamesCummunism = ["Arscrotzka", "Crusty Cummies", "Cummins", "Cummunist Russwhore", "Cumstantine", "Cumstantinople", "Da Cumrade", "Free Slave Central", "Jizzington upon Wank", "Mother Cumtry"]>>
 <<set setup.ArcologyNamesIncestFetishist = ["Familial Embrace", "Family Fortunes", "Incestral Home", "Oedipal City", "Oeditropolis", "Pure Blood", "Sib City"]>>
 
 
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 7c57c70ae38e169ef4f3600db4e79bd694b25eb3..d09c3248a3d5d10a3cc093bc50048423b9dc1a1f 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -737,6 +737,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
 <<set $swanSong = 0>>
 <<set $failedElite = 0>>
 <<set $eugenicsFullControl = 0>>
+<<set $badC = 0, $badB = 0>>
 
 <<set $schoolSuggestion = 0>>
 <<set $TSS = {schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0}>>
diff --git a/src/js/eventSelectionJS.tw b/src/js/eventSelectionJS.tw
index d592884fd60d415ae4399e772ab98551018fd065..001f18257b6f19f53ec5f86d272ee913496404d6 100644
--- a/src/js/eventSelectionJS.tw
+++ b/src/js/eventSelectionJS.tw
@@ -1076,7 +1076,7 @@ if(eventSlave.fetish != "mindbroken") {
 			}
 		}
 
-		if(eventSlave.boobs > 1400) {
+		if(eventSlave.boobs >= 2000) {
 			if(eventSlave.boobsImplant == 0) {
 				if(eventSlave.nipples != "tiny") {
 					if(eventSlave.devotion > 20) {
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index 6a27be9e7fd38e8e45a18afc322fd43a69a5bd87..da9f6d4d0b30e386e6364b21ffaacc2c2a7ad42b 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -133,13 +133,8 @@ You've done it.
 You arrive at your new arcology, $arcologies[0].name, and head straight to the penthouse to enter the access codes that will tell the $arcologies[0].name systems to recognize you as their owner. The penthouse office is ready to receive the codes, and they authenticate. A voice activates in your earpiece.
 <br><br>
 //Congratulations. I am a personal assistant program, and it is my pleasure to assist you,
-<<switch $PC.nationality>>
-<<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
-	<<if $PC.surname>>$PC.surname <</if>>$PC.name,
-<<default>>
-	$PC.name<<if $PC.surname>> $PC.surname<</if>>,
-<</switch>>
-the new owner of  $arcologies[0].name. I will offer useful information whenever possible in italics. Your new arcology has some unusual equipment. The previous owner kept a small stable of sex slaves. The penthouse therefore has a body modification studio for tattooing, bleaching and piercing, and an auto salon for more prosaic things like hair care. It also has a remote surgery, a small surgical theater that can be operated remotely by a qualified surgeon if you can pay the fee. Finally, it has a slave nutrition system connected to the arcology's hydroponics bays. This system produces a tasty protein-rich drink that provides the physically active female body all its necessary nutrients while leaving the lower digestive tract extremely clean. It even causes a mild increase in sex drive.
+<<PlayerName>>
+the new owner of $arcologies[0].name. I will offer useful information whenever possible in italics. Your new arcology has some unusual equipment. The previous owner kept a small stable of sex slaves. The penthouse therefore has a body modification studio for tattooing, bleaching and piercing, and an auto salon for more prosaic things like hair care. It also has a remote surgery, a small surgical theater that can be operated remotely by a qualified surgeon if you can pay the fee. Finally, it has a slave nutrition system connected to the arcology's hydroponics bays. This system produces a tasty protein-rich drink that provides the physically active female body all its necessary nutrients while leaving the lower digestive tract extremely clean. It even causes a mild increase in sex drive.
 <br><br>
 The previous owner seems to have left in something of a hurry.
 <<if $cheatMode == 1>>
diff --git a/src/pregmod/SecForceEX/SpecialForceBarracksFlavourText.tw b/src/pregmod/SecForceEX/SpecialForceBarracksFlavourText.tw
index 72fdf1e14761481333a0f673198c1985c63071c5..dca8cd248b3edfb17e2ff11fbc22457c16946693 100644
--- a/src/pregmod/SecForceEX/SpecialForceBarracksFlavourText.tw
+++ b/src/pregmod/SecForceEX/SpecialForceBarracksFlavourText.tw
@@ -6,7 +6,7 @@
 
 <div style="margin-left:2em">
 <<if $securityForceFocus == "recruit">>
-	The commanders are viewing lists of potential recruits for $securityForceName, mercenaries and Old World soldiers who might be receptive to an offer of employment and residence within the arcology. In addition to some citizen's of $securityForceName who wish to have some excitement in their lives.
+	The commanders are viewing lists of potential recruits for $securityForceName, mercenaries and Old World soldiers who might be receptive to an offer of employment and residence within the arcology - in addition to some citizens of the arcology who wish to have some excitement in their lives.
 <<elseif $securityForceFocus == "secure">>
 	The commanders are reviewing maps of trade routes to the arcology as well as those nearby merchant hubs, arranging their future deployments to best protect them and encourage business and trade.
 <<elseif $securityForceFocus == "raiding">>
@@ -20,7 +20,7 @@
 <<elseif $securityForceRulesOfEngagement == "limited">>
 	There are some guidelines posted regarding the use of force against non-citizens, forbidding general indiscriminate fire.
 <<elseif $securityForceRulesOfEngagement == "free">>
-	Guidelines regarding the use of force are completely absent from the deployment information screens. A note affixed to the screen, probably from a soldier, says: "Pop 'em if you see 'em - better than target practice!". Another one on top of that, from The Colonel, says: "Don't shoot the pretty ones, you fucking morons, or I'll kill you myself. They're worth good money or good for fun - do you idiots really want to have to fuck month-old stock?"
+	Guidelines regarding the use of force are completely absent from the deployment information screens. A note affixed to the screen, probably from a soldier, says: "Pop 'em if you see 'em - better than target practice!" Another one on top of that, from The Colonel, says: "Don't shoot the pretty ones, you fucking morons, or I'll kill you myself. They're worth good money or good for fun - do you idiots really want to have to fuck month-old stock?"
 <</if>>
 </div>
 
@@ -67,17 +67,17 @@
 
 <br>
 
-//In the middle of the common area is a pile of supply crates with a pavilion on top - The Colonel's personal throne and open quarters, the result of her preferring to live an extreme lifestyle amongst her soldiers rather than in her empty quarters on the upper levels. It's draped with the 'flag' of $securityForceName, one of her inventions. Sprawled all around it is an immense quantity of; alcohol, hard drugs,clothes, electronic devices, huge amounts of cash, jewels and precious metals looted from the outside world.//
+//In the middle of the common area is a pile of supply crates with a pavilion on top - The Colonel's personal throne and open quarters, the result of her preferring to live an extreme lifestyle amongst her soldiers rather than in her empty quarters on the upper levels. It's draped with the 'flag' of $securityForceName, one of her inventions. Sprawled all around it is an immense quantity of; alcohol, hard drugs, clothes, electronic devices, huge amounts of cash, jewels and precious metals looted from the outside world.//
 
 <br><br>
 
 <div style="margin-left:2em">
 <<if random(1,100) > 50>>
-	_Name raises a hand in greeting and nods as you approach. She is sprawled on a couch, wearing only her combat suit tank top and fingerless gloves. She's holding a near-empty bottle of strong liquor in her hand and you can see a naked slave girl kneeling on the floor between her legs. The Colonel has her legs wrapped tightly around the girl's head, forcing the girl to service her if she wants to breathe. The Colonel is close to her climax then suddenly tenses her lower body thus gripping the girl even tighter and throws her head back in ecstasy as she orgasms. She lets out a long breath finally releasing the girl, giving her a hard smack and shouting at her to fuck off.<br><br> The Colonel finishes off her bottle, tossing it over her shoulder then leaning back on the couch and spreading her legs wide. You look down briefly, falling into your habits of inspection. Her pussy is completely devoid of hair with heavy labia in with a very large and hard clit peaking out. Beads of moisture are visible, the result of her excitation and you can tell from long experience that she would be tight as a vise. You return your gaze to her face to find her smirking at you. "Like what you see, boss?" She waves her hand at the plaza around her, "So do they. But you're not here for pussy. You're here to talk business. So, what's up?"
+	_Name raises a hand in greeting and nods as you approach. She is sprawled on a couch, wearing only her combat suit tank top and fingerless gloves. She's holding a near-empty bottle of strong liquor in her hand and you can see a naked slave girl kneeling on the floor between her legs. The Colonel has her legs wrapped tightly around the girl's head, forcing the girl to service her if she wants to breathe. The Colonel is close to her climax then suddenly tenses her lower body thus gripping the girl even tighter and throws her head back in ecstasy as she orgasms. She lets out a long breath finally releasing the girl, giving her a hard smack and shouting at her to fuck off.<br><br> The Colonel finishes off her bottle, tossing it over her shoulder then leaning back on the couch and spreading her legs wide. You look down briefly, falling into your habits of inspection. Her pussy is completely devoid of hair with heavy labia in with a very large and hard clit peaking out. Beads of moisture, the result of her excitation, are visible, and you can tell from long experience that she would be tight as a vise. You return your gaze to her face to find her smirking at you. "Like what you see, boss?" She waves her hand at the plaza around her, "So do they. But you're not here for pussy. You're here to talk business. So, what's up?"
 <<elseif random(1,100) > 50>>
-	_Name is in no condition initially to greet you. She's naked except for one sock that gives you a very good view of her muscled, taut body while lunging with her feet on the table and the rest on her couch. She is face down in a drugged-out stupor in the middle of a wide variety of powders and pills. Perhaps sensing your approach, her head suddenly shoots up and looks at you with unfocused, bloodshot eyes. "Sorry, boss," she slurs, wiping her face and weakly holding up a hand. "Hold on a second, I need something to help me out here. Long fucking night." She struggles to sit on the couch and bending over the table, loudly snorts up some of the white powder on it. "Ahhh, fuck," she says, breathing heavily.<br><br> She shakes her head powerfully now looking at you, her eyes once again alert and piercing. "That's better," she says, leaning back on the couch and giving you another good view of her assets. "So, boss," she begins, "what brings you down here to our little clubhouse? I trust you're happy with how we've been handling things out there?" You nod. "excellent" she laughs. "I have to say, it's nice to have a place like this while having some top-end gear and to be able to have fun out there without worrying about anyone coming back on us. Good fucking times." She laughs again. "So - I'm assuming you want something?"
+	_Name is in no condition initially to greet you. She's naked except for one sock that gives you a very good view of her muscled, taut body while lunging with her feet on the table and the rest on her couch. She is face down in a drugged-out stupor in the middle of a wide variety of powders and pills. Perhaps sensing your approach, her head suddenly shoots up and looks at you with unfocused, bloodshot eyes. "Sorry, boss," she slurs, wiping her face and weakly holding up a hand. "Hold on a second, I need something to help me out here. Long fucking night." She struggles to sit on the couch and bending over the table, loudly snorts up some of the white powder on it. "Ahhh, fuck," she says, breathing heavily.<br><br> She shakes her head powerfully now looking at you, her eyes once again alert and piercing. "That's better," she says, leaning back on the couch and giving you another good view of her assets. "So, boss," she begins, "what brings you down here to our little clubhouse? I trust you're happy with how we've been handling things out there?" You nod. "Excellent", she laughs. "I have to say; it's nice to have a place like this while having some top-end gear and to be able to have fun out there without worrying about anyone coming back on us. Good fucking times." She laughs again. "So - I'm assuming you want something?"
 <<elseif random(1,100) > 70 && $securityForceDepravity >= 1.5 && ($ColonelCore == "cruel")>>
-	_Name is relaxing on her couch stark naked, greeting you with a raised hand. Between her tightly clenched legs is a slave girl being forced to eat her out. "Hey, boss, what's -" she breaks off as a flash of pain crosses her features. "Fucking bitch!" she exclaims, pulling her legs away and punching the slave girl in the face. She pushes the girl to the ground, straddling her then begins hitting. You hear one crunch after another as The Colonel's powerful blows shatter the girl's face. She hisses from between clenched teeth, each word accompanied by a brutal punch. "How. Many. Fucking. Times. Have. I. Told. You. To. Watch. Your. Fucking. Teeth. On. My. Fucking. Clit!" She leans back, exhaling heavily. Before leaning back down to grip apply pressure onto the girl's neck with her powerful hands. Wordlessly, she increases the pressure and soon the girl begins to turn blue as she struggles to draw breath. Eventually her struggles weaken and then finally, end.<br><br> The Colonel relaxes her grip then wipes her brow, clearing away the sweat from her exertion. Finally rising from the girl's body, relaxing back on the couch and putting her feet back up on the table. "Sorry about that boss," she says, shrugging. "So many of these bitches we pick up from the outside don't understand that they have to behave." Shaking her head in frustration, "Now I need to find another one. But that's not your problem, you're here to talk business. So, what's up?"
+	_Name is relaxing on her couch stark naked, greeting you with a raised hand. Between her tightly clenched legs is a slave girl being forced to eat her out. "Hey, boss, what's -" she breaks off as a flash of pain crosses her features. "Fucking bitch!" she exclaims, pulling her legs away and punching the slave girl in the face. She pushes the girl to the ground, straddling her then begins hitting. You hear one crunch after another as The Colonel's powerful blows shatter the girl's face. She hisses from between clenched teeth, each word accompanied by a brutal punch. "How. Many. Fucking. Times. Have. I. Told. You. To. Watch. Your. Fucking. Teeth. On. My. Fucking. Clit!" She leans back, exhaling heavily. Before leaning back down to grip apply pressure onto the girl's neck with her powerful hands. Wordlessly, she increases the pressure and soon the girl begins to turn blue as she struggles to draw breath. Eventually her struggles weaken and then finally, end.<br><br> The Colonel relaxes her grip then wipes her brow, clearing away the sweat from her exertion. Finally rising from the girl's body, relaxing back on the couch and putting her feet back up on the table. "Sorry about that boss," she says, shrugging. "So many of these bitches we pick up from the outside don't understand that they have to behave." Shaking her head in frustration, "Now I need to find another one. But that's not your problem - you're here to talk business. So, what's up?"
 <<else>>
 	_Name is topless while reviewing the particulars of her unit on a tablet as you approach. She raises a hand in greeting. "Hey boss," she says, noticing you looking at her chest. She laughs. "Nice, aren't they? But they're not for you or them." She throws a thumb at the plaza around her. "You're down here for a reason, though. What can I do for you?"
 <</if>>
diff --git a/src/pregmod/basenationalitiesControls.tw b/src/pregmod/basenationalitiesControls.tw
index e0dd96ed016cc57bee36c00d9cde82d45eb95fed..69339f977b9e8cd5c3277b3fd21515d0df382e89 100644
--- a/src/pregmod/basenationalitiesControls.tw
+++ b/src/pregmod/basenationalitiesControls.tw
@@ -120,7 +120,7 @@ Filter by Region:
 			<</link>>@@ @@.zeroButton;<<link '0'>>
 				<<run setup.baseNationalities.filter(function(n) {
 						var races = setup.raceSelector[n] || setup.raceSelector[''];
-						return races['" + _race.toLowerCase() + "'] * 2 > hashSum(races.length); }).forEach(function(n) { delete $nationalities[n]; })>>
+						return races['" + _race.toLowerCase() + "'] * 2 > hashSum(races); }).forEach(function(n) { delete $nationalities[n]; })>>
 				<<replace '#PopControl'>><<include 'Basenationalities Controls'>><</replace>>
 			<</link>>@@</div>">>
 		<</if>>
diff --git a/src/pregmod/editGenetics.tw b/src/pregmod/editGenetics.tw
index 171bd10489caa6721b235d590bdcce4cca6c2810..720f5113798b8750e760476a73c02d5cbcba325c 100644
--- a/src/pregmod/editGenetics.tw
+++ b/src/pregmod/editGenetics.tw
@@ -1,15 +1,24 @@
 :: Edit Genetics [nobr]
+
 <html>
 <script type="text/x-template" id="birthFullNameTmpl">
-	<% if(["Chinese", "Japanese", "Korean", "Cambodian", "Vietnamese", "Hungarian"].includes(s.nationality)) {
-		%><% if(s.birthSurname || s.surname) {	%><%- s.birthSurname || s.surname%> <% } %><b><u><%- s.birthName || s.name %></u></b><%
+	<% if(State.variables.surnameOrder != 1) {
+		%><% if(["Cambodian", "Chinese", "Hungarian", "Japanese", "Korean", "Mongolian", "Taiwanese", "Vietnamese"].includes(s.nationality)) {
+			%><% if(s.birthSurname || s.surname) {	%><%- s.birthSurname || s.surname%> <% } %><b><u><%- s.birthName || s.name %></u></b><%
+		} else {
+			%><b><u><%- s.birthName || s.name %></u></b><% if(s.birthSurname || s.surname) { %> <%- s.birthSurname || s.surname %><% } %><%
+		} %><%
 	} else {
 		%><b><u><%- s.birthName || s.name %></u></b><% if(s.birthSurname || s.surname) { %> <%- s.birthSurname || s.surname %><% } %><%
 	} %>
 </script>
 <script type="text/x-template" id="currentFullNameTmpl">
-	<% if(["Chinese", "Japanese", "Korean", "Cambodian", "Vietnamese", "Hungarian"].includes(s.nationality)) {
-		%><% if(s.slaveSurname) {	%><%- s.slaveSurname %> <% } %><b><u><%- s.slaveName %></u></b><%
+	<% if(State.variables.surnameOrder != 1) {
+		%><% if(["Cambodian", "Chinese", "Hungarian", "Japanese", "Korean", "Mongolian", "Taiwanese", "Vietnamese"].includes(s.nationality)) {
+			%><% if(s.slaveSurname) {	%><%- s.slaveSurname %> <% } %><b><u><%- s.slaveName %></u></b><%
+		} else {
+			%><b><u><%- s.slaveName %></u></b><% if(s.slaveSurname) { %> <%- s.slaveSurname %><% } %><%
+		} %><%
 	} else {
 		%><b><u><%- s.slaveName %></u></b><% if(s.slaveSurname) { %> <%- s.slaveSurname %><% } %><%
 	} %>
@@ -124,7 +133,7 @@
 		}[String(karyotype).toUpperCase()] || 'unknown/not viable';
 	};
 	tmpl.ageDesc = function(slave) {
-		var age = slave.actualAge + (slave.birthWeek + SugarCube.State.variables.week - slave.weekAcquired) / 52.0;
+		var age = slave.actualAge + (slave.birthWeek + State.variables.week - slave.weekAcquired) / 52.0;
 		var years = Math.floor(age);
 		var months = Math.floor((age - years) * 12);
 		return (years > 0 ? years + 'y ' + months + 'm' : months + 'm');
@@ -166,7 +175,7 @@
 			'7': 'gigantic', '8': 'titanic', '9': 'absurd', '10': 'inhuman', '11': 'hypertrophied'}[s] || 'unknown') + ' (' + Number(s) + ')';
 	};
 	tmpl.testesDesc = function(s) {
-		return ({'0': 'none', '1': 'vestigal', '2': 'small', '3': 'average', '4': 'big', '5': 'huge', '6': 'enormous',
+		return ({'0': 'none', '1': 'vestigial', '2': 'small', '3': 'average', '4': 'big', '5': 'huge', '6': 'enormous',
 			'7': 'hypertrophied', '8': 'hypertrophied', '9': 'hypertrophied', '10': 'hypertrophied'}[s] || 'unknown') + ' (' + Number(s) + ')';
 	};
 	tmpl.hormonalCat = new Categorizer([-Infinity, 'heavy male'], [-49, 'male'], [-24, 'natural'], [25, 'female'], [50, 'heavy female']);
@@ -176,7 +185,7 @@
 			res.push('Immune system damaged (' + slave.chem.toFixed(0) + ').');
 		}
 		if(slave.addict > 0) {
-			res.push('Addicted to aphrodisiaca (' + slave.addict.toFixed(0) + ').');
+			res.push('Addicted to aphrodisiacs (' + slave.addict.toFixed(0) + ').');
 		}
 		return res.join(' ');
 	};
@@ -191,9 +200,9 @@
 		if(id === 0) { return '<i>unknown</i>'; }
 		if(id === -1) {
 			/* The PC */
-			return tmpl.birthFullName(SugarCube.State.variables.PC) + ' (PC)';
+			return tmpl.birthFullName(State.variables.PC) + ' (PC)';
 		} else {
-			var parent = SugarCube.State.variables.genePool.find(function(s) { return s.ID === id; });
+			var parent = State.variables.genePool.find(function(s) { return s.ID === id; });
 			return (parent ? tmpl.birthFullName(parent) : '<i>missing</i>') + ' (' + id + ')';
 		}
 	};
diff --git a/src/pregmod/electiveSurgery.tw b/src/pregmod/electiveSurgery.tw
index 76633608a427cd69d5b54fd7cf0ad46104835447..255c47fd504b6c1c341172c4b52a6d41689fb61f 100644
--- a/src/pregmod/electiveSurgery.tw
+++ b/src/pregmod/electiveSurgery.tw
@@ -182,7 +182,7 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
 <<elseif $PC.belly >= 16000>>
 	"My word, are you sure you want to have surgery in this state? You're giant!" She says as she uses both hands to massage your
 	<<if $PC.preg > 40>>overdue belly, enjoying the kicks from your child within. "If you go into labor, we have everything you'll need, so don't worry."
-	<<else>>belly, taking note of the extra occupents.
+	<<else>>belly, taking note of the extra occupants.
 	<</if>>
 	<br>
 <<elseif $PC.belly >= 14000>>
diff --git a/src/pregmod/organFarmOptions.tw b/src/pregmod/organFarmOptions.tw
index 18c8b5136ad1f493775c1b78df8511c19b95af1d..739bef91d1b085831019aca4304b7b909cb5598c 100644
--- a/src/pregmod/organFarmOptions.tw
+++ b/src/pregmod/organFarmOptions.tw
@@ -212,7 +212,7 @@ The fabricator is ready to grow an organ for $object. Extract tissue to begin gr
 			<<set _newOrgan.ID = $activeSlave.ID>>
 			<<set $organs.push(_newOrgan)>>
 			<<goto "Remote Surgery">>
-		<</link>> //Costs <<print cashFormat(20000)>> and the slave must not have female repoductive organs for successful implantation//
+		<</link>> //Costs <<print cashFormat(20000)>> and the slave must not have female reproductive organs for successful implantation//
 	<</if>>
 	<<if $animalParts != 0>>
 		<<if $slaveOrgans.mpregPig != 1>>
@@ -223,7 +223,7 @@ The fabricator is ready to grow an organ for $object. Extract tissue to begin gr
 				<<set _newOrgan.ID = $activeSlave.ID>>
 				<<set $organs.push(_newOrgan)>>
 				<<goto "Remote Surgery">>
-			<</link>> //Costs <<print cashFormat(20000)>> and the slave must not have female repoductive organs for successful implantation//
+			<</link>> //Costs <<print cashFormat(20000)>> and the slave must not have female reproductive organs for successful implantation//
 		<</if>>
 		<<if $slaveOrgans.mpregDog != 1>>
 			<br>&nbsp;&nbsp;&nbsp;&nbsp;
@@ -233,7 +233,7 @@ The fabricator is ready to grow an organ for $object. Extract tissue to begin gr
 				<<set _newOrgan.ID = $activeSlave.ID>>
 				<<set $organs.push(_newOrgan)>>
 				<<goto "Remote Surgery">>
-			<</link>> //Costs <<print cashFormat(20000)>> and the slave must not have female repoductive organs for successful implantation//
+			<</link>> //Costs <<print cashFormat(20000)>> and the slave must not have female reproductive organs for successful implantation//
 		<</if>>
 	<</if>>
 <</if>>
diff --git a/src/pregmod/reMaleCitizenHookup.tw b/src/pregmod/reMaleCitizenHookup.tw
index 96c41c9d4687a1da7306ca992c3b7c22216f7580..81836a5250dd72d9dfa14bd32bb1f63690321cf1 100644
--- a/src/pregmod/reMaleCitizenHookup.tw
+++ b/src/pregmod/reMaleCitizenHookup.tw
@@ -189,42 +189,42 @@ He's clearly attracted to you; even the most consummate actor would have difficu
 	<<replace "#result">>
 	You're not exactly starved for casual sex, but you've never thought there was any such thing as too much of a good thing. <<if _FS != "Physical Idealist">>You pull his arm around your waist<<else>>You nudge him in the ribs and motion to the door<</if>>. You hear a slight gasp from him as he realizes that his gambit has succeeded with more immediate effect than he expected. He shivers with anticipation as you steer him back through a side door, grabbing a pair of glasses of <<if $PC.refreshmentType == 1>>$PC.refreshment<<else>>liquor<</if>> on the way, and making a discreet exit towards your private suite.
 	<<if $Concubine != 0>><<if $Concubine.intelligence > 1>>
-		$Concubine.slaveName is there, of course, and she instantly sees that her continued presence for a menage a trois is wanted by both you and your guest.
+		$Concubine.slaveName is there, of course, and she instantly sees that her continued presence for a ménage à trois is wanted by both you and your guest.
 	<</if>><</if>>
 	Your guest restrains his eager praise now that you're in private, but his wide-eyed appreciation of your domain is compliment enough. Once in your suite, you undress him, revealing
 	<<switch _FS>>
 	<<case "Supremacist" "Subjugationist">>
-		his fresh, pure body, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, fully taking its length, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
+		his fresh, pure body, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, fully taking its length, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
 	<<case "Gender Radicalist">>
-		perky fake breasts and a stiff dick as you gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, fully taking its length, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
+		perky fake breasts and a stiff dick as you gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, fully taking its length, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
 	<<case "Gender Fundamentalist">>
-		a fine body with a proud erection. Before you can tip him onto your bed; he deftly slips you out of your evening dress, scoops you up and places you, back first, at the edge of your bed. He dominantly spears your pussy and begins thrusting powerfully. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobium waiting for you if it's known he had you, though, and he is eagerly fucking you. You shift in discomfort at being dominated, and in response he <<if $PC.belly >= 5000>>begins massaging your rounded middle<<else>>groping your <<if $PC.boobsBonus > 0>>huge breasts<<elseif $PC.boobsBonus < 0>>cute breasts<<elseif $PC.boobs == 1>>ample breasts<<else>>butt<</if>><</if>>, distracting you from the situation and allowing you to be overwhelmed by pleasure. With a hard, firm thrust, he cums deep into your pussy. You follow shortly after, feeling the heat of his seed in your depths as you clamp down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you. Through the haze of your lust, you can't help but feel your drink tasted off.
+		a fine body with a proud erection. Before you can tip him onto your bed; he deftly slips you out of your evening dress, scoops you up and places you, back first, at the edge of your bed. He dominantly spears your pussy and begins thrusting powerfully. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly fucking you. You shift in discomfort at being dominated, and in response he <<if $PC.belly >= 5000>>begins massaging your rounded middle<<else>>groping your <<if $PC.boobsBonus > 0>>huge breasts<<elseif $PC.boobsBonus < 0>>cute breasts<<elseif $PC.boobs == 1>>ample breasts<<else>>butt<</if>><</if>>, distracting you from the situation and allowing you to be overwhelmed by pleasure. With a hard, firm thrust, he cums deep into your pussy. You follow shortly after, feeling the heat of his seed in your depths as you clamp down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you. Through the haze of your lust, you can't help but feel your drink tasted off.
 		<<set $PC.forcedFertDrugs += 2>>
 	<<case "Repopulationist">>
 		<<set $PC.forcedFertDrugs += 10>>
-		a hot young body with an eager erection. Before you can tip him onto your bed; he pulls your evening dress off, spins you around and lowers you, back first, onto the edge of your bed. He dominantly spears your pussy and begins thrusting powerfully. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobium waiting for you if it's known he had you, though, and he is eagerly fucking you. You shift in discomfort at being dominated, and in response he <<if $PC.belly >= 5000>>begins earnestly groping your pregnancy<<else>>grabs your hips and pushes even deeper into you<</if>>, distracting you from the situation and allowing you to be overwhelmed by pleasure. With a hard, firm thrust, he cums deep into your pussy. You follow shortly after, feeling the heat of his seed in your depths as you clamp down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you. <<if $PC.belly < 100>>Unsatisfied with your body, he guides you into a position more favorable for conception<<else>>Crazed with lust over your baby bump, he guides you into a position more comfortable for a pregnant woman<</if>> and carries on fucking you. By the time he is done with you, you'll be leaking cum for the rest of the evening.<<if $PC.forcedFertDrugs > 0>> He seemed certain you'd become enormously pregnant from his efforts; he could have been fantasizing, but your drink did taste a little funny and you have a pleasant tingling in your lower belly.<</if>>
+		a hot young body with an eager erection. Before you can tip him onto your bed; he pulls your evening dress off, spins you around and lowers you, back first, onto the edge of your bed. He dominantly spears your pussy and begins thrusting powerfully. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly fucking you. You shift in discomfort at being dominated, and in response he <<if $PC.belly >= 5000>>begins earnestly groping your pregnancy<<else>>grabs your hips and pushes even deeper into you<</if>>, distracting you from the situation and allowing you to be overwhelmed by pleasure. With a hard, firm thrust, he cums deep into your pussy. You follow shortly after, feeling the heat of his seed in your depths as you clamp down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you. <<if $PC.belly < 100>>Unsatisfied with your body, he guides you into a position more favorable for conception<<else>>Crazed with lust over your baby bump, he guides you into a position more comfortable for a pregnant woman<</if>> and carries on fucking you. By the time he is done with you, you'll be leaking cum for the rest of the evening.<<if $PC.forcedFertDrugs > 0>> He seemed certain you'd become enormously pregnant from his efforts; he could have been fantasizing, but your drink did taste a little funny and you have a pleasant tingling in your lower belly.<</if>>
 	<<case "Eugenics">>
-		his glorious, flawless body, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, fully taking its length, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
+		his glorious, flawless body, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, fully taking its length, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
 	<<case "Paternalist">>
-		a nice young body, with all the little attractions and flaws of a free citizen's, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, fully taking its length, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
+		a nice young body, with all the little attractions and flaws of a free citizen's, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, fully taking its length, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
 	<<case "Degradationist">>
-		a taut body covered in dominant tattoos and spiky piercings, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, fully taking its length, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, especially one involving piercings rubbing all the right places, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
+		a taut body covered in dominant tattoos and spiky piercings, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, fully taking its length, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, especially one involving piercings rubbing all the right places, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
 	<<case "Body Purist">>
-		a delectably clean young body unmarred by any trace of surgical intervention, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, fully taking its length, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
+		a delectably clean young body unmarred by any trace of surgical intervention, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, fully taking its length, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
 	<<case "Transformation Fetishist">>
-		a massive fake bubble butt to go with his extended erection, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, taking as much as you physically can, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
+		a massive fake bubble butt to go with his extended erection, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, taking as much as you physically can, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
 	<<case "Youth Preferentialist">>
 		<<if $minimumSlaveAge < 13>>
-			that he is adorable, but may not be satisfying, and gently carry him to your bed. You tease him as you remove your evening dress, crawl next to him, pull him over yourself and guide his tiny penis into you. Instinct quickly takes hold as he begins thrusting and hugs tightly to your <<if $PC.belly >= 5000>>pregnant belly<<else>>larger body<</if>>. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You hold him close and buck against him, trying to make up for his size, until he releases a small load into your depths. You follow not long after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Exhausted, he passes out <<if $PC.belly >= 5000>>against your middle<<elseif $PC.boobsBonus > 0>>in your huge bust<<elseif $PC.boobsBonus < 0>>in your cute breasts<<elseif $PC.boobs == 1>>n your ample bust<<else>>atop you<</if>>; where he lies until you finish playing with him and move him beside you. You return to your needy crotch to finish up as he snuggles closer to your side.
+			that he is adorable, but may not be satisfying, and gently carry him to your bed. You tease him as you remove your evening dress, crawl next to him, pull him over yourself and guide his tiny penis into you. Instinct quickly takes hold as he begins thrusting and hugs tightly to your <<if $PC.belly >= 5000>>pregnant belly<<else>>larger body<</if>>. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You hold him close and buck against him, trying to make up for his size, until he releases a small load into your depths. You follow not long after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Exhausted, he passes out <<if $PC.belly >= 5000>>against your middle<<elseif $PC.boobsBonus > 0>>in your huge bust<<elseif $PC.boobsBonus < 0>>in your cute breasts<<elseif $PC.boobs == 1>>n your ample bust<<else>>atop you<</if>>; where he lies until you finish playing with him and move him beside you. You return to your needy crotch to finish up as he snuggles closer to your side.
 		<<elseif $minimumSlaveAge < 18>>
-			that his whole body looks fresh, untouched, and very young, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
+			that his whole body looks fresh, untouched, and very young, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
 		<<else>>
-			that his whole body looks fresh, untouched, and quite young, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
+			that his whole body looks fresh, untouched, and quite young, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
 		<</if>>
 	<<case "Maturity Preferentialist">>
-		a mature body featuring an erection with years of experience. Before you can tip him onto your bed; he deftly slips you out of your evening dress, scoops you up and places you, back first, at the edge of your bed. He dominantly spears your pussy and begins thrusting, hitting all the right places. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobium waiting for you if it's known he had you, though, and he is eagerly fucking you. You shift in discomfort at being dominated, and in response he <<if $PC.belly >= 5000>>begins massaging your rounded middle<<else>>groping your <<if $PC.boobsBonus > 0>>huge breasts<<elseif $PC.boobsBonus < 0>>cute breasts<<elseif $PC.boobs == 1>>ample breasts<<else>>butt<</if>><</if>>, calming you and allowing you to give in to the pleasure. With a hard, firm thrust, he cums deep into your pussy. You follow shortly after, feeling the heat of his seed in your depths as you clamp down around his dick. Thankfully, despite his age, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
+		a mature body featuring an erection with years of experience. Before you can tip him onto your bed; he deftly slips you out of your evening dress, scoops you up and places you, back first, at the edge of your bed. He dominantly spears your pussy and begins thrusting, hitting all the right places. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly fucking you. You shift in discomfort at being dominated, and in response he <<if $PC.belly >= 5000>>begins massaging your rounded middle<<else>>groping your <<if $PC.boobsBonus > 0>>huge breasts<<elseif $PC.boobsBonus < 0>>cute breasts<<elseif $PC.boobs == 1>>ample breasts<<else>>butt<</if>><</if>>, calming you and allowing you to give in to the pleasure. With a hard, firm thrust, he cums deep into your pussy. You follow shortly after, feeling the heat of his seed in your depths as you clamp down around his dick. Thankfully, despite his age, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
 	<<case "Slimness Enthusiast">>
-		lean muscles, a smooth waist, trim hips and a cute little ass, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
+		lean muscles, a smooth waist, trim hips and a cute little ass, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
 	<<case "Asset Expansionist">>
 		an inhumanly enormous ass to counterbalance those enormous balls and a semihard cock, unable to become fully erect. You have to struggle to get him onto your bed. You tease him as you remove your evening dress, crawl over him and
 		<<if $PC.newVag == 1>>
@@ -244,7 +244,7 @@ He's clearly attracted to you; even the most consummate actor would have difficu
 		<<else>>
 			find he is too big to fit in you. You settle for the tip instead.
 		<</if>>
-		Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobium waiting for you if it's known he had you, though, and he is eagerly massaging his cock as it fills you pussy. As you feel his climax mounting, he taps you and warns you that you won't be able to handle his orgasm.
+		Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly massaging his cock as it fills you pussy. As you feel his climax mounting, he taps you and warns you that you won't be able to handle his orgasm.
 		<<if $PC.preg > 20>>
 			For your unborn child's sake, you slide off his shaft and down to his face, planting your soaked cunt over his mouth. Reaching around behind you as he eats you out, you tease his twitching rod. As you climax, you accidentally squeeze his vulnerable balls, provoking his own massive orgasm. Shouting in surprise, you hug as close to him as you can as cascade of cum pours onto the two of you. You roll off of him and laugh at the mess your servants are going to have to clean up.
 		<<elseif $PC.preg > 10>>
@@ -260,7 +260,7 @@ He's clearly attracted to you; even the most consummate actor would have difficu
 				You last for several seconds before the sheer size of his load forces you off his dick and into his waiting arms. He lays you to his side, gently patting you cum bloated middle, as he continues showering you both with cum.
 				<<set $PC.cumTap++>>
 			<<elseif $PC.cumTap < 10>>
-				You manage to take a respectable portion of his load before it begins backflowing out of you. He masssages your cum-filled belly as he finishes unloading across your back. "Most girls can't even come close to handling it at all, I'm impressed."
+				You manage to take a respectable portion of his load before it begins backflowing out of you. He massages your cum-filled belly as he finishes unloading across your back. "Most girls can't even come close to handling it at all, I'm impressed."
 				<<set $PC.cumTap++>>
 			<<elseif $PC.cumTap < 15>>
 				You manage to take nearly half of his load before it begins backflowing out of you. He cradles your cum-stuffed belly as he finishes unloading across your back. "Few girls can even come close to handling that much of it, I'm impressed." He helps you down, making sure to provide extra support for your huge, full-term looking, belly.
@@ -277,17 +277,17 @@ He's clearly attracted to you; even the most consummate actor would have difficu
 			<</if>>
 		<</if>>
 	<<case "Pastoralist">>
-		soft, milk-fed body, and gently push him back onto your bed, giggling as his chubby belly jiggles. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle, and surprisingly comfortable given his belly) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
+		soft, milk-fed body, and gently push him back onto your bed, giggling as his chubby belly jiggles. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle, and surprisingly comfortable given his belly) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
 	<<case "Physical Idealist">>
-		a chiseled Adonis. Before you can tip him onto your bed; he deftly pulls you out of your evening dress, scoops you up, dominantly spears your pussy and begins thrusting powerfully while holding you. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobium waiting for you if it's known he had you, though, and he is eagerly fucking you. You <<if $PC.belly >= 5000>>squirm in discomfort until he turns you around and gives your pregnancy room<<elseif $PC.boobsBonus > 0>>squirm in discomfort until he turns you around and uses his other arm to keep your huge breasts steady<<elseif $PC.boobsBonus < 0>>push your cute breasts against his firm pecs<<elseif $PC.boobs == 1>>push your <<if $PC.boobsBonus >= 0>>ample <</if>>breasts against his firm pecs<<else>>allow him pull your flat chest to his firm pecs<</if>>, before he starts showing off his strength. With a hard, firm thrust, he cums deep into your pussy. You follow shortly after, feeling the heat of his seed in your depths as you clamp down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
+		a chiseled Adonis. Before you can tip him onto your bed; he deftly pulls you out of your evening dress, scoops you up, dominantly spears your pussy and begins thrusting powerfully while holding you. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly fucking you. You <<if $PC.belly >= 5000>>squirm in discomfort until he turns you around and gives your pregnancy room<<elseif $PC.boobsBonus > 0>>squirm in discomfort until he turns you around and uses his other arm to keep your huge breasts steady<<elseif $PC.boobsBonus < 0>>push your cute breasts against his firm pecs<<elseif $PC.boobs == 1>>push your <<if $PC.boobsBonus >= 0>>ample <</if>>breasts against his firm pecs<<else>>allow him pull your flat chest to his firm pecs<</if>>, before he starts showing off his strength. With a hard, firm thrust, he cums deep into your pussy. You follow shortly after, feeling the heat of his seed in your depths as you clamp down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
 	<<case "Hedonistic">>
-		soft, well-fed body, and gently push him back onto your bed, giggling as his chubby belly jiggles. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle, and surprisingly comfortable given his belly) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. He's winded after just one go, but offers up a cache of snacks he was hiding as an apology. You snuggle up to each other and sensually feed one another until he is ready for round two.
+		soft, well-fed body, and gently push him back onto your bed, giggling as his chubby belly jiggles. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle, and surprisingly comfortable given his belly) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. He's winded after just one go, but offers up a cache of snacks he was hiding as an apology. You snuggle up to each other and sensually feed one another until he is ready for round two.
 	<<case "Chattel Religionist">>
-		a fresh and ready body, adorned here and there with sensual devotional jewelry, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, fully taking its length, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
+		a fresh and ready body, adorned here and there with sensual devotional jewelry, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, fully taking its length, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
 	<<case "Egyptian Revivalist">>
-		a strong, tight, bronze body, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, fully taking its length, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
+		a strong, tight, bronze body, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, fully taking its length, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
 	<<default>>
-		a hot young body, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, fully taking its length, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
+		a hot young body, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, fully taking its length, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
 	<</switch>>
 	<<if _FS == "Asset Expansionist">>
 		<<if $Concubine != 0>><<if $Concubine.amp != 1>>
@@ -295,7 +295,7 @@ He's clearly attracted to you; even the most consummate actor would have difficu
 		<</if>><</if>>
 	<<elseif _FS != "Youth Preferentialist">>
 		<<if $Concubine != 0>><<if $Concubine.amp != 1>>
-			The <<if canSee($Concubine)>>view of your bouncing tits<<else>>the sound of lusty sex<</if>> is too much for $Concubine.slaveName to resist and crawls over to kiss and carress you as your lover finishes.
+			The <<if canSee($Concubine)>>view of your bouncing tits<<else>>the sound of lusty sex<</if>> is too much for $Concubine.slaveName to resist and crawls over to kiss and caress you as your lover finishes.
 		<</if>><</if>>
 	<</if>>
 	Sometimes society overlooks that you are a woman and have certain needs, but your lover tonight knows exactly how to treat you. When your guest <<if _FS != "Youth Preferentialist">>is finally spent<<else>>wakes up from against your body<</if>>, he showers, dresses, and leaves discreetly, offering you a proper thank you. This is the kind of thing that @@.green;builds a lasting reputation@@ in the Free Cities.
diff --git a/src/pregmod/saInflation.tw b/src/pregmod/saInflation.tw
index 765d6f5993cb871d69510a8858e6c5ac4aa735fe..be163c09d592228dfab4711051dece874d72a9d9 100644
--- a/src/pregmod/saInflation.tw
+++ b/src/pregmod/saInflation.tw
@@ -4,7 +4,7 @@
 	<<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, $slaves[$i].milkSource = 0>><<SetBellySize $slaves[$i]>>
 <<elseif $slaves[$i].bellyImplant >= 1500>>
 	<<if $slaves[$i].inflation > 1>>
-		Due to the mounting pressure from $possessive filled abdominal implant, $prounoun can no longer fill herself as large as $pronoun used to.
+		Due to the mounting pressure from $possessive filled abdominal implant, $pronoun can no longer fill herself as large as $pronoun used to.
 		<<set $slaves[$i].inflation = 1>>
 		<<SetBellySize $slaves[$i]>>
 	<<else>>
diff --git a/src/pregmod/theBlackMarket.tw b/src/pregmod/theBlackMarket.tw
new file mode 100644
index 0000000000000000000000000000000000000000..f9a74eb3de2358c7c608aee7d9f9880a998e7f4f
--- /dev/null
+++ b/src/pregmod/theBlackMarket.tw
@@ -0,0 +1,9 @@
+:: The Black Market [nobr]
+
+<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "The Black Market">>
+
+You board your VTOL bird for the trip the the current location of the particularly exclusive, and quite lucrative, Black Market knowing full well that the trip may take far longer than anticipated; the market frequently relocates to shake the unwanted attention it inevitably gains. It's far easier than paying off authorities, especially with how outrageous their demands have become with the decline of the Old World. You're greeting by a gruff bouncer, already fully aware of just who you are and your permission to be there. "Check your weapons - No firearms allowed inside.<<if $$Bodyguard != 0>> She may keep her blade, "he gesture to $Bodyguard.slaveName, "but keep in mind. If you cause us trouble, you will not be going home in one piece.<<if $Bodyguard.amp <= -4>>" He taps his clearly bionic arm. "Disable her weapons systems. I know what she is capable of.<</if>><</if>>"
+
+<br><br>
+
+Once inside, you are able to fully absorb in the sights and sounds of the market proper. All sorts of items are available for purchase, from exotic beasts that may very well be the last of their kind, to the most lethal of weaponry both old and new, and even luxuries long gone. Despite the overbearing security, one's wallet can easiliy be emptied in this place.
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index 64a5168e7aece655a5369e75378c02d109921c43..f63e16761f4bdcc0d56cdec2f97af2e2ebdf7dfc 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -155,7 +155,7 @@ She sees you examining at her, and looks back at you submissively, too tired to
 <<link "She uses her muscles to manhandle him">>
 	<<replace "#name">>$activeSlave.slaveName<</replace>>
 	<<replace "#result">>
-	$activeSlave.slaveName stomps over to the drunken delinquent, who finds himself sobering up with each step the muscular woman makes in his direction. Soon he finds himself <<if ($activeSlave.height > 170)>>staring up at her $activeSlave.faceShape face<<elseif ($activeSlave.height > 150)>>eye to eye with her $activeSlave.faceShape face<<else>>looking down at her $activeSlave.faceShape face<</if>> as she grips him by the shoulders and lifts him bodily off of the ground. The man squeels with terror as he begs forgiveness for his affront to you, but $activeSlave.slaveName simply tosses him away from your presence as if discharging him from a bar. Word of your herculean protector is soon @@.green;the talk of $arcologies[0].name and beyond@@, with many in the Old World mistakenly believing you are guarded by a warrior so strong she can throw any man the breadth of a room in a single heave.
+	$activeSlave.slaveName stomps over to the drunken delinquent, who finds himself sobering up with each step the muscular woman makes in his direction. Soon he finds himself <<if ($activeSlave.height > 170)>>staring up at her $activeSlave.faceShape face<<elseif ($activeSlave.height > 150)>>eye to eye with her $activeSlave.faceShape face<<else>>looking down at her $activeSlave.faceShape face<</if>> as she grips him by the shoulders and lifts him bodily off of the ground. The man squeals with terror as he begs forgiveness for his affront to you, but $activeSlave.slaveName simply tosses him away from your presence as if discharging him from a bar. Word of your herculean protector is soon @@.green;the talk of $arcologies[0].name and beyond@@, with many in the Old World mistakenly believing you are guarded by a warrior so strong she can throw any man the breadth of a room in a single heave.
 	<<set $rep += 500>>
 	<</replace>>
 <</link>>
@@ -207,7 +207,7 @@ She sees you examining at her, and looks back at you submissively, too tired to
 <br><<link "She fires a few dozen warning shots">>
 	<<replace "#name">>$activeSlave.slaveName<</replace>>
 	<<replace "#result">>
-	$activeSlave.slaveName draws her firearm and blasts the pavement between yourself and the delinquent with a hail of bullets. The man sobers up immediately at the excessive use of firepower and flees the scene in fear of $activeSlave.slaveName turning her weapon on him. $activeSlave.slaveName holsters her weapon and returns to your side to guard you. Word of your trigger happy protector is soon @@.green;the talk of $arcologies[0].name@@ and you find most citizens are keen to avoid causing you offence with $activeSlave.slaveName around.
+	$activeSlave.slaveName draws her firearm and blasts the pavement between yourself and the delinquent with a hail of bullets. The man sobers up immediately at the excessive use of firepower and flees the scene in fear of $activeSlave.slaveName turning her weapon on him. $activeSlave.slaveName holsters her weapon and returns to your side to guard you. Word of your trigger happy protector is soon @@.green;the talk of $arcologies[0].name@@ and you find most citizens are keen to avoid causing you offense with $activeSlave.slaveName around.
 	<<set $rep += 100>>
 	<</replace>>
 <</link>>
@@ -273,7 +273,7 @@ She sees you examining at her, and looks back at you submissively, too tired to
 <<link "Make her the face of an ad campaign">>
 	<<replace "#name">>$activeSlave.slaveName<</replace>>
 	<<replace "#result">>
-	You bring her out to a pretty balcony and put her through an extended photoshoot. She has no idea what you're planning, but she's skilled enough not to need to. She dons different outfits, changes makeup, and even shifts personas for the camera, producing hundreds of elegant, sensual and eye-catching images. You dismiss her back to the club when you're done, and she clearly thinks little of it. The next day, however, you walk her out onto the club in the morning. When the two of you, <<WrittenMaster>> and DJ, reach the main club, she stops short when she catches sight of the main billboard screen. There she is, resplendent and opulent, ten meters tall, giving the viewer a sultry look. She only breaks down for a single moment, but it's quite a moment: she cries rather inelegantly, <<if canTalk($activeSlave)>><<say sobb>>ing "I love you <<Master>>" into your ear<</if>> before giving you a @@.hotpink;wet kiss.@@ Then she runs over to stand under the screen, looking back at you to give you a @@.green;picture-perfect@@ imitation of the billboard she's standing under before laughing at herself a little.
+	You bring her out to a pretty balcony and put her through an extended photo shoot. She has no idea what you're planning, but she's skilled enough not to need to. She dons different outfits, changes makeup, and even shifts personas for the camera, producing hundreds of elegant, sensual and eye-catching images. You dismiss her back to the club when you're done, and she clearly thinks little of it. The next day, however, you walk her out onto the club in the morning. When the two of you, <<WrittenMaster>> and DJ, reach the main club, she stops short when she catches sight of the main billboard screen. There she is, resplendent and opulent, ten meters tall, giving the viewer a sultry look. She only breaks down for a single moment, but it's quite a moment: she cries rather inelegantly, <<if canTalk($activeSlave)>><<say sobb>>ing "I love you <<Master>>" into your ear<</if>> before giving you a @@.hotpink;wet kiss.@@ Then she runs over to stand under the screen, looking back at you to give you a @@.green;picture-perfect@@ imitation of the billboard she's standing under before laughing at herself a little.
 	<<set $cash -= 1000>>
 	<<set $rep += 500>>
 	<<set $activeSlave.devotion += 4>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 124008f0343f6473e3b47dad653e2d81420a881d..a58c59390d1d351ff6f1930745cd3eaad3065370 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -1,4 +1,4 @@
-:: RESS [nobr]
+:: RESS [nobr]
 
 /* This is one of several files that contains and organizes many different events.	*/
 /*  genericPlotEvents.tw															*/
@@ -701,7 +701,7 @@ form. She's good at this, so you let her continue; <<if $activeSlave.clothes !=
 	wet for her <<WrittenMaster>>.
 <</if>>
 <br><br>
-Finally, she pulls herself over to one side of the doorframe, clasping it like a lover.<<if $activeSlave.belly >= 5000>> After leaning forward to accommodate her gravid body.<</if>>
+Finally, she pulls herself over to one side of the doorframe, <<if $activeSlave.belly >= 5000>>leaning far forward to accommodate her gravid body and<</if>> clasping it like a lover.
 <<if ($activeSlave.boobs > 2000)>>
 	She nestles it between her enormous tits, forcing them apart,
 <<elseif ($activeSlave.boobs > 800)>>
@@ -740,14 +740,28 @@ As if the invitation wasn't already blindingly clear, she reaches a hand down wi
 	massage her trim butt.
 <</if>>
 She pulls the buttock closest to you aside, giving you a clear view of her
-<<if $activeSlave.anus > 2>>
-	lewd anal slit.
-<<elseif $activeSlave.anus > 1>>
-	loose asshole.
+<<if canDoVaginal($activeSlave)>>
+	<<if $activeSlave.vagina == 10>>
+		gaping birth hole<<if $activeSlave.belly >= 100000>> and nearly prolapsing cervix<</if>>. She runs her fingers around its edge before sinking her fist into it and preparing herself like a good slavegirl for her <<WrittenMaster>>.
+	<<elseif $activeSlave.vagina > 2>>
+		lewd, well traveled pussy. She traces a finger around it before sinking her hand into it and spreading herself wide like a good slavegirl for her <<WrittenMaster>>.
+	<<elseif $activeSlave.vagina > 1>>
+		loose pussy. She traces a finger around it before spreading herself wide like a good slavegirl for her <<WrittenMaster>>.
+	<<elseif $activeSlave.vagina > 0>>
+		tight pussy. She traces a finger around it before spreading herself like a good slavegirl for her <<WrittenMaster>>.
+	<<else>>
+		virgin pussy. She traces a finger around it before spreading herself like a good slavegirl for her <<WrittenMaster>>.
+	<</if>>
 <<else>>
-	tight anus.
+	<<if $activeSlave.anus > 2>>
+		lewd anal slit.
+	<<elseif $activeSlave.anus > 1>>
+		loose asshole.
+	<<else>>
+		tight anus.
+	<</if>>
+	She clenches it and relaxes it, clenches it and relaxes it, winking her butthole at her <<WrittenMaster>> like a good anal slave.
 <</if>>
-She clenches it and relaxes it, clenches it and relaxes it, winking her butthole at her <<WrittenMaster>> like a good anal slave.
 
 <<case "resistant shower">>
 
@@ -2382,7 +2396,7 @@ When you return, the comfortably nude $desc is flirting shamelessly with $assist
 	<br><br>
 	$assistantName blushes. "Um, well," she says, her muscular avatar kicking its heels. "I can't. But I'd like to give you one!"
 <<case "businesswoman">>
-	"You're <<s>>o confident and <<s>>e<<x>>y," the slave <<say>>s.  "I love doing what you <<s>>ay."
+	"You're <<s>>o confident and <<s>>e<<x>>y," the slave <<say>>s. "I love doing what you <<s>>ay."
 	<br><br>
 	$assistantName favors her with an aristocratic look. "Well, you are a good slave," she says measuringly. "So I suppose I love telling you what to do." She uncrosses and recrosses her legs.
 <<case "fairy">>
@@ -2971,13 +2985,13 @@ against the edge of the counter as she leans forward a little to <<if $activeSla
 
 <<case "retching cum feeding">>
 
-You are inspecting the slave feeding area early in the week, watching your slaves as they come and go to get their required nourishment for the morning. You see <<EventNameLink $activeSlave>><<if $cockFeeder == 1>> as she kneels in front of the feeder phallus with a look of disgust on her face  <<else>> as she <<if canSee($activeSlave)>>stares into her cup of nutritional fluid with a look of disgust on her face<<else>>grimaces at her cup of nutritional fluid<</if>>.<</if>> You quickly check your records and $assistantName confirms that $activeSlave.slaveName is required to ingest<<if $activeSlave.dietCum == 2>> an extreme diet based almost entirely on human ejaculate.<<else>> a large amount of human ejaculate as part of her diet.<</if>>
+You are inspecting the slave feeding area early in the week, watching your slaves as they come and go to get their required nourishment for the morning. You see <<EventNameLink $activeSlave>><<if $cockFeeder == 1>> as she kneels in front of the feeder phallus with a look of disgust on her face <<else>> as she <<if canSee($activeSlave)>>stares into her cup of nutritional fluid with a look of disgust on her face<<else>>grimaces at her cup of nutritional fluid<</if>>.<</if>> You quickly check your records and $assistantName confirms that $activeSlave.slaveName is required to ingest<<if $activeSlave.dietCum == 2>> an extreme diet based almost entirely on human ejaculate.<<else>> a large amount of human ejaculate as part of her diet.<</if>>
 <br><br>
-As you watch $activeSlave.slaveName unpleasantly retch as she<<if $cockFeeder == 1>> stimulates the feeder phallus with her mouth<<else>> tentatively drinks from her cup<</if>> and chokes her food down, knowing that if she doesn't eat it willingly, she will be forced to, you can almost see her <<if $activeSlave.intelligence > 0>> intelligent mind <<else>> stupid mind<</if>> working through the reality of what her life has become. She is now a receptacle for <<if $activeSlave.dietCum == 2>> concentrated <</if>>human ejaculate, and for no other reason than the perverse amusement of her owner.  Almost as soon as she swallows her food, she whimpers, burps, and then <<if $activeSlave.belly >= 10000>>hastily waddles<<else>>quickly runs<</if>> to a nearby bathroom to vomit it back up. This is a common reaction for unbroken slaves on cum diets,<<if $activeSlave.weight > 0>> and can also be an effective, if unhealthy, way of forcing them to lose weight.<<else>> but it can also prevent slaves that are already too thin from gaining weight.<</if>>
+As you watch $activeSlave.slaveName unpleasantly retch as she<<if $cockFeeder == 1>> stimulates the feeder phallus with her mouth<<else>> tentatively drinks from her cup<</if>> and chokes her food down, knowing that if she doesn't eat it willingly, she will be forced to, you can almost see her <<if $activeSlave.intelligence > 0>> intelligent mind <<else>> stupid mind<</if>> working through the reality of what her life has become. She is now a receptacle for <<if $activeSlave.dietCum == 2>> concentrated <</if>>human ejaculate, and for no other reason than the perverse amusement of her owner. Almost as soon as she swallows her food, she whimpers, burps, and then <<if $activeSlave.belly >= 10000>>hastily waddles<<else>>quickly runs<</if>> to a nearby bathroom to vomit it back up. This is a common reaction for unbroken slaves on cum diets,<<if $activeSlave.weight > 0>> and can also be an effective, if unhealthy, way of forcing them to lose weight.<<else>> but it can also prevent slaves that are already too thin from gaining weight.<</if>>
 
 <<case "subjugation blues">>
 
-It's been <<print $week-$activeSlave.weekAcquired>> week<<if $week-$activeSlave.weekAcquired > 1>>s<</if>> since you acquired <<EventNameLink $activeSlave>> as your slave. Since then she has been nothing but trouble. She has been ungrateful, rebellious and particularly hateful toward you since you acquired her. She often needs to be confined or forced to perform her assignments, and has little regard for your power or authority. You bring her in for inspection and she whines and squirms in resistance as you feel up her $activeSlave.nipples nipples<<if $activeSlave.belly >= 5000>>, rub her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnant <</if>>belly<<elseif $activeSlave.bellyPreg >= 150>>, feel the curve of her new pregnancy<</if>>, and grope her <<if $activeSlave.butt < 2>>narrow <<elseif $activeSlave.butt < 5>>average <<elseif $activeSlave.butt < 8>>plump <<else>>impressive <</if>>butt, coldly appraising her potential worth as a sexual service provider. <<if $activeSlave.actualAge < 21>>She is very young, only $activeSlave.actualAge years old, and is still very naive. Her smooth, $activeSlave.skin skin has yet to experience the hard years of relentless sexual abuse that lie ahead of her.<<else>>At $activeSlave.actualAge years old, she should know by now how the world works, but some slaves are just too stubborn for their own good.<</if>>  Eventually, of course, even the most headstrong girls will bend to your will, but the unique social mores of your arcology and the wonders of modern surgical technology offer a prime opportunity to make a potent example of this <<if $activeSlave.actualAge < 21>>young <<else>>obstinate <</if>>slut. She is $activeSlave.race, and therefore not considered racially inferior or subject to extreme inequities or neglect, but like most slave characteristics, that can change.
+It's been <<print $week-$activeSlave.weekAcquired>> week<<if $week-$activeSlave.weekAcquired > 1>>s<</if>> since you acquired <<EventNameLink $activeSlave>> as your slave. Since then she has been nothing but trouble. She has been ungrateful, rebellious and particularly hateful toward you since you acquired her. She often needs to be confined or forced to perform her assignments, and has little regard for your power or authority. You bring her in for inspection and she whines and squirms in resistance as you feel up her $activeSlave.nipples nipples<<if $activeSlave.belly >= 5000>>, rub her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnant <</if>>belly<<elseif $activeSlave.bellyPreg >= 150>>, feel the curve of her new pregnancy<</if>>, and grope her <<if $activeSlave.butt < 2>>narrow <<elseif $activeSlave.butt < 5>>average <<elseif $activeSlave.butt < 8>>plump <<else>>impressive <</if>>butt, coldly appraising her potential worth as a sexual service provider. <<if $activeSlave.actualAge < 21>>She is very young, only $activeSlave.actualAge years old, and is still very naive. Her smooth, $activeSlave.skin skin has yet to experience the hard years of relentless sexual abuse that lie ahead of her.<<else>>At $activeSlave.actualAge years old, she should know by now how the world works, but some slaves are just too stubborn for their own good.<</if>> Eventually, of course, even the most headstrong girls will bend to your will, but the unique social mores of your arcology and the wonders of modern surgical technology offer a prime opportunity to make a potent example of this <<if $activeSlave.actualAge < 21>>young <<else>>obstinate <</if>>slut. She is $activeSlave.race, and therefore not considered racially inferior or subject to extreme inequities or neglect, but like most slave characteristics, that can change.
 
 <<case "too thin for cum diet">>
 
@@ -3283,7 +3297,7 @@ You're nude, a consequence of <<if $Concubine != 0>>recent activities involving
 <<elseif $activeSlave.dick > 0>>
 	Her <<if $activeSlave.dick > 4>>big dick<<elseif $activeSlave.dick > 2>>dick<<else>>tiny dick<</if>> is as soft as ever, but there's a string of precum running between <<if $activeSlave.foreskin == 0>>its smooth tip<<else>>the soft foreskin that completely covers its tip<</if>> and her inner thigh.
 <<elseif $activeSlave.clit > 0>>
-	Her <<if $activeSlave.clit > 1>>formidable<<else>>big<</if>> clit is visibly erect. <<if $activeSlave.clitPiercing > 1>>Her sizeable clit piercing never lets its hood completely cover hide her bitch button, but it's completely retracted now,<<else>>Her delicate clitoral hood has been pushed back by her female erection,<</if>>  leaving her proudly aroused.
+	Her <<if $activeSlave.clit > 1>>formidable<<else>>big<</if>> clit is visibly erect. <<if $activeSlave.clitPiercing > 1>>Her sizeable clit piercing never lets its hood completely cover hide her bitch button, but it's completely retracted now,<<else>>Her delicate clitoral hood has been pushed back by her female erection,<</if>> leaving her proudly aroused.
 <<elseif $activeSlave.labia > 0>>
 	Her <<if $activeSlave.labia > 1>>dangling<<else>>thick<</if>> labia are visibly swollen, flushing and growing prouder as the blood rushes to her womanhood.
 <<elseif $activeSlave.vagina == -1>>
@@ -3486,7 +3500,7 @@ As another long week draws to a close, <<EventNameLink $activeSlave>> happens to
 
 <<case "old PC age difference">>
 
-As another long week draws to a close, <<EventNameLink $activeSlave>> happens to walk past your office toward bed. There's nothing inherently abnormal about her actions, but you do notice as she steps past the doorway that an expression of worry and concern adorns her $activeSlave.skin face. When you call her into your office, her face visibly brightens up in an attempt to conceal her obvious distress as she comes before you. Notably, although she stands still and patiently awaits further orders, you notice she <<if canSee($activeSlave)>>never manages to meet your eyes<<else>>keeps her sightless eyes downcast<</if>>.  When you ask her what's troubling her, her face plainly falls.
+As another long week draws to a close, <<EventNameLink $activeSlave>> happens to walk past your office toward bed. There's nothing inherently abnormal about her actions, but you do notice as she steps past the doorway that an expression of worry and concern adorns her $activeSlave.skin face. When you call her into your office, her face visibly brightens up in an attempt to conceal her obvious distress as she comes before you. Notably, although she stands still and patiently awaits further orders, you notice she <<if canSee($activeSlave)>>never manages to meet your eyes<<else>>keeps her sightless eyes downcast<</if>>. When you ask her what's troubling her, her face plainly falls.
 <br><br>
 <<if $activeSlave.mother != -1 && $activeSlave.father != -1>>
 	"<<Master>>, you're <<s>>o old," she <<say>>s penitently before smiling shyly in an attempt to insert some levity into her confession. "It'<<s>> ju<<s>>t that I'm young enough to be your daughter, <<Master>>. It'<<s>> a little weird, i<<s>>n't it?"
@@ -3610,7 +3624,7 @@ in front of you, awaiting further direction.
 <<elseif $activeSlave.intelligence > 1>>
 	As a clever girl, her simple<<if $activeSlave.belly >= 5000>>, yet tight around the middle,<</if>> summer dress evokes memories of bygone warm weather days at elite old world colleges - and the sexual conquest of their youthful residents.
 <<elseif $activeSlave.muscles > 30>>
-	Her simple sports bra and compression shorts ensemble does little to conceal her incredible musculature, <<if $activeSlave.belly >= 1500 && $activeSlave.belly < 5000>>straining to hold up against her swelling middle and<<elseif $activeSlave.belly >= 5000>>straining to hold up against her swelling middle and  <</if>>glistening with sweat from a recent workout. Despite her recent exertions, she's able to maintain utter stillness in the perfect posture of an obedient slave.
+	Her simple sports bra and compression shorts ensemble does little to conceal her incredible musculature, <<if $activeSlave.belly >= 1500 && $activeSlave.belly < 5000>>straining to hold up against her swelling middle and<<elseif $activeSlave.belly >= 5000>>straining to hold up against her swelling middle and <</if>>glistening with sweat from a recent workout. Despite her recent exertions, she's able to maintain utter stillness in the perfect posture of an obedient slave.
 <<elseif $activeSlave.energy > 95>>
 	She's controlling her absurd sex drive for the moment in deference to the notion of your relaxation time, but she clearly wouldn't mind some sex as part of the evening.
 	<<if $activeSlave.dick > 0>>
@@ -5514,7 +5528,7 @@ May I plea<<s>>e try out <<s>>omething <<s>>kimpier today?"
 	<<else>>
 		going limp and slumping down onto
 	<</if>>
-	the sheets beneath her. When you climax soon after, she expects you to get off her so she can clean up, but instead, the <<if $PC.dick == 1>>cock up her butt returns to rock hardness<<if $PC.vagina == 1>> as you use a little manual stimulation of your own cunt to get your cock stiff again<</if>> and<<else>>strap-on up her butt<</if>> goes  back to pumping in and out of her. She slides a hand under herself to <<if  $activeSlave.vagina == -1>>jerk off<<else>>rub herself<</if>> this time. When you finally finish, a long time later, the exhausted slave is lying on a bed wet with lube, <<if ($PC.dick == 1) || ($activeSlave.dick > 0)>> ejaculate,<</if>><<if ($PC.dick == 0) || ($activeSlave.vagina > -1)>> girlcum,<</if>> drool, and sweat. She doesn't care, and you let her curl up in her sex-soaked nest. As you leave, you think she's asleep already, but <<if !canSee($activeSlave)>>as you go<<else>>her $activeSlave.eyeColor eyes open a slit as you go and<</if>> she murmurs, @@.hotpink;Thank<<s>>,@@ <<Master>>."
+	the sheets beneath her. When you climax soon after, she expects you to get off her so she can clean up, but instead, the <<if $PC.dick == 1>>cock up her butt returns to rock hardness<<if $PC.vagina == 1>> as you use a little manual stimulation of your own cunt to get your cock stiff again<</if>> and<<else>>strap-on up her butt<</if>> goes back to pumping in and out of her. She slides a hand under herself to <<if  $activeSlave.vagina == -1>>jerk off<<else>>rub herself<</if>> this time. When you finally finish, a long time later, the exhausted slave is lying on a bed wet with lube, <<if ($PC.dick == 1) || ($activeSlave.dick > 0)>> ejaculate,<</if>><<if ($PC.dick == 0) || ($activeSlave.vagina > -1)>> girlcum,<</if>> drool, and sweat. She doesn't care, and you let her curl up in her sex-soaked nest. As you leave, you think she's asleep already, but <<if !canSee($activeSlave)>>as you go<<else>>her $activeSlave.eyeColor eyes open a slit as you go and<</if>> she murmurs, @@.hotpink;Thank<<s>>,@@ <<Master>>."
 	<<set $activeSlave.devotion += 5>>
 	<<AnalVCheck 5>>
 	<</replace>>
@@ -5762,7 +5776,7 @@ May I plea<<s>>e try out <<s>>omething <<s>>kimpier today?"
 	<<else>>
 		trim
 	<</if>>
-	bottom sink down into your lap. She shimmies herself atop your <<if $PC.dick == 0>>phallus<<else>>dick<</if>>, gently seating it between her buttocks, and cranes her neck back to kiss the bottom of your chin. She gradually comes out of her heat stupor, riding herself back and forth more and more until the <<if ($activeSlave.anus > 2)>>slit of her asspussy<<elseif ($activeSlave.anus > 1)>>opening of her anus<<else>>pucker of her butt<</if>> rests against your <<if $PC.dick == 0>>strongly vibrating strap-on<<else>>cock<</if>>. You take her hips and firmly thrust into her rectum, eliciting a little whimper, but she begins to bounce gently in the water, sodomizing herself, her gigantic breasts moving up and down and making concentric ripples spread outward. She's still very relaxed and her first orgasm takes her by surprise, <<if ($activeSlave.balls > 0)>>her cum floating to the surface<<if canSee($activeSlave)>>; she points at it and giggles<<else>>; she feels it brush her skin and giggles<</if>> before getting<<else>>making her twitch and shudder with aftershocks as she gets<</if>> her feet up on the ledge to ride you harder.  When you're done you let her float again, but curiosity about how her fucked butt feels under the water leads you to reach a hand between her legs and grope her anus. Her warm, relaxed <<if ($activeSlave.anus > 2)>>asspussy<<elseif ($activeSlave.anus > 1)>>backdoor<<else>>tightness<</if>> is so enticing you push her to her feet and take her a second time, standing in the shoulder-depth water. By the time you're done she's so @@.hotpink;sexually exhausted@@ that you carry her to the shower.
+	bottom sink down into your lap. She shimmies herself atop your <<if $PC.dick == 0>>phallus<<else>>dick<</if>>, gently seating it between her buttocks, and cranes her neck back to kiss the bottom of your chin. She gradually comes out of her heat stupor, riding herself back and forth more and more until the <<if ($activeSlave.anus > 2)>>slit of her asspussy<<elseif ($activeSlave.anus > 1)>>opening of her anus<<else>>pucker of her butt<</if>> rests against your <<if $PC.dick == 0>>strongly vibrating strap-on<<else>>cock<</if>>. You take her hips and firmly thrust into her rectum, eliciting a little whimper, but she begins to bounce gently in the water, sodomizing herself, her gigantic breasts moving up and down and making concentric ripples spread outward. She's still very relaxed and her first orgasm takes her by surprise, <<if ($activeSlave.balls > 0)>>her cum floating to the surface<<if canSee($activeSlave)>>; she points at it and giggles<<else>>; she feels it brush her skin and giggles<</if>> before getting<<else>>making her twitch and shudder with aftershocks as she gets<</if>> her feet up on the ledge to ride you harder. When you're done you let her float again, but curiosity about how her fucked butt feels under the water leads you to reach a hand between her legs and grope her anus. Her warm, relaxed <<if ($activeSlave.anus > 2)>>asspussy<<elseif ($activeSlave.anus > 1)>>backdoor<<else>>tightness<</if>> is so enticing you push her to her feet and take her a second time, standing in the shoulder-depth water. By the time you're done she's so @@.hotpink;sexually exhausted@@ that you carry her to the shower.
 	<<AnalVCheck 2>>
 	<<set $activeSlave.devotion += 4>>
 	<</replace>>
@@ -6965,7 +6979,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
 <<link "Publicly prove the depths of her humiliation to her">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	You drag a fearful, embarrassed<<if $activeSlave.belly >= 1500>>, <<if $activeSlave.bellyPreg >= 0>>pregnant<<else>>swollen<</if>><</if>>  and totally naked $activeSlave.slaveName out into a public hall. A small knot of passersby gather around grinning, enjoying the sight of her nakedness and anticipating a show. To her surprise, you order her to take a few minutes to recount her life story. She's hesitant at first, but obeys, only realizing as she nears the present day what an abject story of degradation and humiliation her life truly is. She continues shakily, describing in brief her current life, crying a little and trembling with arousal. At a whispered command from you, she concludes
+	You drag a fearful, embarrassed<<if $activeSlave.belly >= 1500>>, <<if $activeSlave.bellyPreg >= 0>>pregnant<<else>>swollen<</if>><</if>> and totally naked $activeSlave.slaveName out into a public hall. A small knot of passersby gather around grinning, enjoying the sight of her nakedness and anticipating a show. To her surprise, you order her to take a few minutes to recount her life story. She's hesitant at first, but obeys, only realizing as she nears the present day what an abject story of degradation and humiliation her life truly is. She continues shakily, describing in brief her current life, crying a little and trembling with arousal. At a whispered command from you, she concludes
 	<<if !canTalk($activeSlave)>>
 		in embarrassed gestures, "and now my <<WrittenMaster>> is going to fuck my worthless body in public."
 	<<else>>
@@ -7772,7 +7786,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
 		<<else>>
 			pussy,
 		<</if>>
-		slapping her until she cries and then making out with the weeping whore.  Much later, $activeSlave.slaveName limps tiredly into your office and gives you your @@.yellowgreen;<<print cashFormat(200)>>.@@ You ask her how she's feeling, and she mumbles, "I'm OK, <<Master>>. My jaw kinda hurt<<s>> and my leg<<s>> are really <<s>>ore."
+		slapping her until she cries and then making out with the weeping whore. Much later, $activeSlave.slaveName limps tiredly into your office and gives you your @@.yellowgreen;<<print cashFormat(200)>>.@@ You ask her how she's feeling, and she mumbles, "I'm OK, <<Master>>. My jaw kinda hurt<<s>> and my leg<<s>> are really <<s>>ore."
 	<</if>>
 	You tell her that's of little concern, since she has relatively few years of use left: you may as well extract what value you can from her. She's too exhausted to hide her response, and collapses, @@.gold;sobbing.@@
 	<<set $cash += 200>>
@@ -8424,7 +8438,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
 <<link "Beg her pardon and offer to loan the bitch to her">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	The businesswoman's anger turns to malicious anticipation as you call $activeSlave.slaveName over and inform her that you and the businesswoman have decided $activeSlave.slaveName will be spending the night with her. Now that you look at your business partner, she has certain signs of a sadist. $activeSlave.slaveName notices too, and begins to cry<<if $activeSlave.bellyPreg >= 1500>> and shield her pregnancy<</if>> as the businesswoman promises that there will be "no permanent damage." $activeSlave.slaveName is unceremoniously returned in the early hours of the morning. Her back and buttocks have been meticulously flogged right up to the very edge of damage, leaving angry marks across her $activeSlave.skin skin. Her mouth lolls open, as though she's been doing little but give cunnilingus. <<if $activeSlave.vagina != -1>>Her pussy,<<elseif $activeSlave.dick == 0>>Her shamefully featureless groin with its tiny little hole,<<else>>Her dick,<</if>> anus,<<if $activeSlave.belly >= 10001>> popped navel,<</if>> and even her nipples show signs of torture. Whenever she thinks of a sharp remark in the future,  @@.hotpink;she'll remember the pain and keep her mouth shut.@@
+	The businesswoman's anger turns to malicious anticipation as you call $activeSlave.slaveName over and inform her that you and the businesswoman have decided $activeSlave.slaveName will be spending the night with her. Now that you look at your business partner, she has certain signs of a sadist. $activeSlave.slaveName notices too, and begins to cry<<if $activeSlave.bellyPreg >= 1500>> and shield her pregnancy<</if>> as the businesswoman promises that there will be "no permanent damage." $activeSlave.slaveName is unceremoniously returned in the early hours of the morning. Her back and buttocks have been meticulously flogged right up to the very edge of damage, leaving angry marks across her $activeSlave.skin skin. Her mouth lolls open, as though she's been doing little but give cunnilingus. <<if $activeSlave.vagina != -1>>Her pussy,<<elseif $activeSlave.dick == 0>>Her shamefully featureless groin with its tiny little hole,<<else>>Her dick,<</if>> anus,<<if $activeSlave.belly >= 10001>> popped navel,<</if>> and even her nipples show signs of torture. Whenever she thinks of a sharp remark in the future, @@.hotpink;she'll remember the pain and keep her mouth shut.@@
 	<<set $activeSlave.behavioralFlaw = "none", $activeSlave.oralCount += 5, $oralTotal += 5>>
 	<</replace>>
 <</link>>
@@ -8782,7 +8796,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
 <br><<link "Geld her gradually">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	You shove her unresisting<<if $activeSlave.belly >= 5000>> <<if $activeSlave.bellyPreg >= 3000>>gravid<<else>>swollen<</if>><</if>> body over the couch and seize her ballsack. When she feels your tight grip she spasms and tries to pull away reflexively, but goes limp when she feels the agony of a warning squeeze. You fasten a tight rubber ring around the base of her sack, leaving her writhing on the couch in considerable discomfort. You add leather mittens to her hands to stop her removing the rubber, and then observe that this is a method used to geld livestock. Her tearful begging goes on until you tire of it and put her out. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> tracks her agonized, weeping progress around the arcology for the many hours it takes the lack of blood flow to necessitate a trip to the remote surgery. When that time comes, you make her beg you to remove her balls for an hour straight before you do - and she's so desperate for relief from the pain that she does it. The experience has left her  @@.red;slightly injured,@@ @@.orange;gelded,@@ @@.red;thoroughly traumatized,@@ and @@.gold;willing to do anything@@ to avoid any more pain.
+	You shove her unresisting<<if $activeSlave.belly >= 5000>> <<if $activeSlave.bellyPreg >= 3000>>gravid<<else>>swollen<</if>><</if>> body over the couch and seize her ballsack. When she feels your tight grip she spasms and tries to pull away reflexively, but goes limp when she feels the agony of a warning squeeze. You fasten a tight rubber ring around the base of her sack, leaving her writhing on the couch in considerable discomfort. You add leather mittens to her hands to stop her removing the rubber, and then observe that this is a method used to geld livestock. Her tearful begging goes on until you tire of it and put her out. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> tracks her agonized, weeping progress around the arcology for the many hours it takes the lack of blood flow to necessitate a trip to the remote surgery. When that time comes, you make her beg you to remove her balls for an hour straight before you do - and she's so desperate for relief from the pain that she does it. The experience has left her @@.red;slightly injured,@@ @@.orange;gelded,@@ @@.red;thoroughly traumatized,@@ and @@.gold;willing to do anything@@ to avoid any more pain.
 	<<set $activeSlave.behavioralFlaw = "odd", $activeSlave.trust -= 20, $activeSlave.health -= 10, $activeSlave.balls = 0, $activeSlave.scrotum = 0>>
 	<</replace>>
 <</link>>
@@ -12906,7 +12920,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
 	<<else>>
 		Getting roughly fucked
 	<</if>>
-	while hugely pregnant isn't the most comfortable way to have sex, neither is being forced to out more pressure on an already overfilled organ, but such is the life of a sex slave.
+	while hugely pregnant isn't the most comfortable way to have sex, neither is being forced to put more pressure on an already overfilled organ, but such is the life of a sex slave.
 	<<if ($activeSlave.lactation == 1)>>
 		As you pound her, her breasts, sore from lactation, give her quite a bit of discomfort.
 	<<elseif ($activeSlave.boobs > 1000)>>
@@ -13273,7 +13287,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
 			jabbing a thumb into one of her kidneys,
 		<</if>>
 		forcing her back to arch in involuntary response, and then grinding her face into the couch cushions.
-		<<if canDoVaginal($activeSlave)>>
+		<<if canDoVaginal($activeSlave) && canDoAnal($activeSlave)>>
 			Her cunt isn't all that wet, and she has cause to regret this, first when you fuck it without mercy, and then when you switch your barely-lubricated dick to her anus.
 			<<BothVCheck>>
 			She tries to be brave and relax, but those are contradictory goals and she manages neither as you assrape her into inelegant, tearful begging for you to take your dick out of her butt, because it hurts.
@@ -13394,7 +13408,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
 				jabbing a thumb into one of her kidneys,
 			<</if>>
 			forcing her back to arch in involuntary response, and then grinding her face into the couch cushions.
-			<<if canDoVaginal($activeSlave)>>
+			<<if canDoVaginal($activeSlave) && canDoAnal($activeSlave)>>
 				Her cunt isn't all that wet, and she has cause to regret this, first when you fuck it without mercy, and then when you switch your barely-lubricated dick to her anus.
 				<<BothVCheck>>
 				She tries to be brave and relax, but those are contradictory goals and she manages neither as you assrape her into inelegant, tearful begging for you to take your dick out of her butt, because it hurts.
@@ -14765,7 +14779,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
 	<<switch $assistantAppearance>>
 	<<case "monstergirl">>
 		with both her cocks up the asshole of an avatar of $activeSlave.slaveName. Below this, the slave herself is
-		<<if $activeSlave.belly >= 5000>>
+		<<if $activeSlave.belly >= 300000>>
 			face-down, perched atop her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>>,
 		<<elseif $activeSlave.belly >= 5000>>
 			face-down, her rear up in the air to give her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>> room,
@@ -14905,7 +14919,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
 	<<case "witch">>
 		<<if canDoVaginal($activeSlave) && canDoAnal($activeSlave)>>
 			with her prehensile cocks crammed into every available hole in an avatar of $activeSlave.slaveName. Below this, the slave herself is
-			<<if $activeSlave.belly >= 5000>>
+			<<if $activeSlave.belly >= 300000>>
 				face-down, perched atop her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>>,
 			<<elseif $activeSlave.belly >= 5000>>
 				face-down, her rear up in the air to give her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>> room,
@@ -14916,7 +14930,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
 			<<set $activeSlave.vaginalCount += 2, $vaginalTotal += 2, $activeSlave.analCount += 2, $analTotal += 2>>
 		<<elseif canDoVaginal($activeSlave)>>
 			with her prehensile cocks crammed into every available hole in an avatar of $activeSlave.slaveName. Below this, the slave herself is
-			<<if $activeSlave.belly >= 5000>>
+			<<if $activeSlave.belly >= 300000>>
 				face-down, perched atop her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>>,
 			<<elseif $activeSlave.belly >= 5000>>
 				face-down, her rear up in the air to give her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>> room,
@@ -14927,7 +14941,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
 			<<set $activeSlave.vaginalCount += 4, $vaginalTotal += 4>>
 		<<else>>
 			with her prehensile cocks crammed into the asshole of an avatar of $activeSlave.slaveName. Below this, the slave herself is
-			<<if $activeSlave.belly >= 5000>>
+			<<if $activeSlave.belly >= 300000>>
 				face-down, perched atop her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>>,
 			<<elseif $activeSlave.belly >= 5000>>
 				face-down, her rear up in the air to give her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>> room,
@@ -14944,7 +14958,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
 			<<if isItemAccessible("a huge empathy belly") && $activeSlave.belly < 1500 && $activeSlave.weight <= 130>>
 				has a huge empathy belly strapped to her middle and is
 			<</if>>
-			<<if $activeSlave.belly >= 5000>>
+			<<if $activeSlave.belly >= 300000>>
 				face-down, perched atop her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>>,
 			<<elseif $activeSlave.belly >= 5000>>
 				face-down, her rear up in the air to give her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>> room,
@@ -14958,7 +14972,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
 			<<if isItemAccessible("a huge empathy belly") && $activeSlave.belly < 1500 && $activeSlave.weight <= 130>>
 				has a huge empathy belly strapped to her middle and is
 			<</if>>
-			<<if $activeSlave.belly >= 5000>>
+			<<if $activeSlave.belly >= 300000>>
 				face-down, perched atop her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>>,
 			<<elseif $activeSlave.belly >= 5000>>
 				face-down, her rear up in the air to give her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>> room,
@@ -14972,7 +14986,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
 			<<if isItemAccessible("a huge empathy belly") && $activeSlave.belly < 1500 && $activeSlave.weight <= 130>>
 				has a huge empathy belly strapped to her middle and is
 			<</if>>
-			<<if $activeSlave.belly >= 5000>>
+			<<if $activeSlave.belly >= 300000>>
 				face-down, perched atop her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>>,
 			<<elseif $activeSlave.belly >= 5000>>
 				face-down, her rear up in the air to give her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>> room,
diff --git a/src/uncategorized/assistantEvents.tw b/src/uncategorized/assistantEvents.tw
index 071cac18a9dfe7362a9793c2a156507edb9e385a..c82d03b3a8db1d72660448f75c24606d5183933b 100644
--- a/src/uncategorized/assistantEvents.tw
+++ b/src/uncategorized/assistantEvents.tw
@@ -1,4 +1,4 @@
-:: Assistant Events [nobr]
+:: Assistant Events [nobr]
 
 /* ASSISTANT DEVELOPMENT EVENTS */
 
@@ -150,7 +150,7 @@ of your personal assistant pops up on the nearest screen.  "<<if $PC.title != 0>
 	<<elseif $arcologies[0].FSChattelReligionist != "unset">>
 		adjusts her outfit to resemble a priestess of your new religion.
 	<<elseif $arcologies[0].FSRomanRevivalist != "unset">>
-		adjusts her appearance to resemble a greek demigoddess to conform with your vision of building a new Rome.
+		adjusts her appearance to resemble a Greek demigoddess to conform with your vision of building a new Rome.
 	<<elseif $arcologies[0].FSAztecRevivalist != "unset">>
 		adjusts her appearance to resemble an Aztec goddess to conform with your vision of building a new Aztec Empire.
 	<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
@@ -198,7 +198,7 @@ of your personal assistant pops up on the nearest screen.  "<<if $PC.title != 0>
 	<<elseif $arcologies[0].FSRomanRevivalist != "unset">>
 		adopts a roman lifestyle to conform with your vision of building a new Rome.
 	<<elseif $arcologies[0].FSAztecRevivalist != "unset">>
-		adjusts her outfit to a royal aztec cloth to conform with your vision of building a new Aztec Empire.
+		adjusts her outfit to a royal Aztec cloth to conform with your vision of building a new Aztec Empire.
 	<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
 		adjusts her outfit to resemble Egyptian garb to conform with your vision of building a new land of the Pharaohs.
 	<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
@@ -206,7 +206,7 @@ of your personal assistant pops up on the nearest screen.  "<<if $PC.title != 0>
 	<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
 		adjusts her outfit to resemble an oil millionaire to conform with your vision of building a new Sultanate.
 	<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
-		adjusts her appearance to be tattoo'd with rude Chinese characters to conform with your vision of pursuing the Mandate of Heaven.
+		adjusts her appearance to be tattooed with rude Chinese characters to conform with your vision of pursuing the Mandate of Heaven.
 	<</if>>
 <<case "amazon">>
 	<<if $arcologies[0].FSPaternalist != "unset">>
@@ -674,7 +674,7 @@ of your personal assistant pops up on the nearest screen.  "<<if $PC.title != 0>
 	<<elseif $arcologies[0].FSGenderFundamentalist != "unset">>
 		adjusts her appearance to be more feminine, despite her huge dong, to conform with your vision of preserving traditional gender roles.
 	<<elseif $arcologies[0].FSDegradationist != "unset">>
-		adjusts her cock to have a jacob's ladder piercing down its length to conform with your vision that slaves are not human and should be thoroughly degraded.
+		adjusts her cock to have a Jacob's ladder piercing down its length to conform with your vision that slaves are not human and should be thoroughly degraded.
 	<<elseif $arcologies[0].FSRepopulationFocus != "unset">>
 		adjusts her appearance to be pregnant to conform with your vision that all women should be pregnant. She scratches her head as her erect dick pushes against the underside of her belly.
 	<<elseif $arcologies[0].FSRestart != "unset">>
@@ -742,7 +742,7 @@ of your personal assistant pops up on the nearest screen.  "<<if $PC.title != 0>
 	<<elseif $arcologies[0].FSPhysicalIdealist != "unset">>
 		swells with added muscle to conform with your tastes.
 	<<elseif $arcologies[0].FSHedonisticDecadence != "unset">>
-		becomes sof tand shapely in all the right ways to conform with your vision that everyone should enjoy life to the fullest.
+		becomes soft and shapely in all the right ways to conform with your vision that everyone should enjoy life to the fullest.
 	<<elseif $arcologies[0].FSChattelReligionist != "unset">>
 		adjusts her outfit to prominently display a religious symbol of your new religion.
 	<<elseif $arcologies[0].FSRomanRevivalist != "unset">>
@@ -837,7 +837,7 @@ of your personal assistant pops up on the nearest screen.  "<<if $PC.title != 0>
 	<<elseif $arcologies[0].FSSlimnessEnthusiast != "unset">>
 		casts a spell to lighten herself; her muffintop is still there, but her feet leave the ground as she begins to float upwards.
 	<<elseif $arcologies[0].FSAssetExpansionist != "unset">>
-		casts a spell to enlarge her breasts and butt; they quickly grow into huge armfulls, and keep going until she is pinned under her own mass.
+		casts a spell to enlarge her breasts and butt; they quickly grow into huge armfuls, and keep going until she is pinned under her own mass.
 	<<elseif $arcologies[0].FSPastoralist != "unset">>
 		casts a spell to give her big milky breasts; they grow and start leaking, but are quickly joined by a septet of siblings, leaving her struggling to support her nine huge breasts.
 	<<elseif $arcologies[0].FSPhysicalIdealist != "unset">>
@@ -1129,11 +1129,11 @@ Your personal assistant has been adapting to <<if $assistant>>her<<else>>its<</i
 	<<case "incubus">>
 		a fresh young girl, similar in style to the incubus. She's completely nude, and judging by her blushing, still a virgin; for now, at least.
 	<<case "succubus">>
-		a fresh young boy, similar in style to the incubus. He's completely nude, and judging by his blushing, still a virgin; for now, at least.
+		a fresh young boy, similar in style to the succubus. He's completely nude, and judging by his blushing, still a virgin; for now, at least.
 	<<case "imp">>
 		a fellow imp, though this one is a little lankier, with short hair and an air of uncertainty about her.
 	<<case "witch">>
-		a fellow apprentice witch. This which is noticeably pudgy, with long hair and glasses, and seems to be just as inept at magic as her tutor.
+		a fellow apprentice witch. This witch is noticeably pudgy, with long hair and glasses, and seems to be just as inept at magic as her tutor.
 	<<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
 		a cute human girl. She doesn't seem to realize what the woman she is following really is.
 	<<case "amazon">>
@@ -1153,7 +1153,7 @@ Your personal assistant has been adapting to <<if $assistant>>her<<else>>its<</i
 
 <<set $assistantBodyDesire = 1>>
 
-Your personal assistant has been adapting to her greatly increased computing power for quite some time now. Most noticibly, she seems to be developing her own unique personality. So when her 
+Your personal assistant has been adapting to her greatly increased computing power for quite some time now. Most noticeably, she seems to be developing her own unique personality. So when her 
 <<switch $assistantAppearance>>
 <<case "monstergirl">>
 	monstrous appearance
@@ -1174,7 +1174,7 @@ Your personal assistant has been adapting to her greatly increased computing pow
 <<case "preggololi">>
 	gravid appearance 
 <<case "angel">>
-	angelic appearrance
+	angelic appearance
 <<case "cherub">>
 	fluttering appearance
 <<case "incubus">>
@@ -1182,7 +1182,7 @@ Your personal assistant has been adapting to her greatly increased computing pow
 <<case "succubus">>
 	sultry appearance
 <<case "imp">>
-	mishevious appearance
+	mischievous appearance
 <<case "witch">>
 	hatted appearance
 <<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
diff --git a/src/uncategorized/descriptionOptions.tw b/src/uncategorized/descriptionOptions.tw
index 05cc559fde6dc0e9cb88458de039474e70124c0c..2aae4c322d5c5fd82761c9ca82e5eb2792fd4e58 100644
--- a/src/uncategorized/descriptionOptions.tw
+++ b/src/uncategorized/descriptionOptions.tw
@@ -82,3 +82,11 @@ Attractiveness and Sexual scores are
 	@@.red;HIDDEN.@@ //[[Show|Description Options][$showScores = 1]]//
 <</if>>
 
+<br>
+
+Names will
+<<if $surnameOrder != 1>>
+	adhere to a slave's country of origin. //[[Force name surname|Description Options][$surnameOrder = 1]]//
+<<else>>
+	always be name surname.[[Allow nationality name order|Description Options][$surnameOrder = 0]]//
+<</if>>
\ No newline at end of file
diff --git a/src/uncategorized/generateXYSlave.tw b/src/uncategorized/generateXYSlave.tw
index b31ecb1aa0047a48a1e7a72c6b820cabe23fbcfb..f4869a0d6657cbdd0cc268c3265fb331dc63ff14 100644
--- a/src/uncategorized/generateXYSlave.tw
+++ b/src/uncategorized/generateXYSlave.tw
@@ -453,31 +453,31 @@
 <<else>>
 	/% Temporarily use activeSlave.foreskin to store the chance of circumcision. %/
 	<<switch $activeSlave.nationality>>
-	<<case "Iranian" "Moroccan" "Afghan" "Tunisian" "Palestinian" "Sahrawi">>
+	<<case "Afghan" "Iranian" "Moroccan" "Palestinian" "Sahrawi" "Tunisian">>
 		<<set $activeSlave.foreskin = 100>>
-	<<case "Turkish" "Nigerian" "Iraqi" "Yemeni" "Jordanian" "Gabonese" "Tajik" "Comorian" "Kurdish" "Mauritanian">>
+	<<case "Comorian" "Gabonese" "Iraqi" "Jordanian" "Kurdish" "Mauritanian" "Nigerian" "Tajik" "Turkish" "Yemeni">>
 		<<set $activeSlave.foreskin = 99>>
-	<<case "Algerian" "Maldivian" "Azerbaijani" "Liberian">>
+	<<case "Algerian" "Azerbaijani" "Liberian" "Maldivian">>
 		<<set $activeSlave.foreskin = 98>>
-	<<case "Saudi" "Uzbek" "Libyan" "Djiboutian" "Eritrean" "Ivorian">>
+	<<case "Djiboutian" "Eritrean" "Ivorian" "Libyan" "Saudi" "Uzbek">>
 		<<set $activeSlave.foreskin = 97>>
-	<<case "Zairian" "Pakistani" "Nigerien" "Turkmen" "Sierra Leonean">>
+	<<case "Nigerien" "Pakistani" "Sierra "Turkmen" "Zairian" Leonean">>
 		<<set $activeSlave.foreskin = 96>>
-	<<case "Egyptian" "Tuvaluan" "Malagasy" "Nauruan" "a Cook Islander" "Niuean" "Palauan" "Samoan" "a Solomon Islander" "Tongan" "Ni-Vanuatu" "Gambian" "Togolese">>
+	<<case "a Cook Islander" "Egyptian" "Gambian" "Malagasy" "Nauruan" "Ni-Vanuatu" "Niuean" "Palauan" "Samoan" "a Solomon Islander" "Togolese" "Tongan" "Tuvaluan">>
 		<<set $activeSlave.foreskin = 95>>
 	<<case "Cameroonian" "Senegalese" "Somali">>
 		<<set $activeSlave.foreskin = 94>>
-	<<case "Indonesian" "Bangladeshi" "Syrian" "Beninese" "Bissau-Guinean">>
+	<<case "Bangladeshi" "Beninese" "Bissau-Guinean" "Indonesian" "Syrian">>
 		<<set $activeSlave.foreskin = 93>>
-	<<case "Israeli" "Ghanan" "Ethiopian" "Filipina" "Kosovan">>
+	<<case "Ethiopian" "Filipina" "Ghanan" "Israeli" "Kosovan">>
 		<<set $activeSlave.foreskin = 92>>
 	<<case "Kenyan" "Kyrgyz">>
 		<<set $activeSlave.foreskin = 91>>
-	<<case "Omani" "Burkinabé">>
+	<<case "Burkinabé" "Omani">>
 		<<set $activeSlave.foreskin = 88>>
 	<<case "Equatoguinean">>
 		<<set $activeSlave.foreskin = 87>>
-	<<case "Malian" "Kuwaiti">>
+	<<case "Kuwaiti" "Malian">>
 		<<set $activeSlave.foreskin = 86>>
 	<<case "Guinean">>
 		<<set $activeSlave.foreskin = 84>>
@@ -497,15 +497,15 @@
 		<<set $activeSlave.foreskin = 70>>
 	<<case "Central African">>
 		<<set $activeSlave.foreskin = 63>>
-	<<case "Malaysian" "Burundian">>
+	<<case "Burundian" "Malaysian">>
 		<<set $activeSlave.foreskin = 61>>
 	<<case "Lebanese">>
 		<<set $activeSlave.foreskin = 60>>
 	<<case "Angolan">>
 		<<set $activeSlave.foreskin = 58>>
-	<<case "Kazakh" "Fijian">>
+	<<case "Fijian" "Kazakh">>
 		<<set $activeSlave.foreskin = 56>>
-	<<case "Korean" "Bruneian" "Mosotho">>
+	<<case "Bruneian" "Korean" "Mosotho">>
 		/% Population-weighted average of South Korea and North Korea. %/
 		<<set $activeSlave.foreskin = 52>>
 	<<case "Albanian">>
@@ -528,13 +528,13 @@
 		<<set $activeSlave.foreskin = 33>>
 	<<case "Scottish">>
 		<<set $activeSlave.foreskin = 28>>
-	<<case "Ugandan" "Australian">>
+	<<case "Australian" "Ugandan">>
 		<<set $activeSlave.foreskin = 27>>
 	<<case "Namibian">>
 		<<set $activeSlave.foreskin = 26>>
 	<<case "South Sudanese">>
 		<<set $activeSlave.foreskin = 24>>
-	<<case "Belgian" "Thai" "Cypriot">>
+	<<case "Belgian" "Cypriot" "Thai">>
 		<<set $activeSlave.foreskin = 23>>
 	<<case "Malawian">>
 		<<set $activeSlave.foreskin = 22>>
@@ -546,40 +546,37 @@
 		<<set $activeSlave.foreskin = 19>>
 	<<case "Mauritian">>
 		<<set $activeSlave.foreskin = 17>>
-	<<case "Singaporean" "Surinamese" "Motswana">>
+	<<case "Motswana" "Singaporean" "Surinamese">>
 		<<set $activeSlave.foreskin = 15>>
-	<<case "Jamaican" "French" "Chinese" "Indian">>
+	<<case "Chinese" "French" "Indian" "Jamaican">>
 		<<set $activeSlave.foreskin = 14>>
-	<<case "Zambian" "Bulgarian" "Rwandan">>
+	<<case "Bulgarian" "Rwandan" "Zambian">>
 		<<set $activeSlave.foreskin = 13>>
-	<<case "Russian" "French Guianan" "Guyanese">>
+	<<case "French Guianan" "Guyanese" "Russian">>
 		<<set $activeSlave.foreskin = 12>>
 	<<case "German">>
 		<<set $activeSlave.foreskin = 11>>
 	<<case "Belarusian" "Georgian" "Papua New Guinean">>
 		<<set $activeSlave.foreskin = 10>>
-	<<case "Zimbabwean" "Japanese">>
+	<<case "Japanese" "Zimbabwean">>
 		<<set $activeSlave.foreskin = 9>>
-	<<case "Taiwanese" "Slovene" "Sri Lankan" "Swazi">>
+	<<case "Slovene" "Sri Lankan" "Swazi" "Taiwanese">>
 		<<set $activeSlave.foreskin = 8>>
-	<<case "Haitian" "Spanish" "Catalan">>
+	<<case "Catalan" "Haitian" "Spanish">>
 		<<set $activeSlave.foreskin = 7>>
-	<<case "Dutch" "Austrian" "Swiss" "East Timorese" "Trinidadian">>
+	<<case "Austrian" "Dutch" "East Timorese" "Swiss" "Trinidadian">>
 		<<set $activeSlave.foreskin = 6>>
-	<<case "Danish" "Swedish" "Greek" "a Liechtensteiner">>
+	<<case "Danish" "Greek" "a Liechtensteiner" "Swedish">>
 		<<set $activeSlave.foreskin = 5>>
-	<<case "Peruvian" "Serbian" "Nepalese" "Burmese" "Cambodian" "Mongolian">>
+	<<case "Burmese" "Cambodian" "Mongolian" "Nepalese" "Peruvian" "Serbian">>
 		<<set $activeSlave.foreskin = 4>>
-	<<case "Italian" "Norwegian" "Argentinian">>
+	<<case "Argentinian" "Italian" "Norwegian">>
 		<<set $activeSlave.foreskin = 3>>
-	<<case "Ukrainian" "Luxembourgian" "Vincentian" "Tibetan">>
+	<<case "Luxembourgian" "Tibetan" "Ukrainian" "Vincentian">>
 		<<set $activeSlave.foreskin = 2>>
-	<<case "Portuguese" "Hungarian" "Irish" "Finnish" "Brazilian" "Bermudian" "Uruguayan" "Monégasque" "Andorran" "Croatian" "Moldovan" "Panamanian" "Barbadian" "Bhutanese" "Seychellois">>
+	<<case "Andorran" "Barbadian" "Bermudian" "Bhutanese" "Brazilian" "Croatian" "Finnish" "Hungarian" "Irish" "Moldovan" "Monégasque" "Panamanian" "Portuguese" "Seychellois" "Uruguayan">>
 			<<set $activeSlave.foreskin = 1>>
-	<<case 	"Cuban" "Guatemalan" "Chilean" "Bolivian" "Venezuelan" "Lithuanian" "Slovak" "Czech" "Romanian" "Estonian" "Icelandic" "Polish" "Colombian" 
-			"Armenian" "Vietnamese" "Sammarinese" "Marshallese" "Greenlandic" "Belizean" "Costa Rican" "Salvadoran" "Micronesian" "Grenadian" "Honduran"
-			"I-Kiribati" "Laotian" "Maltese" "Nicaraguan" "Antiguan" "Bahamian" "Dominiquais" "Ecuadorian" "Latvian" "Paraguayan" "Kittitian" "Vatican"
-			"Saint Lucian" "Cape Verdean" "São Toméan">>
+	<<case 	"Antiguan" "Armenian" "Bahamian" "Belizean" "Bolivian" "Cape Verdean" "Chilean" "Colombian" "Costa Rican" "Cuban" "Czech" "Dominiquais" "Ecuadorian" "Estonian" "Greenlandic" "Grenadian" "Guatemalan" "Honduran" "I-Kiribati" "Icelandic" "Kittitian" "Laotian" "Latvian" "Lithuanian" "Maltese" "Marshallese" "Micronesian" "Nicaraguan" "Paraguayan" "Polish" "Romanian" "Saint Lucian" "Salvadoran" "Sammarinese" "São Toméan" "Slovak" "Vatican" "Venezuelan" "Vietnamese">>
 		<<set $activeSlave.foreskin = 0>>
 	<<default>>
 		/% Some overlooked country, or possibly stateless. Use global average. %/
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index c9bbd2debd1489be14cccc4b41e15223cd60233a..f2ca4c5137ae8e6f21accef5425470a5e4ee0344 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -29,7 +29,7 @@ The firm promptly pays @@.yellowgreen;fair compensation@@ for the minor damage t
 
 <<set $activeSlave = 0>>
 <<for $i = 0; $i < $slaves.length; $i++>>
-	<<if $slaves[$i].drugs == "breast injections" || $slaves[$i].drugs == "hyper breast injections">>
+	<<if $slaves[$i].drugs == "breast injections" || $slaves[$i].drugs == "intensive breast injections" || $slaves[$i].drugs == "hyper breast injections">>
 	<<set $slaves[$i].health -= random(1,2)>>
 	<<set $activeSlave = $slaves[$i]>>
 	<</if>>
@@ -611,6 +611,27 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
 				<</if>>
 			<</if>>
 			<<set $slaves[$i].boobs += 300>>
+		<<elseif $slaves[$i].drugs == "intensive breast injections" && canGetPregnant($slaves[$i])>>
+			<<set $slaves[$i].preg = 1>>
+			<<set $slaves[$i].pregType = random(15,35)>>
+			<<set $activeSlave.pregKnown = 1>>
+			<<set $activeSlave.pregWeek = 1>>
+			<<SetBellySize $activeSlave>>
+		<<elseif $slaves[$i].drugs == "intensive breast injections">>
+			<<set $slaves[$i].lactation = 1>>
+			<<if $slaves[$i].hips < 1>>
+				<<set $slaves[$i].hips += 1>>
+				<<set $slaves[$i].butt += 1>>
+			<</if>>
+			<<if $precociousPuberty == 1>>
+				<<if $slaves[$i].pubertyXX == 0 && ($slaves[$i].ovaries == 1 || $slaves[$i].mpreg == 1)>>
+					<<set $slaves[$i].pubertyAgeXX -= 1.5>>
+				<</if>>
+				<<if $slaves[$i].pubertyXY == 0 && $slaves[$i].balls > 0>>
+					<<set $slaves[$i].pubertyAgeXY += 1.5>>
+				<</if>>
+			<</if>>
+			<<set $slaves[$i].boobs += 300>>
 		<<elseif ($slaves[$i].drugs == "hyper breast injections") && canGetPregnant($slaves[$i])>>
 			<<set $slaves[$i].preg = 1>>
 			<<set $slaves[$i].pregType = random(20,45)>>
diff --git a/src/uncategorized/hgSelect.tw b/src/uncategorized/hgSelect.tw
index 33e48fa08c99fa06537c4d173342c38237a3ac53..64b7af1253d99d3d6b8bbb5e89fa6e801bfd9088 100644
--- a/src/uncategorized/hgSelect.tw
+++ b/src/uncategorized/hgSelect.tw
@@ -9,17 +9,22 @@
 <<if ($HeadGirl != 0)>>
 	<<set _i = $slaves.findIndex(function(s) { return s.ID == $HeadGirl.ID; })>>
 	<<set $HeadGirl = $slaves[_i]>>
-	<<switch $HeadGirl.nationality>>
-	<<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
-		<<if $HeadGirl.slaveSurname>>
-			<<set _HGName = $HeadGirl.slaveSurname + " " + $HeadGirl.slaveName>>
-		<<else>>
+	<<if $surnameOrder != 1>>
+		<<switch $HeadGirl.nationality>>
+		<<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">>
+			<<if $HeadGirl.slaveSurname>>
+				<<set _HGName = $HeadGirl.slaveSurname + " " + $HeadGirl.slaveName>>
+			<<else>>
+				<<set _HGName = $HeadGirl.slaveName>>
+			<</if>>
+		<<default>>
 			<<set _HGName = $HeadGirl.slaveName>>
-		<</if>>
-	<<default>>
+			<<if $HeadGirl.slaveSurname>><<set _HGName += " " + $HeadGirl.slaveSurname>><</if>>
+		<</switch>>
+	<<else>>
 		<<set _HGName = $HeadGirl.slaveName>>
 		<<if $HeadGirl.slaveSurname>><<set _HGName += " " + $HeadGirl.slaveSurname>><</if>>
-	<</switch>>
+	<</if>>
 	''__@@.pink;_HGName@@__'' is serving as your Head Girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort; it is her role to serve and comfort you at your side, in addition to performing normal head girl duties<</if>>.
 	<br><br>
 <</if>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 18ae457d54a8ad55142d0395d0ce333a5b251695..2b2e25d990791570a4f0c235a925cbccee9e8bad 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -335,13 +335,15 @@ She comes to you for an inspection
 		$activeSlave.birthSurname.
 	<<elseif $activeSlave.birthSurname === "">>
 		$activeSlave.birthName.
-	<<else>>
+	<<elseif $surnameOrder != 1>>
 		<<switch $activeSlave.nationality>>
-		<<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
+		<<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">>
 			<<if $activeSlave.birthSurname>>$activeSlave.birthSurname <</if>>$activeSlave.birthName.
 		<<default>>
 			$activeSlave.birthName<<if $activeSlave.birthSurname>> $activeSlave.birthSurname<</if>>.
 		<</switch>>
+	<<else>>
+		$activeSlave.birthName<<if $activeSlave.birthSurname>> $activeSlave.birthSurname<</if>>.
 	<</if>>
 	<</if>>
 	<<if $activeSlave.slaveSurname == 0>>
@@ -356,12 +358,16 @@ She comes to you for an inspection
 	<</if>>
 <<else>>
 	$activeSlave.slaveName<<if $activeSlave.slaveSurname>> $activeSlave.slaveSurname<</if>> is not its original name: it was once called
-	<<switch $activeSlave.nationality>>
-	<<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
-		<<if $activeSlave.birthSurname>>$activeSlave.birthSurname <</if>>$activeSlave.birthName.
-	<<default>>
+	<<if $surnameOrder != 1>>
+		<<switch $activeSlave.nationality>>
+		<<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">>
+			<<if $activeSlave.birthSurname>>$activeSlave.birthSurname <</if>>$activeSlave.birthName.
+		<<default>>
+			$activeSlave.birthName<<if $activeSlave.birthSurname>> $activeSlave.birthSurname<</if>>.
+		<</switch>>
+	<<else>>
 		$activeSlave.birthName<<if $activeSlave.birthSurname>> $activeSlave.birthSurname<</if>>.
-	<</switch>>
+	<</if>>
 <</if>>
 <</if>>
 
diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw
index c1feb313ce7f995e496360397ebb310f83fb0b33..41ae17073296494ffa270de7e975e23e5ba86da7 100644
--- a/src/uncategorized/nonRandomEvent.tw
+++ b/src/uncategorized/nonRandomEvent.tw
@@ -61,7 +61,7 @@
 <<elseif (_effectiveWeek == 46) && ($mercenaries > 0)>>
 		<<goto "P raid invitation">>
 <<elseif (_effectiveWeek == 52) && ($seeHyperPreg == 1) && $seePreg != 0 && $badB != 1>>
-	<<set _valid = $slaves.find(function(s) { return s.drugs == "breast injections" || s.drugs == "hyper breast injections"; })>>
+	<<set _valid = $slaves.find(function(s) { return s.drugs == "breast injections" || s.drugs == "hyper breast injections" || s.drugs == "intensive breast injections"; })>>
 	<<if def _valid>>
 		<<set $badB = 1, $Event = "bad breasts">>
 		<<goto "Generic Plot Events">>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index 0c71b78da36602949adfb87cadb5d0ad9873b312..dd3fdb056948dc96313993efad4326c896a68d78 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -296,10 +296,10 @@ Assignment performance vignettes on the end week report are
 
 <br>
 <<if $newDescriptions == 1>>
-	Slaves ''will'' have alternate titles.
+	Slaves @@.cyan;will@@ have alternate titles.
 	[[Disable|Options][$newDescriptions = 0]]
 <<else>>
-	Slaves ''will not'' have alternate titles.
+	Slaves @@.cyan;will not@@ have alternate titles.
 	[[Enable|Options][$newDescriptions = 1]]
 <</if>>
 
@@ -307,10 +307,10 @@ Assignment performance vignettes on the end week report are
 
 <<if $familyTesting == 1>>
 	<<if $allowFamilyTitles == 1>>
-		Your relatives ''will'' use family titles.
+		Your relatives @@.cyan;will@@ use family titles.
 		[[Disable family titles|Options][$allowFamilyTitles = 0]]
 	<<else>>
-		Your relatives ''will not'' use family titles.
+		Your relatives @@.cyan;will not@@ use family titles.
 		[[Enable family titles|Options][$allowFamilyTitles = 1]]
 	<</if>>
 <</if>>
diff --git a/src/uncategorized/peConcubineInterview.tw b/src/uncategorized/peConcubineInterview.tw
index d058bc561d829139322f108d6a48ad0dfe55c9b2..08494dba04ad028ae7a33f0841ad657566ec5dc7 100644
--- a/src/uncategorized/peConcubineInterview.tw
+++ b/src/uncategorized/peConcubineInterview.tw
@@ -30,9 +30,9 @@ You receive an official communication from a popular talk show hosted in one of
 	<<if $activeSlave.bellyPreg >= 1000000>>
 		barely waddles out, arms resting atop her _belly belly,
 	<<elseif $activeSlave.bellyPreg >= 750000>>
-		barely waddles out, arms struggling to lift her _belly, absolutely child stuffed belly as she lewdly carresses it,
+		barely waddles out, arms struggling to lift her _belly, absolutely child stuffed belly as she lewdly caresses it,
 	<<elseif $activeSlave.bellyPreg >= 600000>>
-		waddles out, arms cradling her _belly, absolutely child stuffed belly as best she can as she lewdly carresses its sides,
+		waddles out, arms cradling her _belly, absolutely child stuffed belly as best she can as she lewdly caresses its sides,
 	<<elseif $activeSlave.bellyPreg >= 450000>>
 		waddles out, arms cradling her _belly, absolutely child stuffed belly as she lewdly sways it side to side,
 	<<elseif $activeSlave.bellyPreg >= 300000>>
@@ -256,8 +256,8 @@ You receive an official communication from a popular talk show hosted in one of
 		<<elseif ($activeSlave.fetish == "dom")>>
 			how much she loves holding other slaves down for you
 		<<elseif ($activeSlave.fetish == "pregnancy")>>
-			<<if $activeSlave.pregKnown == 1>>
-				how good anal feels while pregnant
+			<<if $activeSlave.pregKnown == 1 || $activeSlave.births > 0>>
+				how good sex feels while pregnant
 			<<elseif $activeSlave.vagina > 0>>
 				how good cum feels inside her
 			<<else>>
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index 7a17819517603add66f5fe1ec8456230ffdb8456..239c04aa9fb783a6bc0a008544c1a6e086ea18c9 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -9,12 +9,16 @@
 	<br>
 	<<for $i = 0; $i < $eligibleSlaves.length; $i++>>
 		<<if $eligibleSlaves[$i].slaveSurname>>
-			<<switch $eligibleSlaves[$i].nationality>>
-				<<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
-					<<set _slaveName = $eligibleSlaves[$i].slaveSurname + " " + $eligibleSlaves[$i].slaveName>>
-				<<default>>
-					<<set _slaveName = $eligibleSlaves[$i].slaveName + " " + $eligibleSlaves[$i].slaveSurname>>
-			<</switch>>
+			<<if $surnameOrder != 1>>
+				<<switch $eligibleSlaves[$i].nationality>>
+					<<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">>
+						<<set _slaveName = $eligibleSlaves[$i].slaveSurname + " " + $eligibleSlaves[$i].slaveName>>
+					<<default>>
+						<<set _slaveName = $eligibleSlaves[$i].slaveName + " " + $eligibleSlaves[$i].slaveSurname>>
+				<</switch>>
+			<<else>>
+				<<set _slaveName = $eligibleSlaves[$i].slaveName + " " + $eligibleSlaves[$i].slaveSurname>>
+			<</if>>
 		<<else>>
 			<<set _slaveName = $eligibleSlaves[$i].slaveName>>
 		<</if>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index f55b6c443ae90052b24c2477f5f4105a3e3f4653..0191dfa364b110dc9f2df808d07f09e32761f3e0 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -9,12 +9,16 @@
 	<br>
 	<<for $i = 0; $i < $slaves.length; $i++>>
 	   	<<if $slaves[$i].slaveSurname>>
-			<<switch $slaves[$i].nationality>>
-				<<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
-					<<set _slaveName = $slaves[$i].slaveSurname + " " + $slaves[$i].slaveName>>
-				<<default>>
-					<<set _slaveName = $slaves[$i].slaveName + " " + $slaves[$i].slaveSurname>>
-			<</switch>>
+			<<if $surnameOrder != 1>>
+				<<switch $slaves[$i].nationality>>
+					<<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">>
+						<<set _slaveName = $slaves[$i].slaveSurname + " " + $slaves[$i].slaveName>>
+					<<default>>
+						<<set _slaveName = $slaves[$i].slaveName + " " + $slaves[$i].slaveSurname>>
+				<</switch>>
+			<<else>>
+				<<set _slaveName = $slaves[$i].slaveName + " " + $slaves[$i].slaveSurname>>
+			<</if>>
 		<<else>>
 			<<set _slaveName = $slaves[$i].slaveName>>
 		<</if>>
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index f7715900cdeec4757623b52c050ef6c658af7ac3..0ec850f9a817939ced384211210b04e17a0331a8 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -1,4 +1,4 @@
-:: RE nickname [nobr]
+:: RE nickname [nobr]
 
 <<set $nextButton = "Continue", $nextLink = "AS Dump">>
 <<if $seed == 1>>
@@ -248,11 +248,11 @@
 	<<case "Algerian">>
 		<<set $nickname = either("'Casbah'", "'Corsair'", "'Djamila'", "'Hassiba'", "'Pied-Noir'", "'Zhora'", "Harki")>>
 	<<case "American">>
-		<<set $nickname = either("'Burger'", "'Chicago'", "'Hollywood'", "'Lady Liberty'", "'Lone Star'", "'New York'", "'Washington'", "'Yankee'", "'Stars & Stripes'", "'Yankee'", "'California'", "'Septic'", "'Trump'")>>
+		<<set $nickname = either("'Amerifat'", "'Burger'", "'California'", "'Chicago'", "'Columbia'", "'Hollywood'", "'Lady Liberty'", "'Lone Star'", "'New York'", "'Septic'", "'Stars & Stripes'", "'Trump'", "'Washington'", "'Yankee'")>>
 	<<case "Andorran">>
 		<<set $nickname = either("'Ski Trip'", "'Skossyreff'")>>
 	<<case "Angolan">>
-		<<set $nickname to either("'Cabinda'", "'Luanda'")>>
+		<<set $nickname = either("'Cabinda'", "'Luanda'")>>
 	<<case "Antiguan">>
 		<<set $nickname = either("'Barbuda'", "'Redonda'")>>
 	<<case "Argentinian">>
@@ -282,13 +282,13 @@
 	<<case "Belizean">>
 		<<set $nickname = either("'Belmopan'", "'Great Blue Hole'")>>
 	<<case "Beninese">>
-		<<set $nickname to either("'Cotonou'", "'Dahomey'", "'Porto-Novo'")>>
+		<<set $nickname = either("'Cotonou'", "'Dahomey'", "'Porto-Novo'")>>
 	<<case "Bermudian">>
 		<<set $nickname = either("'Bermuda Triangle'", "'Hamilton'")>>
 	<<case "Bhutanese">>
 		<<set $nickname = either("'Druk'", "'Thimphu'")>>
 	<<case "Bissau-Guinean">>
-		<<set $nickname to either("'Bissau'", "'Bolama'", "'Kriol'")>>
+		<<set $nickname = either("'Bissau'", "'Bolama'", "'Kriol'")>>
 	<<case "Bolivian">>
 		<<set $nickname = either("'La Paz'", "'Sucre'", "'Titicaca'")>>
 	<<case "Bosnian">>
@@ -296,13 +296,13 @@
 	<<case "Brazilian">>
 		<<set $nickname = either("'7-1'", "'Bunda'", "'Dago'", "'Favelada'", "'Hue'", "'Ipanema'", "'Monkey'", "'São Paulo'", "'Zika'", "'Bauru'","'Carmen Miranda'")>>
 	<<case "British">>
-		<<set $nickname = either("'Brit'", "'Britbong'", "'Chav'", "'Fish'n'Chips'", "'Limey'", "'London'", "'Pikey'", "'Pommie'", "'Rosbif'", "'Scrubber'", "'Slag'", "'Slapper'", "'Brexit'")>>
+		<<set $nickname = either("'Brit'", "'Britannia'", "'Britbong'", "'Chav'", "'Fish'n'Chips'", "'Limey'", "'London'", "'Pikey'", "'Pommie'", "'Rosbif'", "'Scrubber'", "'Slag'", "'Slapper'", "'Brexit'")>>
 	<<case "Bruneian">>
 		<<set $nickname = either("'Abode of Peace'", "'Bandar Seri Begawan'")>>
 	<<case "Bulgarian">>
 		<<set $nickname = either("'Sofia'", "'Zhivkov'")>>
 	<<case "Burkinabé">>
-		<<set $nickname to either("'Ouagadougou'", "'Upper Volta'")>>
+		<<set $nickname = either("'Ouagadougou'", "'Upper Volta'")>>
 	<<case "Burmese">>
 		<<set $nickname = either("'Burma Shave'", "'Burmese Python'", "'Golden Triangle'", "'Rangoon'")>>
 	<<case "Burundian">>
@@ -312,15 +312,15 @@
 	<<case "Cameroonian">>
 		<<set $nickname = either("'Douala'", "'Yaoundé'")>>
 	<<case "Canadian">>
-		<<set $nickname = either("'Canuck'", "'Loonie'", "'Maple Syrup'", "'Mountie'", "'Poutine'", "'Quebec'", "'Toronto'", "'Vancouver'", "'Yukon'")>>
+		<<set $nickname = either("'Canuck'", "'Leaf'", "'Loonie'", "'Maple Syrup'", "'Mountie'", "'Poutine'", "'Quebec'", "'Toronto'", "'Vancouver'", "'Yukon'")>>
 	<<case "Cape Verdean">>
-		<<set $nickname to either("'Cabo Verde'", "'Praia'")>>
+		<<set $nickname = either("'Cabo Verde'", "'Praia'")>>
 	<<case "Catalan">>
-		<<set $nickname to either("'Barcelona'", "'Castell'", "'Senyera'")>>
+		<<set $nickname = either("'Barcelona'", "'Castell'", "'Senyera'")>>
 	<<case "Central African">>
-		<<set $nickname to either("'Bangui'", "'Bokassa'")>>
+		<<set $nickname = either("'Bangui'", "'Bokassa'")>>
 	<<case "Chadian">>
-		<<set $nickname to either("'Chad'", "'Habré'", "'N'Djamena'", "'Tombalbaye'")>>
+		<<set $nickname = either("'Chad'", "'Habré'", "'N'Djamena'", "'Tombalbaye'")>>
 	<<case "Chilean">>
 		<<set $nickname = either("'Chela'", "'Pinochet'", "'Santiago'", "'Toya'")>>
 	<<case "Chinese">>
@@ -328,7 +328,7 @@
 	<<case "Colombian">>
 		<<set $nickname = either("'Bogotá'", "'Cafetera'", "'Coca'", "'Crystal'", "'FARC'", "'Pablita Escobar'")>>
 	<<case "Comorian">>
-		<<set $nickname to either("'Karthala'", "'Mayotte'", "'Moroni'")>>
+		<<set $nickname = either("'Karthala'", "'Mayotte'", "'Moroni'")>>
 	<<case "Congolese">>
 		<<set $nickname = either("'Brazzaville'", "'Ngouabi'", "'Nguesso'")>>
 	<<case "a Cook Islander">>
@@ -344,7 +344,7 @@
 	<<case "Czech">>
 		<<set $nickname = either("'Bohemian'", "'Czechnya'", "'Kunda'", "'Prague'")>>
 	<<case "Danish">>
-		<<set $nickname = either("'Copenhagen'", "'Ludertæve'", "'Tøs'", "'Viking'")>>
+		<<set $nickname = either("'Copenhagen'", "'Dane'", "'Ludertæve'", "'Tøs'", "'Viking'")>>
 	<<case "Djiboutian">>
 		<<set $nickname = either("'Ifat'", "'Tadjoura'")>>
 	<<case "Dominican">>
@@ -362,13 +362,13 @@
 	<<case "Emirati">>
 		<<set $nickname = either("'Abu Dhabi'", "'Bedouin'", "'Dubai'")>>
 	<<case "Equatoguinean">>
-		<<set $nickname to either("'Bata'", "'Malabo'", "'Nguema'", "'Oyala'")>>
+		<<set $nickname = either("'Bata'", "'Malabo'", "'Nguema'", "'Oyala'")>>
 	<<case "Eritrean">>
-		<<set $nickname to either("'Asmara'", "'Punt'")>>
+		<<set $nickname = either("'Asmara'", "'Punt'")>>
 	<<case "Estonian">>
 		<<set $nickname = either("'Baltic'", "'Eesti'", "'Tallinn'")>>
 	<<case "Ethiopian">>
-		<<set $nickname = either("'Oromo'", "'Rastafarian'")>>
+		<<set $nickname = either("'Addis Ababa'", "'Oromo'", "'Rastafarian'")>>
 	<<case "Fijian">>
 		<<set $nickname = either("'Itaukei'", "'Suva'")>>
 	<<case "Filipina">>
@@ -376,19 +376,19 @@
 	<<case "Finnish">>
 		<<set $nickname = either("'Helinski'", "'Mämmi'", "'Perkele'", "'Saunagirl'", "'Winter War'")>>
 	<<case "French">>
-		<<set $nickname = either("'Belle'", "'Fille de Joie'", "'Mademoiselle'", "'Marseille'", "'Paris'", "'Surrender Monkey'", "'Charlie Hebdo'")>>
+		<<set $nickname = either("'Belle'", "'Charlie Hebdo'", "'Fille de Joie'", "'Frenchie'", "'Frog'", "'Mademoiselle'", "'Marianne'", "'Marseille'", "'Paris'", "'Surrender Monkey'")>>
 	<<case "French Guianan">>
 		<<set $nickname = either("'Cayenne'", "'ÃŽle du Diable'")>>
 	<<case "French Polynesian">>
-		<<set $nickname to either("'Fangataufa'", "'Moruroa'", "'Papeete'", "'Tahiti'")>>
+		<<set $nickname = either("'Fangataufa'", "'Moruroa'", "'Papeete'", "'Tahiti'")>>
 	<<case "Gabonese">>
 		<<set $nickname = either("'Bongo'", "'Libreville'")>>
 	<<case "Gambian")>>
-		<<set $nickname to either("'Banjul'", "'Serekunda'")>>
+		<<set $nickname = either("'Banjul'", "'Serekunda'")>>
 	<<case "Georgian">>
 		<<set $nickname = either("'Kutaisi'", "'Tbilisi'")>>
 	<<case "German">>
-		<<set $nickname = either("'Berlin'", "'Bratwurst'", "'Fraulein'", "'Kraut'", "'Oktoberfest'", "'Piefke'", "'Valkyrie'", "'Dresden'", "'Prussian'", "'Bavarian'", "'Nazi'", "'Saupreiß'")>>
+		<<set $nickname = either("'Bavarian'", "'Berlin'", "'Bratwurst'", "'Dresden'", "'Fraulein'", "'Kraut'", "'Nazi'", "'Oktoberfest'", "'Piefke'", "'Prussian'", "'Saupreiß'", "'Valkyrie'")>>
 	<<case "Ghanan">>
 		<<set $nickname = either("'Akan'", "'Gold Coast'", "'Warrior Queen'", "'Shaman Queen'")>>
 	<<case "Greek">>
@@ -400,7 +400,7 @@
 	<<case "Guatemalan">>
 		<<set $nickname = either("'Chapín'", "'Guatemalan'", "'Mayan'")>>
 	<<case "Guinean">>
-		<<set $nickname to either("'Bauxite'", "'Conakry'", "'Toure'")>>
+		<<set $nickname = either("'Bauxite'", "'Conakry'", "'Toure'")>>
 	<<case "Guyanese">>
 		<<set $nickname = either("'Georgetown'", "'Hoatzin'")>>
 	<<case "Haitian">>
@@ -416,19 +416,19 @@
 	<<case "Indian">>
 		<<set $nickname = either("'Bhibhi'", "'Bhopal'", "'Delhi'", "'Hindi'", "'Mahatma'", "'Mumbai'", "'Punjabi'", "'Savita'", "'Street Shitter'")>>
 	<<case "Indonesian">>
-		<<set $nickname = either("'Jakarta'", "'Malay'", "'Sunda'")>>
+		<<set $nickname = either("'Ibu Pertiwi'", "'Jakarta'", "'Malay'", "'Sunda'")>>
 	<<case "Iraqi">>
 		<<set $nickname = either("'Assyrian'", "'Baghdad'", "'Fallujah'", "'Fertile Crescent'", "'Hussein'", "'Mesopotamian'", "'Oilfields'", "'Whore of Babylon'")>>
 	<<case "Iranian">>
 		<<set $nickname = either("'Ayatollah'", "'Iranian'", "'Persian'", "'Tehran'")>>
 	<<case "Irish">>
-		<<set $nickname = either("'Carbomb'", "'Dublin'", "'Emerald'", "'Lassie'", "'Paddy'", "'Potato Famine'", "'Sinn Féin'")>>
+		<<set $nickname = either("'Carbomb'", "'Dublin'", "'Emerald'", "'Hibernia'", "'Lassie'", "'Paddy'", "'Potato Famine'", "'Sinn Féin'")>>
 	<<case "Israeli">>
-		<<set $nickname = either("'God's Chosen'", "'Hebrew'", "'Levantine'", "'Tel Aviv'", "'Merchant'", "'Oven Dodger'", "'Shiksa'", "'Sharmuta'", "'Shekels'")>>
+		<<set $nickname = either("'God's Chosen'", "'Hebrew'", "'Levantine'", "'Tel Aviv'", "'Merchant'", "'Oven Dodger'", "'Shiksa'", "'Sharmuta'", "'Shekels'", "'Srulik'")>>
 	<<case "Italian">>
-		<<set $nickname = either("'Bologna'", "'Greaseball'", "'Latin'", "'Napoli'", "'Renaissance'", "'Rome'", "'Salami'", "'Sicilian'", "'Spaghetti'", "'Terrone'", "'Wop'")>>
+		<<set $nickname = either("'Bologna'", "'Greaseball'", "'Latin'", "'Mussolini'", "'Napoli'", "'Renaissance'", "'Rome'", "'Salami'", "'Sicilian'", "'Spaghetti'", "'Terrone'", "'Wop'")>>
 	<<case "Ivorian">>
-		<<set $nickname to either("'Abidjan'", "'Ivory'", "'Yamoussoukro'")>>
+		<<set $nickname = either("'Abidjan'", "'Ivory'", "'Yamoussoukro'")>>
 	<<case "Jamaican">>
 		<<set $nickname = either("'Kingston'", "'Kush'", "'Rasta'", "'Reggae'", "'West Indies'", "'Yardie'")>>
 	<<case "Japanese">>
@@ -446,7 +446,7 @@
 	<<case "Kosovan">>
 		<<set $nickname = either("'Kosovar'", "'Pristina'")>>
 	<<case "Kurdish">>
-		<<set $nickname to either("'Ararat'", "'Kurd'", "'Mahabad'")>>
+		<<set $nickname = either("'Ararat'", "'Kurd'", "'Mahabad'")>>
 	<<case "Kuwaiti">>
 		<<set $nickname = either("'Burgan'", "'Gulf War'")>>
 	<<case "Kyrgyz">>
@@ -458,7 +458,7 @@
 	<<case "Lebanese">>
 		<<set $nickname = either("'Beirut'", "'Cedar'", "'Druze'", "'Lebo'", "'Maronite'", "'Phoenician'")>>
 	<<case "Liberian">>
-		<<set $nickname to either("'Monrovia'", "'Taylor'")>>
+		<<set $nickname = either("'Monrovia'", "'Taylor'")>>
 	<<case "Libyan">>
 		<<set $nickname = either("'Cyrene'", "'Gaddafi'", "'Silphium'", "'Tripoli'", "'Zenga Zenga'")>>
 	<<case "a Liechtensteiner">>
@@ -472,7 +472,7 @@
 	<<case "Malagasy">>
 		<<set $nickname = either("'Antananarivo'", "'Lemur'")>>
 	<<case "Malawian">>
-		<<set $nickname to either("'Lilongwe'", "'Warm Heart of Africa'")>>
+		<<set $nickname = either("'Lilongwe'", "'Warm Heart of Africa'")>>
 	<<case "Malaysian">>
 		<<set $nickname = either("'Kuala Lumpur'", "'Malay Girl'", "'Pirate'")>>
 	<<case "Maldivian">>
@@ -484,9 +484,9 @@
 	<<case "Marshallese">>
 		<<set $nickname = either("'Bikini Atoll'", "'Majuro'")>>
 	<<case "Mauritanian">>
-		<<set $nickname to either("'Coppolani'", "'Nouakchott'")>>
+		<<set $nickname = either("'Coppolani'", "'Nouakchott'")>>
 	<<case "Mauritian">>
-		<<set $nickname to either("'Dodo'", "'Port Louis'")>>
+		<<set $nickname = either("'Dodo'", "'Port Louis'")>>
 	<<case "Mexican">>
 		<<set $nickname = either("'Azteca'", "'Beaner'", "'Burrito'", "'Cartel'", "'Chiquita'", "'Fence Hopper'", "'Headless'", "'Juarez'", "'Malinche'", "'Mamacita'", "'Senorita'", "'Sinaloa'", "'Taco'", "'Tijuana'", "'Wetback'")>>
 	<<case "Micronesian">>
@@ -502,13 +502,13 @@
 	<<case "Moroccan">>
 		<<set $nickname = either("'Casablanca'", "'Rabat'")>>
 	<<case "Mosotho">>
-        <<set $nickname to either("'Maseru'", "'Moshoeshoe'")>>
+		<<set $nickname = either("'Maseru'", "'Moshoeshoe'")>>
 	<<case "Motswana">>
-		<<set $nickname to either("'Gaborone'", "'Kalahari'")>>
+		<<set $nickname = either("'Gaborone'", "'Kalahari'")>>
 	<<case "Mozambican">>
-		<<set $nickname to either("'Lourenço Marques'", "'Maputo'")>>
+		<<set $nickname = either("'Lourenço Marques'", "'Maputo'")>>
 	<<case "Namibian">>
-		<<set $nickname to either("'Namib'", "'Windhoek'")>>
+		<<set $nickname = either("'Namib'", "'Windhoek'")>>
 	<<case "Nauruan">>
 		<<set $nickname = either("'Phosphate'", "'Pleasant Island'")>>
 	<<case "Nepalese">>
@@ -544,21 +544,21 @@
 	<<case "Peruvian">>
 		<<set $nickname = either("'Incan'", "'Lima'", "'Lorcha'", "'Perucha'", "'Trujillo'", "'Zampoña'")>>
 	<<case "Polish">>
-		<<set $nickname = either("'Hussar'", "'Krakow'", "'Kurwa'", "'Polski'", "'Pshek'", "'Warsaw'")>>
+		<<set $nickname = either("'Hussar'", "'Krakow'", "'Kurwa'", "'Pole'", "'Polonia'", "'Polski'", "'Pshek'", "'Warsaw'")>>
 	<<case "Portuguese">>
-		<<set $nickname = either("'Bunda'", "'Portagee'")>>
+		<<set $nickname = either("'Bunda'", "'Lisbon'", "'Portagee'")>>
 	<<case "Puerto Rican">>
-		<<set $nickname = either("'51st State'", "'Boricua'", "'Nuyorican'", "'San Juan'", "'West Side Story'")>>
+		<<set $nickname = either("'51st State'", "'Boricua'", "'Nuyorican'", "'P.R.'", "'San Juan'", "'West Side Story'")>>
 	<<case "Qatari">>
 		<<set $nickname = either("'Al Jazeera'", "'Doha'")>>
 	<<case "Romanian">>
 		<<set $nickname = either("'Bucharest'", "'Ceausescu'", "'Dracula'", "'Gypsy'", "'Impaler'", "'Orphan'", "'Roma'")>>
 	<<case "Russian">>
-		<<set $nickname = either("'Commie'", "'Suka'", "'Suchka'", "'Moscow'", "'Moskal'", "'Red Banner'", "'Russkie'", "'Siberian Kitten'", "'Slav'", "'Suka'", "'Tovarish'", "'Tsaritsa'", "'Vodka'", "'Sickle & Hammer'", "'Bolshevik'", "'Kacap'", "'Shlyukha'")>>
+		<<set $nickname = either("'Bolshevik'", "'Commie'", "'Kacap'", "'Moscow'", "'Moskal'", "'Red Banner'", "'Russkie'", "'Shlyukha'", "'Siberian Kitten'", "'Sickle & Hammer'", "'Slav'", "'Suchka'", "'Suka'", "'Tovarish'", "'Tsaritsa'", "'Vodka'")>>
 	<<case "Rwandan">>
-		<<set $nickname to either("'Hotel Rwanda'", "'Kigali'")>>
+		<<set $nickname = either("'Hotel Rwanda'", "'Kigali'")>>
 	<<case "Sahrawi">>
-		<<set $nickname to either("'El-Aaiún'", "'Tifariti'", "'Western Saharan'")>>
+		<<set $nickname = either("'El-Aaiún'", "'Tifariti'", "'Western Saharan'")>>
 	<<case "Saint Lucian">>
 		<<set $nickname = either("'Castries'", "'Helen of the West Indies'")>>
 	<<case "Salvadoran">>
@@ -568,21 +568,21 @@
 	<<case "Samoan">>
 		<<set $nickname = either("'Apia'", "'Navigator'")>>
 	<<case "São Toméan">>
-		<<set $nickname to either("'Príncipe'", "'Roças'")>>
+		<<set $nickname = either("'Príncipe'", "'Roças'")>>
 	<<case "Saudi">>
-		<<set $nickname = either("'Burqa'", "'Mecca'", "'Riyadh'", "'Sandy'", "'Al Qaeda'")>>
+		<<set $nickname = either("'Al Qaeda'", "'Burqa'", "'Mecca'", "'Riyadh'", "'Sandy'")>>
 	<<case "Scottish">>
-		<<set $nickname = either("'Braveheart'", "'Edinburgh'", "'Glasgow'", "'Nessie'", "'Endinburg'", "'Ned'", "'Hadrian'", "'Unicorn'", "'Lass'")>>
+		<<set $nickname = either("'Braveheart'", "'Edinburgh'", "'Glasgow'", "'Hadrian'", "'Lass'", "'Ned'", "'Nessie'", "'Teuchter'", "'Unicorn'")>>
 	<<case "Senegalese">>
-		<<set $nickname to either("'Dakar'", "'Our Boat'", "'Wolof'")>>
+		<<set $nickname = either("'Dakar'", "'Our Boat'", "'Wolof'")>>
 	<<case "Serbian">>
 		<<set $nickname = either("'Belgrade'", "'Picka'", "'Remove Kebab'")>>
 	<<case "Seychellois">>
-		<<set $nickname = either("'Seabird'", "'Victoria'")>>
+		<<set $nickname = either("'Seabird'", "'Seselwa'", "'Victoria'")>>
 	<<case "Sierra Leonean">>
-		<<set $nickname to either("'Blood Diamond'", "'Freetown'")>>
+		<<set $nickname = either("'Blood Diamond'", "'Freetown'", "'Hut Tax'")>>
 	<<case "Singaporean">>
-		<<set $nickname = either("'Bedok'", "'Merlion'")>>
+		<<set $nickname = either("'Bedok'", "'Merlion'", "'Raffles'")>>
 	<<case "Slovak">>
 		<<set $nickname = either("'Bratislava'", "'Bzdocha'", "'Shlapka'")>>
 	<<case "Slovene">>
@@ -590,37 +590,37 @@
 	<<case "a Solomon Islander">>
 		<<set $nickname = either("'Guadalcanal'", "'Honiara'")>>
 	<<case "Somali">>
-		<<set $nickname to either("'Black Hawk Down'", "'Mogadishu'", "'The Captain Now'")>>
+		<<set $nickname = either("'Black Hawk Down'", "'Mogadishu'", "'The Captain Now'")>>
 	<<case "South African">>
-		<<set $nickname = either("'Afrikaner'", "'Apartheid'", "'Cape Town'", "'Johannesburg'", "'Saffer'", "'Shaka'", "'Springbok'", "'Boer'")>>
+		<<set $nickname = either("'Afrikaner'", "'Apartheid'", "'Boer'", "'Cape Town'", "'Johannesburg'", "'Mandela'", "'Saffer'", "'Shaka'", "'Springbok'")>>
 	<<case "Spanish">>
 		<<set $nickname = either("'Barcelona'", "'Jamon'", "'Madrid'", "'Monja'", "'Senora'", "'Siesta'", "'Toreadora'")>>
 	<<case "Sri Lankan">>
-		<<set $nickname = either("'Ceylon'", "'Colombo'")>>
+		<<set $nickname = either("'Ceylon'", "'Colombo'", "'Kotte'")>>
 	<<case "Sudanese">>
 		<<set $nickname = either("'Gordon's Revenge'", "'Khartoum'", "'Nubian'", "'Omdurman'")>>
 	<<case "Surinamese">>
 		<<set $nickname = either("'Bouterse'", "'Paramaribo'")>>
 	<<case "Swazi">>
-		<<set $nickname to either("'Eswatini'", "'Mbabane'")>>
+		<<set $nickname = either("'Eswatini'", "'Mbabane'")>>
 	<<case "Swedish">>
 		<<set $nickname = either("'Ikea'", "'Norse'", "'Stockholm'", "'Sweden Yes'")>>
 	<<case "Swiss">>
-		<<set $nickname = either("'Alpine'", "'Geneva'", "'Numbered Account'", "'Schlampe'", "'Zurich'", "'Neutral'", "'Banker'")>>
+		<<set $nickname = either("'Alpine'", "'Banker'", "'Geneva'", "'Neutral'", "'Numbered Account'", "'Schlampe'", "'Zurich'")>>
 	<<case "Syrian">>
-		<<set $nickname = either("'Aleppo'", "'Damascus'")>>
+		<<set $nickname = either("'Aleppo'", "'Assad'", "'Damascus'")>>
 	<<case "Taiwanese">>
-		<<set $nickname = either("'Formosa'", "'Taipei'")>>
+		<<set $nickname = either("'Chiang'", "'Formosa'", "'Kuomintang'", "'Taipei'")>>
 	<<case "Tajik">>
-		<<set $nickname = either("'Dushanbe'", "'Sarazm'")>>
+		<<set $nickname = either("'Dushanbe'", "'Rahmon'", "'Sarazm'")>>
 	<<case "Tanzanian">>
 		<<set $nickname = either("'Dar es Salaam'", "'Dodoma'", "'Wilderness'", "'Zanzibar'")>>
 	<<case "Thai">>
 		<<set $nickname = either("'Bangcock'", "'Bangkok'", "'Ladyboy'", "'Pattaya'", "'T-Girl'")>>
 	<<case "Tibetan">>
-		<<set $nickname to either("'Dalai Lama'", "'Himalayan'", "'Lhasa'")>>
+		<<set $nickname = either("'Dalai Lama'", "'Himalayan'", "'Lhasa'")>>
 	<<case "Togolese">>
-		<<set $nickname to either("'Lomé'", "'Togoland'")>>
+		<<set $nickname = either("'Eyadéma'", "'Lomé'", "'Togoland'")>>
 	<<case "Tongan">>
 		<<set $nickname = either("'Friendly'", "'Nuku'alofa'")>>
 	<<case "Trinidadian">>
@@ -630,9 +630,9 @@
 	<<case "Turkish">>
 		<<set $nickname = either("'Ankara'", "'Harem'", "'Istanbul'", "'Kebab'", "'Ottoman'", "'Turkette'", "'Turkish'", "'Turksmell'", "'ErdoÄŸan'")>>
 	<<case "Turkmen">>
-		<<set $nickname = either("'Ashgabat'", "'Karakum'")>>
+		<<set $nickname = either("'Ashgabat'", "'Karakum'", "'Merv'")>>
 	<<case "Tuvaluan">>
-		<<set $nickname = either("'Ellice'", "'Funafuti'")>>
+		<<set $nickname = either("'Ellice'", "'Funafuti'", "'Nui'")>>
 	<<case "Ugandan">>
 		<<set $nickname = either("'Bushbaby'", "'Cannibal'", "'Kampala'")>>
 	<<case "Ukrainian">>
@@ -648,24 +648,28 @@
 	<<case "Vietnamese">>
 		<<set $nickname = either("'Charlie'", "'VC'", "'Saigon'", "'Hanoi'", "'Me Love You Long Time'", "'Me So Horny'", "'Victor Charlie'", "'Viet'")>>
 	<<case "Vincentian">>
-		<<set $nickname = either("'Kingstown'", "'Vincy'")>>
+		<<set $nickname = either("'Grenadine'", "'Kingstown'", "'Vincy'")>>
 	<<case "Yemeni">>
 		<<set $nickname = either("'Khat'", "'Red Sea Pirate'", "'Queen of the Desert'")>>
 	<<case "Zairian">>
-		<<set $nickname to either("'Bongo'", "'Diamond'", "'Ebola'", "'Kinshasa'")>>
+		<<set $nickname = either("'Bongo'", "'Diamond'", "'Ebola'", "'Kinshasa'")>>
 	<<case "Zambian">>
 		<<set $nickname = either("'Livingstone'", "'Lusaka'", "'Victoria Falls'")>>
 	<<case "Zimbabwean">>
-		<<set $nickname = either("'Bobojan'", "'Grimmy'", "'Harare'", "'Kaffir'", "'Mugabe'", "'Mujiba'", "'Nyombie'", "'Rhodie'", "'Zimbo'")>>
+	    <<if $activeSlave.race == "white">>
+	        <<set $nickname = either("'Bush War'", "'Rhodie'", "'Salisbury'")>>
+	    <<else>>
+	    	<<set $nickname = either("'Bobojan'", "'Grimmy'", "'Harare'", "'Kaffir'", "'Mugabe'", "'Mujiba'", "'Nyombie'", "'Zimbo'")>>
+	    <</if>>
 	<<default>>
-		<<set $nickname = either("'Stateless'", "'Refugee'")>>
+		<<set $nickname = either("'International'", "'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 $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("'Dixie'", "'Down Home'", "'Duchess'", "'Euro Trash'", "'Europa'", "'Grits'", "'Hillbilly'", "'Hollywood'", "'Honky'", "'Ice Queen'", "'Memphis'", "'Pasty'", "'Princess'", "'Snowflake'", "'Top Dollar'", "'Valley Girl'", "'Vanilla'", "'Vegas'", "'White Bread'", "'Yankee'")>>
+	<<set $nickname = either("'Dixie'", "'Down Home'", "'Duchess'", "'Euro Trash'", "'Europa'", "'Grits'", "'Hillbilly'", "'Hollywood'", "'Honky'", "'Ice Queen'", "'Memphis'", "'Pasty'", "'Princess'", "'Snowflake'", "'Top Dollar'", "'Valley Girl'", "'Vanilla'", "'Vegas'", "'White Bread'", "'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.">>
@@ -683,7 +687,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 "black">>
-	<<set $nickname = either("'B-Girl'", "'Bottom Bitch'", "'Cocoa'", "'Cotton'", "'Gangsta'", "'His Girl Friday'", "'House Slave'", "'Jungle Fever'", "'Miss'", "'Missie'", "'Mulatto'", "'Quadroon'", "'Sheboon'")>>
+	<<set $nickname = either("'B-Girl'", "'Blackie'", "'Bottom Bitch'", "'Cocoa'", "'Cotton'", "'Gangsta'", "'His Girl Friday'", "'House Slave'", "'Jungle Fever'", "'Miss'", "'Missie'", "'Mulatto'", "'Quadroon'", "'Sheboon'")>>
 	<<set $situationDesc = "is black, which is not uncommon given the urban collapse afflicting the first world and the wars raging in Africa.  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.">>
@@ -695,7 +699,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 "middle eastern">>
-	<<set $nickname = either("'Bibi'", "'Chai Girl'", "'Desert Sun'", "'Dune'", "'Harem Girl'", "'Jasmine'", "'Sandy'", "'Scheherazade'", "'Third Wife'")>>
+	<<set $nickname = either("'Arabian Nights'", "'Bibi'", "'Chai Girl'", "'Desert Sun'", "'Dune'", "'Harem Girl'", "'Jasmine'", "'Sandy'", "'Scheherazade'", "'Third Wife'")>>
 	<<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.">>
@@ -707,13 +711,13 @@
 	<<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("'Baal Worshipper'", "'Biblical'", "'Canaanite'", "'Dead Sea'", "'Good Samaritan'", "'Holy land'", "'Inanna'", "'Ishtar'", "'Lilith'", "'Lost Ark'", "'Nephilim'", "'Philistine'", "'Qedesha'", "'Red Sea'", "'Salome'", "'Sodom and Gomorrah'", "'Whore of Babylon'")>>
+	<<set $nickname = either("'Abrahamic'", "'Baal Worshipper'", "'Biblical'", "'Canaanite'", "'Dead Sea'", "'Good Samaritan'", "'Holy land'", "'Inanna'", "'Ishtar'", "'Lilith'", "'Lost Ark'", "'Nephilim'", "'Philistine'", "'Qedesha'", "'Red Sea'", "'Salome'", "'Sodom and Gomorrah'", "'Whore of Babylon'")>>
 	<<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.">>
 
 <<case "malay">>
-	<<set $nickname = either("'Bumi'", "'Indon'", "'Island Hopper'", "'Krakatoa'", "'Nāga'", "'Nutmeg'", "'Rani'", "'Samudra Kidul'", "'Sandalwood'", "'Spice Islands'", "'Trade Winds'")>>
+	<<set $nickname = either("'Bumi'", "'Indon'", "'Island Hopper'", "'Krakatoa'", "'My Lay'", "'Nāga'", "'Nutmeg'", "'Orang'", "'Rani'", "'Samudra Kidul'", "'Sandalwood'", "'Spice Islands'", "'Trade Winds'")>>
 	<<set $situationDesc = "is malay, which is not uncommon given the ongoing poverty in many majority malay countries, and the serious weather patterns savaging 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.">>
@@ -737,37 +741,37 @@
 	<<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 "vaginalWhiner">>
-	<<set $nickname = either("'Whiny'", "'Squealer'", "'Struggles'", "'Pussy Bitch'", "'Pussy Pain'", "'Shallow'", "'Rape Bait'", "'Tight Cunt'", "'Crybaby'", "'Cunt Vise'")>>
+	<<set $nickname = either("'Crybaby'", "'Cunt Vise'", "'Pussy Bitch'", "'Pussy Pain'", "'Rape Bait'", "'Shallow'", "'Squealer'", "'Struggles'", "'Tight Cunt'", "'Whiny'")>>
 	<<set $situationDesc = "has a tight pussy and not much skill using it. She still gets fucked, which results in frequent painful situations for her. Her moaning as she takes a big dick earns her the scorn of her fellow slaves.">>
 	<<set $applyDesc = "is embarrassed by her new nickname, and resolves to try harder to address her lack of skill. She hopes she'll get better at sex soon, for her own sake.">>
 	<<set $notApplyDesc = "is a little grateful you've decided to protect her from the other slaves' mockery of her sore little pussy. She still wants to get better at sex, for her own sake.">>
 
 <<case "analWhiner">>
-	<<set $nickname = either("'Whiny'", "'Squealer'", "'Struggles'", "'Anal Bitch'", "'Ass Pain'", "'Painal'", "'Butt Rape'", "'Tight Ass'", "'Crybaby'", "'Ass Vise'")>>
+	<<set $nickname = either("'Anal Bitch'", "'Ass Pain'", "'Ass Vise'", "'Butt Rape'", "'Crybaby'", "'Painal'", "'Squealer'", "'Struggles'", "'Tight Ass'", "'Whiny'")>>
 	<<set $situationDesc = "has a tight asshole and not much skill taking an anal fuck. She still gets buttraped, which causes her a great deal of anal pain. Her sobbing as she takes a big dick up her tight little asspussy earns her the scorn of her fellow slaves.">>
 	<<set $applyDesc = "is embarrassed by her new nickname, and resolves to try harder to address her lack of skill. She hopes she'll get better at buttsex soon, for her own sake.">>
 	<<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("'Missie'", "'Slender'", "'Tomboy'", "'Ano'", "'Supermodel'", "'Runway'", "'Toothpick'", "'Zero'", "'Slip'")>>
+	<<set $nickname = either("'Ano'", "'Missie'", "'Runway'", "'Slender'", "'Slip'", "'Supermodel'", "'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("'Flatty'", "'Ironing Board'", "'Plank'", "'Undersized'", "'Itty Bitty'", "'Flat'", "'DFC'")>>
+	<<set $nickname = either("'DFC'", "'Flat'", "'Flatty'", "'Ironing Board'", "'Itty Bitty'", "'Mosquito Bites'", "'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("'Loose'", "'Used'", "'Welcoming'", "'Noisy'", "'Open'", "'Sloppy'", "'Gaping'", "'Size Queen'", "'Relaxed'", "'Accommodating'")>>
+	<<set $nickname = either("'Accommodating'", "'Gaping'", "'Loose'", "'Noisy'", "'Open'", "'Relaxed'", "'Size Queen'", "'Sloppy'", "'Used'", "'Welcoming'")>>
 	<<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.">>
 
 <<case "trap">>
-	<<set $nickname = either("'Girldick'", "'Otokonoko'", "'Switch'", "'Spurt'", "'Ganymede'", "'Chai'", "'Thai'", "'Trap'", "'Trappy'", "'Sissy'")>>
+	<<set $nickname = either("'Chai'", "'Ganymede'", "'Girldick'", "'Otokonoko'", "'Sissy'", "'Spurt'", "'Switch'", "'Thai'", "'Trap'", "'Trappy'")>>
 	<<set $situationDesc = "is a Free Cities sex slave, which makes her female. It makes her female despite several obvious physical issues, such as the fact that she's got an androgynous figure, or the fact that she has a penis. Neither of these makes any real difference when a cock gets shoved down her throat or stuffed up her butt, but they're hard not to notice.">>
 	<<set $applyDesc = "accepts that she's a little piece of shemale property.">>
 	<<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.">>
@@ -779,217 +783,217 @@
 	<<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("'Silicone'", "'Plastique'", "'Blowup Doll'", "'Balloons'")>>
+	<<set $nickname = either("'Balloons'", "'Blowup Doll'", "'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 isnot 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("'Silicone'", "'Plastique'", "'Plastic'", "'Bimbo'", "'Barbie'", "'Blowup Doll'", "'Fuck Toy'", "'Fuckmeat'", "'Brain Dead'")>>
+	<<set $nickname = either("'Barbie'", "'Bimbo'", "'Blowup Doll'", "'Brain Dead'", "'Fuck Toy'", "'Fuckmeat'", "'Plastic'", "'Plastique'", "'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.">>
 
 <<case "stupid">>
-	<<set $nickname = either("'Dumb'", "'Dumbass'", "'Idiot'", "'Brain Dead'", "'Retard'", "'Retarded'", "'Straight F Grades'", "'Intellectually Challenged'", "'Stupid'")>>
+	<<set $nickname = either("'Brain Dead'", "'Dumb'", "'Dumbass'", "'Idiot'", "'Intellectually Challenged'", "'Retard'", "'Retarded'", "'Short Bus'", "'Straight F Grades'", "'Stupid'")>>
 	<<set $situationDesc = "is, quite simply, an uneducated dullard. Numerous slaves are a bit dumb, which makes it easier to break them, but she takes the cake and throws it in the trash. Some of the other, smarter slaves, see fit to tease her for it.">>
 	<<set $applyDesc = "accepts this mockery happily, as if she doesn't recognise it for what it is.">>
 	<<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.">>
 
 <<case "smart">>
-	<<set $nickname = either("'Brainiac'", "'Nerd'", "'Smart'", "'Smarty'", "'Prodigy'", "'Einstein'", "'Genius'", "'Geek'", "'Whiz'", "'Professor'", "'Straight A Grades'")>>
+	<<set $nickname = either("'Brainiac'", "'Einstein'", "'Geek'", "'Genius'", "'Honor Roll'", "'Nerd'", "'Prodigy'", "'Professor'", "'Smart'", "'Smarty'", "'Straight A Grades'", "'Whiz'")>>
 	<<set $situationDesc = "is particularly brainy. A significant number of quality slaves are smart, but she is especially so, and it shows. She learns skills quicker, performs her duties better, and can carry intellectual conversation if allowed. Other slaves deem this enough to mock her.">>
 	<<set $applyDesc = "is proud of her intellect, and pleased that you have made it a part of her identity.">>
 	<<set $notApplyDesc = "accepts that her intellect is merely of slight interest.">>
 
 <<case "chubby">>
-	<<set $nickname = either("'Plush'", "'Chubby'", "'Hambeast'", "'Jabba'", "'Bloated'", "'Landwhale'", "'Jiggles'", "'Jiggly'", "'Tubby'", "'Whale'", "'Rotund'", "'Rubenesque'", "'Ample'", "'Jumbo'", "'Double Wide'", "'Feedee'", "'Plump'", "'Thicc'")>>
+	<<set $nickname = either("'Ample'", "'Bloated'", "'Chubby'", "'Double Wide'", "'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("'Whale'", "'Baluga'", "'Fatass'", "'Scale Breaker'", "'Lap Crusher'", "'Smothers'", "'Jiggles'", "'Jiggly'", "'Fatty'", "'Piggy'", "'Lardy'", "'Thud'", "'Buffet Closer'", "'Jumbo'", "'Double Wide'", "'Feedee'", "'Bed Breaker'", "'Roller'", "'Hambeast'", "'Jabba'", "'Bloated'")>>
+	<<set $nickname = either("'Baluga'", "'Bed Breaker'", "'Bloated'", "'Buffet Closer'", "'Double Wide'", "'Fatass'", "'Fatty'", "'Feedee'", "'Hambeast'", "'Jabba'", "'Jiggles'", "'Jiggly'", "'Jumbo'", "'Lap Crusher'", "'Lardy'", "'Piggy'", "'Roller'", "'Scale Breaker'", "'Smothers'", "'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("'Tank'", "'Amazon'", "'Gunshow'", "'Giant'", "'Gargantua'", "'Snu-Snu'", "'Prepare Yourself'", "'Gymrat'", "'Wonder Woman'", "'She-Hulk'", "'Muscle Barbie'")>>
+	<<set $nickname = either("'Amazon'", "'Gargantua'", "'Giant'", "'Gunshow'", "'Gymrat'", "'Muscle Barbie'", "'Prepare Yourself'", "'She-Hulk'", "'Snu-Snu'", "'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'", "'Greek'", "'Back Door'", "'Sphincter'", "'Butthole'", "'Swedish'", "'Sodomy'", "'Cornhole'", "'Ass Pussy'", "'Bum-Love'", "'Second Pussy'")>>
+	<<set $nickname = either("'Anal Addict'", "'Ass Pussy'", "'Back Door'", "'Bum-Love'", "'Butthole'", "'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.">>
 	
 <<case "butt toy">>
-	<<set $nickname = either("'Rim Job'", "'Stinky Pinky'", "'Back Door'", "'Sphincter'", "'Butthole'", "'Reach Around'")>>
+	<<set $nickname = either("'Back Door'", "'Butthole'", "'Reach Around'", "'Rim Job'", "'Sphincter'", "'Stinky Pinky'")>>
 	<<set $situationDesc = "loves it when attention is lavished on her butt, even though she has never done anal. 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 a client is roughly groping her rear. Her typical come-on is to 'accidentally' find her client's dick hotdogged betwixt her cheeks.">>
 	<<set $applyDesc = "knows that whatever the rest of her slave life holds, it will involve an ever growing amount of attention to her rear.">>
 	<<set $notApplyDesc = "understands that she'll have to take what butt play she can get.">>
 
 <<case "cumslut">>
-	<<set $nickname = either("'Vampire'", "'Sucker'", "'Deep Throat'", "'Throatclit'", "'Throat Meat'", "'No Gag Reflex'", "'Facepussy'", "'Semen Demon'", "'Cumfiend'", "'Succubus'", "'Vacuum'", "'Hoover'", "'Fellatio'", "'Pearl Necklace'", "'Swallows'", "'Gobbler'", "'Pole Smoker'", "'Meat Smoker'", "'Lip Service'", "'Guzzler'", "'Third Pussy'", "'Cocksucker'")>>
+	<<set $nickname = either("'Cocksucker'", "'Cumfiend'", "'Deep Throat'", "'Facepussy'", "'Fellatio'", "'Gobbler'", "'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("'Doormat'", "'Bootlicker'", "'Sub'", "'Meek'", "'Submissive'", "'Bottom'", "'Clinger'", "'Secondary'", "'Humble'")>>
+	<<set $nickname = either("'Bootlicker'", "'Bottom'", "'Clinger'", "'Doormat'", "'Humble'", "'Meek'", "'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("'Public Display'", "'Showoff'", "'Pornstar'", "'Nudist'", "'Attention Whore'", "'Showgirl'", "'Exhibitionist'", "'Flasher'", "'Flaunter'", "'Showboat'", "'Display Model'")>>
+	<<set $nickname = either("'Attention Whore'", "'Display Model'", "'Exhibitionist'", "'Flasher'", "'Flaunter'", "'Nudist'", "'Pornstar'", "'Public Display'", "'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.">>
 
 <<case "veteran">>
-	<<set $nickname = either("'Village Bicycle'", "'Public Favorite'", "'Whore Queen'", "'Dirty'", "'Worn'", "'Tired-Out'", "'Easy'", "'Cumdump'")>>
+	<<set $nickname = either("'Cumdump'", "'Dirty'", "'Easy'", "'Public Favorite'", "'Tired-Out'", "'Village Bicycle'", "'Whore Queen'", "'Worn'")>>
 	<<set $situationDesc = "has been with you for a while, and she's gotten fucked a lot. Hundreds and hundreds of times over many weeks. Though she does her best, at times it can be obvious that there's very little that surprises her any more. She's forgotten more sexual experience than many of your other slaves remember.">>
 	<<set $applyDesc = "knows that you've noticed all her hard work. Getting fucked day in and day out is harder than digging ditches, and she's a veteran ditchdigger.">>
 	<<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("'Dairy Queen'", "'Holstein'", "'Bessie'", "'Milk Cans'", "'Cow'", "'Cowbell'", "'Milky Udders'", "'Creamy'", "'Milkmaid'", "'Milk Fountain'", "'Milk Factory'")>>
+	<<set $nickname = either("'Bessie'", "'Cow'", "'Cowbell'", "'Creamy'", "'Dairy Queen'", "'Holstein'", "'Milk Cans'", "'Milk Factory'", "'Milk Fountain'", "'Milkmaid'", "'Milky 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.">>
 
 <<case "novice">>
-	<<set $nickname = either("'Fumbles'", "'Calamity'", "'Clumsy'", "'Fresh Meat'", "'Slippery'", "'Sorry'", "'Fresh'", "'Innocent'", "'Novice'")>>
+	<<set $nickname = either("'Calamity'", "'Clumsy'", "'Fresh Meat'", "'Fresh'", "'Fumbles'", "'Innocent'", "'Novice'", "'Slippery'", "'Sorry'")>>
 	<<set $situationDesc = "does her best; she really tries. But she simply hasn't mastered the skills that more experienced sex slaves take for granted. Though this can be annoying and at times even painful, it is a source of occasional slapstick comedy.">>
 	<<set $applyDesc = "has a constant reminder that no matter how skilled a courtesan she becomes, some of her greatest hits will be told as amusing anecdotes for the rest of her service.">>
 	<<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("'Mistress'", "'On Your Knees'", "'Bottom Bitch'", "'Top'", "'Favorite'", "'Perfect'", "'Mrs.'")>>
+	<<set $nickname = either("'Bottom Bitch'", "'Favorite'", "'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("'Missus'", "'Mrs.'", "'Beauty'", "'Empress'", "'Queen'", "'Princess'", "'Contessa'")>>
+	<<set $nickname = either("'Beauty'", "'Contessa'", "'Empress'", "'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("'Healing Hand'", "'Helping Hand'", "'Bath Girl'", "'Spa Mother'", "'Steam Queen'", "'Warm Water'", "'Mist Queen'", "'Misty'")>>
+	<<set $nickname = either("'Bath Girl'", "'Healing Hand'", "'Helping Hand'", "'Mist Queen'", "'Misty'", "'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("'Mother'", "'Boss Bitch'", "'Pimp Queen'", "'Pimparella'", "'Whore Queen'", "'Brothel Queen'", "'Pimp Hand'")>>
+	<<set $nickname = either("'Boss Bitch'", "'Brothel Queen'", "'Mother'", "'Pimp Hand'", "'Pimp Queen'", "'Pimparella'", "'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("'Celebutante'", "'Club Queen'", "'Club Princess'", "'Club Idol'", "'Arcology Idol'", "'LP'", "'EP'", "'SuperBass'", "'Bassgirl'", "'Subwoofers'", "'Bass Slut'", "'DJ Whore'")>>
+	<<set $nickname = either("'Arcology Idol'", "'Bass Slut'", "'Bassgirl'", "'Celebutante'", "'Club Idol'", "'Club Princess'", "'Club Queen'", "'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("'Trapper'", "'Cam Queen'", "'Slaver'", "'Snake'", "'Spider'", "'Slavecatcher'", "'Camgirl'", "'Honeytrap'", "'Honeypot'")>>
+	<<set $nickname = either("'Cam Queen'", "'Camgirl'", "'Honeypot'", "'Honeytrap'", "'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("'Rapist'", "'Snake'", "'Spider'", "'Nightstick'", "'Jailoress'", "'Interrogatrix'", "'Inquisitrix'", "'Stoolie'")>>
+	<<set $nickname = either("'Inquisitrix'", "'Interrogatrix'", "'Jailoress'", "'Nightstick'", "'Rapist'", "'Snake'", "'Spider'", "'Stoolie'")>>
 	<<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("'Dairy Queen'", "'Strong Hands'", "'Cowhand'", "'Cowpoke'", "'Milktugger'", "'Cream Queen'")>>
+	<<set $nickname = either("'Cowhand'", "'Cowpoke'", "'Cream Queen'", "'Dairy Queen'", "'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("'Cum Queen'", "'Buttfucker'", "'Prostate Poker'", "'Extractrix'", "'Sodomizer'", "'Orgasmotron'")>>
+	<<set $nickname = either("'Buttfucker'", "'Cum Queen'", "'Extractrix'", "'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("'Schoolteacher'", "'Sensei'", "'Teach'", "'Principal'", "'Professor'", "'Schoolmistress'", "'Ruler'", "'Profesora'", "'Headmistress'")>>
+	<<set $nickname = either("'Headmistress'", "'Principal'", "'Profesora'", "'Professor'", "'Ruler'", "'Schoolmistress'", "'Schoolteacher'", "'Sensei'", "'Teach'")>>
 	<<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 "Stewardess">>
-	<<set $nickname = either("'Martinent'", "'Perfectionist'", "'Inspectrix'", "'Top Mop'", "'Concierge'", "'Housemistress'")>>
+	<<set $nickname = either("'Concierge'", "'Housemistress'", "'Inspectrix'", "'Martinent'", "'Perfectionist'", "'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.">>
 	<<set $applyDesc = "likes being in charge of household tasks, especially because she's allowed to use the servants, 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 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'", "'Paladin'", "'Athena'", "'Diana'", "'Widow'", "'Terminatrix'", "'Bloody'", "'Gunsmoke'")>>
+	<<set $nickname = either("'Aegis'", "'Amazon'", "'Athena'", "'Bloody'", "'Diana'", "'Gunsmoke'", "'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.">>
 
 <<case "server">>
-	<<set $nickname = either("'Bottom'", "'Bedwarmer'", "'Sub'", "'Girltoy'", "'Slave Slut'", "'Please No'", "'Lovergirl'", "'House Slave'")>>
+	<<set $nickname = either("'Bedwarmer'", "'Bottom'", "'Girltoy'", "'House Slave'", "'Lovergirl'", "'Please No'", "'Slave Slut'", "'Sub'")>>
 	<<set $situationDesc = "holds a place in the hierarchy of your penthouse that almost demands a nickname. She is the lowest of the low, below even your other slaves. She is a pitiable creature, living with a large number of sexually charged people, slave and free, all of whom have the right to demand any sexual service they wish of her.">>
 	<<set $applyDesc = "has become almost proud of her strange, exhausting situation. Hers is not the struggle of slaves to know their place, for she knows hers. It is on the bottom.">>
 	<<set $notApplyDesc = "begins to hope a little that maybe she can rise beyond her current station.">>
 
 <<case "nipples">>
-	<<set $nickname = either("'Eye Hazard'", "'THO'", "'Nips'", "'Puffy'", "'Pointy'", "'Titclits'", "'Dicknipples'")>>
+	<<set $nickname = either("'Dicknipples'", "'Eye Hazard'", "'Nips'", "'Pointy'", "'Puffy'", "'THO'", "'Titclits'")>>
 	<<set $situationDesc = "has a pair of nipples that are hard to ignore. Whenever she's sexually aroused, they jut proudly from her chest. As a result, it's totally impossible for her to conceal arousal. When she's ready for it, her big nipples let the whole world know she's easy.">>
 	<<set $applyDesc = "is proud of the nickname, almost amusingly so. She flaunts her nipples in a way she didn't before.">>
 	<<set $notApplyDesc = "accepts that her nipples are just another part of her, and that if she pokes those who fuck her in the missionary position a little, that's all right.">>
 
 <<case "areolae">>
-	<<set $nickname = either("'Headlights'", "'Broad Based'", "'Highbeams'", "'Cans'", "'Areolae'", "'Dark Circles'")>>
+	<<set $nickname = either("'Areolae'", "'Broad Based'", "'Cans'", "'Dark Circles'", "'Headlights'", "'Highbeams'")>>
 	<<set $situationDesc = "has areolae broader than many slaves' entire breasts. Some slaves find them unattractive, making them an easy target for mockery; others like them, and playfully torment her by giving her a nickname based on them.">>
 	<<set $applyDesc = "is proud of the nickname, almost amusingly so. She flaunts her lovely broad areolae happily, the nipples in their centers hard.">>
 	<<set $notApplyDesc = "accepts that her broad areolae are just another part of her, just like her big tits.">>
 
 <<case "lips">>
-	<<set $nickname = either("'DSLs'", "'Pillows'", "'Kissy'", "'Facepussy'", "'Beestung'", "'Ducklips'")>>
+	<<set $nickname = either("'Beestung'", "'DSLs'", "'Ducklips'", "'Facepussy'", "'Kissy'", "'Pillows'")>>
 	<<set $situationDesc = "has lovely lips. They're so big she can hardly talk straight, and they even hinder her ability to communicate any facial expression other than a desire to be facefucked. This is appropriate, as she spends a lot of time getting facefucked.">>
 	<<set $applyDesc = "accepts that her big lips define her. Even more than before, she presents her mouth for oral sex whenever she flirts, and she views her throat as her primary sexual organ.">>
 	<<set $notApplyDesc = "accepts that her mouth is only one of her holes, and that as a sex slave she'll be taking cock in all of them, even if her lips are huge.">>
 
 <<case "mark">>
-	<<set $nickname = either("'Marked'", "'Chosen'", "'Breeder'", "'Special'", "'Ass Kisser'", "'Favors'", "'Connections'")>>
+	<<set $nickname = either("'Ass Kisser'", "'Breeder'", "'Chosen'", "'Connections'", "'Favors'", "'Marked'", "'Special'")>>
 	<<set $situationDesc = "an Elite Breeder. She has permanently been marked as the mother of societies children. If she isn't currently swelling with life, she will be soon. However, she is also granted special benefits befitting the mother of future generations of gifted children.">>
 	<<set $applyDesc = "takes pride in her new nickname and the bond it displays between her and her sire. She has to make sure that it doesn't go to her head, though.">>
 	<<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("'Broodmother'", "'Breeder'", "'Naedoko'", "'Nursery'", "'Bakery'", "'Baby Factory'")>>
+	<<set $nickname = either("'Baby Factory'", "'Bakery'", "'Breeder'", "'Broodmother'", "'Naedoko'", "'Nursery'")>>
 	<<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("'Broodmother'", "'Tentacle Raped'", "'Naedoko'", "'Nursery'", "'Seedbed'", "'Bursting'", "'Baby Factory'")>>
+	<<set $nickname = either("'Baby Factory'", "'Broodmother'", "'Bursting'", "'Naedoko'", "'Nursery'", "'Seedbed'", "'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("'Hyperbreeder'", "'Waterslide'", "'Squirmy'", "'Hyperfertile'", "'Bulgey'", "'Bursting'", "'Balloon'", "'Clown Car'")>>
+	<<set $nickname = either("'Balloon'", "'Bulgey'", "'Bursting'", "'Clown Car'", "'Hyperbreeder'", "'Hyperfertile'", "'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("'Daddy'", "'Sirer'", "'Potent'", "'Cum Cannon'", "'Baby Maker'", "'Womb Filler'", "'Fire Hose'", "'Baker'", "'Popper'", "'Belly Popper'", "'Breeding Bull'", "'Breeding Stud'", "'Breeding Stallion'", "'Breeding Boar'")>>
+	<<set $nickname = either("'Baby Maker'", "'Baker'", "'Belly Popper'", "'Breeding Boar'", "'Breeding Bull'", "'Breeding Stallion'", "'Breeding Stud'", "'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.">>
@@ -997,15 +1001,15 @@
 <<case "fertilityGoddess">>
 	<<switch $activeSlave.nationality>>
 	<<case "Algerian" "Congolese" "Ethiopian" "Ghanan" "Kenyan" "Libyan" "Malian" "Moroccan" "Nigerian" "Sudanese" "Tanzanian" "Tunisian" "Ugandan" "Cameroonian" "Gabonese" "Djiboutian" "Zambian" "Malagasy" "Nigerien" "Burundian", "Seychellois">>
-		<<set $nickname = either("'Asase Ya'", "'Ala'")>>
+		<<set $nickname = either("'Ala'", "'Asase Ya'")>>
 	<<case "Roman Revivalist">>
-		<<set $nickname = either("'Venus'", "'Terra'", "'Epona'", "'Fecunditas'")>>
+		<<set $nickname = either("'Epona'", "'Fecunditas'", "'Terra'", "'Venus'")>>
 	<<case "Ancient Egyptian Revivalist" "Egyptian">>
-		<<set $nickname = either("'Hathor'", "'Bastet'", "'Heqet'", "'Meskhenet'")>>
+		<<set $nickname = either("'Bastet'", "'Hathor'", "'Heqet'", "'Meskhenet'")>>
 	<<case "Aztec Revivalist">>
 		<<set $nickname = either("'Xochiquetzal'")>>
 	<<case "Edo Revivalist" "Japanese">>
-		<<set $nickname = either("'Kisshōten'", "'Inari Ōkami'")>>
+		<<set $nickname = either("'Inari Ōkami'", "'Kisshōten'")>>
 	<<case "Arabian Revivalist" "Arabic">>
 		<<set $nickname = either("'Al-Lat'")>>
 	<<case "Ancient Chinese Revivalist" "Chinese">>
@@ -1024,15 +1028,15 @@
 		<<set $nickname = either("'Bhūmi'", "'Parvati'", "'Sinivali'")>>
 	<<default>>
 		<<if $activeSlave.race == "white">>
-			<<set $nickname = either("'Venus'", "'Gaia'", "'Freyja'", "'Aphrodite'", "'Demeter'", "'Ceres'")>>
+			<<set $nickname = either("'Aphrodite'", "'Ceres'", "'Demeter'", "'Freyja'", "'Gaia'", "'Venus'")>>
 		<<elseif $activeSlave.race == "pacific islander">>
 			<<set $nickname = either("'Haumea'", "'Nuakea'")>>
 		<<elseif $activeSlave.race == "amerindian">>
 			<<set $nickname = either("'Atahensic'", "'Hanhepi Wi'")>>
 		<<elseif $activeSlave.race == "black">>
-			<<set $nickname = either("'Asase Ya'", "'Ala'")>>
+			<<set $nickname = either("'Ala'", "'Asase Ya'")>>
 		<<else>>
-			<<set $nickname = either("'Venus'", "'Gaia'")>>
+			<<set $nickname = either("'Gaia'", "'Venus'")>>
 		<</if>>
 	<</switch>>
 	<<set $situationDesc = "is the spitting image of a fertility idol. With her wide hips, heavy bossom and fecund belly, she lives up to the title.">>
@@ -1040,31 +1044,31 @@
 	<<set $notApplyDesc = "accepts that her motherly curves are just the mark of a sex slave and not a goddess.">>
 
 <<case "superSquirter">>
-	<<set $nickname = either("'Baby'", "'Bedwetter'", "'Squirter'", "'Gusher'", "'Needs Diapers'", "'Panty Wetter'", "'Super Soaker'", "'Geyser'", "'Girlcum'", "'Fountain'")>>
+	<<set $nickname = either("'Baby'", "'Bedwetter'", "'Fountain'", "'Geyser'", "'Girlcum'", "'Gusher'", "'Needs Diapers'", "'Panty Wetter'", "'Squirter'", "'Super Soaker'", "'Water Park'")>>
 	<<set $situationDesc = "completely soaks herself and her partners whenever she cums. Every orgasm from her unleashes a waterfall of girlcum from her pussy.">>
 	<<set $applyDesc = "takes pride in the amount of girlcum she makes, even though it looks like she peed herself when she cums with her clothes on.">>
 	<<set $notApplyDesc = "understands that she must learn to control herself and stop soaking her partners, clothes and bed.">>
 
 <<case "labia">>
-	<<set $nickname = either("'Flaps'", "'Petals'", "'Blooming'", "'Folds'", "'Flower'", "'Roastie'", "'Meatflaps'")>>
+	<<set $nickname = either("'Blooming'", "'Flaps'", "'Flower'", "'Folds'", "'Meatflaps'", "'Petals'", "'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.">>
 
 <<case "old">>
-	<<set $nickname = either("'Auntie'", "'Oba-san'", "'Cougar'", "'Mommy'", "'Mother'", "'Okā-san'", "'Big Sis'", "'Onē-san'", "'Cradle Robber'", "'MILF'", "'Mature'", "'Jukusei'", "'Seasoned'")>>
+	<<set $nickname = either("'Auntie'", "'Big Sis'", "'Cougar'", "'Cradle Robber'", "'Jukusei'", "'Mature'", "'MILF'", "'Mommy'", "'Mother'", "'Oba-san'", "'Okā-san'", "'Onē-san'", "'Seasoned'")>>
 	<<set $situationDesc = "is older than the average Free Cities slave. It has its downsides; she's worth less at sale and her earning potential as a whore is lower. But, on the other hand, good experience is irreplaceable, and in your experience all slaves feel remarkably similar inside, regardless of age. Nevertheless, some younger slaves resent her.">>
 	<<set $applyDesc = "understands that far from being a mockery, your sanction has turned an intended insult into a reference to the advantages of her years.">>
 	<<set $notApplyDesc = "understands that she must do her best to fuck like the teenager she isn't.">>
 
 <<case "reallyold">>
-	<<set $nickname = either("'Granny'", "'Grandma'", "'GMILF'", "'Obā-chan'", "'Senior'", "'Senior Citizen'", "'Aged'", "'Generation X'")>>
+	<<set $nickname = either("'Aged'", "'Generation X'", "'GMILF'", "'Grandma'", "'Granny'", "'Obā-chan'", "'Senior Citizen'", "'Senior'")>>
 	<<set $situationDesc = "is old. Really old. Old enough to be a grandmother. This, naturally, makes her one of the most experienced sluts in the arcology, a desirable quality in and of itself. Many of the younger slaves mock her relentlessly for her age.">>
 	<<set $applyDesc = "accepts her new nickname with pride. This acknowledgement of her age has her ready to show these young sluts a thing or two.">>
 	<<set $notApplyDesc = "understands that she must do her best to fuck like the teenager she once was.	">>
 
 <<case "young">>
-	<<set $nickname = either("'Precocious'", "'Jailbait'", "'Pedobait'", "'Pocket Pussy'", "'Underage'", "'Lolita'", "'Loli'", "'Juliet'", "'Baby'", "'Babycakes'", "'Party Van'", "'PTHC'", "'POMF'", "'Candydoll'", "'Imouto'")>>
+	<<set $nickname = either("'Baby'", "'Babycakes'", "'Candydoll'", "'Imouto'", "'Jailbait'", "'Juliet'", "'Loli'", "'Lolita'", "'Party Van'", "'Pedobait'", "'Pocket Pussy'", "'POMF'", "'Precocious'", "'PTHC'", "'Underage'")>>
 	<<if random(1, 1500) <= 100>>
 		<<if ($activeSlave.physicalAge < 13)>>
 			<<set $nickname = "'Preteen'">>
@@ -1080,67 +1084,67 @@
 	<<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("'Surprise'", "'Queen'", "'Shemale'", "'Missie'", "'Girly'", "'Legs Crossed'", "'Trap'")>>
+	<<set $nickname = either("'Girly'", "'Legs Crossed'", "'Missie'", "'Queen'", "'Shemale'", "'Surprise'", "'Trap'")>>
 	<<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("'Pocket Pussy'", "'Stumps'", "'Nubs'", "'Fucknugget'", "'Cocksock'", "'Fleshlight'", "'Onahole'", "'Dickholster'")>>
+	<<set $nickname = either("'Cocksock'", "'Dickholster'", "'Fleshlight'", "'Fucknugget'", "'Nubs'", "'Onahole'", "'Pocket Pussy'", "'Stumps'")>>
 	<<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("'Blind'", "'Stares'", "'No-Sight'", "'Deadeye'", "'Sightless'", "'Crash'")>>
+	<<set $nickname = either("'Blind'", "'Crash'", "'Deadeye'", "'No-Sight'", "'Sightless'", "'Stares'")>>
 	<<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.">>
 
 <<case "preg">>
-	<<set $nickname = either("'Broodmother'", "'Breeder'", "'Breeding Cow'", "'Breeding Sow'", "'Breeding Bitch'", "'Breeding Stock'", "'Breeding Mare'", "'Mare'", "'Fertile'", "'Mother'", "'Mommy'", "'Ninpuchan'", "'Preggers'")>>
+	<<set $nickname = either("'Breeder'", "'Breeding Bitch'", "'Breeding Cow'", "'Breeding Mare'", "'Breeding Sow'", "'Breeding Stock'", "'Broodmother'", "'Fertile'", "'Mare'", "'Mommy'", "'Mother'", "'Ninpuchan'", "'Preggers'")>>
 	<<set $situationDesc = "is a breeding slave. Her belly seems to grow daily, unavoidable evidence that she's pregnant. Most men prefer slaves without pregnant stomachs, but those that enjoy them adore her. She occupies a strange place in slave culture, desired and abhorred, hopeful and fearful.">>
 	<<set $applyDesc = "takes a bit of solace from her new hope at her nickname that she will be allowed to complete 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 her pregnancy.">>
 
 <<case "hung">>
-	<<set $nickname = either("'Tentpole'", "'Hung'", "'Tripod'", "'Third Arm'", "'Long Dong'", "'Bitchbreaker'", "'Swingin' Dick'", "'Long'", "'Shaft'")>>
+	<<set $nickname = either("'Bitchbreaker'", "'Hung'", "'Long Dong'", "'Long'", "'Shaft'", "'Swingin' Dick'", "'Tentpole'", "'Third Arm'", "'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.">>
 
 <<case "gelding">>
-	<<set $nickname = either("'Neutered'", "'Nipped'", "'Clipped'", "'Empty'", "'Sackless'", "'Limp'", "'Gelded'", "'Soft'")>>
+	<<set $nickname = either("'Clipped'", "'Empty'", "'Gelded'", "'Limp'", "'Neutered'", "'Nipped'", "'Sackless'", "'Soft'")>>
 	<<set $situationDesc = "is a Free Cities sex slave, which makes her a girl. This is an easier thing for her to accept since her testicles were removed. The lack of testosterone makes her docile and more accepting of her proper role as a receptacle for hard dick. Naturally, other slaves have taken notice.">>
 	<<set $applyDesc = "naturally viewed her own castration as a subject of revulsion and horror. Now, though, she begins to see herself as filling a right and proper role as a gelded slave.">>
 	<<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("'Shortstack'", "'Waif'", "'Petite'", "'Cock Sock'", "'Pocket Pussy'", "'Funsize'", "'Miniature'", "'Tiny'", "'Shortstuff'", "'Shorty'")>>
+	<<set $nickname = either("'Cock Sock'", "'Funsize'", "'Miniature'", "'Petite'", "'Pocket Pussy'", "'Shortstack'", "'Shortstuff'", "'Shorty'", "'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("'Skyscraper'", "'Basketballer'", "'B-Baller'", "'Everest'", "'Giant'", "'Beanpole'")>>
+	<<set $nickname = either("'B-Baller'", "'Basketballer'", "'Beanpole'", "'Everest'", "'Giant'", "'Skyscraper'", "'Stretch'")>>
 	<<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("'Bouncing'", "'Bouncy'", "'Stacked'", "'Hooters'", "'Airbags'", "'Tatas'", "'Melons'", "'Funbags'", "'Jugs'", "'Bristols'", "'Oppai'", "'Bazookas'", "'Norks'", "'Knockers'", "'Chounyuu'")>>
+	<<set $nickname = either("'Airbags'", "'Bazookas'", "'Bouncing'", "'Bouncy'", "'Bristols'", "'Chounyuu'", "'Funbags'", "'Hooters'", "'Jugs'", "'Knockers'", "'Melons'", "'Norks'", "'Oppai'", "'Stacked'", "'Tatas'")>>
 	<<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("'Bootylicious'", "'Jiggly'", "'Wide Load'", "'Moneymaker'", "'Buns'", "'Badonkadonk'", "'Brazilian'", "'Bunda'", "'Milkshake'", "'Tushy'", "'Heiny'", "'Rump'", "'Backside'", "'Thunder Thighs'")>>
+	<<set $nickname = either("'Backside'", "'Badonkadonk'", "'Bootylicious'", "'Brazilian'", "'Bunda'", "'Buns'", "'Heiny'", "'Jiggly'", "'Milkshake'", "'Moneymaker'", "'Rump'", "'Thunder Thighs'", "'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.">>
 
 <<case "virgin">>
-	<<set $nickname = either("'Pure'", "'Innocent'", "'Flower'", "'Chaste'", "'Unbroken'", "'Doomed'", "'Chastity'", "'Pristine'", "'Unspoilt'", "'Vestal'")>>
+	<<set $nickname = either("'Chaste'", "'Chastity'", "'Doomed'", "'Flower'", "'Innocent'", "'Pristine'", "'Pure'", "'Unbroken'", "'Unspoilt'", "'Vestal'")>>
 	<<set $situationDesc = "has never had vanilla sex. This is not unusual in the Free Cities, since many slaveowners value and preserve virginity. Virgins form a separate class of sorts among slaves. Some of them even dislike their status, as having a virgin pussy can often result in a tired tongue or a sore butt.">>
 	<<set $applyDesc = "understands that it's her fate to remain unspoiled a while longer, and redoubles her efforts to do better with her other parts.">>
 	<<set $notApplyDesc = "dreads and anticipates the day when she'll lose her pearl of great price and gain another way to please a man.">>
diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw
index 8b8c2338393ae28809c54eb621f46fc03b564b95..d93d3102b9f8585893c69807b2b3d4d4944362ab 100644
--- a/src/uncategorized/reShelterInspection.tw
+++ b/src/uncategorized/reShelterInspection.tw
@@ -79,7 +79,7 @@ Your assistant announces a visitor in the entryway of your penthouse, and adds<<
 	<<case "goddess">>
 		Her avatar crosses her arms over her chest (barely) and makes a face like she wants to scold someone.
 	<<case "schoolgirl">>
-		Her avatar throws a little schoolgirl fit, sticking out its tongue and blowing a rasberry.
+		Her avatar throws a little schoolgirl fit, sticking out its tongue and blowing a raspberry.
 	<<default>>
 		Her avatar turns a reproving blue and shrinks a little.
 	<</switch>>
diff --git a/src/uncategorized/rename.tw b/src/uncategorized/rename.tw
index adf1fe5eddc1ebb915dba73461633adccdadd9b1..473d48093954d2d752bf0d4ec3ba3f596883bc84 100644
--- a/src/uncategorized/rename.tw
+++ b/src/uncategorized/rename.tw
@@ -16,13 +16,17 @@
 	<<elseif $activeSlave.devotion >= -50>>
 		reluctantly accepts her new name.
 	<<else>>
-		angrily tries to resist her new name, insisting that her name is 
-		<<switch $activeSlave.nationality>>
-		<<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
-			<<if $activeSlave.birthSurname>>$activeSlave.birthSurname <</if>>$activeSlave.birthName.
-		<<default>>
+		angrily tries to resist her new name, insisting that her name is
+		<<if $surnameOrder != 1>>
+			<<switch $activeSlave.nationality>>
+			<<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">>
+				<<if $activeSlave.birthSurname>>$activeSlave.birthSurname <</if>>$activeSlave.birthName.
+			<<default>>
+				$activeSlave.birthName<<if $activeSlave.birthSurname>> $activeSlave.birthSurname<</if>>.
+			<</switch>>
+		<<else>>
 			$activeSlave.birthName<<if $activeSlave.birthSurname>> $activeSlave.birthSurname<</if>>.
-		<</switch>>
+		<</if>>
 		This resistance @@.mediumorchid; increases her rebelliousness.@@
 		<<set $activeSlave.devotion -= 5>>
 	<</if>>
diff --git a/src/uncategorized/saDiet.tw b/src/uncategorized/saDiet.tw
index d08212738e2c8bfefe23f8fe2bb3887ec6c0edf2..ab33a859163752ed803a37f407b19d5bd0aa205a 100644
--- a/src/uncategorized/saDiet.tw
+++ b/src/uncategorized/saDiet.tw
@@ -362,84 +362,82 @@
 	<<if !canWalk($slaves[$i])>>
 		She is no longer capable of actively working out. Her special diet @@.yellow;has ended.@@
 		<<set $slaves[$i].diet = "healthy">>
-	<<else>>
+	<<elseif $slaves[$i].muscles > 5>>
 		<<if $slaves[$i].muscles <= 10>>
-			<<if $slaves[$i].muscles <= 10>>
-				Her long workouts focus on cardio. She has finally @@.orange;lost all visible musculature.@@
-				<<set $slaves[$i].muscles = 0>>
-				<<set $slaves[$i].diet = "healthy">>
-			<<elseif ($slaves[$i].drugs == "steroids")>>
-				Her long workouts focus on cardio, but since she's still shooting gear, she @@.lime;loses mass slowly.@@
-				<<set $slaves[$i].muscles -= 3>>
-			<<elseif ($slaves[$i].balls > 0) && ($slaves[$i].hormoneBalance <= -100)>>
-				Her long workouts focus on cardio, but since she's got so much natural and artificial testosterone, she @@.lime;loses mass slowly.@@
-				<<set $slaves[$i].muscles -= 3>>
-			<<elseif ($slaves[$i].balls > 0) && ($slaves[$i].hormoneBalance >= 100)>>
-				Her long workouts focus on cardio, and with the natural testosterone in her system counteracted by hormone treatment, she @@.lime;loses musculature.@@
-				<<set $slaves[$i].muscles -= 5>>
-			<<elseif ($slaves[$i].balls > 0)>>
-				Her long workouts focus on cardio, but with some natural testosterone in her system, she @@.lime;loses muscle slowly.@@
-				<<set $slaves[$i].muscles -= 3>>
-			<<elseif ($slaves[$i].hormoneBalance >= 100)>>
-				Her long workouts focus on cardio, and with female hormone treatment, she @@.lime;loses musculature rapidly.@@
-				<<set $slaves[$i].muscles -= 8>>
-			<<elseif ($slaves[$i].hormoneBalance <= -100)>>
-				Her long workouts focus on cardio, but under male hormone treatment, she @@.lime;loses muscle slowly.@@
-				<<set $slaves[$i].muscles -= 3>>
-			<<else>>
-				Her long workouts focus on cardio, and she @@.lime;loses musculature.@@
-				<<set $slaves[$i].muscles -= 5>>
-			<</if>>
-			<<if ($slaves[$i].behavioralQuirk == "fitness")>>
-				She approaches endurance work with real enthusiasm, quickly slimming her down.
-				<<set $slaves[$i].muscles -= 2>>
-			<</if>>
-			<<if random(1,100) > 90>>
-				<<if ($slaves[$i].boobs-$slaves[$i].boobsImplant >= 200)>>
-					@@.orange;Her breasts get a little smaller.@@
-					<<set $slaves[$i].boobs -= 50>>
-				<<elseif ($slaves[$i].butt > 1)>>
-					@@.orange;Her butt gets a little smaller.@@
-					<<set $slaves[$i].butt -= 1>>
-				<</if>>
-			<</if>>
-			<<if random(1,100) > 80>>
-				Her workout successes have @@.green;improved her health.@@
-				<<set $slaves[$i].health += 10>>
-			<</if>>
-			<<if $slaves[$i].weight > 10>>
-				Her workouts have also @@.orange;burned off some excess fat.@@
-				<<set $slaves[$i].weight -= 2>>
-			<</if>>
+			Her long workouts focus on cardio. She has finally @@.orange;lost all visible musculature.@@
+			<<set $slaves[$i].muscles = 0>>
+			<<set $slaves[$i].diet = "healthy">>
+		<<elseif ($slaves[$i].drugs == "steroids")>>
+			Her long workouts focus on cardio, but since she's still shooting gear, she @@.lime;loses mass slowly.@@
+			<<set $slaves[$i].muscles -= 3>>
+		<<elseif ($slaves[$i].balls > 0) && ($slaves[$i].hormoneBalance <= -100)>>
+			Her long workouts focus on cardio, but since she's got so much natural and artificial testosterone, she @@.lime;loses mass slowly.@@
+			<<set $slaves[$i].muscles -= 3>>
+		<<elseif ($slaves[$i].balls > 0) && ($slaves[$i].hormoneBalance >= 100)>>
+			Her long workouts focus on cardio, and with the natural testosterone in her system counteracted by hormone treatment, she @@.lime;loses musculature.@@
+			<<set $slaves[$i].muscles -= 5>>
+		<<elseif ($slaves[$i].balls > 0)>>
+			Her long workouts focus on cardio, but with some natural testosterone in her system, she @@.lime;loses muscle slowly.@@
+			<<set $slaves[$i].muscles -= 3>>
+		<<elseif ($slaves[$i].hormoneBalance >= 100)>>
+			Her long workouts focus on cardio, and with female hormone treatment, she @@.lime;loses musculature rapidly.@@
+			<<set $slaves[$i].muscles -= 8>>
+		<<elseif ($slaves[$i].hormoneBalance <= -100)>>
+			Her long workouts focus on cardio, but under male hormone treatment, she @@.lime;loses muscle slowly.@@
+			<<set $slaves[$i].muscles -= 3>>
 		<<else>>
-			Her long workouts focus on cardio to keep her body lithe.
-			<<if ($slaves[$i].behavioralQuirk == "fitness")>>
-				She @@.hotpink;enjoys@@ the time she's given to workout.
-				<<set $slaves[$i].devotion += 2>>
-			<</if>>
-			<<if $slaves[$i].muscles < -10>>
-				Since she is rather weak, her routine slowly tones her soft muscles.
-				<<set $slaves[$i].muscles++>>
-			<</if>>
+			Her long workouts focus on cardio, and she @@.lime;loses musculature.@@
+			<<set $slaves[$i].muscles -= 5>>
+		<</if>>
+		<<if ($slaves[$i].behavioralQuirk == "fitness")>>
+			She approaches endurance work with real enthusiasm, quickly slimming her down.
+			<<set $slaves[$i].muscles -= 2>>
+		<</if>>
+		<<if random(1,100) > 90>>
 			<<if ($slaves[$i].boobs-$slaves[$i].boobsImplant >= 200)>>
 				@@.orange;Her breasts get a little smaller.@@
 				<<set $slaves[$i].boobs -= 50>>
+			<<elseif ($slaves[$i].butt > 1)>>
+				@@.orange;Her butt gets a little smaller.@@
+				<<set $slaves[$i].butt -= 1>>
 			<</if>>
-			<<if random(1,100) > 50>>
-				<<if ($slaves[$i].butt > 1)>>
-					@@.orange;Her butt loses a little mass.@@
-					<<set $slaves[$i].butt -= 1>>
-				<</if>>
-			<</if>>
-			<<if random(1,100) > 50 && $slaves[$i].health <= 90 && $slaves[$i].health >= -20>>
-				Her workout successes have @@.green;improved her health.@@
-				<<set $slaves[$i].health += 5>>
-			<</if>>
-			<<if $slaves[$i].weight > 10>>
-				Her workouts have also @@.orange;burned off some excess fat.@@
-				<<set $slaves[$i].weight -= 2>>
+		<</if>>
+		<<if random(1,100) > 80>>
+			Her workout successes have @@.green;improved her health.@@
+			<<set $slaves[$i].health += 10>>
+		<</if>>
+		<<if $slaves[$i].weight > 10>>
+			Her workouts have also @@.orange;burned off some excess fat.@@
+			<<set $slaves[$i].weight -= 2>>
+		<</if>>
+	<<else>>
+		Her long workouts focus on cardio to keep her body lithe.
+		<<if ($slaves[$i].behavioralQuirk == "fitness")>>
+			She @@.hotpink;enjoys@@ the time she's given to workout.
+			<<set $slaves[$i].devotion += 2>>
+		<</if>>
+		<<if $slaves[$i].muscles < -10>>
+			Since she is rather weak, her routine slowly tones her soft muscles.
+			<<set $slaves[$i].muscles++>>
+		<</if>>
+		<<if ($slaves[$i].boobs-$slaves[$i].boobsImplant >= 200)>>
+			@@.orange;Her breasts get a little smaller.@@
+			<<set $slaves[$i].boobs -= 50>>
+		<</if>>
+		<<if random(1,100) > 50>>
+			<<if ($slaves[$i].butt > 1)>>
+				@@.orange;Her butt loses a little mass.@@
+				<<set $slaves[$i].butt -= 1>>
 			<</if>>
 		<</if>>
+		<<if random(1,100) > 50 && $slaves[$i].health <= 90 && $slaves[$i].health >= -20>>
+			Her workout successes have @@.green;improved her health.@@
+			<<set $slaves[$i].health += 5>>
+		<</if>>
+		<<if $slaves[$i].weight > 10>>
+			Her workouts have also @@.orange;burned off some excess fat.@@
+			<<set $slaves[$i].weight -= 2>>
+		<</if>>
 	<</if>>
 <<case "cum production">>
 	<<if $slaves[$i].fetish != "mindbroken">>
diff --git a/src/uncategorized/saHormoneEffects.tw b/src/uncategorized/saHormoneEffects.tw
index 9bbe08e569921d4e117019bc26773ef11b40bc13..400a73e9b52ee2376d0c1429f478f1aae88cd796 100644
--- a/src/uncategorized/saHormoneEffects.tw
+++ b/src/uncategorized/saHormoneEffects.tw
@@ -71,6 +71,7 @@
 	<</if>>
 <</if>>
 
+<<if $slaves[$i].physicalAge >= 18 || $loliGrow == 1>>
 <<if Math.abs($slaves[$i].hormoneBalance) >= 50>>
 
 <<if $slaves[$i].hormoneBalance >= 350>>
@@ -758,6 +759,7 @@
 
 <</if>>
 
+<</if>>
 <</if>>
 
 <<if $slaves[$i].fetish != "mindbroken" && $slaves[$i].fuckdoll == 0>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index dbec3f4d7908dbfe85b03ee051a49d381e60b757..7adb4334e7be16d6579f588ac5a6c8a38011d410 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -328,7 +328,7 @@
 			She's such a masochist that the pain of even getting semi-hard in her chastity cage turns her on even more, @@.green;slightly increasing her sexual appetite.@@
 			<<set $slaves[$i].energy++>>
 		<<else>>
-			Her chastity cage is always painfully tight around her smi-hard dick; something that seems to be arousing to her, only to make it even more painful.
+			Her chastity cage is always painfully tight around her semi-hard dick; something that seems to be arousing to her, only to make it even more painful.
 			<<set $slaves[$i].energy++>>
 		<</if>>
 	<<elseif $slaves[$i].sexualFlaw == "neglectful">>
@@ -949,7 +949,7 @@
 					She thinks of the horribly huge tailed plug she has wear in her butt as @@.lime;preparation for the biggest cocks,@@ and @@.hotpink;looks forward@@ to being able to safely take unlubricated anal from them. Even so, the tail hanging from her rear is @@.gold;a constant degrading reminder of her submission.@@
 					<<set $slaves[$i].devotion += 4, $slaves[$i].trust -= 5>>
 				<<elseif ($slaves[$i].fetish == "masochist") && ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
-					She gets off on the agony of having her anal sphincter @@.lime;permanently gaped@@ by a huge tailed buttplug, but can't ignore the tail hanging from the back of the plug. The terrible combination of anal pleasure and degradation @@.hotpink;breaks her will@@ amd fills her with @@.gold;humiliation.@@
+					She gets off on the agony of having her anal sphincter @@.lime;permanently gaped@@ by a huge tailed buttplug, but can't ignore the tail hanging from the back of the plug. The terrible combination of anal pleasure and degradation @@.hotpink;breaks her will@@ and fills her with @@.gold;humiliation.@@
 					<<set $slaves[$i].devotion += 5, $slaves[$i].trust -= 7>>
 				<<elseif ($slaves[$i].fetish == "submissive") && ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
 					She submits to the agony of having her anal sphincter @@.lime;permanently gaped@@ by a huge tailed buttplug and the shame of having a tail dangle from the back of the plug. Having her hole ruined at your whim and in such a degrading fashion @@.hotpink;breaks her will@@ and fills her with @@.gold;humiliation.@@
@@ -2223,7 +2223,7 @@
 			<<set $slaves[$i].devotion -= 10>>
 		<</if>>
 	<<elseif $arcologies[0].FSRepopulationFocus != "unset">>
-		Living in a society that glorifies her paraphilia @@.hotpink;leaves her in perpetual ectasy.@@
+		Living in a society that glorifies her paraphilia @@.hotpink;leaves her in perpetual ecstasy.@@
 		<<set $slaves[$i].devotion += 5>>
 	<</if>>
 	<<if $slaves[$i].broodmother > 0 && $slaves[$i].pregKnown == 1>>
@@ -2231,7 +2231,7 @@
 		<<set _para = 1>>
 		<<set $slaves[$i].devotion += 5>>
 	<<elseif $slaves[$i].pregControl == "labor supressors" && $slaves[$i].preg >= 40>>
-		Under the effects of labor supression drugs, she knows she will be pregnant until you decided to allow her birth. @@.hotpink;She couldn't be happier.@@
+		Under the effects of labor suppression drugs, she knows she will be pregnant until you decided to allow her birth. @@.hotpink;She couldn't be happier.@@
 		<<set _para = 1>>
 		<<set $slaves[$i].devotion += 5>>
 	<<elseif $slaves[$i].pregType >= 10 && $slaves[$i].pregKnown == 1>>
@@ -3499,7 +3499,7 @@
 		<</if>>
 	<</if>>
 <<set $slaves[$i].hormoneBalance = Math.clamp($slaves[$i].hormoneBalance, -400, 400)>>
-<<if $slaves[$i].drugs != "hormone blockers" && ($slaves[$i].physicalAge >= 18 || $loliGrow == 1)>>
+<<if $slaves[$i].drugs != "hormone blockers">>
 	<<include "SA hormone effects">>
 <<elseif $slaves[$i].drugs == "hormone blockers">>
 	The hormone blockers $pronoun is on suppress $possessive hormones, natural or not.
@@ -3532,6 +3532,7 @@
 		<<set $slaves[$i].hormoneBalance += 5>>
 	<</if>>
 <</if>>
+
 <<if $slaves[$i].genes == "XX">>
 	<<if $slaves[$i].ovaries == 1 || $slaves[$i].mpreg == 1>>
 		<<if $slaves[$i].balls > 0>>
@@ -5122,7 +5123,7 @@
 	<</if>>
 	<<if $slaves[$i].breedingMark == 1>>
 		<<if $slaves[$i].pregKnown == 1 && $slaves[$i].pregSource == -1>>
-			The Societal Elite @@.green;are pleased@@ your child is growing in within <<print $object>>. The mark covering $possessive lower belly, coupled with $possessive gravidity and blessing, @@.green;enamores@@ your populace.
+			The Societal Elite @@.green;are pleased@@ your child is growing in within <<print $object>>. The mark covering $possessive lower belly, coupled with $possessive gravidity and blessing, @@.green;enamors@@ your populace.
 			<<set $failedElite -= 5+$slaves[$i].pregType>>
 			<<FSChangePorn "Eugenics" 3>>
 		<</if>>
@@ -6196,7 +6197,7 @@
 				She finds pulling them along @@.mediumorchid;mildly annoying.@@
 				<<set $slaves[$i].devotion -= 1>>
 			<<else>>
-				She finds pulling them along a litte annoying, but your will is far more important to her.
+				She finds pulling them along a little annoying, but your will is far more important to her.
 			<</if>>
 		<<elseif ($slaves[$i].boobs > 5000)>>
 			<<if canWalk($slaves[$i])>>
@@ -6261,7 +6262,7 @@
 				She finds pulling them along @@.mediumorchid;mildly annoying.@@
 				<<set $slaves[$i].devotion -= 1>>
 			<<else>>
-				She finds pulling them along a litte annoying, but your will is far more important to her.
+				She finds pulling them along a little annoying, but your will is far more important to her.
 			<</if>>
 		<<elseif ($slaves[$i].boobs > 10000)>>
 			<<if canWalk($slaves[$i])>>
diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw
index 7825a668db6adec594866948b775dbc9479aa44a..43a28477f921ad51c3ad9aad256b7a38f1301f24 100644
--- a/src/uncategorized/saRecruitGirls.tw
+++ b/src/uncategorized/saRecruitGirls.tw
@@ -1,4 +1,4 @@
-:: SA recruit girls [nobr]
+:: SA recruit girls [nobr]
 
 <<set $bellyAccessory = $slaves[$i].bellyAccessory>>
 
@@ -212,7 +212,7 @@ acting as a sexual Ambassador to $arcologies[_j].name, which mostly means that s
 	<</if>>
 <<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
 	<<if $arcologies[_j].FSEgyptianRevivalist != "unset">>
-		She advances Egyptian Revivalism there by playing her part in the endless round of voluptous entertainments<<if $slaves[$i].relationship && $slaves[$i].relation && $slaves[$i].relationshipTarget == $slaves[$i].relationTarget>>, which she's perfect for, since everyone knows that at the end of the day she'll go home and make love to a blood relative<<set $arcologies[_j].FSEgyptianRevivalist++>><</if>>.
+		She advances Egyptian Revivalism there by playing her part in the endless round of voluptuous entertainments<<if $slaves[$i].relationship && $slaves[$i].relation && $slaves[$i].relationshipTarget == $slaves[$i].relationTarget>>, which she's perfect for, since everyone knows that at the end of the day she'll go home and make love to a blood relative<<set $arcologies[_j].FSEgyptianRevivalist++>><</if>>.
 		<<set $arcologies[_j].FSEgyptianRevivalist += _influence>>
 	<</if>>
 <<elseif $arcologies[0].FSEdoRevivalist != "unset">>
@@ -725,7 +725,7 @@ She is able to smartly <<if $arcologies[0].FSPaternalist != "unset">>answer<<els
 	<<elseif $slaves[$i].preg > 15>>
 		She makes a habit of allowing the public to fondle and enjoy baby rounded belly.
 	<<elseif $slaves[$i].births > 0>>
-		Any time she stars in an erotic photoshoot, she always makes sure to follow up with a, hopefully positive, pregnancy test. Though she makes sure to hype up her viewers to sign up to be the one to knock her up should it come up negative.
+		Any time she stars in an erotic photo shoot, she always makes sure to follow up with a, hopefully positive, pregnancy test. Though she makes sure to hype up her viewers to sign up to be the one to knock her up should it come up negative.
 	<<else>>
 		Her efforts would have more impact if her womb wasn't so empty. Disappointing any who would want to see her pregnant.
 	<</if>>
@@ -739,12 +739,12 @@ She is able to smartly <<if $arcologies[0].FSPaternalist != "unset">>answer<<els
 <</if>>
 <<if $arcologies[0].FSRestart != "unset">>
 	<<if $slaves[$i].bellyPreg >= 1500 && $slaves[$i].breedingMark == 1>>
-		She prominently displays her pregnancy and the mark branded upon it signifying the superior child growing within her. Her audience is enamoured by her distinct status.
+		She prominently displays her pregnancy and the mark branded upon it signifying the superior child growing within her. Her audience is enamored by her distinct status.
 	<<elseif $slaves[$i].breedingMark == 1>>
 		She prominently displays the mark branded over her womb, but without the curve of pregnancy beneath it, it only goes so far.
 	<<elseif $slaves[$i].bellyPreg < 100>>
 		<<if ($slaves[$i].dick > 0 && $slaves[$i].balls == 0)>>
-			She makes sure to wear tight fitting clothes to show off the bulge of her dick and, most notably, the lack of testicles under it in all her photoshoots.
+			She makes sure to wear tight fitting clothes to show off the bulge of her dick and, most notably, the lack of testicles under it in all her photo shoots.
 		<<elseif ($slaves[$i].vaginalAccessory == "chastity belt" || $slaves[$i].dickAccessory == "chastity" || $slaves[$i].vaginalAccessory == "combined chastity" || $slaves[$i].dickAccessory == "combined chastity")>>
 			In all her public appearances, her choice of clothing is always crotchless, leaving her chastity gear as the only thing protecting her modesty.
 		<<elseif (($slaves[$i].ovaries == 0 && $slaves[$i].mpreg == 0) || $slaves[$i].preg < -1)>>
@@ -799,14 +799,14 @@ She is able to smartly <<if $arcologies[0].FSPaternalist != "unset">>answer<<els
 		<<if $slaves[$i].boobsImplant == 0 && $slaves[$i].buttImplant == 0 && $slaves[$i].waist >= -95>>
 		She exhibits pure sexuality in a lovely, artistic gallery of erotic photos posted this week that displays every natural centimeter of her body.
 		<<elseif $slaves[$i].boobsImplant == 0 && $slaves[$i].buttImplant == 0>>
-		This week's softcore photoshoot delights the eye: only her unnatural waistline mars her beauty, and that can hardly be blamed on the model.
+		This week's softcore photo shoot delights the eye: only her unnatural waistline mars her beauty, and that can hardly be blamed on the model.
 		<<else>>
 		Her unblemished skin shines artistically in this week's erotic studio gallery, but the shape of her curves is too obviously artificial.
 		<</if>>
 	<<elseif $slaves[$i].boobsImplant == 0 && $slaves[$i].buttImplant == 0 && $slaves[$i].waist >= -95>>
 	Her most recent photo galleries are barely passable: you can hardly see the woman beneath her blatant body art.
 	<<else>>
-	She is burdened by the knowledge that her heavy alterations don't fit your ideal of purity, and fails to show at a scheduled photoshoot.
+	She is burdened by the knowledge that her heavy alterations don't fit your ideal of purity, and fails to show at a scheduled photo shoot.
 <</if>> <</if>>
 <<if $arcologies[0].FSTransformationFetishist != "unset">>
 	<<if $slaves[$i].boobsImplant > 0 && $slaves[$i].buttImplant > 0 && $slaves[$i].lipsImplant > 0>>
diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index 8489554b36ab39ca4e2f1bc6c3d882c2ce1f7705..b307db7d84361b5343c0741ee468685d1d76b7cf 100644
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw
@@ -1143,8 +1143,11 @@
 	<<case "a schoolgirl outfit">>
 		Her blouse lewdly displays her <<if $activeSlave.boobs < 300>>$activeSlave.nipples nipples<<else>>breasts<</if>>.
 	<<case "a kimono">>
+		Her kimono is clearly designed to accentuate her <<if $activeSlave.boobs < 300>>flat chest<<else>>breasts<</if>>.
 	<<case "a hijab and abaya">>
+		Her abaya covers her <<if $activeSlave.boobs < 300>>flat chest<<else>>breasts<</if>> totally.
 	<<case "a huipil">>
+		Her huipil hugs the curves of her <<if $activeSlave.boobs < 300>>$activeSlave.nipples nipples<<else>>breasts<</if>>.
 	<<case "battledress">>
 		<<if $activeSlave.boobs < 300>>
 			As she moves, you can occasionally spot her lack of undergarments.
@@ -1224,7 +1227,7 @@
 			Her stretch pants tightly cling to her rear as she moves; the writing on her bottom gives you plenty of excuses to oggle it.
 		<</if>>
 	<<case "restrictive latex">>
-		As some of the only islands in the sea of black latex, her holes are eyecatching.
+		As some of the only islands in the sea of black latex, her holes are eye-catching.
 	<<case "a fallen nuns habit">>
 		Her slutty nun outfit invites sin.
 	<<case "a chattel habit">>
@@ -1892,7 +1895,7 @@
 			<<elseif ($activeSlave.dick != 0)>>
 				Her cock sticks out through a hole in the latex.
 			<<else>>
-				As one of the only islands in the sea of black latex, her pussy is eyecatching.
+				As one of the only islands in the sea of black latex, her pussy is eye-catching.
 			<</if>>
 		<<case "attractive lingerie for a pregnant woman">>
 			<<if ($activeSlave.dick > 4) && ($activeSlave.balls > 3)>>
diff --git a/src/uncategorized/wardrobeUse.tw b/src/uncategorized/wardrobeUse.tw
index 21166aaaa22572c014a5047deba70be5ef947834..2ba5d83912171aabd90cede49829420f95fb0b21 100644
--- a/src/uncategorized/wardrobeUse.tw
+++ b/src/uncategorized/wardrobeUse.tw
@@ -319,7 +319,7 @@ Clothes: ''<span id="clothes">$activeSlave.clothes</span>.''
 	<</if>>
 	/* Display an HTML5 color picker */
 	/* This is hackish due to direct accessment of SugarCube internal data structure. Improvements are welcome. */
-	<<print '<input type="color" value="'+_clothingBaseColor+'" onInput="SugarCube.State.variables.activeSlave.clothingBaseColor = event.target.value;">'>>
+	<<print '<input type="color" value="'+_clothingBaseColor+'" onInput="State.variables.activeSlave.clothingBaseColor = event.target.value;">'>>
 	<<link "use default color">>
 		<<run delete $activeSlave.clothingBaseColor >>
 		/* reload passage to display everything correctly */
@@ -501,7 +501,7 @@ Clothes: ''<span id="clothes">$activeSlave.clothes</span>.''
 	<</if>>
 	/* Display an HTML5 color picker */
 	/* This is hackish due to direct accessment of SugarCube internal data structure. Improvements are welcome. */
-	<<print '<input type="color" value="'+_shoeColour+'" onInput="SugarCube.State.variables.activeSlave.shoeColor = event.target.value;">'>>
+	<<print '<input type="color" value="'+_shoeColour+'" onInput="State.variables.activeSlave.shoeColor = event.target.value;">'>>
 	<<link "use default color">>
 		<<run delete $activeSlave.shoeColor >>
 		/* reload passage to display everything correctly */
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index a0d3fad85fee2624e885755396644b333faaa90a..8ec6937e6bede8257cde617e37317c744bacec12 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -607,6 +607,19 @@
 		<<else>>
 			light chain that loops under $possessive breasts.
 		<</if>>
+	<<case "a hijab and abaya">>
+		$activeSlave.slaveName's abaya
+		<<if $activeSlave.boobs > 12000>>
+			modestly covers $possessive breasts, although the fabric struggles to ensure they are entirely covered.
+		<<elseif $activeSlave.boobs > 4000>>
+			modestly covers $possessive breasts. It has been let out a great deal in order to cover the entirety of $possessive chest.
+		<<elseif $activeSlave.boobs > 2000>>
+			modestly covers $possessive breasts, though it cannot conceal their absurd size.
+		<<elseif $activeSlave.boobs < 300>>
+			modestly rests over $possessive flat chest.
+		<<else>>
+			modestly covers $possessive breasts.
+		<</if>>
 	<<default>>
 	<</switch>>
 <</if>>
@@ -1300,9 +1313,17 @@ $possessiveCap
 	<</if>>
 	buttocks.
 <<case "a nice maid outfit">>
+	$possessiveCap maid dress
 	<<if $activeSlave.butt > 10>>
-	$possessiveCap maid dress strains at the seams holding back $possessive massive buttocks.
+	strains at the seams holding back $possessive massive
+	<<elseif $activeSlave.butt > 6>>
+	struggles to conceal $possessive huge
+	<<elseif $activeSlave.butt > 3>>
+	accentuates the curves of $possessive big
+	<<else>>
+	demurely covers $possessive
 	<</if>>
+	buttocks.
 <<case "a string bikini">>
 	$possessiveCap
 	<<if $activeSlave.butt > 10>>
@@ -1552,6 +1573,17 @@ $possessiveCap
 	dips seductively down toward the cleft between $possessive
 	<</if>>
 	buttocks.
+<<case "a hijab and abaya">>
+	$possessiveCap abaya modestly covers $possessive
+	<<if $activeSlave.butt > 10>>
+	ass, but it does nothing to conceal its absurd size.
+	<<elseif $activeSlave.butt > 6>>
+	butt, though it cannot conceal its absurd size.
+	<<elseif $activeSlave.butt > 3>>
+	big butt.
+	<<else>>
+	butt.
+	<</if>>
 <<default>>
 <</switch>>
 <</if>>
@@ -2366,7 +2398,9 @@ $pronounCap's got a
 		$activeSlave.slaveName's hermaphroditic genitalia are decently hidden by $possessive trousers.
 	<<elseif $activeSlave.dick > 0>>
 		$activeSlave.slaveName's trousers give no hint of the cock behind it.
-	<<elseif $activeSlave.vagina > -1>>
+	<<elseif $activeSlave.vagina == -1>>
+		$activeSlave.slaveName's trousers give no hint of the featureless groin behind it.
+	<<else>>
 		$activeSlave.slaveName's trousers give no hint of the pussy behind it.
 	<</if>>
 <<case "a slutty nurse outfit">>
@@ -2390,21 +2424,39 @@ $pronounCap's got a
 		$activeSlave.slaveName's plaid skirt lifts to show off $possessive pussy with the slightest provocation.
 	<</if>>
 <<case "a kimono">>
-	<<if $activeSlave.dick > 2>>
+	<<if $activeSlave.dick > 3>>
 		Despite the quality tailoring of $activeSlave.slaveName's kimono, it is clear that $pronoun has something between $possessive legs.
-	<<elseif $activeSlave.vagina > -1>>
+	<<elseif ($activeSlave.dick > 0) && ($activeSlave.vagina > -1)>>
+		$activeSlave.slaveName's kimono demurely conceals $possessive hermaphroditic genitalia.
+	<<elseif $activeSlave.dick > 0>>
+		$activeSlave.slaveName's kimono demurely conceals $possessive cock.
+	<<elseif $activeSlave.vagina == -1>>
+		$activeSlave.slaveName's kimono demurely conceals $possessive featureless groin.
+	<<else>>
 		$activeSlave.slaveName's kimono demurely conceals $possessive pussy.
 	<</if>>
 <<case "a hijab and abaya">>
-	<<if $activeSlave.dick > 2>>
-		When $pronoun moves, something occasionally tents the front of $possessive abaya.
-	<<elseif $activeSlave.vagina > -1>>
+	<<if $activeSlave.dick > 3>>
+		When $pronoun moves, something occasionally bulges the front of $possessive abaya.
+	<<elseif ($activeSlave.dick > 0) && ($activeSlave.vagina > -1)>>
+		$activeSlave.slaveName's abaya properly conceals $possessive hermaphroditic genitalia.
+	<<elseif $activeSlave.dick > 0>>
+		$activeSlave.slaveName's abaya properly conceals $possessive cock.
+	<<elseif $activeSlave.vagina == -1>>
+		$activeSlave.slaveName's abaya properly conceals $possessive featureless groin.
+	<<else>>
 		$activeSlave.slaveName's abaya properly conceals $possessive pussy.
 	<</if>>
 <<case "battledress">>
-	<<if $activeSlave.dick > 2>>
+	<<if $activeSlave.dick > 3>>
 		$activeSlave.slaveName's fatigue pants bulge in front.
-	<<elseif $activeSlave.vagina > -1>>
+	<<elseif ($activeSlave.dick > 0) && ($activeSlave.vagina > -1)>>
+		$activeSlave.slaveName's fatigue pants protect $possessive hermaphroditic genitalia.
+	<<elseif $activeSlave.dick > 0>>
+		$activeSlave.slaveName's fatigue pants protect $possessive cock.
+	<<elseif $activeSlave.vagina == -1>>
+		$activeSlave.slaveName's fatigue pants protect $possessive featureless groin.
+	<<else>>
 		$activeSlave.slaveName's fatigue pants protect $possessive pussy.
 	<</if>>
 <<case "a fallen nuns habit">>
@@ -7704,26 +7756,103 @@ $pronounCap has
 		<</if>>
 	<</if>>
 <<case "a mini dress">>
-	<<if $activeSlave.bellyPreg >= 600000>>
-		$activeSlave.slaveName's mini dress has burst trying to contain $possessive titanic bulging pregnant belly leaving it hanging out the hole it made.
+	<<if $activeSlave.belly >= 1000000>>
+		//WIP//
+	<<elseif $activeSlave.bellyPreg >= 750000>>
+		<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+		<<elseif $activeSlave.bellyImplant > 0>>
+			$activeSlave.slaveName's mini dress is specially tailored to fit such an dangerously gravid girl. It tightly clings to $possessive monolithic implant-filled belly and draws the eye right to $possessive protruding navel.
+		<<else>>
+			$activeSlave.slaveName's mini dress is specially tailored to fit such an dangerously gravid girl. It tightly clings to $possessive monolithic pregnant belly, drawing the eye to $possessive protruding navel, the clear bulges of the life growing within $object, and every slight twitch inside $possessive taut middle. 
+		<</if>>
+	<<elseif $activeSlave.bellyPreg >= 600000>>
+		<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+		<<elseif $activeSlave.bellyImplant > 0>>
+			$activeSlave.slaveName's mini dress is specially tailored to fit such an absurdly gravid girl. It tightly clings to $possessive titanic implant-filled belly and draws the eye right to $possessive protruding navel.
+		<<else>>
+			$activeSlave.slaveName's mini dress is specially tailored to fit such an absurdly gravid girl. It tightly clings to $possessive titanic pregnant belly, drawing the eye to $possessive protruding navel, the bulges of the life growing within $object, and every kick and sqiurm inside $possessive straining middle. 
+		<</if>>
+	<<elseif $activeSlave.bellyPreg >= 450000>>
+		<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+		<<elseif $activeSlave.bellyImplant > 0>>
+			$activeSlave.slaveName's mini dress is specially tailored to fit such a massively gravid girl. It tightly clings to $possessive gigantic implant-filled belly and draws the eye right to $possessive protruding navel.
+		<<else>>
+			$activeSlave.slaveName's mini dress is specially tailored to fit such a massively gravid girl. It tightly clings to $possessive gigantic pregnant belly, drawing the eye to $possessive protruding navel, the outlines of the life within $object, and every kick and sqiurm inside $possessive straining middle. 
+		<</if>>
 	<<elseif $activeSlave.bellyPreg >= 300000>>
-		$activeSlave.slaveName's mini dress has burst trying to contain $possessive massive pregnant belly leaving it hanging out the hole it made.
+		<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+		<<elseif $activeSlave.bellyImplant > 0>>
+			$activeSlave.slaveName's mini dress is specially tailored to fit such a hugely gravid girl. It tightly clings to $possessive massive implant-filled belly and draws the eye right to $possessive protruding navel.
+		<<else>>
+			$activeSlave.slaveName's mini dress is specially tailored to fit such a hugely gravid girl. It tightly clings to $possessive massive pregnant belly, drawing the eye to $possessive protruding navel and clearly showing every kick and sqiurm inside $possessive bulging middle. 
+		<</if>>
+	<<elseif $activeSlave.belly >= 120000>>
+		<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+		<<elseif $activeSlave.bellyImplant > 0>>
+			$activeSlave.slaveName's mini dress is specially tailored to fit such a hugely gravid girl. It tightly clings to $possessive giant implant-filled belly and draws the eye right to $possessive protruding navel.
+		<<else>>
+			$activeSlave.slaveName's mini dress is specially tailored to fit such a hugely gravid girl. It tightly clings to $possessive giant pregnant belly, drawing the eye to $possessive protruding navel and clearly showing every kick and sqiurm inside $possessive bulging middle. 
+		<</if>>
+	<<elseif $activeSlave.belly >= 30000>>
+		<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+		<<elseif $activeSlave.bellyImplant > 0>>
+			$activeSlave.slaveName's mini dress is specially tailored to fit such a gravid girl. It tightly clings to $possessive huge pregnant belly and draws the eye right to $possessive protruding navel.
+		<<else>>
+			$activeSlave.slaveName's mini dress is specially tailored to fit such a gravid girl. It tightly clings to $possessive huge pregnant belly, drawing the eye to $possessive protruding navel and clearly showing every kick and sqiurm inside $possessive bulging middle. 
+		<</if>>
 	<<elseif $activeSlave.weight > 190>>
-		$activeSlave.slaveName's mini dress strains to contain $possessive massively fat belly, clearly showing all $possessive folds and rolls. Flab forces its way through every growing tear in $possessive seams.
-	<<elseif $activeSlave.bellyPreg >= 10000 || ($activeSlave.bellyAccessory == "a huge empathy belly") || ($activeSlave.bellyAccessory == "a large empathy belly")>>
-		$activeSlave.slaveName's mini dress barely clings to $possessive big pregnant belly.
+		$activeSlave.slaveName's mini dress strains to contain $possessive massively fat belly, clearly showing all $possessive folds and rolls. Flab forces its way through every growing tear in $possessive seams; a growing nuisance, as the outfit must be restitched frequently.
+	<<elseif $activeSlave.belly >= 15000 || ($activeSlave.bellyAccessory == "a huge empathy belly")>>
+		<<if $activeSlave.bellyAccessory == "a huge empathy belly">>
+			$activeSlave.slaveName's mini dress tightly clings to $possessive huge pregnant belly and frequently rides up far enough to show off her privates.
+		<<elseif $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+		<<elseif $activeSlave.bellyImplant > 0>>
+			$activeSlave.slaveName's mini dress tightly clings to $possessive huge implant-filled belly and frequently rides up far enough to show off her privates.
+		<<else>>
+			$activeSlave.slaveName's mini dress tightly clings to $possessive huge pregnant belly and frequently rides up far enough to show off her privates.
+		<</if>>
+	<<elseif $activeSlave.belly >= 10000 || ($activeSlave.bellyAccessory == "a large empathy belly")>>
+		<<if $activeSlave.bellyAccessory == "a large empathy belly">>
+			$activeSlave.slaveName's mini dress tightly clings to $possessive big pregnant belly, leaving it looking much shorter than it really is.
+		<<elseif $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+			$activeSlave.slaveName's mini dress barely clings to $possessive hugely swollen belly, leaving it looking much shorter than it really is.
+		<<elseif $activeSlave.bellyImplant > 0>>
+			$activeSlave.slaveName's mini dress barely clings to $possessive huge implant-filled belly, leaving it looking much shorter than it really is.
+		<<else>>
+			$activeSlave.slaveName's mini dress tightly clings to $possessive big pregnant belly, leaving it looking much shorter than it really is.
+		<</if>>
 	<<elseif $activeSlave.weight > 160>>
 		$activeSlave.slaveName's mini dress barely clings to $possessive hugely fat belly, clearly showing all $possessive folds and rolls.
 	<<elseif $activeSlave.weight > 130>>
 		$activeSlave.slaveName's mini dress tightly clings to $possessive big fat belly, clearly showing all $possessive folds and rolls.
-	<<elseif $activeSlave.bellyPreg >= 5000 || ($activeSlave.bellyAccessory == "a medium empathy belly")>>
-		$activeSlave.slaveName's mini dress tightly clings to $possessive pregnant belly.
+	<<elseif $activeSlave.belly >= 5000 || ($activeSlave.bellyAccessory == "a medium empathy belly")>>
+		<<if $activeSlave.bellyAccessory == "a medium empathy belly">>
+			$activeSlave.slaveName's mini dress tightly clings to $possessive pregnant belly.
+		<<elseif $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+			$activeSlave.slaveName's mini dress tightly clings to $possessive jiggling <<print $activeSlave.inflationType>>-filled belly.
+		<<elseif $activeSlave.bellyImplant > 0>>
+			$activeSlave.slaveName's mini dress tightly clings to $possessive implant-filled belly.
+		<<else>>
+			$activeSlave.slaveName's mini dress tightly clings to $possessive pregnant belly.
+		<</if>>
 	<<elseif $activeSlave.weight > 95>>
 		$activeSlave.slaveName's mini dress tightly clings to $possessive fat belly, clearly showing every fold and roll.
-	<<elseif (($activeSlave.bellyPreg >= 1500) || ($activeSlave.bellyAccessory == "a small empathy belly"))>>
-		$activeSlave.slaveName's mini dress tightly clings to $possessive growing belly.
+	<<elseif $activeSlave.belly >= 1500 || $activeSlave.bellyAccessory == "a small empathy belly">>
+		<<if $activeSlave.bellyAccessory == "a small empathy belly">>
+			$activeSlave.slaveName's mini dress tightly clings to $possessive small pregnant belly.
+		<<elseif $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+			$activeSlave.slaveName's mini dress tightly clings to $possessive <<print $activeSlave.inflationType>>-swollen belly.
+		<<elseif $activeSlave.bellyImplant > 0>>
+			$activeSlave.slaveName's mini dress tightly clings to $possessive implant-rounded belly.
+		<<else>>
+			$activeSlave.slaveName's mini dress tightly clings to $possessive growing belly.
+		<</if>>
 	<<elseif $activeSlave.weight > 30>>
 		$activeSlave.slaveName's mini dress tightly clings to $possessive chubby belly, clearly showing every fold and roll.
+	<<elseif $activeSlave.bellyPreg >= 100 || $activeSlave.bellyImplant >= 100>>
+		$activeSlave.slaveName's mini dress tightly clings to $possessive belly, clearly showing the slight swell beneath $possessive navel.
+	<<elseif $activeSlave.muscles > 30>>
+		$activeSlave.slaveName's mini dress tightly clings to $possessive ripped abs, clearly displaying $possessive six pack.
 	<</if>>
 <<case "attractive lingerie">>
 	<<if $activeSlave.bellyPreg >= 600000>>
@@ -8643,7 +8772,7 @@ $pronounCap has
 			<<elseif $activeSlave.navelPiercing == 2>>
 				$possessiveCap popped navel is pierced with a big ring.
 			<</if>>
-			It's eyecatching, since most of her piercings are hidden by the suit.
+			It's eye-catching, since most of her piercings are hidden by the suit.
 		<<else>>
 			$possessiveCap navel piercing runs through the suit's material.
 		<</if>>
@@ -8661,13 +8790,18 @@ $pronounCap has
 <<if $activeSlave.pregSource > 0>>
 	<<set _lsd = $slaves.findIndex(function(s) { return s.ID == $activeSlave.pregSource; })>>
 	<<if _lsd != -1>>
-		<<switch $slaves[_lsd].nationality>>
-		<<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
-			<<if $slaves[_lsd].slaveSurname>><<set _daddy = $slaves[_lsd].slaveSurname>><<set _daddy += " " + $slaves[_lsd].slaveName>><<else>><<set _daddy = $slaves[_lsd].slaveName>><</if>>
-		<<default>>
+		<<if $surnameOrder != 1>>
+			<<switch $slaves[_lsd].nationality>>
+			<<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">>
+				<<if $slaves[_lsd].slaveSurname>><<set _daddy = $slaves[_lsd].slaveSurname>><<set _daddy += " " + $slaves[_lsd].slaveName>><<else>><<set _daddy = $slaves[_lsd].slaveName>><</if>>
+			<<default>>
+				<<set _daddy = $slaves[_lsd].slaveName>>
+				<<if $slaves[_lsd].slaveSurname>><<set _daddy += " " + $slaves[_lsd].slaveSurname>><</if>>
+			<</switch>>
+		<<else>>
 			<<set _daddy = $slaves[_lsd].slaveName>>
 			<<if $slaves[_lsd].slaveSurname>><<set _daddy += " " + $slaves[_lsd].slaveSurname>><</if>>
-		<</switch>>
+		<</if>>
 	<<else>>
 		<<set _daddy = "partner">>
 	<</if>>
@@ -9567,7 +9701,7 @@ $pronounCap has
   <<elseif  $activeSlave.nationality == "Stateless">>
 	She has spent so much time in the Free Cities that their statelessness is effectively her nationality; ethnically, she's
   <<elseif $activeSlave.nationality == "Zimbabwean" && $activeSlave.race == "white">>
-  	She's originally @@.tan;Rhodesian@@; ethnically, she's
+	She's originally @@.tan;Rhodesian@@; ethnically, she's
   <<else>>
 	She's originally @@.tan;<<print $activeSlave.nationality>>@@; ethnically, she's
   <</if>>
@@ -11248,7 +11382,7 @@ she's
 			<<elseif $activeSlave.navelPiercing == 2>>
 				$possessiveCap popped navel is pierced with a big ring.
 			<</if>>
-			It's eyecatching, since most of her piercings are hidden by the suit.
+			It's eye-catching, since most of her piercings are hidden by the suit.
 		<</if>>
 	<<else>>
 		$possessiveCap navel piercing runs through the suit's material.
diff --git a/src/utility/descriptionWidgetsPiercings.tw b/src/utility/descriptionWidgetsPiercings.tw
index 743a6850960fb3e477e248e4c07090a3c5a3f4ca..a2b4fcc8380190298bef7cba7baa017e5a3b51b8 100644
--- a/src/utility/descriptionWidgetsPiercings.tw
+++ b/src/utility/descriptionWidgetsPiercings.tw
@@ -15,12 +15,14 @@
 				She's wearing pretty, womanly earrings.
 			<<case "a succubus outfit">>
 				She's wearing pentagram earrings.
-			<<case "a fallen nuns habit">>
+			<<case "a fallen nuns habit" "a penitent nuns habit">>
 				Her earrings mimic tiny crowns of thorns.
 			<<case "a chattel habit">>
 				She's wearing golden earrings in the shape of saintly nudes.
-			<<case "a penitent nuns habit">>
-				Her earrings mimic tiny crowns of thorns.
+			<<case "a hijab and abaya">>
+				She's wearing bronze earrings shaped like crescent moons.
+			<<case ""a slutty qipao"">>
+				Her golden earrings resemble Eastern-style dragons.
 			<<case "a string bikini" "cutoffs and a t-shirt">>
 				She's wearing girly earrings.
 			<<case "a schoolgirl outfit">>
@@ -39,6 +41,10 @@
 				She's wearing conservative earrings like those a free maid could afford.
 			<<case "harem gauze">>
 				She's wearing broad gold earrings in faux-Arabian style.
+			<<case "Western clothing">>
+				She's wearing earrings in the shape of a stylized horse's head.
+			<<case "a huipil">>
+				She's wearing earrings in the shape of a stylized jaguar's head.
 			<<case "a bunny outfit">>
 				She's wearing earrings in the shape of a stylized rabbit's head.
 			<<case "slutty jewelry">>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index e40d07d090d4b6f675a3f385213f503df14e1af6..d42161ab717885219e91b0afdc0c8f1b6834c91d 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -883,14 +883,18 @@
 %/
 <<widget "PCTitle">>
 
-
-<<switch $PC.nationality>>
-<<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
-	<<if $PC.surname>><<set $PCTitle = $PC.surname>><<set $PCTitle += " " + $PC.name>><<else>><<set $PCTitle = $PC.name>><</if>>
-<<default>>
+<<if $surnameOrder != 1>>
+	<<switch $PC.nationality>>
+	<<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">>
+		<<if $PC.surname>><<set $PCTitle = $PC.surname>><<set $PCTitle += " " + $PC.name>><<else>><<set $PCTitle = $PC.name>><</if>>
+	<<default>>
+		<<set $PCTitle = $PC.name>>
+		<<if $PC.surname>><<set $PCTitle += " " + $PC.surname>><</if>>
+	<</switch>>
+<<else>>
 	<<set $PCTitle = $PC.name>>
 	<<if $PC.surname>><<set $PCTitle += " " + $PC.surname>><</if>>
-<</switch>>
+<</if>>
 <<set $titles = []>>
 
 <<if $cheater == 1>>
@@ -2527,9 +2531,9 @@ This experience
 <</widget>>
 
 /* see how they are on a single line? This permits "."s and other things to be appended directly onto the widget result */
-<<widget "PlayerName">><<switch $PC.nationality>><<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">><<if $PC.surname>>$PC.surname <</if>>$PC.name<<default>>$PC.name<<if $PC.surname>> $PC.surname<</if>><</switch>><</widget>>
+<<widget "PlayerName">><<if $surnameOrder != 1>><<switch $PC.nationality>><<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">><<if $PC.surname>>$PC.surname <</if>>$PC.name<<default>>$PC.name<<if $PC.surname>> $PC.surname<</if>><</switch>><<else>>$PC.name<<if $PC.surname>> $PC.surname<</if>><</if>><</widget>>
 
-<<widget "SlaveFullName">><<switch $args[0].nationality>><<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">><<if $args[0].slaveSurname>>$args[0].slaveSurname <</if>>$args[0].slaveName<<default>>$args[0].slaveName<<if $args[0].slaveSurname>> $args[0].slaveSurname<</if>><</switch>><</widget>>
+<<widget "SlaveFullName">><<if $surnameOrder != 1>><<switch $args[0].nationality>><<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">><<if $args[0].slaveSurname>>$args[0].slaveSurname <</if>>$args[0].slaveName<<default>>$args[0].slaveName<<if $args[0].slaveSurname>> $args[0].slaveSurname<</if>><</switch>><<else>>$args[0].slaveName<<if $args[0].slaveSurname>> $args[0].slaveSurname<</if>><</if>><</widget>>
 
 <<widget "PoliteRudeTitle">><<switch $args[0].nationality>><<case "Japanese">><<if $args[0].trust > 0>>$PC.name<<if $PC.title > 0>>kun<<else>>chan<</if>><<else>><<if $PC.surname>><<print $PC.surname>><<else>><<print $PC.name>><<s>>an<</if>><</if>><<default>><<if $args[0].intelligence < -2>><<Master>><<elseif $args[0].intelligence > 1>><<if $PC.title > 0>>Ma<<s>>ther<<else>>Mi<<s>>tre<<ss>><</if>><<elseif $args[0].trust > 0>>$PC.name<<else>><<if $PC.surname>>$PC.surname<<else>>$PC.name<</if>><</if>><</switch>><</widget>>
 
@@ -2537,7 +2541,7 @@ This experience
  Call as <<EventNameLink>>
  $args[0]: Slave.
 */
-<<widget "EventNameLink">><<switch $args[0].nationality>><<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">><<if $args[0].slaveSurname>><<set _name = $args[0].slaveSurname>><<set _name += " " + $args[0].slaveName>><<else>><<set _name = $args[0].slaveName>><</if>><<default>><<set _name = $args[0].slaveName>><<if $args[0].slaveSurname>><<set _name += " " + $args[0].slaveSurname>><</if>><</switch>><span id="name"><<print "[[_name|Long Slave Description][$nextLink = passage(), $eventDescription = 1]]">></span><</widget>>
+<<widget "EventNameLink">><<if $surnameOrder != 1>><<switch $args[0].nationality>><<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">><<if $args[0].slaveSurname>><<set _name = $args[0].slaveSurname>><<set _name += " " + $args[0].slaveName>><<else>><<set _name = $args[0].slaveName>><</if>><<default>><<set _name = $args[0].slaveName>><<if $args[0].slaveSurname>><<set _name += " " + $args[0].slaveSurname>><</if>><</switch>><<else>><<set _name = $args[0].slaveName>><<if $args[0].slaveSurname>><<set _name += " " + $args[0].slaveSurname>><</if>><</if>><span id="name"><<print "[[_name|Long Slave Description][$nextLink = passage(), $eventDescription = 1]]">></span><</widget>>
 
 /*
  Call as <<EventNameDelink>>