diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index cd749bc20db9a24cd120a86ab2ff92da2877b66a..0de2942a9e3c7ef9b6759f12925a07e1368a4fd4 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -85,8 +85,8 @@
 		<<set $farmyardFoodCost = 5 >>
 	<<else>>
 		<<set $farmyardFoodCost = Math.min(5 * (1 + 1.5 * Math.sqrt(Math.trunc(100000/$localEcon-1000)/10)/100), 6.5)>>
-	<</if>
-<</if>
+	<</if>>
+<</if>>
 
 <<set $minimumSlaveAge = variableAsNumber($minimumSlaveAge, 3, 18, 18)>>
 <<set $retirementAge = variableAsNumber($retirementAge, 25, 120, 45)>>
diff --git a/src/interaction/main/mainLinks.js b/src/interaction/main/mainLinks.js
index 0db84b94b36846c5b450ec7afed0b91a69cf46a2..8515e1c1e0d1d4045f8875ad9875001aa20adb7d 100644
--- a/src/interaction/main/mainLinks.js
+++ b/src/interaction/main/mainLinks.js
@@ -159,7 +159,7 @@ App.UI.View.mainLinks = function() {
 					div.append('an organ');
 				}
 				div.append(" for ",
-					App.UI.DOM.makeElement("span", App.UI.link(V.slaves[i].slaveName, () => { V.activeSlave = V.slaves[i]; }, [], "Slave Interact"), "clear-formatting"),
+					App.UI.DOM.makeElement("span", App.UI.DOM.link(V.slaves[i].slaveName, () => { V.activeSlave = V.slaves[i]; }, [], "Slave Interact"), "clear-formatting"),
 					" which ");
 				if (slaveOrgans > 1) {
 					div.append('are');
diff --git a/src/js/generateMarketSlave.js b/src/js/generateMarketSlave.js
index dc1fc36b139820805de695690f36465fdf61d59d..c913c2818f3c27eb92fdad41ea29132fc5863998 100644
--- a/src/js/generateMarketSlave.js
+++ b/src/js/generateMarketSlave.js
@@ -18,10 +18,10 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
 				r += `Newly enslaved MILFs are strongly favored for training. `;
 				if (V.pedo_mode === 1) {
 					V.activeSlaveOneTimeMinAge = 24;
-					V.activeSlaveOneTimeMaxAge = V.retirementAge;
+					V.activeSlaveOneTimeMaxAge = V.retirementAge-1;
 				} else {
 					V.activeSlaveOneTimeMinAge = 36;
-					V.activeSlaveOneTimeMaxAge = V.retirementAge;
+					V.activeSlaveOneTimeMaxAge = V.retirementAge-1;
 				}
 			} else {
 				r += `Promising slaves are trained without special sorting based on age. `;
diff --git a/src/js/generateNewSlaveJS.js b/src/js/generateNewSlaveJS.js
index aefa3922ab4d7cad60572a9368daca94af66c46e..db80b929d1c58d9a92ba665c2598c450d187266a 100644
--- a/src/js/generateNewSlaveJS.js
+++ b/src/js/generateNewSlaveJS.js
@@ -1284,17 +1284,14 @@ window.GenerateNewSlave = (function() {
 		} else if (V.pedo_mode === 1 && V.one_time_age_overrides_pedo_mode === 0 && V.activeSlaveOneTimeMaxAge > 18) {
 			V.activeSlaveOneTimeMaxAge = 18;
 		}
-		if (V.retirementAge < V.activeSlaveOneTimeMaxAge) {
-			V.activeSlaveOneTimeMaxAge = (V.retirementAge - 1);
-		}
+		V.activeSlaveOneTimeMaxAge = Math.min(V.retirementAge - 1, V.activeSlaveOneTimeMaxAge);
+		V.activeSlaveOneTimeMinAge = Math.min(V.retirementAge - 1, V.activeSlaveOneTimeMinAge);
 		if (V.activeSlaveOneTimeMinAge < V.minimumSlaveAge) {
 			V.activeSlaveOneTimeMinAge = V.minimumSlaveAge;
 		} else if (V.pedo_mode === 1 && V.one_time_age_overrides_pedo_mode === 0) {
 			V.activeSlaveOneTimeMinAge = V.minimumSlaveAge;
 		}
-		if (V.activeSlaveOneTimeMaxAge < V.activeSlaveOneTimeMinAge) {
-			V.activeSlaveOneTimeMaxAge = V.activeSlaveOneTimeMinAge;
-		}
+		V.activeSlaveOneTimeMaxAge = Math.max(V.activeSlaveOneTimeMaxAge, V.activeSlaveOneTimeMinAge);
 		if (V.activeSlaveOneTimeMaxAge >= 30 && V.arcologies[0].FSMaturityPreferentialist !== "unset" && V.ageAdjustOverride !== 1) {
 			V.activeSlaveOneTimeMaxAge += 10;
 		}
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index 231d1ba7985f30cd8ca4151c39c5fa446858f350..3ef29cc1664e68ff9d47fbfde66cc6fa9a224a42 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -91,8 +91,8 @@
 			<<set $farmyardFoodCost = 5 >>
 		<<else>>
 			<<set $farmyardFoodCost = Math.min(5 * (1 + 1.5 * Math.sqrt(Math.trunc(100000/$localEcon-1000)/10)/100), 6.5)>>
-		<</if>
-	<</if>
+		<</if>>
+	<</if>>
 	<<set $foodCost = Math.trunc(2500/$localEcon)>>
 	<<set $drugsCost = Math.trunc(10000/$localEcon)>>
 	<<set $rulesCost = Math.trunc(10000/$localEcon)>>