diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 2074efeda9bb06c0154dfe7be7997beacf2b4708..53c67af4eb33ad3448d4d91b6ba43b8975029d62 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -979,7 +979,7 @@ window.slaveJobValues = function() {
 		}
 		if (V.DJ.muscles > 5 && V.DJ.muscles <= 95) {
 			V.DJRepBonus += 0.05;
-			// $His toned body helps $him lead $his fellow club girls by letting $him dance all night.
+			// $His toned body helps $him lead $his fellow club sluts by letting $him dance all night.
 		}
 		if (V.DJ.intelligence + V.DJ.intelligenceImplant > 15) {
 			V.DJRepBonus += 0.05 * Math.floor((V.DJ.intelligence + V.DJ.intelligenceImplant) / 32);
diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index 654c65441a035be3c8bdca6d05cd61ae1a8e34d4..20e1361474db198f415831c7901fca2ec265a73d 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -28,14 +28,18 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
 					}
 				}
 
-				if (State.variables.familyTesting === 0) {
-					if (eventSlave.devotion > 20) {
-						if (eventSlave.sexualQuirk === "perverted" || eventSlave.energy > 80) {
-							if (eventSlave.relation === "mother") {
-								if (eventSlave.belly < 100000) {
-									if (eventSlave.lactation) {
-										if (eventSlave.nipples !== "fuckable") {
-											if (eventSlave.releaseRules !== "restrictive" && eventSlave.releaseRules !== "masturbation" && eventSlave.releaseRules !== "chastity") {
+				if (eventSlave.devotion > 20) {
+					if (eventSlave.sexualQuirk === "perverted" || eventSlave.energy > 80) {
+						if (eventSlave.belly < 100000) {
+							if (eventSlave.lactation > 0) {
+								if (eventSlave.nipples !== "fuckable") {
+									if (eventSlave.releaseRules !== "restrictive" && eventSlave.releaseRules !== "masturbation" && eventSlave.releaseRules !== "chastity") {
+										if (State.variables.familyTesting === 0) {
+											if (eventSlave.relation === "mother") {
+												State.variables.RETSevent.push("incestuous nursing");
+											}
+										} else {
+											if (eventSlave.daughters > 0) {
 												State.variables.RETSevent.push("incestuous nursing");
 											}
 										}
@@ -44,10 +48,6 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
 							}
 						}
 					}
-				} else {
-					if (eventSlave.devotion > 20 && (eventSlave.sexualQuirk === "perverted" || eventSlave.energy > 80) && eventSlave.belly < 100000 && eventSlave.lactation > 0 && eventSlave.nipples !== "fuckable" && eventSlave.releaseRules !== "restrictive" && eventSlave.releaseRules !== "masturbation" && eventSlave.releaseRules !== "chastity" && eventSlave.daughters > 0) {
-						State.variables.RETSevent.push("incestuous nursing");
-					}
 				}
 
 				if (eventSlave.intelligence + eventSlave.intelligenceImplant > 50) {
@@ -89,7 +89,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
 						if (eventSlave.devotion >= -20) {
 							if (canSee(eventSlave)) {
 								if (eventSlave.devotion <= 50) {
-									if (["be a servant", "work as a servant"].includes(eventSlave.assignment)) {
+									if (eventSlave.assignment === "be a servant") {
 										if (canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
 											State.variables.RESSevent.push("PA servant");
 										}
@@ -374,7 +374,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
 
 				if (eventSlave.face >= -10) {
 					if (eventSlave.devotion >= 10) {
-						if (eventSlave.assignment === "serve the public" || eventSlave.assignment === "whore") {
+						if (["serve the public", "whore"].includes(eventSlave.assignment)) {
 							if (State.variables.REUglyCheckinIDs.includes(eventSlave.ID)) {
 								State.variables.RECIevent.push("ugly");
 							}
@@ -412,7 +412,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
 				}
 				*/
 
-				if (eventSlave.assignment === "be a servant" || eventSlave.assignment === "work as a servant") {
+				if (eventSlave.assignment === "be a servant") {
 					if (eventSlave.devotion <= 95) {
 						if (eventSlave.intelligence + eventSlave.intelligenceImplant < -50) {
 							State.variables.RESSevent.push("cooler lockin");
@@ -602,7 +602,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
 
 				if (State.variables.PC.dick === 1) {
 					if (State.variables.PC.belly < 5000) {
-						if (["be a servant", "work as a servant"].includes(eventSlave.assignment)) {
+						if (eventSlave.assignment === "be a servant") {
 							if (eventSlave.attrXY <= 35 || eventSlave.behavioralFlaw === "hates men" || eventSlave.sexualFlaw === "repressed") {
 								if (eventSlave.devotion >= -20) {
 									if (eventSlave.trust > 20) {
@@ -708,7 +708,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
 
 				if (eventSlave.physicalAge > 35) {
 					if (eventSlave.speechRules !== "restrictive") {
-						if (["serve in the club", "serve the public", "whore", "work in the brothel"].includes(eventSlave.assignment)) {
+						if (["serve the public", "whore"].includes(eventSlave.assignment)) {
 							if (eventSlave.devotion >= -20) {
 								if (eventSlave.devotion <= 95) {
 									State.variables.RESSevent.push("ara ara");
@@ -1231,7 +1231,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
 
 			if (eventSlave.skill.entertainment >= 100) {
 				if (eventSlave.trust > 50) {
-					if (["serve in the club", "serve the public"].includes(eventSlave.assignment)) {
+					if (eventSlave.assignment === "serve the public") {
 						State.variables.RESSevent.push("masterful entertainer");
 					}
 				}
@@ -1239,7 +1239,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
 
 			if (eventSlave.skill.whoring >= 100) {
 				if (eventSlave.trust > 50) {
-					if (["whore", "work in the brothel"].includes(eventSlave.assignment)) {
+					if (eventSlave.assignment === "whore") {
 						State.variables.RESSevent.push("masterful whore");
 					}
 				}
@@ -1247,7 +1247,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
 
 			if (eventSlave.dick > 0) {
 				if (eventSlave.balls === 0) {
-					if (eventSlave.ovaries === 0) {
+					if (eventSlave.genes === "XY") {
 						if (eventSlave.devotion <= 50) {
 							if (eventSlave.trust < -50) {
 								if (eventSlave.anus > 0) {
@@ -1299,7 +1299,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
 				}
 			}
 
-			if (["serve in the club", "serve the public", "whore", "work in the brothel"].includes(eventSlave.assignment)) {
+			if (["serve the public", "whore"].includes(eventSlave.assignment)) {
 				if (eventSlave.vagina !== 0) {
 					if (eventSlave.anus !== 0) {
 						if (canDoAnal(eventSlave)) {
@@ -1351,7 +1351,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
 				}
 			}
 
-			if (eventSlave.assignment === "please you") {
+			if (["be your Concubine", "please you", "serve in the master suite"].includes(eventSlave.assignment)) {
 				if (eventSlave.devotion > 20) {
 					if (eventSlave.trust >= -20) {
 						if (canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
@@ -1380,30 +1380,6 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
 						}
 					}
 				}
-			} else if (["be your Concubine", "serve in the master suite"].includes(eventSlave.assignment)) {
-				if (eventSlave.devotion > 20) {
-					if (eventSlave.trust >= -20) {
-						if (canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
-							if ((eventSlave.chastityPenis !== 1) || (eventSlave.dick === 0)) {
-								if (State.variables.corpIncorporated !== 0) {
-									State.variables.RESSevent.push("shift sleep");
-								}
-								if (eventSlave.skill.entertainment >= 60) {
-									State.variables.RESSevent.push("shift doorframe");
-								}
-							}
-							if (canDoVaginal(eventSlave)) {
-								if (State.variables.PC.vagina === 1) {
-									if (eventSlave.dick === 0) {
-										if (State.variables.fuckSlaves > 2) {
-											State.variables.RESSevent.push("fucktoy tribbing");
-										}
-									}
-								}
-							}
-						}
-					}
-				}
 			}
 
 			if (eventSlave.speechRules !== "restrictive") {
@@ -1509,7 +1485,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
 
 		if (eventSlave.devotion > 50) {
 			if (eventSlave.trust > 50) {
-				if (eventSlave.assignment === "please you" || eventSlave.assignment === "serve in the master suite" || eventSlave.assignment === "be your Concubine") {
+				if (["be your Concubine", "please you", "serve in the master suite"].includes(eventSlave.assignment)) {
 					State.variables.RESSevent.push("bed snuggle");
 				}
 			}
@@ -1730,7 +1706,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
 
 		if (eventSlave.fetishKnown === 1) {
 			if (eventSlave.fetish === "cumslut" || eventSlave.energy > 95) {
-				if (["serve in the club", "serve the public", "whore", "work a glory hole", "work in the brothel"].includes(eventSlave.assignment)) {
+				if (["serve the public", "whore", "work a glory hole"].includes(eventSlave.assignment)) {
 					if (eventSlave.devotion > 20) {
 						if (State.variables.PC.dick !== 0) {
 							State.variables.RESSevent.push("cumslut whore");
@@ -1748,14 +1724,6 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
 			}
 		}
 
-		if (eventSlave.relationship === 4) {
-			if (eventSlave.devotion > 20) {
-				if (eventSlave.trust > 20) {
-					State.variables.events.push("RE slave marriage");
-				}
-			}
-		}
-
 		if (State.variables.PC.dick !== 0) {
 			if (eventSlave.bellyPreg >= 300000) {
 				State.variables.RESSevent.push("hyperpreg stuck");
@@ -1807,7 +1775,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
 
 					if (eventSlave.balls > 6) {
 						if (eventSlave.dick > 6) {
-							if (eventSlave.assignment === "work in the dairy" || eventSlave.assignment === "get milked") {
+							if (eventSlave.assignment === "get milked") {
 								State.variables.events.push("RE legendary balls");
 							}
 						}
@@ -1822,6 +1790,14 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
 			}
 		}
 
+		if (eventSlave.relationship === 4) {
+			if (eventSlave.devotion > 20) {
+				if (eventSlave.trust > 20) {
+					State.variables.events.push("RE slave marriage");
+				}
+			}
+		}
+
 		/* NICKNAME EVENTS */
 
 		if (State.variables.nicknamesAllowed === 1) {
@@ -1893,14 +1869,18 @@ window.generateRandomEventPoolServant = function(eventSlave) {
 					}
 				}
 
-				if (State.variables.familyTesting === 0) {
-					if (eventSlave.devotion > 20) {
-						if (eventSlave.sexualQuirk === "perverted" || eventSlave.energy > 80) {
-							if (eventSlave.relation === "mother") {
-								if (eventSlave.belly < 100000) {
-									if (eventSlave.lactation) {
-										if (eventSlave.nipples !== "fuckable") {
-											if (eventSlave.releaseRules !== "restrictive" && eventSlave.releaseRules !== "masturbation" && eventSlave.releaseRules !== "chastity") {
+				if (eventSlave.devotion > 20) {
+					if (eventSlave.sexualQuirk === "perverted" || eventSlave.energy > 80) {
+						if (eventSlave.belly < 100000) {
+							if (eventSlave.lactation > 0) {
+								if (eventSlave.nipples !== "fuckable") {
+									if (eventSlave.releaseRules !== "restrictive" && eventSlave.releaseRules !== "masturbation" && eventSlave.releaseRules !== "chastity") {
+										if (State.variables.familyTesting === 0) {
+											if (eventSlave.relation === "mother") {
+												State.variables.RETSevent.push("incestuous nursing");
+											}
+										} else {
+											if (eventSlave.daughters > 0) {
 												State.variables.RETSevent.push("incestuous nursing");
 											}
 										}
@@ -1909,18 +1889,13 @@ window.generateRandomEventPoolServant = function(eventSlave) {
 							}
 						}
 					}
-				} else {
-					if (eventSlave.devotion > 20 && (eventSlave.sexualQuirk === "perverted" || eventSlave.energy > 80) && eventSlave.belly < 100000 && eventSlave.lactation > 0 && eventSlave.nipples !== "fuckable" && eventSlave.releaseRules !== "restrictive" && eventSlave.releaseRules !== "masturbation" && eventSlave.releaseRules !== "chastity" && eventSlave.daughters > 0) {
-						State.variables.RETSevent.push("incestuous nursing");
-					}
 				}
 
-
 				if (State.variables.assistant > 0) {
 					if (State.variables.assistantAppearance !== "normal") {
 						if (eventSlave.devotion >= -20) {
-							if (eventSlave.devotion <= 50) {
-								if (["be a servant", "work as a servant"].includes(eventSlave.assignment)) {
+							if (canSee(eventSlave)) {
+								if (eventSlave.devotion <= 50) {
 									if (canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
 										State.variables.RESSevent.push("PA servant");
 									}
@@ -2012,11 +1987,9 @@ window.generateRandomEventPoolServant = function(eventSlave) {
 					}
 				}
 
-				if (eventSlave.assignment === "be a servant" || eventSlave.assignment === "work as a servant") {
-					if (eventSlave.devotion <= 95) {
-						if (eventSlave.intelligence + eventSlave.intelligenceImplant < -50) {
-							State.variables.RESSevent.push("cooler lockin");
-						}
+				if (eventSlave.devotion <= 95) {
+					if (eventSlave.intelligence + eventSlave.intelligenceImplant < -50) {
+						State.variables.RESSevent.push("cooler lockin");
 					}
 				}
 
@@ -2176,12 +2149,10 @@ window.generateRandomEventPoolServant = function(eventSlave) {
 
 				if (State.variables.PC.dick === 1) {
 					if (State.variables.PC.belly < 5000) {
-						if (["be a servant", "work as a servant"].includes(eventSlave.assignment)) {
-							if (eventSlave.attrXY <= 35 || eventSlave.behavioralFlaw === "hates men" || eventSlave.sexualFlaw === "repressed") {
-								if (eventSlave.devotion >= -20) {
-									if (eventSlave.trust > 20) {
-										State.variables.RESSevent.push("frightening dick");
-									}
+						if (eventSlave.attrXY <= 35 || eventSlave.behavioralFlaw === "hates men" || eventSlave.sexualFlaw === "repressed") {
+							if (eventSlave.devotion >= -20) {
+								if (eventSlave.trust > 20) {
+									State.variables.RESSevent.push("frightening dick");
 								}
 							}
 						}
@@ -2526,14 +2497,10 @@ window.generateRandomEventPoolServant = function(eventSlave) {
 				}
 			}
 
-			if (State.variables.seeExtreme === 1) {
-				if (eventSlave.devotion < -50) {
-					if (eventSlave.trust >= -50) {
-						if (eventSlave.assignment !== "stay confined") {
-							if (eventSlave.heels !== 1) {
-								State.variables.RESSevent.push("escapee");
-							}
-						}
+			if (eventSlave.devotion < -50) {
+				if (eventSlave.trust >= -50) {
+					if (eventSlave.heels !== 1) {
+						State.variables.RESSevent.push("escapee");
 					}
 				}
 			}
@@ -2568,11 +2535,11 @@ window.generateRandomEventPoolServant = function(eventSlave) {
 				}
 			}
 
-			if (eventSlave.releaseRules === "restrictive") {
+			if (eventSlave.releaseRules === "restrictive" || eventSlave.releaseRules === "chastity") {
 				if (eventSlave.need) {
 					if (eventSlave.devotion <= 95) {
 						if (eventSlave.trust >= -20) {
-							if (eventSlave.chastityPenis !== 1 || (eventSlave.dick === 0)) {
+							if ((eventSlave.chastityPenis !== 1) || (eventSlave.dick === 0)) {
 								State.variables.RESSevent.push("forbidden masturbation");
 							}
 						}
@@ -2623,7 +2590,7 @@ window.generateRandomEventPoolServant = function(eventSlave) {
 
 			if (eventSlave.dick > 0) {
 				if (eventSlave.balls === 0) {
-					if (eventSlave.ovaries === 0) {
+					if (eventSlave.genes === "XY") {
 						if (eventSlave.devotion <= 50) {
 							if (eventSlave.trust < -50) {
 								if (eventSlave.anus > 0) {
@@ -2637,20 +2604,22 @@ window.generateRandomEventPoolServant = function(eventSlave) {
 				}
 			}
 
-			if (isFertile(eventSlave)) {
-				if (eventSlave.devotion > 50) {
-					if (State.variables.PC.dick !== 0) {
-						if (eventSlave.fetish === "pregnancy" || eventSlave.energy > 95) {
-							if (eventSlave.eggType === "human") {
-								if (eventSlave.fetishKnown === 1) {
-									if (eventSlave.vagina !== 0) {
-										if (eventSlave.anus > 0) {
-											if (eventSlave.geneticQuirks.superfetation === 2 && (eventSlave.intelligence + eventSlave.intelligenceImplant > 15) && eventSlave.womb.length > 0) {
-												if (eventSlave.belly < (eventSlave.pregAdaptation * 1750)) {
+			if (State.variables.seePreg !== 0) {
+				if (isFertile(eventSlave)) {
+					if (eventSlave.devotion > 50) {
+						if (State.variables.PC.dick !== 0) {
+							if (eventSlave.fetish === "pregnancy" || eventSlave.energy > 95) {
+								if (eventSlave.eggType === "human") {
+									if (eventSlave.fetishKnown === 1) {
+										if (eventSlave.vagina !== 0) {
+											if (eventSlave.anus > 0) {
+												if (eventSlave.geneticQuirks.superfetation === 2 && (eventSlave.intelligence + eventSlave.intelligenceImplant > 15) && eventSlave.womb.length > 0) {
+													if (eventSlave.belly < (eventSlave.pregAdaptation * 1750)) {
+														State.variables.RESSevent.push("impregnation please");
+													}
+												} else {
 													State.variables.RESSevent.push("impregnation please");
 												}
-											} else {
-												State.variables.RESSevent.push("impregnation please");
 											}
 										}
 									}
@@ -2662,7 +2631,7 @@ window.generateRandomEventPoolServant = function(eventSlave) {
 			}
 
 			if (["huge plug", "large plug", "long, huge plug", "long, large plug"].includes(eventSlave.buttplug)) {
-				if (eventSlave.assignment !== "stay confined" && isSlaveAvailable(eventSlave)) {
+				if (isSlaveAvailable(eventSlave)) {
 					if (eventSlave.devotion <= 20) {
 						if (eventSlave.trust >= -50) {
 							if (eventSlave.anus < 3) {
@@ -2786,16 +2755,12 @@ window.generateRandomEventPoolServant = function(eventSlave) {
 		}
 
 		if (eventSlave.devotion <= 50) {
-			if (eventSlave.assignment === "work as a servant" || eventSlave.assignment === "be a servant") {
-				State.variables.RESSevent.push("scrubbing");
-			}
+			State.variables.RESSevent.push("scrubbing");
 		}
 
 		if (eventSlave.devotion <= 20) {
-			if (eventSlave.assignment === "work as a servant" || eventSlave.assignment === "be a servant") {
-				if (eventSlave.clothes === "a slutty maid outfit" || eventSlave.clothes === "a nice maid outfit") {
-					State.variables.RESSevent.push("servant maid");
-				}
+			if (eventSlave.clothes === "a slutty maid outfit" || eventSlave.clothes === "a nice maid outfit") {
+				State.variables.RESSevent.push("servant maid");
 			}
 		}
 
@@ -2813,7 +2778,7 @@ window.generateRandomEventPoolServant = function(eventSlave) {
 			}
 		}
 
-		if (eventSlave.releaseRules !== "restrictive") {
+		if (eventSlave.releaseRules !== "restrictive" && eventSlave.releaseRules !== "chastity") {
 			if (eventSlave.dick > 4) {
 				if (eventSlave.amp !== 1) {
 					if (canAchieveErection(eventSlave)) {
@@ -2835,7 +2800,7 @@ window.generateRandomEventPoolServant = function(eventSlave) {
 			}
 		}
 
-		if (eventSlave.releaseRules !== "restrictive") {
+		if (eventSlave.releaseRules !== "restrictive" && eventSlave.releaseRules !== "chastity") {
 			if (eventSlave.belly < 300000) {
 				if (eventSlave.anus > 2) {
 					if (eventSlave.fetish === "buttslut" || eventSlave.energy > 95) {
@@ -2849,22 +2814,6 @@ window.generateRandomEventPoolServant = function(eventSlave) {
 			}
 		}
 
-		if (eventSlave.boobs < 500) {
-			if (eventSlave.butt < 3) {
-				if (canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
-					if (eventSlave.devotion <= 50) {
-						if (eventSlave.devotion > 20 && eventSlave.trust >= -20) {
-							if (eventSlave.weight <= 10) {
-								if (eventSlave.muscles <= 30) {
-									State.variables.RESSevent.push("obedient girlish");
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
 		if (eventSlave.boobs > 1200) {
 			if (eventSlave.areolaeShape !== "circle") {
 				if (eventSlave.devotion > 50) {
@@ -2873,8 +2822,10 @@ window.generateRandomEventPoolServant = function(eventSlave) {
 			}
 		}
 
-		if (eventSlave.bellyPreg >= 10000) {
-			State.variables.RESSevent.push("hugely pregnant");
+		if (State.variables.seePreg !== 0) {
+			if (eventSlave.bellyPreg >= 10000) {
+				State.variables.RESSevent.push("hugely pregnant");
+			}
 		}
 
 		if (eventSlave.hormoneBalance >= 50) {
@@ -2954,15 +2905,6 @@ window.generateRandomEventPoolServant = function(eventSlave) {
 		if (canWalk(eventSlave)) {
 			State.variables.RESSevent.push("mindbroken morning");
 		}
-		if (eventSlave.kindness !== undefined && eventSlave.kindness >= 100) {
-			if ((isSlaveAvailable(eventSlave) && canWalk(eventSlave)) || (["be your Concubine", "please you", "serve in the master suite"].includes(eventSlave.assignment))) {
-				if (eventSlave.relationship === -3) {
-					if (jsRandom(1, 200) < eventSlave.kindness) {
-						State.variables.RESSevent.push("surprising wakeup");
-					}
-				}
-			}
-		}
 	}
 };
 
diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index c83d9666a360108cf22174ef9f552879d85de980..fe84284d231fcebf7b688ff6e5d9d467ec79a83c 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -36,120 +36,123 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $
 ** So, I borrowed the sorting list and dropped a few options here.
 */
 <<if (0 < _SL)>>
-		<<set $sortIncubatorList = $sortIncubatorList || 'Unsorted'>>
-		<br>//Sorting:// ''<span id="qlIncubatorSort">$sortIncubatorList</span>.''
-		<<link "Sort by Name">>
-				<<set $sortIncubatorList = 'Name'>>
-				<<replace "#qlIncubatorSort">>$sortIncubatorList<</replace>>
-				<<script>>
-						sortIncubatorPossiblesByName();
-				<</script>>
-		<</link>> |
-		<<link "Sort by Reserved Incubator Spots">>
-				<<set $sortIncubatorList = 'Reserved Incubator Spots'>>
-				<<replace "#qlIncubatorSort">>$sortIncubatorList<</replace>>
-				<<script>>
-						sortIncubatorPossiblesByReservedSpots();
-				<</script>>
-		<</link>> |
-		<<link "Sort by Pregnancy Week">>
-				<<set $sortIncubatorList = 'Pregnancy Week'>>
-				<<replace "#qlIncubatorSort">>$sortIncubatorList<</replace>>
-				<<script>>
-						sortIncubatorPossiblesByPregnancyWeek();
-				<</script>>
-		<</link>> |
-		<<link "Sort by Number of Children">>
-				<<set $sortIncubatorList = 'Number of Children'>>
-				<<replace "#qlIncubatorSort">>$sortIncubatorList<</replace>>
-				<<script>>
-						sortIncubatorPossiblesByPregnancyCount();
-				<</script>>
-		<</link>>
-		<br>
+	<<set $sortIncubatorList = $sortIncubatorList || 'Unsorted'>>
+	<br>//Sorting:// ''<span id="qlIncubatorSort">$sortIncubatorList</span>.''
+	<<link "Sort by Name">>
+		<<set $sortIncubatorList = 'Name'>>
+		<<replace "#qlIncubatorSort">>$sortIncubatorList<</replace>>
+		<<script>>
+			sortIncubatorPossiblesByName();
+		<</script>>
+	<</link>> |
+	<<link "Sort by Reserved Incubator Spots">>
+		<<set $sortIncubatorList = 'Reserved Incubator Spots'>>
+		<<replace "#qlIncubatorSort">>$sortIncubatorList<</replace>>
+		<<script>>
+			sortIncubatorPossiblesByReservedSpots();
+		<</script>>
+	<</link>> |
+	<<link "Sort by Pregnancy Week">>
+		<<set $sortIncubatorList = 'Pregnancy Week'>>
+		<<replace "#qlIncubatorSort">>$sortIncubatorList<</replace>>
+		<<script>>
+			sortIncubatorPossiblesByPregnancyWeek();
+		<</script>>
+	<</link>> |
+	<<link "Sort by Number of Children">>
+		<<set $sortIncubatorList = 'Number of Children'>>
+		<<replace "#qlIncubatorSort">>$sortIncubatorList<</replace>>
+		<<script>>
+			sortIncubatorPossiblesByPregnancyCount();
+		<</script>>
+	<</link>>
+	<br>
 <</if>>
 <div id="qlIncubator">
 <<for _u = 0; _u < _SL; _u++>>
 	<<setLocalPronouns $slaves[_u]>>
 	<<if $slaves[_u].preg > 0 && $slaves[_u].broodmother == 0 && $slaves[_u].pregKnown == 1 && $slaves[_u].eggType == "human">>
-	<<if ($slaves[_u].assignment == "work in the dairy" && $dairyPregSetting > 0) || $activeSlave.assignment == "be your agent" || $activeSlave.assignment == "live with your agent">>
-	<<else>>
-		<<set _slaveId = "slave-" + $slaves[_u].ID>>
-		<<set _WL = $slaves[_u].womb.length>>
-		<<set _reservedIncubator = WombReserveCount($slaves[_u], "incubator")>>
-		<<set _reservedNursery = WombReserveCount($slaves[_u], "nursery")>>
-		<<set _pregWeek = $slaves[_u].pregWeek>>
-		<<set _slaveName = SlaveFullName($slaves[_u])>>
-		<div class="possible" @id="_slaveId" @data-preg-count="_pregCount" @data-reserved-spots="_reservedIncubator" @data-preg-week="_pregWeek" @data-name="_slaveName">
-		<<print "[[_slaveName|Long Slave Description][$activeSlave = $slaves[" + _u + "], $nextLink = passage()]]">> is $slaves[_u].pregWeek week<<if $slaves[_u].pregWeek > 1>>s<</if>> pregnant with
-		<<if $slaves[_u].pregSource == 0 || $slaves[_u].preg <= 5>>someone's<<if $slaves[_u].preg <= 5>>, though it is too early to tell whose,<</if>>
-		<<elseif $slaves[_u].pregSource == -1>>your
-		<<elseif $slaves[_u].pregSource == -2>>a citizen's
-		<<elseif $slaves[_u].pregSource == -3>>your Master's
-		<<elseif $slaves[_u].pregSource == -7>>the lab's
-		<<elseif $slaves[_u].pregSource == -9>>the Futanari Sisters'
+		<<if ($slaves[_u].assignment == "work in the dairy" && $dairyPregSetting > 0) || $activeSlave.assignment == "be your agent" || $activeSlave.assignment == "live with your agent">>
 		<<else>>
-			<<set _t = $slaveIndices[$slaves[_u].pregSource]>>
-			<<if def _t>>
-				<<print $slaves[_t].slaveName>>'s
-			<</if>>
-		<</if>>
-		<<if _WL > 1>>_WL babies<<else>>baby<</if>>.
-		<<if _reservedIncubator > 0>>
-			<<set _childrenReserved = 1>>
-			<<if _WL == 1>>
-				$His child will be placed in $incubatorName.
-			<<elseif _reservedIncubator < _WL>>
-				_reservedIncubator of $his children will be placed in $incubatorName.
-			<<elseif _WL == 2>>
-				Both of $his children will be placed in $incubatorName.
+			<<set _slaveId = "slave-" + $slaves[_u].ID>>
+			<<set _WL = $slaves[_u].womb.length>>
+			<<set _reservedIncubator = WombReserveCount($slaves[_u], "incubator")>>
+			<<set _reservedNursery = WombReserveCount($slaves[_u], "nursery")>>
+			<<set _pregWeek = $slaves[_u].pregWeek>>
+			<<set _slaveName = SlaveFullName($slaves[_u])>>
+			<div class="possible" @id="_slaveId" @data-preg-count="_pregCount" @data-reserved-spots="_reservedIncubator" @data-preg-week="_pregWeek" @data-name="_slaveName">
+			<<print "[[_slaveName|Long Slave Description][$activeSlave = $slaves[" + _u + "], $nextLink = passage()]]">> is $slaves[_u].pregWeek week<<if $slaves[_u].pregWeek > 1>>s<</if>> pregnant with
+			<<if $slaves[_u].pregSource == 0 || $slaves[_u].preg <= 5>>someone's<<if $slaves[_u].preg <= 5>>, though it is too early to tell whose,<</if>>
+			<<elseif $slaves[_u].pregSource == -1>>your
+			<<elseif $slaves[_u].pregSource == -2>>a citizen's
+			<<elseif $slaves[_u].pregSource == -3>>your Master's
+			<<elseif $slaves[_u].pregSource == -4>>another arcology owner's
+			<<elseif $slaves[_u].pregSource == -5>>your client's
+			<<elseif $slaves[_u].pregSource == -6>>the Societal Elite's
+			<<elseif $slaves[_u].pregSource == -7>>the lab's
+			<<elseif $slaves[_u].pregSource == -9>>the Futanari Sisters'
 			<<else>>
-				All _reservedIncubator of $his children will be placed in $incubatorName.
-			<</if>>
-			<<if (_reservedIncubator + _reservedNursery < _WL) && ($reservedChildren < $freeTanks)>>
-				<br>&nbsp;&nbsp;&nbsp;&nbsp;
-				<<print "[[Keep another child|Incubator][WombAddToGenericReserve($slaves[" + _u + "], 'incubator', 1)]]">>
-				<<if _reservedIncubator > 0>>
-					| <<print "[[Keep one less child|Incubator][WombCleanGenericReserve($slaves[" + _u + "], 'incubator', 1)]]">>
+				<<set _t = $slaveIndices[$slaves[_u].pregSource]>>
+				<<if def _t>>
+					<<print $slaves[_t].slaveName>>'s
 				<</if>>
-				<<if _reservedIncubator > 1>>
-					| <<print "[[Keep none of " + $his + " children|Incubator][WombCleanGenericReserve($slaves[" + _u + "], 'incubator', 9999)]]">>
+			<</if>>
+			<<if _WL > 1>>_WL babies<<else>>baby<</if>>.
+			<<if _reservedIncubator > 0>>
+				<<set _childrenReserved = 1>>
+				<<if _WL == 1>>
+					$His child will be placed in $incubatorName.
+				<<elseif _reservedIncubator < _WL>>
+					_reservedIncubator of $his children will be placed in $incubatorName.
+				<<elseif _WL == 2>>
+					Both of $his children will be placed in $incubatorName.
+				<<else>>
+					All _reservedIncubator of $his children will be placed in $incubatorName.
 				<</if>>
-				<<if ($reservedChildren + _WL - _reservedIncubator) <= $freeTanks>>
-					| <<print "[[Keep the rest of " + $his + " children|Incubator][WombAddToGenericReserve($slaves[" + _u + "], 'incubator', 9999)]]">>
+				<<if (_reservedIncubator + _reservedNursery < _WL) && ($reservedChildren < $freeTanks)>>
+					<br>&nbsp;&nbsp;&nbsp;&nbsp;
+					<<print "[[Keep another child|Incubator][WombAddToGenericReserve($slaves[" + _u + "], 'incubator', 1)]]">>
+					<<if _reservedIncubator > 0>>
+						| <<print "[[Keep one less child|Incubator][WombCleanGenericReserve($slaves[" + _u + "], 'incubator', 1)]]">>
+					<</if>>
+					<<if _reservedIncubator > 1>>
+						| <<print "[[Keep none of " + $his + " children|Incubator][WombCleanGenericReserve($slaves[" + _u + "], 'incubator', 9999)]]">>
+					<</if>>
+					<<if ($reservedChildren + _WL - _reservedIncubator) <= $freeTanks>>
+						| <<print "[[Keep the rest of " + $his + " children|Incubator][WombAddToGenericReserve($slaves[" + _u + "], 'incubator', 9999)]]">>
+					<</if>>
+				<<elseif (_reservedIncubator == _WL) || ($reservedChildren == $freeTanks) || (_reservedIncubator + _reservedNursery == _WL)>>
+					<br>&nbsp;&nbsp;&nbsp;&nbsp;
+					<<print "[[Keep one less child|Incubator][WombCleanGenericReserve($slaves[" + _u + "], 'incubator', 1)]]">>
+					<<if _reservedIncubator > 1>>
+						| <<print "[[Keep none of " + $his + " children|Incubator][WombCleanGenericReserve($slaves[" + _u + "], 'incubator', 9999)]]">>
+					<</if>>
 				<</if>>
-			<<elseif (_reservedIncubator == _WL) || ($reservedChildren == $freeTanks) || (_reservedIncubator + _reservedNursery == _WL)>>
-				<br>&nbsp;&nbsp;&nbsp;&nbsp;
-				<<print "[[Keep one less child|Incubator][WombCleanGenericReserve($slaves[" + _u + "], 'incubator', 1)]]">>
-				<<if _reservedIncubator > 1>>
-					| <<print "[[Keep none of " + $his + " children|Incubator][WombCleanGenericReserve($slaves[" + _u + "], 'incubator', 9999)]]">>
+			<<elseif ($reservedChildren < $freeTanks)>>
+				<<if _WL - _reservedNursery == 0>>
+					//$His children are already reserved for $nurseryName//
+					<br>&nbsp;&nbsp;&nbsp;&nbsp;
+					<<print "[[Keep " + $his + " " + ((_WL > 1) ? "children" : "child") + " here instead|Incubator][WombChangeReserveType($slaves[" + _u + "], 'nursery', 'incubator')]]">>
+				<<else>>
+					You have <<if $freeTanks == 1>>an<</if>> @@.lime;available aging tank<<if $freeTanks > 1>>s<</if>>.@@
+					<br>&nbsp;&nbsp;&nbsp;&nbsp;
+					<<print "[[Keep "+ ((_WL > 1) ? "a" : "the") +" child|Incubator][WombAddToGenericReserve($slaves[" + _u + "], 'incubator', 1)]]">>
+					<<if (_WL > 1) && ($reservedChildren + _WL - _reservedIncubator) <= $freeTanks>>
+						| <<print "[[Keep all of " + $his + " children|Incubator][WombAddToGenericReserve($slaves[" + _u + "], 'incubator', 9999)]]">>
+					<</if>>
 				<</if>>
-			<</if>>
-		<<elseif ($reservedChildren < $freeTanks)>>
-			<<if _WL - _reservedNursery == 0>>
-				//$His children are already reserved for $nurseryName//
+			<<elseif $reservedChildren == $freeTanks>>
 				<br>&nbsp;&nbsp;&nbsp;&nbsp;
-				<<print "[[Keep " + $his + " " + ((_WL > 1) ? "children" : "child") + " here instead|Incubator][WombChangeReserveType($slaves[" + _u + "], 'nursery', 'incubator')]]">>
-			<<else>>
-				You have <<if $freeTanks == 1>>an<</if>> @@.lime;available aging tank<<if $freeTanks > 1>>s<</if>>.@@
-				<br>&nbsp;&nbsp;&nbsp;&nbsp;
-				<<print "[[Keep "+ ((_WL > 1) ? "a" : "the") +" child|Incubator][WombAddToGenericReserve($slaves[" + _u + "], 'incubator', 1)]]">>
-				<<if (_WL > 1) && ($reservedChildren + _WL - _reservedIncubator) <= $freeTanks>>
-					| <<print "[[Keep all of " + $his + " children|Incubator][WombAddToGenericReserve($slaves[" + _u + "], 'incubator', 9999)]]">>
-				<</if>>
+				You have @@.red;no room for $his offspring.@@
 			<</if>>
-		<<elseif $reservedChildren == $freeTanks>>
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			You have @@.red;no room for $his offspring.@@
+			<<set _eligibility = 1>>
+			</div>
 		<</if>>
-		<<set _eligibility = 1>>
-		</div>
-	<</if>>
 	<</if>>
 <</for>>
 </div>
 <<script>>
-		$('div#qlIncubator').ready(sortIncubatorPossiblesByPreviousSort);
+	$('div#qlIncubator').ready(sortIncubatorPossiblesByPreviousSort);
 <</script>>
 <<if _eligibility == 0>>
 	<br>
diff --git a/src/pregmod/theCattleRanch.tw b/src/pregmod/theCattleRanch.tw
index a79a23789586134ee53b5deac90ae7f9de875265..de615b0e75a14349583088a0ee2a759dd1134844 100644
--- a/src/pregmod/theCattleRanch.tw
+++ b/src/pregmod/theCattleRanch.tw
@@ -7,7 +7,7 @@
 	<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $slaveMarket = "TCR", $returnTo = "Main", $newSlaveIndex = 0>>
 <</if>>
 
-//The Cattle Ranch is a controversial slave school operating primarily out of Pastoralistic Free Cities. Its business model is to offer the ideal free range dairy cow; one whose tits and belly reach the floor when on all fours. All cattle come optimized for milking, with big breasts and gravid middles. Slave orphans have their heels clipped shortly after birth and are conditioned to believe they are actual livestock, resulting in a mindbreak-like state. Between their wide hips and big butts and their heavy, milky breasts, they are often popular breeding slaves. They rarely display their stock over video call, instead favoring a more hands-on approach. Buyers can visit their local shops to view grazing cattle available for sale. Alternatively, they can watch the calves frolic among their mothers or enjoy the sight of a breeding bull impregnating an empty womb. Cows are also specially trained to respond to spectators banging on the fence; oral awaits if you drop trou for them! <<if $TCR.schoolUpgrade != 0>><br><br>You have endowed <<if $TCR.schoolUpgrade == 1>>a healthy sum of credits to make their breeding bulls available for sale.<<else>>a healthy sum of credits to encourage the sale of heifers.<</if>> As a major <<if $PC.title == 0>>benefactrix<<else>>benefactor<</if>> of the ranch, you also receive a discount on them.<</if>>//
+//The Cattle Ranch is a controversial slave school operating primarily out of Pastoralistic Free Cities. Its business model is to offer the ideal free range dairy cow; one whose tits and belly reach the floor when on all fours. All cattle come optimized for milking, with big breasts and gravid middles. Slave orphans have their heels clipped shortly after birth and are conditioned to believe they are actual livestock, resulting in a mindbreak-like state. Between their wide hips and big butts and their heavy, milky breasts, they are often popular breeding slaves. They rarely display their stock over video call, instead favoring a more hands-on approach. Buyers can visit their local shops to view grazing cattle available for sale. Alternatively, they can watch the calves frolic among their mothers or enjoy the sight of a breeding bull impregnating an empty womb. Cows are also specially trained to respond to spectators banging on the fence; oral awaits if you drop trou for them! <<if $TCR.schoolUpgrade != 0>><br><br>You have endowed <<if $TCR.schoolUpgrade == 1>>a healthy sum of credits to make their breeding bulls available for sale.<<else>>a healthy sum of credits to encourage the sale of heifers.<</if>> As a major benefact<<if $PC.title == 0>>rix<<else>>or<</if>> of the ranch, you also receive a discount on them.<</if>>//
 
 <br><br>The Cattle Ranch parades a choice selection of cows for your viewing pleasure. You're free to do as you please to the slaves, as long as you don't cause lasting harm to them.<<if isPlayerFertile($PC)>> You can't help but notice the number of bulls lining up along the fence sniffing at you.<</if>>
 
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index f4df13fb113dc7172abf970975bf7782f380ad4f..49acd960b368cdbf5fe7c2087300795bb505fdcc 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -238,7 +238,7 @@ Finishing your work, you lean back for a well-deserved break. Your peace is quic
 	in a desperate attempt at taking control.
 	<<if $HeadGirl != 0>>
 		<<setLocalPronouns $HeadGirl 2>>
-		<<setSpokenLocalPronouns $activeSlave $HeadGirl>>
+		<<setSpokenLocalPronouns $HeadGirl $activeSlave>>
 		<<run Enunciate($HeadGirl)>>
 		You jump in surprise as $HeadGirl.slaveName tackles $him off you and to the floor
 		<<if $HeadGirl.skill.combat > 0>>
@@ -287,7 +287,7 @@ The $desc is
 
 <<case "devoted lotion">>
 
-Your slaves are required to take very good care of themselves, and your best girls spend several hours a day maintaining every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of their bodies. You notice <<EventNameLink>> standing naked in front of a mirror outside the bathroom, carefully applying moisturizing lotion to every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of $his $activeSlave.skin skin. $He's clearly feeling well, and $his <<if $activeSlave.face > 95>>gorgeous<<elseif $activeSlave.face <= 40>>attractive<<elseif $activeSlave.face <= 10>>pretty<<elseif $activeSlave.face < -10>>plain<<else>>homely<</if>> face bears a smile of simple enjoyment as $he basks in the warmth of the slave quarters, calibrated to make nudity comfortable. $He straightens $his <<if $activeSlave.height >= 185>>wonderfully long<<elseif $activeSlave.height >= 170>>long<<elseif $activeSlave.height >= 160>>nice<<elseif $activeSlave.height >= 150>>short<<else>>short little<</if>> legs and bends at the waist,
+Your slaves are required to take very good care of themselves, and your best ones spend several hours a day maintaining every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of their bodies. You notice <<EventNameLink>> standing naked in front of a mirror outside the bathroom, carefully applying moisturizing lotion to every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of $his $activeSlave.skin skin. $He's clearly feeling well, and $his <<if $activeSlave.face > 95>>gorgeous<<elseif $activeSlave.face <= 40>>attractive<<elseif $activeSlave.face <= 10>>pretty<<elseif $activeSlave.face < -10>>plain<<else>>homely<</if>> face bears a smile of simple enjoyment as $he basks in the warmth of the slave quarters, calibrated to make nudity comfortable. $He straightens $his <<if $activeSlave.height >= 185>>wonderfully long<<elseif $activeSlave.height >= 170>>long<<elseif $activeSlave.height >= 160>>nice<<elseif $activeSlave.height >= 150>>short<<else>>short little<</if>> legs and bends at the waist,
 <<if $activeSlave.belly >= 600000>>
 	$his _belly belly coming to rest on the floor as $he spreads $his legs around it,
 <<elseif $activeSlave.belly >= 400000>>
@@ -758,7 +758,7 @@ One night, you see <<EventNameLink>> <<if ($activeSlave.amp == 1)>>scooting $him
 
 <<case "shift doorframe">>
 
-Your fucktoys have to eat, sleep, and look after themselves, just like anyone, so they can't spend every moment offering themselves to you. Your <<if $Concubine != 0>>concubine<<elseif $HeadGirl != 0>>Head Girl<<else>>personal assistant<</if>> manages a schedule for them, constantly changing it up to keep the girls from getting predictable. <<EventNameLink>> has just come on shift.
+Your fucktoys have to eat, sleep, and look after themselves, just like anyone, so they can't spend every moment offering themselves to you. Your <<if $Concubine != 0>>concubine<<elseif $HeadGirl != 0>>Head Girl<<else>>personal assistant<</if>> manages a schedule for them, constantly changing it up to keep the sluts from getting predictable. <<EventNameLink>> has just come on shift.
 <br><br>
 You're at your desk as $he arrives; $his predecessor passes $him on the way out. $activeSlave.slaveName pauses for a moment in the doorway, and then decides to give you a show. $He spreads $his legs until $his
 <<if $activeSlave.shoes == "heels">>
@@ -1243,7 +1243,7 @@ Your order $him to turn around and present $his anus for inspection. $He doesn't
 
 <<case "age implant">>
 
-In the morning the penthouse is a busy bustle of female energy. Slaves get up promptly, eat, shower, dress themselves, and head out to work. They chatter if able and allowed, and draw a good deal of strength from each other. As you pass by the kitchen, you are narrowly avoided by a rush of girls heading to the showers. They're almost bouncing, feeding off each others' youthful energy. At the back of the pack is <<EventNameLink>>. $He looks as young as any of them, but after they're out, $he leans against the door frame for a moment and exhales slowly.
+In the morning the penthouse is a busy bustle of female energy. Slaves get up promptly, eat, shower, dress themselves, and head out to work. They chatter if able and allowed, and draw a good deal of strength from each other. As you pass by the kitchen, you are narrowly avoided by a rush of slaves heading to the showers. They're almost bouncing, feeding off each others' youthful energy. At the back of the pack is <<EventNameLink>>. $He looks as young as any of them, but after they're out, $he leans against the door frame for a moment and exhales slowly.
 <br><br>
 $His <<= App.Desc.eyeColor($activeSlave)>> eyed gaze catches yours for a moment, and you are reminded that $he isn't as young as they are, not at all. $His face might look youthful, but $his eyes don't. <<if canSee($activeSlave)>>$He sees your consideration, and<<else>>You make yourself known, and $he<</if>> murmurs, "<<S>>orry, <<Master>>. Ju<<s>>t a little <<s>>low thi<<s>> morning."
 $He hurries after $his sisters, $his
@@ -1294,7 +1294,7 @@ but after a moment $he clearly decides this isn't enough stimulation. $He <<if $
 
 <<case "shift sleep">>
 
-Your fucktoys have to eat, sleep, and look after themselves, just like anyone, so they can't spend every moment offering themselves to you. Your <<if $Concubine != 0>>concubine<<elseif $HeadGirl != 0>>Head Girl<<else>>personal assistant<</if>> manages a schedule for them, constantly changing it up to keep the girls from getting predictable. <<EventNameLink>> has just come on shift.
+Your fucktoys have to eat, sleep, and look after themselves, just like anyone, so they can't spend every moment offering themselves to you. Your <<if $Concubine != 0>>concubine<<elseif $HeadGirl != 0>>Head Girl<<else>>personal assistant<</if>> manages a schedule for them, constantly changing it up to keep the sluts from getting predictable. <<EventNameLink>> has just come on shift.
 <br><br>
 Though it's late, $he's surprised to find the lights in the master suite off. You had an unusually trying day, so you've retired for the night; you're on the point of sleep when $he comes in<<if $Concubine != 0>>, $Concubine.slaveName nestled under your arm<</if>>. After a moment's hesitation, $activeSlave.slaveName strips quietly and
 <<if $activeSlave.belly >= 100000>>
@@ -1488,7 +1488,7 @@ $He <<if canSee($activeSlave)>>stares at you doe-eyed<<else>>$he faces you with
 
 <<case "fearful balls">>
 
-<<EventNameLink>> is still having obedience problems, particularly with $his proper role as a <<if $girl == "girl">>female<</if>> receptacle for cock. Though they're an almost too-obvious explanation, it's hard to avoid $his retention of $his gonads as a possible explanation for $his behavioral issues. They certainly contribute to $his less than perfectly feminine hormonal balance.
+<<EventNameLink>> is still having obedience problems, particularly with $his proper role as a <<if $girl == "girl">>female <</if>>receptacle for cock. Though they're an almost too-obvious explanation, it's hard to avoid $his retention of $his gonads as a possible explanation for $his behavioral issues. They certainly contribute to $his less than perfectly feminine hormonal balance.
 <br><br>
 It's time for $his routine inspection, and $he's standing before you, nude. $He certainly doesn't find $his sexually vulnerable position arousing; $he's totally flaccid. The physical manifestations of $his disobedience are right in front of you, and quite defenseless.
 
@@ -2580,9 +2580,7 @@ personal assistant coming from your office. Looking in, you are treated to the s
 <<case "schoolgirl">>
 	_hisA perky tits
 <</switch>>
-down with screen cleaner, and is talking dirty to the furiously blushing servant. "Ohh, that feels good," _heA moans. "Rub me right there, you
-$desc
-slut! I love it!" The poor slave is doing $his best to hurry, embarrassed and unsure of how to react to $assistantName's behavior.
+down with screen cleaner, and is talking dirty to the furiously blushing servant. "Ohh, that feels good," _heA moans. "Rub me right there, you $desc slut! I love it!" The poor slave is doing $his best to hurry, embarrassed and unsure of how to react to $assistantName's behavior.
 
 <<case "like me">>
 
@@ -3496,7 +3494,7 @@ $His
 	<</if>>
 	tummy, and
 	<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>
-		that can be a very appealing look given the predilection your arcology has for slim girls.
+		that can be a very appealing look given the predilection your arcology has for slim <<= $girl>>s.
 	<<else>>
 		to most clients, this makes $him a less appealing whore.
 	<</if>>
@@ -3673,11 +3671,11 @@ Passing by the kitchen in the morning, you take a moment to listen to the low hu
 <<elseif ($arcologies[0].FSTransformationFetishist != "unset") && ($activeSlave.boobsImplant/$activeSlave.boobs) >= .50>>
 	"It's your fake tits," the other slave explains. "They love how fake they look, here. If you look like a bimbo, they don't care if you're a little mature."
 <<elseif ($arcologies[0].FSHedonisticDecadence != "unset") && ($activeSlave.weight > 95)>>
-	"You're so fat," the other slave explains. "Everyone here loves thick girls. They don't care that you're a little mature; that just means you understand life's pleasures more."
+	"You're so fat," the other slave explains. "Everyone here loves thick <<= $girl>>s. They don't care that you're a little mature; that just means you understand life's pleasures more."
 <<elseif ($arcologies[0].FSPhysicalIdealist != "unset") && ($activeSlave.muscles > 50)>>
 	"It's how ripped you are," the other slave explains. "It promises you won't give out after one fuck, no matter how old you are."
 <<elseif ($arcologies[0].FSSlimnessEnthusiast != "unset") && ($activeSlave.boobs < 800) && ($activeSlave.butt < 3)>>
-	"You're so slim," the other slave explains. "Everyone here loves slender girls. They don't care that you're a little mature; they think you're hot."
+	"You're so slim," the other slave explains. "Everyone here loves slender <<= $girl>>s. They don't care that you're a little mature; they think you're hot."
 <<elseif ($arcologies[0].FSBodyPurist != "unset") && ($activeSlave.boobsImplant == 0) && ($activeSlave.health > 50)>>
 	"It's how healthy you are, and your natural boobs," the other slave explains. "You look good and natural, and everyone likes that here, especially if you're mature."
 <<elseif $activeSlave.face > 95>>
@@ -7796,15 +7794,15 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<set $slaves.forEach(function(s) { if (s.devotion <= 20) { s.trust -= 5; } })>>
 	<</replace>>
 <</link>>
-<br><<link "Clip the would-be escapee's tendons">>
-	<<EventNameDelink $activeSlave>>
-	<<replace "#result">>
-		The simple thing to do would be to sedate $activeSlave.slaveName and haul $him to the remote surgery for $his punishment. That would deny $him the added weight of terror, however, and would stop your other slaves from learning by the sight of it. So, you restrain $him, pronounce judgment, and drag $his struggling, weeping form through the penthouse to the surgery. $activeSlave.slaveName is @@.mediumorchid;saddened@@ and @@.gold;frightened@@ by this punishment, and $his @@.red;health is damaged@@ by the surgery. Every single one of your other slaves with any resistance left in them is @@.gold;sensibly restrained@@ from trying such rash acts.
-		<<set $activeSlave.devotion -= 5, $activeSlave.trust -= 5, $activeSlave.health -= 10, $activeSlave.heels = 1>>
-		<<set $slaves.forEach(function(s) { if (s.devotion <= 20) { s.trust -= 5; } })>>
-	<</replace>>
-<</link>>
-<<if $activeSlave.indentureRestrictions < 1>>
+<<if $seeExtreme == 1>>
+	<br><<link "Clip the would-be escapee's tendons">>
+		<<EventNameDelink $activeSlave>>
+		<<replace "#result">>
+			The simple thing to do would be to sedate $activeSlave.slaveName and haul $him to the remote surgery for $his punishment. That would deny $him the added weight of terror, however, and would stop your other slaves from learning by the sight of it. So, you restrain $him, pronounce judgment, and drag $his struggling, weeping form through the penthouse to the surgery. $activeSlave.slaveName is @@.mediumorchid;saddened@@ and @@.gold;frightened@@ by this punishment, and $his @@.red;health is damaged@@ by the surgery. Every single one of your other slaves with any resistance left in them is @@.gold;sensibly restrained@@ from trying such rash acts.
+			<<set $activeSlave.devotion -= 5, $activeSlave.trust -= 5, $activeSlave.health -= 10, $activeSlave.heels = 1>>
+			<<set $slaves.forEach(function(s) { if (s.devotion <= 20) { s.trust -= 5; } })>>
+		<</replace>>
+	<</link>>
 	<br><<link "Amputate the would-be escapee's limbs">>
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
@@ -20768,7 +20766,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 	<</replace>>
 	<<set $activeSlave.clothes = _clothesTemp>>
 	<<replace "#result">>
-		You tell $him that the wardrobe's sorting system will present $him with a new outfit, just for today. $He's to go try it on and come right back, to see how it fits. "Thank<<s>>, <<Master>>!" $he <<say>>s brightly, and hurries off to see what's in store for $him. $He might be a slave and a $desc but girls everywhere love trying on new clothes. $He makes an entrance when $he comes back, spinning around to show off. $He's wearing the briefest possible string bikini. The top, rather than having patches of material to cover $his nipples, forms a string triangle around them, framing them but not covering them. The bottom is a single string in front, <<if $activeSlave.dick>>which looks rather sad and alone, pushed aside by $his dick as it is<<elseif $activeSlave.labia>>and it's embraced completely by $his generous pussylips<<else>>and it threatens to disappear inside $his pussylips<</if>>. "Thi<<s>> feel<<s>> <<s>>o hot, <<Master>>," $he <<say>>s, and
+		You tell $him that the wardrobe's sorting system will present $him with a new outfit, just for today. $He's to go try it on and come right back, to see how it fits. "Thank<<s>>, <<Master>>!" $he <<say>>s brightly, and hurries off to see what's in store for $him. $He might be a slave and a $desc but <<= $girl>>s everywhere love trying on new clothes. $He makes an entrance when $he comes back, spinning around to show off. $He's wearing the briefest possible string bikini. The top, rather than having patches of material to cover $his nipples, forms a string triangle around them, framing them but not covering them. The bottom is a single string in front, <<if $activeSlave.dick>>which looks rather sad and alone, pushed aside by $his dick as it is<<elseif $activeSlave.labia>>and it's embraced completely by $his generous pussylips<<else>>and it threatens to disappear inside $his pussylips<</if>>. "Thi<<s>> feel<<s>> <<s>>o hot, <<Master>>," $he <<say>>s, and
 		<<if $activeSlave.fetishKnown && $activeSlave.fetish == "humiliation">>
 			blushes cutely. $He looks up at you, <<if canSee($activeSlave)>>sees<<else>>feels<</if>> the way you're staring at $him, and hangs $his head, blushing even harder.
 		<<elseif $activeSlave.fetishKnown && $activeSlave.fetish == "buttslut">>
@@ -20814,7 +20812,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 	<</replace>>
 	<<set $activeSlave.clothes = _clothesTemp>>
 	<<replace "#result">>
-		You tell $him that the wardrobe's sorting system will present $him with a new outfit, just for today. $He's to go try it on and come right back, to see how it fits. "Thanks, <<Master>>!" $he <<say>>s brightly, and hurries off to see what's in store for $him. $He might be a slave and a $desc but girls everywhere love trying on new clothes. $He's wrong to be so enthusiastic. $He comes obediently back, wearing a set of cruelly uncomfortable leather straps in the general shape of a bikini, but much tighter and more restrictive. It isn't at all what $he was expecting, but $he did $his best to obey. $He's @@.gold;tightened $his own straps down@@ until they're just short of cutting off circulation, in an obvious effort to please you. You ask $him how $he likes $his outfit. "It'<<s>> ni<<c>>e, <<Master>>," $he <<say>>s, but $he sounds a little sad.
+		You tell $him that the wardrobe's sorting system will present $him with a new outfit, just for today. $He's to go try it on and come right back, to see how it fits. "Thanks, <<Master>>!" $he <<say>>s brightly, and hurries off to see what's in store for $him. $He might be a slave and a $desc but <<= $girl>>s everywhere love trying on new clothes. $He's wrong to be so enthusiastic. $He comes obediently back, wearing a set of cruelly uncomfortable leather straps in the general shape of a bikini, but much tighter and more restrictive. It isn't at all what $he was expecting, but $he did $his best to obey. $He's @@.gold;tightened $his own straps down@@ until they're just short of cutting off circulation, in an obvious effort to please you. You ask $him how $he likes $his outfit. "It'<<s>> ni<<c>>e, <<Master>>," $he <<say>>s, but $he sounds a little sad.
 		<<if $activeSlave.fetishKnown && $activeSlave.fetish == "humiliation">>
 			"I'm ju<<s>>t a worthle<<ss>> humiliation <<s>>lut. I love having <<s>>teel ring<<s>> around my hole<<s>> like thi<<s>>," $he adds.
 		<<elseif $activeSlave.fetishKnown && $activeSlave.fetish == "buttslut">>
diff --git a/src/utility/extendedFamilyWidgets.tw b/src/utility/extendedFamilyWidgets.tw
index a7a36caa329bcd2eaf9006ba4d8b35c1f8367547..018583f19fa6509bab8f16d20dfd365e464f7535 100644
--- a/src/utility/extendedFamilyWidgets.tw
+++ b/src/utility/extendedFamilyWidgets.tw
@@ -1146,7 +1146,7 @@
 		<<elseif $activeSlave.father != 0>>
 			<<set $PC.father = $activeSlave.father>>
 		<<else>>
-			<<set $activeSlave.father = -5 - 2*$activeSlave.ID -1>>
+			<<set $activeSlave.father = (-5 - 2*$activeSlave.ID -1)>>
 			<<set $PC.father = $activeSlave.father>>
 		<</if>>
 		<<redisplayFamily>>
@@ -1167,7 +1167,7 @@
 					<<elseif $activeSlave.father != 0>>
 						<<set _slave.father = $activeSlave.father>>
 					<<else>>
-						<<set $activeSlave.father = -5 - 2*$activeSlave.ID -1>>
+						<<set $activeSlave.father = (-5 - 2*$activeSlave.ID -1)>>
 						<<set _slave.father = $activeSlave.father>>
 					<</if>>
 					<<redisplayFamily>>