diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index bbd3b74d9218e730e2b5af4d4ee36f676d697e89..9bae74dc6b1fb7ab2110787239f227d8d1360354 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,8 +2,35 @@
 
 0.10.7.0/1
 
+01/10/18
+
+	265
+	-fVagina fixes
+	-SFanon's cleaning
+
+	264
+	-allowed master suite slaves into RESS eligibility
+
+	263
+	-The rest of SFanon's fixes
+	-minor corrections
+	-fixed a number of ".SlaveName"s
+
+	262
+	-SFanon's fixes and policy cleanup
+
+	261
+	-small fixes
+	-secEx fixes
+
 01/09/18
 
+	260
+	-fixes to advertising
+
+	259.2
+	-fixed fVagina, again
+
 	259.1
 	-fixed fVagina
 
diff --git a/devNotes/twine JS b/devNotes/twine JS
index ec336c0bf39265a3ebe6d6e38a1f03932d5de6f6..dc887f3d17a18b145a891c0acd57ae4ad3556a07 100644
--- a/devNotes/twine JS	
+++ b/devNotes/twine JS	
@@ -314,148 +314,6 @@ window.isFertile = function(slave) {
 	}
 };
 
-//hyperpreg size 2
-window.hyperBellyTwo = function(slave) {
-	if (!slave) {
-		return null;
-	} else if (slave.preg > 30 && slave.pregType >= 20) {
-		return true;
-	} else if (slave.bellyImplant >= 32000) {
-		return true;
-	} else {
-		return false;
-	}
-};
-
-window.hyperPregBellyTwo = function(slave) {
-	if (!slave) {
-		return null;
-	} else if (slave.preg > 30 && slave.pregType >= 20) {
-		return true;
-	} else {
-		return false;
-	}
-};
-
-//hyperpreg size 1
-window.hyperBellyOne = function(slave) {
-	if (!slave) {
-		return null;
-	} else if (slave.preg > 20 && slave.pregType >= 20) {
-		return true;
-	} else if (slave.preg > 30 && slave.pregType >= 10) {
-		return true;
-	} else if (slave.bellyImplant >= 16000) {
-		return true;
-	} else {
-		return false;
-	}
-};
-
-window.hyperPregBellyOne = function(slave) {
-	if (!slave) {
-		return null;
-	} else if (slave.preg > 20 && slave.pregType >= 20) {
-		return true;
-	} else if (slave.preg > 30 && slave.pregType >= 10) {
-		return true;
-	} else {
-		return false;
-	}
-};
-
-//full term belly
-window.hugeBelly = function(slave) {
-	if (!slave) {
-		return null;
-	} else if (slave.preg > 0 && slave.pregType >= 20) {
-		return true;
-	} else if (slave.preg > 10 && slave.pregType >= 10) {
-		return true;
-	} else if (slave.preg > 30) {
-		return true;
-	} else if (slave.inflation >= 3) {
-		return true;
-	} else if (slave.bellyImplant >= 8000) {
-		return true;
-	} else {
-		return false;
-	}
-};
-
-window.hugeBellyPreg = function(slave) {
-	if (!slave) {
-		return null;
-	} else if (slave.preg > 0 && slave.pregType >= 20) {
-		return true;
-	} else if (slave.preg > 10 && slave.pregType >= 10) {
-		return true;
-	} else if (slave.preg > 30) {
-		return true;
-	} else {
-		return false;
-	}
-};
-
-//is the slave's belly big enough to get in the way
-window.bigBellyPreg = function(slave) {
-	if (!slave) {
-		return null;
-	} else if (slave.preg > 0 && slave.pregType >= 20) {
-		return true;
-	} else if (slave.preg > 10 && slave.pregType >= 10) {
-		return true;
-	} else if (slave.preg > 20) {
-		return true;
-	} else {
-		return false;
-	}
-};
-
-//is the slave's belly big enough to be noticiable.
-window.visibleBellyPreg = function(slave) {
-	if (!slave) {
-		return null;
-	} else if (slave.preg > 0 && slave.pregType >= 20) {
-		return true;
-	} else if (slave.preg > 5 && slave.pregType >= 10) {
-		return true;
-	} else if (slave.preg > 10) {
-		return true;
-	} else {
-		return false;
-	}
-};
-
-
-window.bigBelly = function(slave) {
-	if (!slave) {
-		return null;
-	} else if (bigBellyPreg(slave) == true) {
-		return true;
-	} else if (slave.inflation > 2) {
-		return true;
-	} else if (slave.bellyImplant >= 4000) {
-		return true;
-	} else {
-		return false;
-	}
-};
-
-window.visibleBelly = function(slave) {
-	if (!slave) {
-		return null;
-	} else if (visibleBellyPreg(slave) == true) {
-		return true;
-	} else if (slave.inflation > 0) {
-		return true;
-	} else if (slave.bellyImplant >= 2000) {
-		return true;
-	} else {
-		return false;
-	}
-};
-
 window.canAchieveErection = function(slave) {
 	if (!slave) {
 		return null;
@@ -4753,4 +4611,80 @@ window.getHeroSlave = function(heroSlave, baseHeroSlave) {
         newSlave[attrname] = heroSlave[attrname];
     };
     return newSlave;
-}
\ No newline at end of file
+}
+
+/*:: Art Color Tools JS [script]*/
+
+/* 
+This takes a textual hair colour description and tries to guess the appropriate HTML compliant color code.
+
+hColor should be a color name, but can also be a string describing hair colour.
+
+This code's working is described to the user in the Encyclopedia, chapter "Lore", section "Dyes".
+*/
+window.extractHairColor = function(hColor) {
+	/* 
+	these are color names known and used in FreeCities 
+	attributed color names are at the front of the array
+	*/
+	var FCname2HTMLarray = [
+		["blazing red", "#E00E2B"],
+		["neon green", "#25d12b"],
+		["neon blue", "#2284C3"],
+		["neon pink", "#cc26aa"],
+		["strawberry-blonde", "#e5a88c"],
+		["platinum blonde", "#fcf3c1"],
+		["dark brown", "#463325"],
+		["brown", "#8D4F21"],
+		["auburn", "#7e543e"],
+		["black", "#3F4040"],
+		["blonde", "#F4F1A3"],
+		["blue", "#4685C5"],
+		["burgundy", "#5f3946"],
+		["chestnut", "#663622"],
+		["chocolate", "#6e4937"],
+		["copper", "#a16145"],
+		["ginger", "#da822d"],
+		["golden", "#ffdf31"],
+		["green", "#5FBA46"],
+		["grey", "#9e9fa4"],
+		["hazel", "#8d6f1f"],
+		["pink", "#D18CBC"],
+		["red", "#BB2027"],
+		["silver", "#cdc9c6"],
+		/* these are not actually FreeCities canon, but like to appear in custom descriptions */
+		["dark", "#463325"],
+		["brunette", "#8D4F21"]
+	];
+	
+	/* these are HTML color names supported by most browsers */
+	var HTMLstandardColors = ["aliceblue","antiquewhite","aqua","aquamarine","azure","beige","bisque","black","blanchedalmond","blue","blueviolet","brown","burlywood","cadetblue","chartreuse","chocolate","coral","cornflowerblue","cornsilk","crimson","cyan","darkblue","darkcyan","darkgoldenrod","darkgray","darkgrey","darkgreen","darkkhaki","darkmagenta","darkolivegreen","darkorange","darkorchid","darkred","darksalmon","darkseagreen","darkslateblue","darkslategray","darkslategrey","darkturquoise","darkviolet","deeppink","deepskyblue","dimgray","dimgrey","dodgerblue","firebrick","floralwhite","forestgreen","fuchsia","gainsboro","ghostwhite","gold","goldenrod","gray","grey","green","greenyellow","honeydew","hotpink","indianred ","indigo ","ivory","khaki","lavender","lavenderblush","lawngreen","lemonchiffon","lightblue","lightcoral","lightcyan","lightgoldenrodyellow","lightgray","lightgrey","lightgreen","lightpink","lightsalmon","lightseagreen","lightskyblue","lightslategray","lightslategrey","lightsteelblue","lightyellow","lime","limegreen","linen","magenta","maroon","mediumaquamarine","mediumblue","mediumorchid","mediumpurple","mediumseagreen","mediumslateblue","mediumspringgreen","mediumturquoise","mediumvioletred","midnightblue","mintcream","mistyrose","moccasin","navajowhite","navy","oldlace","olive","olivedrab","orange","orangered","orchid","palegoldenrod","palegreen","paleturquoise","palevioletred","papayawhip","peachpuff","peru","pink","plum","powderblue","purple","rebeccapurple","red","rosybrown","royalblue","saddlebrown","salmon","sandybrown","seagreen","seashell","sienna","silver","skyblue","slateblue","slategray","slategrey","snow","springgreen","steelblue","tan","teal","thistle","tomato","turquoise","violet","wheat","white","whitesmoke","yellow","yellowgreen"];
+	
+	var FCnames = new Map(FCname2HTMLarray);
+	hColor = hColor.toLowerCase(); /* normalization: lowercase color name */
+	var colorCode = FCnames.get(hColor); /* look up in FreeCities color names */
+	if (!colorCode) { /* not a FreeCities color name*/
+		if (HTMLstandardColors.includes(hColor) || hColor.match(/^#([0-9a-f]{3}){1,2}$/) !== null) {
+			colorCode = hColor; /* is a HTML color name or value, use it directly */
+		} else { 
+			/* 
+			is not even a HTML color name. hColor probably is a description.
+			look for anything resembling a valid color name within the description.
+			*/
+			var hColorNoSpaces = hColor.replace(/\s+/g, ''); /* remove all spaces from description */
+			var FCkeys = Array.from(FCnames.keys());
+			var colorCodes = [
+				FCnames.get(FCkeys.find(function (e){return hColor.startsWith(e);})),
+				HTMLstandardColors.find(function (e){return hColorNoSpaces.startsWith(e);}),
+				FCnames.get(FCkeys.find(function (e){return hColor.includes(e);})),
+				HTMLstandardColors.find(function (e){return hColorNoSpaces.includes(e);})
+			];
+			colorCode = colorCodes.find(function (e){return e;}); /* picks the first successful guess */
+		}
+	}
+	if (!colorCode) {
+		console.log("Art Color Tools JS: Unable to determine HTML compliant color code for hair color string '"+hColor+"'.");
+		colorCode = "fuchsia"; /* use fuchsia as error marker */
+	}
+	return colorCode;
+};
diff --git a/player variables documentation - Pregmod.txt b/player variables documentation - Pregmod.txt
index 31368f894766f75068b86353ff79b27d5afb6cfb..0ecc63cf99d763df9965cb27a7e54c3f728c4b9a 100644
--- a/player variables documentation - Pregmod.txt	
+++ b/player variables documentation - Pregmod.txt	
@@ -97,8 +97,8 @@ pregMood:
 (uncommon in events)($PC.preg >= 28)
 how you act when heavily pregnant
 0 - no change
-1 - aggressive and dominant
-2 - submissive and motherly
+1 - submissive and motherly
+2 - aggressive and dominant
 
 labor:
 
diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw
index b4a31d82dd1113b27d236bcc574209fa6d3141c0..d73903db7fef444cc81df628d5bff7dee11dc247 100644
--- a/src/SecExp/attackReport.tw
+++ b/src/SecExp/attackReport.tw
@@ -149,9 +149,9 @@
 			in the wastelands outside the free city territory,
 		<</if>>
 		<<if $enemyLosses != $attackTroops>>
-			inflicting <<print $enemyLosses>> casualties, while sustaining <<print $losses>> casualties themselves.
+			inflicting <<print $enemyLosses>> casualties, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<else>> a casualty<</if>> themselves.
 		<<else>>
-			completely annihilating their troops, while sustaining <<print $losses>> casualties.
+			completely annihilating their troops, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<else>> a casualty.<</if>>.
 		<</if>>
 	<</if>>
 	<<if $battleResult == 3>>
@@ -215,9 +215,9 @@
 			in the wastelands outside the free city territory,
 		<</if>>
 		<<if $enemyLosses != $attackTroops>>
-			inflicting <<print $enemyLosses>> casualties, while sustaining <<print $losses>> casualties themselves.
+			inflicting <<print $enemyLosses>> casualties, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<else>> a casualty<</if>> themselves.
 		<<else>>
-			completely annihilating their troops, while sustaining <<print $losses>> casualties.
+			completely annihilating their troops, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<else>> a casualty.<</if>>.
 		<</if>>
 	<</if>>
 	<<if $battleResult == 3>>
@@ -281,9 +281,9 @@
 			in the wastelands outside the free city territory,
 		<</if>>
 		<<if $enemyLosses != $attackTroops>>
-			inflicting <<print $enemyLosses>> casualties, while sustaining <<print $losses>> casualties themselves.
+			inflicting <<print $enemyLosses>> casualties, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<else>> a casualty<</if>> themselves.
 		<<else>>
-			completely annihilating their troops, while sustaining <<print $losses>> casualties.
+			completely annihilating their troops, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<else>> a casualty.<</if>>.
 		<</if>>
 	<</if>>
 	<<if $battleResult == 3>>
@@ -347,9 +347,9 @@
 			in the wastelands outside the free city territory,
 		<</if>>
 		<<if $enemyLosses != $attackTroops>>
-			inflicting <<print $enemyLosses>> casualties, while sustaining <<print $losses>> casualties themselves.
+			inflicting <<print $enemyLosses>> casualties, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<else>> a casualty<</if>> themselves.
 		<<else>>
-			completely annihilating their troops, while sustaining <<print $losses>> casualties.
+			completely annihilating their troops, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<else>> a casualty.<</if>>.
 		<</if>>
 	<</if>>
 	<<if $battleResult == 3>>
diff --git a/src/SecExp/rebellionReport.tw b/src/SecExp/rebellionReport.tw
index 9c189f38dde15c85ff1a82dd20a04db4495ee729..8fc720bbfb172d4b4cf04660521ca6a666b01f2d 100644
--- a/src/SecExp/rebellionReport.tw
+++ b/src/SecExp/rebellionReport.tw
@@ -85,9 +85,9 @@
 <<if $slaveRebellion == 1>>
 	Today, the _day of _month _year, our arcology was inflamed by the fires of rebellion. <<print commaNum(Math.trunc($attackTroops))>> rebels from all over the structure dared rise up against their owners and conquer their freedom through blood. Our defense force, <<print commaNum($troopCount)>> strong, fought with them street by street
 	<<if $enemyLosses != $attackTroops>>
-		inflicting <<print commaNum(Math.trunc($enemyLosses))>> casualties, while sustaining <<print commaNum(Math.trunc($losses))>> casualties themselves.
+		inflicting <<print commaNum(Math.trunc($enemyLosses))>> casualties, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<else>> a casualty<</if>> themselves.
 	<<else>>
-		completely annihilating their troops, while sustaining <<print commaNum(Math.trunc($losses))>> casualties.
+		completely annihilating their troops, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<else>> a casualty.<</if>>
 	<</if>>
 	<<set $ASlaves -= $enemyLosses>>
 	<<if $battleResult == 3>>
@@ -179,9 +179,9 @@
 <<else>>
 	Today, the _day of _month _year, our arcology was inflamed by the fires of rebellion. <<print commaNum(Math.trunc($attackTroops))>> rebels from all over the structure dared rise up to dethrone their arcology owner. Our defense force, <<print commaNum($troopCount)>> strong, fought with them street by street
 	<<if $enemyLosses != $attackTroops>>
-		inflicting <<print commaNum(Math.trunc($enemyLosses))>> casualties, while sustaining <<print commaNum(Math.trunc($losses))>> casualties themselves.
+		inflicting <<print commaNum(Math.trunc($enemyLosses))>> casualties, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<else>> a casualty<</if>> themselves.
 	<<else>>
-		completely annihilating their troops, while sustaining <<print commaNum(Math.trunc($losses))>> casualties.
+		completely annihilating their troops, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<else>> a casualty.<</if>>
 	<</if>>
 	<<set $ASlaves -= $enemyLosses>>
 	<<if $battleResult == 3>>
diff --git a/src/cheats/mod_EditArcologyCheat.tw b/src/cheats/mod_EditArcologyCheat.tw
index 5f2fd16938d9d201e2b461b4584d0e74f2d9a6ec..b9f566093944e13907631d72319092ab94857b2d 100644
--- a/src/cheats/mod_EditArcologyCheat.tw
+++ b/src/cheats/mod_EditArcologyCheat.tw
@@ -339,38 +339,6 @@ __Player Character__
 <<radiobutton "$SCP.schoolAnnexed" 0>> 0
 | <<radiobutton "$SCP.schoolAnnexed" 1>> 1 (Failed)
 
-<<if ($seeDicks != 0)>>
-<br><br>''L'École des Enculées:''
-<br>LDE Students Bought: <<textbox "$LDE.studentsBought" $LDE.studentsBought>>
-<br>LDE Upgrades: ''$LDE.schoolUpgrade'' |
-<<radiobutton "$LDE.schoolUpgrade" 0>> 0
-| <<radiobutton "$LDE.schoolUpgrade" 1>> 1
-| <<radiobutton "$LDE.schoolUpgrade" 2>> 2
-
-<br>LDE Moved to Arcology: ''$LDE.schoolPresent'' |
-<<radiobutton "$LDE.schoolPresent" 0>> 0
-| <<radiobutton "$LDE.schoolPresent" 1>> 1 (Moved)
-
-<br>LDE Prosperity: <<textbox "$LDE.schoolProsperity" $LDE.schoolProsperity>>
-<br>LDE Failed: ''$LDE.schoolAnnexed'' |
-<<radiobutton "$LDE.schoolAnnexed" 0>> 0
-| <<radiobutton "$LDE.schoolAnnexed" 1>> 1 (Failed)
-
-<br><br>''The Gymnasium-Academy:''
-<br>TGA Students Bought: <<textbox "$TGA.studentsBought" $TGA.studentsBought>>
-<br>TGA Upgrades: ''$TGA.schoolUpgrade''
-<<radiobutton "$TGA.schoolUpgrade" 0>> 0
-| <<radiobutton "$TGA.schoolUpgrade" 1>> 1
-| <<radiobutton "$TGA.schoolUpgrade" 2>> 2
-
-<br>TGA Moved to Arcology: ''$TGA.schoolPresent'' |
-<<radiobutton "$TGA.schoolPresent" 0>> 0
-| <<radiobutton "$TGA.schoolPresent" 1>> 1 (Moved)
-
-<br>TGA Prosperity: <<textbox "$TGA.schoolProsperity" $TGA.schoolProsperity>>
-<br>TGA Failed: ''$TGA.schoolAnnexed'' |
-<<radiobutton "$TGA.schoolAnnexed" 0>> 0
-| <<radiobutton "$TGA.schoolAnnexed" 1>> 1 (Failed)
 
 <br><br>''The Hippolyta Academy:''
 <br>HA Students Bought: <<textbox "$HA.studentsBought" $HA.studentsBought>>
@@ -404,6 +372,39 @@ __Player Character__
 <<radiobutton "$TCR.schoolAnnexed" 0>> 0
 | <<radiobutton "$TCR.schoolAnnexed" 1>> 1 (Failed)
 
+<<if ($seeDicks != 0)>>
+<br><br>''L'École des Enculées:''
+<br>LDE Students Bought: <<textbox "$LDE.studentsBought" $LDE.studentsBought>>
+<br>LDE Upgrades: ''$LDE.schoolUpgrade'' |
+<<radiobutton "$LDE.schoolUpgrade" 0>> 0
+| <<radiobutton "$LDE.schoolUpgrade" 1>> 1
+| <<radiobutton "$LDE.schoolUpgrade" 2>> 2
+
+<br>LDE Moved to Arcology: ''$LDE.schoolPresent'' |
+<<radiobutton "$LDE.schoolPresent" 0>> 0
+| <<radiobutton "$LDE.schoolPresent" 1>> 1 (Moved)
+
+<br>LDE Prosperity: <<textbox "$LDE.schoolProsperity" $LDE.schoolProsperity>>
+<br>LDE Failed: ''$LDE.schoolAnnexed'' |
+<<radiobutton "$LDE.schoolAnnexed" 0>> 0
+| <<radiobutton "$LDE.schoolAnnexed" 1>> 1 (Failed)
+
+<br><br>''The Gymnasium-Academy:''
+<br>TGA Students Bought: <<textbox "$TGA.studentsBought" $TGA.studentsBought>>
+<br>TGA Upgrades: ''$TGA.schoolUpgrade''
+<<radiobutton "$TGA.schoolUpgrade" 0>> 0
+| <<radiobutton "$TGA.schoolUpgrade" 1>> 1
+| <<radiobutton "$TGA.schoolUpgrade" 2>> 2
+
+<br>TGA Moved to Arcology: ''$TGA.schoolPresent'' |
+<<radiobutton "$TGA.schoolPresent" 0>> 0
+| <<radiobutton "$TGA.schoolPresent" 1>> 1 (Moved)
+
+<br>TGA Prosperity: <<textbox "$TGA.schoolProsperity" $TGA.schoolProsperity>>
+<br>TGA Failed: ''$TGA.schoolAnnexed'' |
+<<radiobutton "$TGA.schoolAnnexed" 0>> 0
+| <<radiobutton "$TGA.schoolAnnexed" 1>> 1 (Failed)
+
 <br><br>''The Futanari Sisters:''
 <br>TFS Students Bought: <<textbox "$TFS.studentsBought" $TFS.studentsBought>>
 <br>TFS Upgrades: ''$TFS.schoolUpgrade'' |
diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw
index 099a05d0f16178b0f1676194ad7afe00336709d5..3c8f71e2741f652fe1187fcafc490afa9519f1d4 100644
--- a/src/js/storyJS.tw
+++ b/src/js/storyJS.tw
@@ -314,148 +314,6 @@ window.isFertile = function(slave) {
 	}
 };
 
-//hyperpreg size 2
-window.hyperBellyTwo = function(slave) {
-	if (!slave) {
-		return null;
-	} else if (slave.preg > 30 && slave.pregType >= 20) {
-		return true;
-	} else if (slave.bellyImplant >= 32000) {
-		return true;
-	} else {
-		return false;
-	}
-};
-
-window.hyperPregBellyTwo = function(slave) {
-	if (!slave) {
-		return null;
-	} else if (slave.preg > 30 && slave.pregType >= 20) {
-		return true;
-	} else {
-		return false;
-	}
-};
-
-//hyperpreg size 1
-window.hyperBellyOne = function(slave) {
-	if (!slave) {
-		return null;
-	} else if (slave.preg > 20 && slave.pregType >= 20) {
-		return true;
-	} else if (slave.preg > 30 && slave.pregType >= 10) {
-		return true;
-	} else if (slave.bellyImplant >= 16000) {
-		return true;
-	} else {
-		return false;
-	}
-};
-
-window.hyperPregBellyOne = function(slave) {
-	if (!slave) {
-		return null;
-	} else if (slave.preg > 20 && slave.pregType >= 20) {
-		return true;
-	} else if (slave.preg > 30 && slave.pregType >= 10) {
-		return true;
-	} else {
-		return false;
-	}
-};
-
-//full term belly
-window.hugeBelly = function(slave) {
-	if (!slave) {
-		return null;
-	} else if (slave.preg > 0 && slave.pregType >= 20) {
-		return true;
-	} else if (slave.preg > 10 && slave.pregType >= 10) {
-		return true;
-	} else if (slave.preg > 30) {
-		return true;
-	} else if (slave.inflation >= 3) {
-		return true;
-	} else if (slave.bellyImplant >= 8000) {
-		return true;
-	} else {
-		return false;
-	}
-};
-
-window.hugeBellyPreg = function(slave) {
-	if (!slave) {
-		return null;
-	} else if (slave.preg > 0 && slave.pregType >= 20) {
-		return true;
-	} else if (slave.preg > 10 && slave.pregType >= 10) {
-		return true;
-	} else if (slave.preg > 30) {
-		return true;
-	} else {
-		return false;
-	}
-};
-
-//is the slave's belly big enough to get in the way
-window.bigBellyPreg = function(slave) {
-	if (!slave) {
-		return null;
-	} else if (slave.preg > 0 && slave.pregType >= 20) {
-		return true;
-	} else if (slave.preg > 10 && slave.pregType >= 10) {
-		return true;
-	} else if (slave.preg > 20) {
-		return true;
-	} else {
-		return false;
-	}
-};
-
-//is the slave's belly big enough to be noticiable.
-window.visibleBellyPreg = function(slave) {
-	if (!slave) {
-		return null;
-	} else if (slave.preg > 0 && slave.pregType >= 20) {
-		return true;
-	} else if (slave.preg > 5 && slave.pregType >= 10) {
-		return true;
-	} else if (slave.preg > 10) {
-		return true;
-	} else {
-		return false;
-	}
-};
-
-
-window.bigBelly = function(slave) {
-	if (!slave) {
-		return null;
-	} else if (bigBellyPreg(slave) == true) {
-		return true;
-	} else if (slave.inflation > 2) {
-		return true;
-	} else if (slave.bellyImplant >= 4000) {
-		return true;
-	} else {
-		return false;
-	}
-};
-
-window.visibleBelly = function(slave) {
-	if (!slave) {
-		return null;
-	} else if (visibleBellyPreg(slave) == true) {
-		return true;
-	} else if (slave.inflation > 0) {
-		return true;
-	} else if (slave.bellyImplant >= 2000) {
-		return true;
-	} else {
-		return false;
-	}
-};
-
 window.canAchieveErection = function(slave) {
 	if (!slave) {
 		return null;
diff --git a/src/npc/descriptions/fVagina.tw b/src/npc/descriptions/fVagina.tw
index 3c71aaf7eb81495caaf34716a387778c6e517e01..7e74c311bd1104b5b554953ca44731f38e529802 100644
--- a/src/npc/descriptions/fVagina.tw
+++ b/src/npc/descriptions/fVagina.tw
@@ -80,10 +80,10 @@ You call her over so you can
 	<</if>>
 <</if>>
 
-<<if $PC.pregMood == 1 && $PC.preg >= 28>>
+<<if $PC.pregMood == 2 && $PC.preg >= 28>>
 	<<set _fPosition = either(50,50,50,90)>>
 	<<set _fSpeed = 90>>
-<<elseif $PC.pregMood == 2 && $PC.preg >= 28>>
+<<elseif $PC.pregMood == 1 && $PC.preg >= 28>>
 	<<set _fPosition = random(1,40)>>
 	<<set _fSpeed = 10>>
 <<elseif $PC.belly >= 3000>>
@@ -98,9 +98,9 @@ You call her over so you can
 	You decide to fuck her
 	<<if (_fPosition <= 20)>>
 		in the missionary position. You tell her to lie down on the couch next to your desk.
-		<<if $activeSlave.bellyPreg >= 750000>>
+		<<if $activeSlave.bellyPreg >= 600000>>
 			A position that will be a challange due to her immense pregnancy.
-		<<elseif $activeSlave.belly >= 750000>>
+		<<elseif $activeSlave.belly >= 600000>>
 			A position that will be a challange due to her immense stomach.
 		<<elseif $activeSlave.bellyPreg >= 300000>>
 			A position that will be difficult due to her massive pregnancy.
@@ -111,9 +111,9 @@ You call her over so you can
 		<</if>>
 	<<elseif (_fPosition <= 40)>>
 		in the cowgirl position. You lie on the couch beside your desk and tell her to straddle you, facing towards you.
-		<<if $activeSlave.bellyPreg >= 750000>>
+		<<if $activeSlave.bellyPreg >= 600000>>
 			A position that will smother you with her immense pregnancy.
-		<<elseif $activeSlave.belly >= 750000>>
+		<<elseif $activeSlave.belly >= 600000>>
 			A position that will smother you with her immense stomach.
 		<<elseif $activeSlave.bellyPreg >= 300000>>
 			A position that will allow you to tease her massive pregnancy as you fuck her.
@@ -124,9 +124,9 @@ You call her over so you can
 		<</if>>
 	<<elseif (_fPosition <= 60)>>
 		doggy-style. You tell her to get on the couch beside your desk on her hands and knees.
-		<<if $activeSlave.bellyPreg >= 750000>>
+		<<if $activeSlave.bellyPreg >= 600000>>
 			As she struggles to fit on the couch, you tell her to just lean over her immense pregnancy instead.
-		<<elseif $activeSlave.belly >= 750000>>
+		<<elseif $activeSlave.belly >= 600000>>
 			As she struggles to fit on the couch, you tell her to just lean over her immense belly instead.
 		<<elseif $activeSlave.bellyPreg >= 300000>>
 			A position that leaves her rear high in the air thanks to her massive pregnancy.
@@ -138,9 +138,9 @@ You call her over so you can
 		<</if>>
 	<<elseif (_fPosition <= 80)>>
 		in the reverse cowgirl position. You lie on the couch beside your desk and tell her to straddle you facing away from you.
-		<<if $activeSlave.bellyPreg >= 750000>>
+		<<if $activeSlave.bellyPreg >= 600000>>
 			A position that will much more comfortable for her immense pregnancy and won't crush you under its mass.
-		<<elseif $activeSlave.belly >= 750000>>
+		<<elseif $activeSlave.belly >= 600000>>
 			A position that will much more comfortable for her immense belly and won't crush you under its mass.
 		<<elseif $activeSlave.bellyPreg >= 300000>>
 			A position that will much more comfortable for her massive pregnancy.
@@ -149,9 +149,9 @@ You call her over so you can
 		<</if>>
 	<<else>>
 		in the wheelbarrow position. You tell her to get on the couch beside your desk, stand next to her and lift her legs up into the air.
-		<<if $activeSlave.bellyPreg >= 750000>>
+		<<if $activeSlave.bellyPreg >= 600000>>
 			Her pregnancy is so immense it reaches the floor even as you hold her saving you the trouble of bearing its weight.
-		<<elseif $activeSlave.belly >= 750000>>
+		<<elseif $activeSlave.belly >= 600000>>
 			Her belly is so immense it reaches the floor even as you hold her saving you the trouble of bearing its weight.
 		<<elseif $activeSlave.bellyPreg >= 300000>>
 			You hope you don't strain something supporting her massive pregnancy.
@@ -214,13 +214,13 @@ You call her over so you can
 <<elseif ($activeSlave.fetish == "submissive") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1) && ($PC.dick != 0)>>
 	She comes over, smiling a little submissive smile, and spreads herself for you. You take her on the couch next to your desk after she gets into position.
 	<<if (_fPosition <= 20)>> /* missionary */
-		<<if $activeSlave.bellyPreg >= 750000>>
+		<<if $activeSlave.bellyPreg >= 600000>>
 			<<if $PC.belly >= 5000>>
 				You have to heft her gravid body up and slip under her expansive middle to position yourself for penetration. With your own baby bump in the way, it's a complicated maneuver, but once you manage to get in, you rest your head against her bulging belly and feel the movements within as you thrust <<if _fSpeed > 75>>hard and fast<<elseif _fSpeed > 50>>firmly and vigorously<<elseif _fSpeed > 25>>steadily<<else>>slowly and tenderly<</if>> into her;
 			<<else>>
 				You have to heft her gravid body up and slip under her expansive middle to position yourself for penetration. But once you are seated, you rest your head against her bulging belly and feel the movements within as you thrust <<if _fSpeed > 75>>hard and fast<<elseif _fSpeed > 50>>firmly and vigorously<<elseif _fSpeed > 25>>steadily<<else>>slowly and tenderly<</if>> into her;
 			<</if>>
-		<<elseif $activeSlave.belly >= 750000>>
+		<<elseif $activeSlave.belly >= 600000>>
 			<<if $PC.belly >= 5000>>
 				You have to heft her weighty body up and slip under her expansive middle to position yourself for penetration. With your own gravid swell in the way, it's a complicated maneuver, but once you manage to get in, you rest your head against her immense belly and feel the force of your <<if _fSpeed > 75>>fast, hard<<elseif _fSpeed > 50>>vigorous, firm<<elseif _fSpeed > 25>>steady<<else>>slow, tender<</if>> thrusts running through her;
 			<<else>>
@@ -257,9 +257,9 @@ You call her over so you can
 			<</if>>
 		<</if>>
 	<<elseif (_fPosition <= 40)>> /* cowgirl */
-		<<if $activeSlave.bellyPreg >= 750000>>
+		<<if $activeSlave.bellyPreg >= 600000>>
 			You wrap your arms around her boundless pregnancy as you thrust <<if _fSpeed > 75>>hard and fast<<elseif _fSpeed > 50>>firmly and vigorously<<elseif _fSpeed > 25>>steadily<<else>>slowly and tenderly<</if>> into her and enjoy the feeling of so much movement squirming against your face;
-		<<elseif $activeSlave.belly >= 750000>>
+		<<elseif $activeSlave.belly >= 600000>>
 			You wrap your arms around her boundless stomach as you thrust <<if _fSpeed > 75>>hard and fast<<elseif _fSpeed > 50>>firmly and vigorously<<elseif _fSpeed > 25>>steadily<<else>>slowly and tenderly<</if>> into her and enjoy the feeling of your every move running through her belly;
 		<<elseif $activeSlave.bellyPreg >= 300000>>
 			She does her best to not suffocate you with her massive belly or knock you out with it as you thrust <<if _fSpeed > 75>>hard and fast<<elseif _fSpeed > 50>>firmly and vigorously<<elseif _fSpeed > 25>>steadily<<else>>slowly and tenderly<</if>> into her. You get a face full of pregnancy with each downward motion;
@@ -285,7 +285,7 @@ You call her over so you can
 			She puts her hands on your chest and starts to lean back as you continue to thrust <<if _fSpeed > 75>>hard and fast<<elseif _fSpeed > 50>>firmly and vigorously<<elseif _fSpeed > 25>>steadily<<else>>slowly and tenderly<</if>> upwards;
 		<</if>>
 	<<else>> /* wheelbarrow */
-		<<if $activeSlave.belly >= 750000>>
+		<<if $activeSlave.belly >= 600000>>
 			With all her weight handled, you can keep <<if _fSpeed > 75>>furiously<<elseif _fSpeed > 50>>vigorously<<elseif _fSpeed > 25>>steadily<<else>>slowly and tenderly<</if>> pounding without your arms getting tired;
 		<<elseif $activeSlave.bellyPreg >= 300000>>
 			Before long both of your strength begins to wane, causing her belly to touch the floor. With some of the weight off of the both of you, you keep on <<if _fSpeed > 75>>furiously<<elseif _fSpeed > 50>>vigorously<<elseif _fSpeed > 25>>steadily<<else>>slowly and tenderly<</if>> pounding;
@@ -362,13 +362,13 @@ You call her over so you can
 	<<if ($PC.dick != 0)>>
 		She skips over smiling and gives you a quick kiss. You take her on the couch next to your desk after she gets into position.
 		<<if (_fPosition <= 20)>> /* missionary */
-			<<if $activeSlave.bellyPreg >= 750000>>
+			<<if $activeSlave.bellyPreg >= 600000>>
 				<<if $PC.belly >= 5000>>
 					You have to heft her gravid body up and slip under her expansive middle to position yourself for penetration. With your own baby bump in the way, it's a complicated maneuver, but once you manage to get in, you rest your head against her bulging belly and feel the movements within as you thrust <<if _fSpeed > 75>>hard and fast<<elseif _fSpeed > 50>>firmly and vigorously<<elseif _fSpeed > 25>>steadily<<else>>slowly and tenderly<</if>> into her;
 				<<else>>
 					You have to heft her gravid body up and slip under her expansive middle to position yourself for penetration. But once you are seated, you rest your head against her bulging belly and feel the movements within as you thrust <<if _fSpeed > 75>>hard and fast<<elseif _fSpeed > 50>>firmly and vigorously<<elseif _fSpeed > 25>>steadily<<else>>slowly and tenderly<</if>> into her;
 				<</if>>
-			<<elseif $activeSlave.belly >= 750000>>
+			<<elseif $activeSlave.belly >= 600000>>
 				<<if $PC.belly >= 5000>>
 					You have to heft her weighty body up and slip under her expansive middle to position yourself for penetration. With your own gravid swell in the way, it's a complicated maneuver, but once you manage to get in, you rest your head against her immense belly and feel the force of your <<if _fSpeed > 75>>fast, hard<<elseif _fSpeed > 50>>vigorous, firm<<elseif _fSpeed > 25>>steady<<else>>slow, tender<</if>> thrusts running through her;
 				<<else>>
@@ -405,9 +405,9 @@ You call her over so you can
 				<</if>>
 			<</if>>
 		<<elseif (_fPosition <= 40)>> /* cowgirl */
-			<<if $activeSlave.bellyPreg >= 750000>>
+			<<if $activeSlave.bellyPreg >= 600000>>
 				You wrap your arms around her boundless pregnancy as you thrust <<if _fSpeed > 75>>hard and fast<<elseif _fSpeed > 50>>firmly and vigorously<<elseif _fSpeed > 25>>steadily<<else>>slowly and tenderly<</if>> into her and enjoy the feeling of so much movement squirming against your face;
-			<<elseif $activeSlave.belly >= 750000>>
+			<<elseif $activeSlave.belly >= 600000>>
 				You wrap your arms around her boundless stomach as you thrust <<if _fSpeed > 75>>hard and fast<<elseif _fSpeed > 50>>firmly and vigorously<<elseif _fSpeed > 25>>steadily<<else>>slowly and tenderly<</if>> into her and enjoy the feeling of your every move running through her belly;
 			<<elseif $activeSlave.bellyPreg >= 300000>>
 				She does her best to not suffocate you with her massive belly or knock you out with it as you thrust <<if _fSpeed > 75>>hard and fast<<elseif _fSpeed > 50>>firmly and vigorously<<elseif _fSpeed > 25>>steadily<<else>>slowly and tenderly<</if>> into her. You get a face full of pregnancy with each downward motion;
@@ -433,7 +433,7 @@ You call her over so you can
 				She puts her hands on your chest and starts to lean back as you continue to thrust <<if _fSpeed > 75>>hard and fast<<elseif _fSpeed > 50>>firmly and vigorously<<elseif _fSpeed > 25>>steadily<<else>>slowly and tenderly<</if>> upwards;
 			<</if>>
 		<<else>> /* wheelbarrow */
-			<<if $activeSlave.belly >= 750000>>
+			<<if $activeSlave.belly >= 600000>>
 				With all her weight handled, you can keep <<if _fSpeed > 75>>furiously<<elseif _fSpeed > 50>>vigorously<<elseif _fSpeed > 25>>steadily<<else>>slowly and tenderly<</if>> pounding without your arms getting tired;
 			<<elseif $activeSlave.bellyPreg >= 300000>>
 				Before long both of your strength begins to wane, causing her belly to touch the floor. With some of the weight off of the both of you, you keep on <<if _fSpeed > 75>>furiously<<elseif _fSpeed > 50>>vigorously<<elseif _fSpeed > 25>>steadily<<else>>slowly and tenderly<</if>> pounding;
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index 869c17d53bee13472a01df9d8328e07efa9a052f..240d364815d0d5d08bea56f59e0d108250ecef55 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -944,7 +944,20 @@ The offered price is <<print cashFormat($slaveCost)>>.
 			<</if>>
 			appreciating the life growing within you and what future prospects may await it.
 		<<elseif $PC.dick == 1>>
-			Stunned and fully erect, you inexplicably feel the urge to creampie a pussy, so you <<if $fuckSlaves > 0>>grab the nearest slave watching with you, who is overjoyed to recreate the entire ending with you<<else>>make your way to the slave dormitory and pick out the perfect slave<</if>>. You've never had a more hope-filled orgasm.
+			Stunned and fully erect, you inexplicably feel the urge to creampie a pussy, so you
+			<<if $Concubine != 0 && $Concubine.vagina > 0 && canDoVaginal($Concubine)>>
+				grab $Concubine.slaveName and recreate the entire ending with her.
+				<<set _fctvs = $slaves.findIndex(function(s) { return s.ID == $Concubine.ID; })>>
+				<<set $slaves[_fctvs].vaginalCount += 1, $vaginalTotal += 1>>
+				<<if $Concubine.eggType == "human" && canGetPregnant($Concubine)>>
+					<<KnockMeUp $slaves[_fctvs] 10 0 -1 1>>
+				<</if>>
+			<<elseif $fuckSlaves > 0>>
+				grab the nearest slave watching with you, who is overjoyed to recreate the entire ending with you.
+			<<else>>
+				make your way to the slave dormitory and pick out the perfect slave.
+			<</if>>
+			You've never had a more hope-filled orgasm.
 		<<else>>
 			Stunned and soaking wet, you hurry to
 			<<if $Concubine != 0 && canPenetrate($Concubine) && $PC.preg == 0 && $Concubine.ballType == "human" && $Concubine.vasectomy == 0 && ($sexualOpeness == 1 || $Concubine.toyHole == "dick")>>
diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/uncategorized/personalAssistantAppearance.tw
index 19872267c7252ea50eb6924872a518d1ec9fba0b..399b51a8059b33211f4d8c6d288748c4629db466 100644
--- a/src/uncategorized/personalAssistantAppearance.tw
+++ b/src/uncategorized/personalAssistantAppearance.tw
@@ -954,7 +954,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
   <</if>>
 
 <<case "angel">>
-	She's a gorgeous little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0].FSSupremacistRace <</if>> angel with long blonde hair and large <<if $arcologies[0].FSGenderFundamentalist != "unset">>black<<else>>white<</if>> wings as large as her when they are folded.
+	She's a gorgeous little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0].FSSupremacistRace <</if>> angel with long blonde hair and large <<if $arcologies[0].degradationist != "unset">>black<<else>>white<</if>> wings as large as her when they are folded.
 	<<if $assistantFSOptions>>
 	<<switch $assistantFSAppearance>>
 	<<case "paternalist">>
diff --git a/src/uncategorized/policies.tw b/src/uncategorized/policies.tw
index b321e7dd477d6bfa50746202b0cce439fbb447a3..546c15a7d9dee84239666830a1e84f6c44c4d67d 100644
--- a/src/uncategorized/policies.tw
+++ b/src/uncategorized/policies.tw
@@ -100,8 +100,68 @@
 <</if>>
 
 <</if>>
+<br><br>__Slave Retirement Planning__
+
+<<if $CustomRetirementAgePolicy == 1 && $PhysicalRetirementAgePolicy != 1>>
+	<br>''Redefined Mandatory Retirement Age:'' you have set your arcology's standard retirement age for sex slaves at $retirementAge.
+	[[Repeal|Policies][$CustomRetirementAgePolicy = 0, $retirementAge = 45]]
+<<else>>
+	<br>''Default Retirement Age:'' in the absence of a defined slave retirement age, slaves will not remain sex slaves after reaching age $retirementAge.
+	<br>&nbsp;&nbsp;&nbsp;&nbsp;//This is a current content and mechanical limitation in FC $ver, not a universal Free Cities rule.//
+<</if>>
+
+<<if $PhysicalRetirementAgePolicy == 1>>
+	<br>''Redefined Mandatory Retirement Age:'' you have set your arcology's standard retirement age for slave bodies at $retirementAge.
+	[[Repeal|Policies][$PhysicalRetirementAgePolicy = 0, $retirementAge = 45]]
+<</if>>
+
+<<if $BioreactorRetirement == 1>>
+	<br>''Public Fluid Production Retirement:'' once reaching mandatory retirement age, slaves are converted for full-time milk<<if $seeDicks != 0>>, vaginal secretion, and semen<</if>> production.
+	[[Repeal|Policies][$BioreactorRetirement = 0]]
+<<elseif $ArcadeRetirement == 1>>
+	<br>''Public Arcade Retirement:'' once reaching mandatory retirement age, slaves are placed in cheap public arcades to be used until useless.
+	[[Repeal|Policies][$ArcadeRetirement = 0]]
+<<elseif $CitizenRetirement == 1>>
+	<br>''Citizen Retirement:'' all slaveowners are required to pay into accounts to support their slaves as lower-class citizens in retirement.
+	[[Repeal|Policies][$CitizenRetirement = 0, $SexMilestoneRetirement = 0, $MilkMilestoneRetirement = 0, $BirthsMilestoneRetirement = 0, $KillsMilestoneRetirement = 0]]
+<<else>>
+	<br>''Menial Retirement:'' in the absence of a clear slave retirement policy, overaged sex slaves will become menial slaves.
+<</if>>
+
+<<if $SexMilestoneRetirement == 1>>
+	<br>''Sexual Milestone Retirement:'' slaves will be rewarded with their freedom once they have been fucked $retirementSex times.
+	[[Repeal|Policies][$SexMilestoneRetirement = 0]]
+	<br>&nbsp;&nbsp;&nbsp;&nbsp;Set a new retirement requirement: <<textbox "$retirementSex" $retirementSex "Policies">>
+<</if>>
+
+<<if $MilkMilestoneRetirement == 1>>
+	<br>''Productive Cow Retirement:'' slaves will be rewarded with their freedom once they have given $retirementMilk liters of milk.
+	[[Repeal|Policies][$MilkMilestoneRetirement = 0]]
+	<br>&nbsp;&nbsp;&nbsp;&nbsp;Set a new retirement requirement: <<textbox "$retirementMilk" $retirementMilk "Policies">>
+<</if>>
+
+<<if $BirthsMilestoneRetirement == 1>>
+	<br>''Fertile Breeder Retirement:'' slaves will be rewarded with their freedom once they add $retirementBirths new slaves to the population of $arcologies[0].name.
+	[[Repeal|Policies][$BirthsMilestoneRetirement = 0]]
+	<br>&nbsp;&nbsp;&nbsp;&nbsp;Set a new retirement requirement: <<textbox "$retirementBirths" $retirementBirths "Policies">>
+<</if>>
+
+<<if $KillsMilestoneRetirement == 1>>
+	<br>''Champion Gladiatrix Retirement:'' slaves will be rewarded with their freedom once they have killed $retirementKills of their fellow slaves in the pit.
+	[[Repeal|Policies][$KillsMilestoneRetirement = 0]]
+	<br>&nbsp;&nbsp;&nbsp;&nbsp;Set a new retirement requirement: <<textbox "$retirementKills" $retirementKills "Policies">>
+<</if>>
+
+<<if $MixedMarriage == 1>>
+	<br>''Marriage between Owners and Slaves:'' you are providing a legal basis for citizens to marry their slaves without impacting their rights as slaveowners.
+	[[Repeal|Policies][$MixedMarriage = 0]]
+<</if>>
+
+<<if ndef $arcologies[0].FSGenderFundamentalistLawBimbo>><<set $arcologies[0].FSGenderFundamentalistLawBimbo = 0>><</if>>
+<<if (($arcologies[0].FSSupremacistLawME + $arcologies[0].FSSupremacistSMR + $arcologies[0].FSSubjugationistLawME + $arcologies[0].FSSubjugationistSMR + $arcologies[0].FSGenderRadicalistLawBeauty + $arcologies[0].FSGenderRadicalistLawFuta + $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderFundamentalistLawBimbo + $arcologies[0].FSGenderFundamentalistSMR + $arcologies[0].FSPaternalistLaw + $arcologies[0].FSPaternalistSMR + $arcologies[0].FSDegradationistLaw + $arcologies[0].FSDegradationistSMR + $arcologies[0].FSBodyPuristLaw + $arcologies[0].FSBodyPuristSMR + $arcologies[0].FSTransformationFetishistSMR + $arcologies[0].FSYouthPreferentialistLaw + $arcologies[0].FSYouthPreferentialistSMR + $arcologies[0].FSMaturityPreferentialistLaw + $arcologies[0].FSMaturityPreferentialistSMR + $arcologies[0].FSSlimnessEnthusiastSMR + $arcologies[0].FSSlimnessEnthusiastLaw + $arcologies[0].FSAssetExpansionistSMR + $arcologies[0].FSPastoralistLaw + $arcologies[0].FSPastoralistSMR + $arcologies[0].FSPhysicalIdealistSMR + $arcologies[0].FSChattelReligionistLaw + $arcologies[0].FSChattelReligionistSMR + $arcologies[0].FSChattelReligionistCreed + $arcologies[0].FSRomanRevivalistLaw + $arcologies[0].FSRomanRevivalistSMR + $arcologies[0].FSAztecRevivalistLaw + $arcologies[0].FSAztecRevivalistSMR + $arcologies[0].FSEgyptianRevivalistLaw + $arcologies[0].FSEgyptianRevivalistSMR + $arcologies[0].FSEdoRevivalistLaw + $arcologies[0].FSEdoRevivalistSMR + $arcologies[0].FSArabianRevivalistLaw + $arcologies[0].FSArabianRevivalistSMR + $arcologies[0].FSChineseRevivalistLaw + $arcologies[0].FSChineseRevivalistSMR + $arcologies[0].FSRepopulationFocusLaw + $arcologies[0].FSRepopulationFocusSMR + $arcologies[0].FSRestartLaw + $arcologies[0].FSRestartSMR > 0 + $arcologies[0].FSHedonisticDecadenceLaw + $arcologies[0].FSHedonisticDecadenceLaw2 + $arcologies[0].FSHedonisticDecadenceSMR + $arcologies[0].FSPhysicalIdealistLaw + $arcologies[0].FSHedonisticDecadenceStrongFat + $arcologies[0].FSPhysicalIdealistStrongFat) > 0) || ($CulturalOpenness != 0)>>
+
 <<if $OralEncouragement + $OralDiscouragement + $VaginalEncouragement + $VaginalDiscouragement + $AnalEncouragement + $AnalDiscouragement + $sexualOpeness > 0>>
-<br>__Sexual Trendsetting__
+<br><br>__Sexual Trendsetting__
 
 <<if $OralEncouragement == 1>>
 	<br>''Oral Sex Encouragement:'' you are using your personal influence to make blowjobs the most fashionable sex act in the arcology.
@@ -140,7 +200,7 @@
 
 <</if>>
 <<if $ProRefugees + $ProRecruitment + $ProImmigrationCash + $ProImmigrationRep + $AntiImmigrationCash + $AntiImmigrationRep + $ProEnslavementCash + $ProEnslavementRep + $AntiEnslavementCash + $AntiEnslavementRep > 0>>
-<br>__Population Policy__
+<br><br>__Population Policy__
 
 <<if $ProRefugees == 1>>
 	<br>''Encourage Refugee Servitude:'' the image of slavery in your arcology is being softened, encouraging old world refugees to consider becoming menial slaves.
@@ -194,7 +254,7 @@
 
 <</if>>
 <<if $alwaysSubsidizeGrowth + $alwaysSubsidizeRep + $CashForRep + $RepForCash + $RegularParties + $PAPublic + $CoursingAssociation + $RaidingMercenaries + $Cash4Babies + $goodImageCampaign > 0>>
-<br>__Domestic Policy__
+<br><br>__Domestic Policy__
 
 <<if $alwaysSubsidizeGrowth == 1>>
 	<br>''Economic Growth Subsidy:'' promising new businesses are offered generous subsidies, driving arcology prosperity.
@@ -251,7 +311,7 @@
 
 <</if>>
 <<if ($TSS.subsidize != 0) || ($GRI.subsidize != 0) || ($SCP.subsidize != 0) || ($LDE.subsidize != 0) || ($TGA.subsidize != 0) || ($TFS.subsidize != 0) || ($TCR.subsidize != 0) || ($HA.subsidize != 0)>>
-<br>__Education Policy__
+<br><br>__Education Policy__
 
 <<if $TSS.subsidize == 1>>
 	<br>''The Slave School subsidy:'' you are subsidizing this school's branch campus in your arcology.
@@ -332,66 +392,8 @@
 <</if>>
 
 <</if>>
-<br>__Slave Retirement Planning__
 
-<<if $CustomRetirementAgePolicy == 1 && $PhysicalRetirementAgePolicy != 1>>
-	<br>''Redefined Mandatory Retirement Age:'' you have set your arcology's standard retirement age for sex slaves at $retirementAge.
-	[[Repeal|Policies][$CustomRetirementAgePolicy = 0, $retirementAge = 45]]
-<<else>>
-	<br>''Default Retirement Age:'' in the absence of a defined slave retirement age, slaves will not remain sex slaves after reaching age $retirementAge.
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;//This is a current content and mechanical limitation in FC $ver, not a universal Free Cities rule.//
-<</if>>
-
-<<if $PhysicalRetirementAgePolicy == 1>>
-	<br>''Redefined Mandatory Retirement Age:'' you have set your arcology's standard retirement age for slave bodies at $retirementAge.
-	[[Repeal|Policies][$PhysicalRetirementAgePolicy = 0, $retirementAge = 45]]
-<</if>>
-
-<<if $BioreactorRetirement == 1>>
-	<br>''Public Fluid Production Retirement:'' once reaching mandatory retirement age, slaves are converted for full-time milk<<if $seeDicks != 0>>, vaginal secretion, and semen<</if>> production.
-	[[Repeal|Policies][$BioreactorRetirement = 0]]
-<<elseif $ArcadeRetirement == 1>>
-	<br>''Public Arcade Retirement:'' once reaching mandatory retirement age, slaves are placed in cheap public arcades to be used until useless.
-	[[Repeal|Policies][$ArcadeRetirement = 0]]
-<<elseif $CitizenRetirement == 1>>
-	<br>''Citizen Retirement:'' all slaveowners are required to pay into accounts to support their slaves as lower-class citizens in retirement.
-	[[Repeal|Policies][$CitizenRetirement = 0, $SexMilestoneRetirement = 0, $MilkMilestoneRetirement = 0, $BirthsMilestoneRetirement = 0, $KillsMilestoneRetirement = 0]]
-<<else>>
-	<br>''Menial Retirement:'' in the absence of a clear slave retirement policy, overaged sex slaves will become menial slaves.
-<</if>>
-
-<<if $SexMilestoneRetirement == 1>>
-	<br>''Sexual Milestone Retirement:'' slaves will be rewarded with their freedom once they have been fucked $retirementSex times.
-	[[Repeal|Policies][$SexMilestoneRetirement = 0]]
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;Set a new retirement requirement: <<textbox "$retirementSex" $retirementSex "Policies">>
-<</if>>
-
-<<if $MilkMilestoneRetirement == 1>>
-	<br>''Productive Cow Retirement:'' slaves will be rewarded with their freedom once they have given $retirementMilk liters of milk.
-	[[Repeal|Policies][$MilkMilestoneRetirement = 0]]
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;Set a new retirement requirement: <<textbox "$retirementMilk" $retirementMilk "Policies">>
-<</if>>
-
-<<if $BirthsMilestoneRetirement == 1>>
-	<br>''Fertile Breeder Retirement:'' slaves will be rewarded with their freedom once they add $retirementBirths new slaves to the population of $arcologies[0].name.
-	[[Repeal|Policies][$BirthsMilestoneRetirement = 0]]
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;Set a new retirement requirement: <<textbox "$retirementBirths" $retirementBirths "Policies">>
-<</if>>
-
-<<if $KillsMilestoneRetirement == 1>>
-	<br>''Champion Gladiatrix Retirement:'' slaves will be rewarded with their freedom once they have killed $retirementKills of their fellow slaves in the pit.
-	[[Repeal|Policies][$KillsMilestoneRetirement = 0]]
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;Set a new retirement requirement: <<textbox "$retirementKills" $retirementKills "Policies">>
-<</if>>
-
-<<if $MixedMarriage == 1>>
-	<br>''Marriage between Owners and Slaves:'' you are providing a legal basis for citizens to marry their slaves without impacting their rights as slaveowners.
-	[[Repeal|Policies][$MixedMarriage = 0]]
-<</if>>
-
-<<if ndef $arcologies[0].FSGenderFundamentalistLawBimbo>><<set $arcologies[0].FSGenderFundamentalistLawBimbo = 0>><</if>>
-<<if (($arcologies[0].FSSupremacistLawME + $arcologies[0].FSSupremacistSMR + $arcologies[0].FSSubjugationistLawME + $arcologies[0].FSSubjugationistSMR + $arcologies[0].FSGenderRadicalistLawBeauty + $arcologies[0].FSGenderRadicalistLawFuta + $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderFundamentalistLawBimbo + $arcologies[0].FSGenderFundamentalistSMR + $arcologies[0].FSPaternalistLaw + $arcologies[0].FSPaternalistSMR + $arcologies[0].FSDegradationistLaw + $arcologies[0].FSDegradationistSMR + $arcologies[0].FSBodyPuristLaw + $arcologies[0].FSBodyPuristSMR + $arcologies[0].FSTransformationFetishistSMR + $arcologies[0].FSYouthPreferentialistLaw + $arcologies[0].FSYouthPreferentialistSMR + $arcologies[0].FSMaturityPreferentialistLaw + $arcologies[0].FSMaturityPreferentialistSMR + $arcologies[0].FSSlimnessEnthusiastSMR + $arcologies[0].FSSlimnessEnthusiastLaw + $arcologies[0].FSAssetExpansionistSMR + $arcologies[0].FSPastoralistLaw + $arcologies[0].FSPastoralistSMR + $arcologies[0].FSPhysicalIdealistSMR + $arcologies[0].FSChattelReligionistLaw + $arcologies[0].FSChattelReligionistSMR + $arcologies[0].FSChattelReligionistCreed + $arcologies[0].FSRomanRevivalistLaw + $arcologies[0].FSRomanRevivalistSMR + $arcologies[0].FSAztecRevivalistLaw + $arcologies[0].FSAztecRevivalistSMR + $arcologies[0].FSEgyptianRevivalistLaw + $arcologies[0].FSEgyptianRevivalistSMR + $arcologies[0].FSEdoRevivalistLaw + $arcologies[0].FSEdoRevivalistSMR + $arcologies[0].FSArabianRevivalistLaw + $arcologies[0].FSArabianRevivalistSMR + $arcologies[0].FSChineseRevivalistLaw + $arcologies[0].FSChineseRevivalistSMR + $arcologies[0].FSRepopulationFocusLaw + $arcologies[0].FSRepopulationFocusSMR + $arcologies[0].FSRestartLaw + $arcologies[0].FSRestartSMR > 0 + $arcologies[0].FSHedonisticDecadenceLaw + $arcologies[0].FSHedonisticDecadenceLaw2 + $arcologies[0].FSHedonisticDecadenceSMR + $arcologies[0].FSPhysicalIdealistLaw + $arcologies[0].FSHedonisticDecadenceStrongFat + $arcologies[0].FSPhysicalIdealistStrongFat) > 0) || ($CulturalOpenness != 0)>>
-<br>__Future Society Policies__
+<br><br>__Future Society Policies__
 
 <<if $CulturalOpenness == 1>>
 	<br>''Cultural Openness:'' you are promoting the exchange of ideas between arcologies, increasing cultural crossover between your arcology and its neighbors.
@@ -805,7 +807,70 @@
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will prevent dishonest adulteration of slaves in the markets//
 <</if>>
 
-<br>__Sexual Trendsetting__
+<br><br>__Slave Retirement Planning__
+
+<<if $CustomRetirementAgePolicy == 0>>
+	<br>''Redefined Mandatory Retirement Age:'' you will set your arcology's standard retirement age for sex slaves at age
+	<br>&nbsp;&nbsp;&nbsp;&nbsp;<<textbox "$customRetirementAge" $customRetirementAge "Policies">>
+	[[Implement|Policies][$CustomRetirementAgePolicy = 1, $cash -=5000, $rep -= 1000]]
+<</if>>
+
+<<if $PhysicalRetirementAgePolicy == 0>>
+	<br>''Redefined Mandatory Retirement Age:'' you will set your arcology's standard retirement age for sex slaves once their bodies reach age
+	<br>&nbsp;&nbsp;&nbsp;&nbsp;<<textbox "$customRetirementAge" $customRetirementAge "Policies">>
+	[[Implement|Policies][$PhysicalRetirementAgePolicy = 1, $cash -=5000, $rep -= 1000]]
+<</if>>
+
+<<if $BioreactorRetirement == 0>>
+<<if $ArcadeRetirement == 0>>
+<<if $CitizenRetirement == 0>>
+<<if $arcologies[0].FSDegradationist == "unset">>
+	<br>''Citizen Retirement:'' all slaveowners will be required to pay into accounts to support their slaves as lower-class citizens in retirement.
+	[[Implement|Policies][$CitizenRetirement = 1, $cash -=5000, $rep -= 1000]]
+	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will add upkeep to all slaves//
+<</if>>
+<<if $arcologies[0].FSPaternalist == "unset">>
+	<br>''Public Arcade Retirement:'' once reaching mandatory retirement age, slaves will be placed in cheap public arcades to be used until useless.
+	[[Implement|Policies][$ArcadeRetirement = 1, $cash -=5000, $rep -= 1000]]
+	<br>''Public Fluid Production Retirement:'' once reaching mandatory retirement age, slaves will be converted for full-time milk<<if $seeDicks != 0>>, vaginal secretion, and semen<</if>> production.
+	[[Implement|Policies][$BioreactorRetirement = 1, $cash -=5000, $rep -= 1000]]
+<</if>>
+<</if>>
+<</if>>
+<</if>>
+
+<<if $CitizenRetirement == 1>>
+<<if $SexMilestoneRetirement == 0>>
+	<br>''Sexual Milestone Retirement:'' slaves will be rewarded with their freedom once they have been fucked $retirementSex times.
+	[[Implement|Policies][$SexMilestoneRetirement = 1, $cash -=5000, $rep -= 1000]]
+<</if>>
+<<if $MilkMilestoneRetirement == 0>>
+	<br>''Productive Cow Retirement:'' slaves will be rewarded with their freedom once they have given $retirementMilk liters of milk.
+	[[Implement|Policies][$MilkMilestoneRetirement = 1, $cash -=5000, $rep -= 1000]]
+<</if>>
+<<if $BirthsMilestoneRetirement == 0>>
+	<br>''Fertile Breeder Retirement:'' slaves will be rewarded with their freedom once they add $retirementBirths new slaves to the population of $arcologies[0].name.
+	[[Implement|Policies][$BirthsMilestoneRetirement = 1, $cash -=5000, $rep -= 1000]]
+<</if>>
+<<if $KillsMilestoneRetirement == 0>>
+	<br>''Champion Gladiatrix Retirement:'' slaves will be rewarded with their freedom once they have killed $retirementKills of their fellow slaves in the pit.
+	[[Implement|Policies][$KillsMilestoneRetirement = 1, $cash -=5000, $rep -= 1000]]
+<</if>>
+<</if>>
+
+<<if $arcologies[0].FSDegradationist == "unset">>
+<<if $MixedMarriage == 0>>
+	<br>''Marriage between Owners and Slaves:'' you will provide a legal basis for citizens to marry their slaves without impacting their rights as slaveowners.
+	[[Implement|Policies][$MixedMarriage = 1, $cash -=5000, $rep -= 1000]]
+	<<if $arcologies[0].FSPaternalist >= 60>>
+	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will not damage your reputation due to your arcology's advanced Paternalism//
+	<<else>>
+	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will damage your reputation//
+	<</if>>
+<</if>>
+<</if>>
+
+<br><br>__Sexual Trendsetting__
 
 <<if $OralEncouragement+$VaginalEncouragement+$AnalEncouragement == 0>>
 	<<if $OralDiscouragement == 0>>
@@ -853,7 +918,7 @@
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will not be well received, but will head off potentially damaging rumors. This policy assumes you wish to be penetrated.//
 <</if>>
 
-<br>__Population Policy__
+<br><br>__Population Policy__
 
 <<if $arcologies[0].FSDegradationist == "unset">>
 <<if $ProRefugees == 0>>
@@ -932,7 +997,7 @@
 <</if>>
 <</if>>
 
-<br>__Domestic Policy__
+<br><br>__Domestic Policy__
 
 <<if $alwaysSubsidizeGrowth == 0>>
 	<br>''Economic Growth Subsidy:'' promising new businesses will be offered generous subsidies, driving arcology prosperity.
@@ -993,7 +1058,7 @@
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will cost <<print cashFormat($policyCost)>> weekly to maintain//
 <</if>>
 
-<br>__Education Policy__
+<br><br>__Education Policy__
 
 <<if $TSS.schoolPresent != 0>>
 <<if $TSS.subsidize == 0>>
@@ -1099,70 +1164,9 @@
 <</if>>
 <</if>>
 
-<br>__Slave Retirement Planning__
 
-<<if $CustomRetirementAgePolicy == 0>>
-	<br>''Redefined Mandatory Retirement Age:'' you will set your arcology's standard retirement age for sex slaves at age
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;<<textbox "$customRetirementAge" $customRetirementAge "Policies">>
-	[[Implement|Policies][$CustomRetirementAgePolicy = 1, $cash -=5000, $rep -= 1000]]
-<</if>>
-
-<<if $PhysicalRetirementAgePolicy == 0>>
-	<br>''Redefined Mandatory Retirement Age:'' you will set your arcology's standard retirement age for sex slaves once their bodies reach age
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;<<textbox "$customRetirementAge" $customRetirementAge "Policies">>
-	[[Implement|Policies][$PhysicalRetirementAgePolicy = 1, $cash -=5000, $rep -= 1000]]
-<</if>>
-
-<<if $BioreactorRetirement == 0>>
-<<if $ArcadeRetirement == 0>>
-<<if $CitizenRetirement == 0>>
-<<if $arcologies[0].FSDegradationist == "unset">>
-	<br>''Citizen Retirement:'' all slaveowners will be required to pay into accounts to support their slaves as lower-class citizens in retirement.
-	[[Implement|Policies][$CitizenRetirement = 1, $cash -=5000, $rep -= 1000]]
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will add upkeep to all slaves//
-<</if>>
-<<if $arcologies[0].FSPaternalist == "unset">>
-	<br>''Public Arcade Retirement:'' once reaching mandatory retirement age, slaves will be placed in cheap public arcades to be used until useless.
-	[[Implement|Policies][$ArcadeRetirement = 1, $cash -=5000, $rep -= 1000]]
-	<br>''Public Fluid Production Retirement:'' once reaching mandatory retirement age, slaves will be converted for full-time milk<<if $seeDicks != 0>>, vaginal secretion, and semen<</if>> production.
-	[[Implement|Policies][$BioreactorRetirement = 1, $cash -=5000, $rep -= 1000]]
-<</if>>
-<</if>>
-<</if>>
-<</if>>
-
-<<if $CitizenRetirement == 1>>
-<<if $SexMilestoneRetirement == 0>>
-	<br>''Sexual Milestone Retirement:'' slaves will be rewarded with their freedom once they have been fucked $retirementSex times.
-	[[Implement|Policies][$SexMilestoneRetirement = 1, $cash -=5000, $rep -= 1000]]
-<</if>>
-<<if $MilkMilestoneRetirement == 0>>
-	<br>''Productive Cow Retirement:'' slaves will be rewarded with their freedom once they have given $retirementMilk liters of milk.
-	[[Implement|Policies][$MilkMilestoneRetirement = 1, $cash -=5000, $rep -= 1000]]
-<</if>>
-<<if $BirthsMilestoneRetirement == 0>>
-	<br>''Fertile Breeder Retirement:'' slaves will be rewarded with their freedom once they add $retirementBirths new slaves to the population of $arcologies[0].name.
-	[[Implement|Policies][$BirthsMilestoneRetirement = 1, $cash -=5000, $rep -= 1000]]
-<</if>>
-<<if $KillsMilestoneRetirement == 0>>
-	<br>''Champion Gladiatrix Retirement:'' slaves will be rewarded with their freedom once they have killed $retirementKills of their fellow slaves in the pit.
-	[[Implement|Policies][$KillsMilestoneRetirement = 1, $cash -=5000, $rep -= 1000]]
-<</if>>
-<</if>>
-
-<<if $arcologies[0].FSDegradationist == "unset">>
-<<if $MixedMarriage == 0>>
-	<br>''Marriage between Owners and Slaves:'' you will provide a legal basis for citizens to marry their slaves without impacting their rights as slaveowners.
-	[[Implement|Policies][$MixedMarriage = 1, $cash -=5000, $rep -= 1000]]
-	<<if $arcologies[0].FSPaternalist >= 60>>
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will not damage your reputation due to your arcology's advanced Paternalism//
-	<<else>>
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will damage your reputation//
-	<</if>>
-<</if>>
-<</if>>
 
-<br>__Future Society Policies__
+<br><br>__Future Society Policies__
 
 <<if $arcologies.length > 1>>
 <<if $CulturalOpenness == 0>>
diff --git a/src/uncategorized/rieEligibilityCheck.tw b/src/uncategorized/rieEligibilityCheck.tw
index 696deb559aa6f9cfee077f7ecd592f2dff719038..5c12ec908dec6d447dc665ee1b1c8dd2212c55fc 100644
--- a/src/uncategorized/rieEligibilityCheck.tw
+++ b/src/uncategorized/rieEligibilityCheck.tw
@@ -5,7 +5,7 @@
 <<set $eventSlave = 0, $eligibleSlaves = []>>
 
 <<for $i = 0; $i < $slaves.length; $i++>>
-	<<if $slaves[$i].assignmentVisible == 1>>
+	<<if $slaves[$i].assignmentVisible == 1 || $slaves[$i].assignment == "serve in the master suite" || $slaves[$i].assignment == "be your Concubine">>
 	<<if $slaves[$i].fuckdoll == 0>>
 		<<set $eligibleSlaves.push($slaves[$i])>>
 	<</if>>
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index 3c66f90421ecbec5f0290bb5f70d11574e15b696..d5c645d403be7a89919e01352fde1b270b18b039 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -3731,14 +3731,14 @@
 			<</if>>
 		<<case "live with your Head Girl">>
 			<<if $slaves[$i].devotion < -50>>
-				is so unhappy that she has little interest in getting off, not that $HeadGirl.SlaveName cares.
+				is so unhappy that she has little interest in getting off, not that $HeadGirl.slaveName cares.
 				<<set $slaves[$i].need = 0>>
 			<<elseif $slaves[$i].energy <= 20>>
-				is frigid and has little interest in getting off, though it doesn't stop $HeadGirl.SlaveName.
+				is frigid and has little interest in getting off, though it doesn't stop $HeadGirl.slaveName.
 				<<set $slaves[$i].need = 0>>
 			<<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
 				<<if ($slaves[$i].devotion <= 20)>>
-					gets off with $HeadGirl.SlaveName despite her reluctance, @@.hotpink;habituating her to sexual slavery.@@
+					gets off with $HeadGirl.slaveName despite her reluctance, @@.hotpink;habituating her to sexual slavery.@@
 					<<set $slaves[$i].devotion += 1>>
 					<<if ($slaves[$i].trust > -20) && ($slaves[$i].devotion <= 20)>>
 						She hates herself for climaxing, and knows the mild aphrodisiacs in the food are forcing her arousal, @@.gold;frightening her.@@
@@ -3746,10 +3746,10 @@
 					<</if>>
 					<<set $slaves[$i].need -= 20>>
 				<<elseif ($slaves[$i].releaseRules != "permissive") && ($slaves[$i].releaseRules != "masturbation")>>
-					gets off with $HeadGirl.SlaveName, so being forbidden to masturbate doesn't affect her seriously.
+					gets off with $HeadGirl.slaveName, so being forbidden to masturbate doesn't affect her seriously.
 					<<set $slaves[$i].need -= 20>>
 				<<else>>
-					gets off with $HeadGirl.SlaveName, so she doesn't feel the need for release that often.
+					gets off with $HeadGirl.slaveName, so she doesn't feel the need for release that often.
 					<<set $slaves[$i].need -= 20>>
 				<</if>>
 			<<else>>
diff --git a/src/uncategorized/securityForceEOWReport.tw b/src/uncategorized/securityForceEOWReport.tw
index 8efcae7313ccc141dcc98c2cec27753bc2d8661e..55f9038ca719fb360bd0974b91b14184d63aea56 100644
--- a/src/uncategorized/securityForceEOWReport.tw
+++ b/src/uncategorized/securityForceEOWReport.tw
@@ -369,19 +369,26 @@
 	<<set $TradeShowHelots = 0>>
 <</if>>
 
-<<set _OverdoseSurvivalChance = 99>>
-<<if _Env == _N1>>
-	<<set _OverdoseSurvivalChance = _OverdoseSurvivalChance-.5>>
-<<elseif _Env == _N2>>
-	<<set _OverdoseSurvivalChance = _OverdoseSurvivalChance>>
-<<elseif _Env == _N3>>
-	<<set _OverdoseSurvivalChance = _OverdoseSurvivalChance+.5>>
-<</if>>
+<<if $securityForceStimulantPower == 8 || $securityForceStimulantPower == 10>>
+	<<set _OverdoseSurvivalChance = 5, _OverdoseDeaths = 0>>
+	<<if _Env == _N1>>
+		<<set _OverdoseSurvivalChance = _OverdoseSurvivalChance-.5>>
+	<<elseif _Env == _N2>>
+		<<set _OverdoseSurvivalChance = _OverdoseSurvivalChance>>
+	<<elseif _Env == _N3>>
+		<<set _OverdoseSurvivalChance = _OverdoseSurvivalChance+.5>>
+	<</if>>
+
+	<<if $securityForceStimulantPower == 8 && random(0,100) > _OverdoseSurvivalChance>>
+		<<set _OverdoseDeaths = random(0,10)>>
+	<<elseif $securityForceStimulantPower == 10 && random(0,100) > _OverdoseSurvivalChance>>
+		<<set _OverdoseDeaths = random(0,20)>>
+	<</if>>
+
+	<<if _OverdoseDeaths > 0>>
+		<<set $securityForcePersonnel -= _OverdoseDeaths>>
+	<</if>>
 
-<<if $securityForceStimulantPower == 8 && random(0,100) > _OverdoseSurvivalChance>>
-	<<set _OverdoseDeaths = "$securityForcePersonnel -= random(0,10)">>
-<<elseif $securityForceStimulantPower == 10 && random(0,100) > _OverdoseSurvivalChance>>
-	<<set _OverdoseDeaths = "$securityForcePersonnel -= random(0,20)">>
 <</if>>
 
 /* Take all the above and display the EOW text and control panel. */
@@ -389,7 +396,7 @@
 <<nobr>>
 	__Status and Activities of the $securityForceName __:
 	<br>This week, $securityForceName, <<print commaNum($securityForcePersonnel)>> strong, focused on <<if $securityForceFocus == "recruit">>recruiting and training more personnel. Smaller parties ventured out to protect the arcology's trade routes and strike targets of opportunity.<<elseif $securityForceFocus == "secure">>securing the trade routes between the arcology and the surrounding area. Smaller parties ventured out to strike targets of opportunity and process new recruits.
-	<<elseif $securityForceFocus == "raiding">>locating and striking targets of opportunity, capturing both material loot and new slaves. Smaller parties secured the most important of the arcology's trade routes and processed new recruits.<</if>> <<if $securityForceStimulantPower == 8 || $securityForceStimulantPower == 10>> _OverdoseDeaths soldiers fatally overdosed. The Colonel's much heavier than average drug use saves her from this side effect.<</if>> These activities have, overall, @@.green;improved@@ your arcology's prosperity. <<if $securityForceProfitable == 1>>The goods procured by the $securityForceName this week, after accounting for the spoils retained by individual soldiers, were @@.green;more than sufficient@@ to cover expenses. Excess material and human assets totalling @@.yellowgreen;<<print cashFormat($securityForceIncome)>>@@ (after liquidation) were transferred to your accounts. <<elseif $securityForceProfitable == 0>>The goods procured by the special force were, after accounting for the spoils retained by individual soldiers, @@.red;barely enough@@ to cover expenses. More growth will be needed to ensure profitability.<</if>> $securityForceName managed to recruit $securityForceRecruit new soldiers this week, and your reputation has @@.green;improved@@ through the improvement of trade security.
+	<<elseif $securityForceFocus == "raiding">>locating and striking targets of opportunity, capturing both material loot and new slaves. Smaller parties secured the most important of the arcology's trade routes and processed new recruits.<</if>> <<if $securityForceStimulantPower == 8 || $securityForceStimulantPower == 10 && _OverdoseDeaths > 0>> <<print (_OverdoseDeaths)>> soldiers fatally overdosed on the drug cocktail, The Colonel's much heavier than average drug use saves her from this side effect.<</if>> These activities have, overall, @@.green;improved@@ your arcology's prosperity. <<if $securityForceProfitable == 1>>The goods procured by the $securityForceName this week, after accounting for the spoils retained by individual soldiers, were @@.green;more than sufficient@@ to cover expenses. Excess material and human assets totalling @@.yellowgreen;<<print cashFormat($securityForceIncome)>>@@ (after liquidation) were transferred to your accounts. <<elseif $securityForceProfitable == 0>>The goods procured by the special force were, after accounting for the spoils retained by individual soldiers, @@.red;barely enough@@ to cover expenses. More growth will be needed to ensure profitability.<</if>> $securityForceName managed to recruit $securityForceRecruit new soldiers this week, and your reputation has @@.green;improved@@ through the improvement of trade security.
 
 <</nobr>>
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Your instructions to <<if $CurrentTradeShowAttendance == 1>>Lieutenant Colonel <<SlaveFullName $LieutenantColonel>><<else>>The Colonel<</if>>://