diff --git a/src/endWeek/saChoosesOwnClothes.tw b/src/endWeek/saChoosesOwnClothes.tw
index e370f8d7b92c2eac2e14213027236fd990c64739..d0f127a56340dc8dff07b82b095110d0da8be5af 100644
--- a/src/endWeek/saChoosesOwnClothes.tw
+++ b/src/endWeek/saChoosesOwnClothes.tw
@@ -207,7 +207,7 @@ window.saChoosesOwnClothes = (function() {
 			selection = jsEither(clothing);
 		} else {
 			if(V.arcologies[0].FSChattelReligionist > 0) {
-				clothing.push({text: "and wears a chattel habit to conform to your arcology's culture.", clothes: "a chattel habit"});
+				clothing.push({text: `and wears a chattel habit to conform to your arcology's culture.`, clothes: "a chattel habit"});
 			}
 			/*Chooses clothes according to assignment (no exceptions)*/
 			else if(slave.assignment == "be the Nurse") {
@@ -226,11 +226,11 @@ window.saChoosesOwnClothes = (function() {
 					wardrobeAssignment.push({text: `and wears a slutty suit to be certain nothing blocks ${him} from getting the sex ${he} needs.`, clothes: "slutty business attire"});
 				} else if(slave.energy > 80) {
 					wardrobeAssignment.push({text: `and wears a nice suit to show ${he} means business.`, clothes: "nice business attire"});
-					wardrobeAssignment.push({text: "and wears a slutty suit to entice and arouse while still looking managerial.", clothes: "slutty business attire"});
-					wardrobeAssignment.push({text: "and wears a slutty suit to entice and arouse while still looking managerial.", clothes: "slutty business attire"});
+					wardrobeAssignment.push({text: `and wears a slutty suit to entice and arouse while still looking managerial.`, clothes: "slutty business attire"});
+					wardrobeAssignment.push({text: `and wears a slutty suit to entice and arouse while still looking managerial.`, clothes: "slutty business attire"});
 				} else {
 					wardrobeAssignment.push({text: `and wears a nice suit to show ${he} means business.`, clothes: "nice business attire"});
-					wardrobeAssignment.push({text: "and wears a slutty suit to entice and arouse while still looking managerial.", clothes: "slutty business attire"});
+					wardrobeAssignment.push({text: `and wears a slutty suit to entice and arouse while still looking managerial.`, clothes: "slutty business attire"});
 				}
 			} else if(slave.assignment == "be the Milkmaid") {
 				if(slave.energy > 95 || slave.need > 100) {
@@ -240,8 +240,8 @@ window.saChoosesOwnClothes = (function() {
 					wardrobeAssignment.push({text: `but goes nude to not be slowed down while moving between ${his} charges.`, clothes: "no clothing"});
 				} else {
 					wardrobeAssignment.push({text: `and wears a sturdy maid outfit, since anything else might be damaged by ${his} hard work with the cows.`, clothes: "a nice maid outfit"});
-					wardrobeAssignment.push({text: "and decides to call it Casual Friday and wear nothing but cutoffs and a t-shirt. Not like the cows will mind.", clothes: "cutoffs and a t-shirt"});
-					wardrobeAssignment.push({text: "and opts to don a cheerleader outfit to help cheer the cows on.", clothes: "a cheerleader outfit"});
+					wardrobeAssignment.push({text: `and decides to call it Casual Friday and wear nothing but cutoffs and a t-shirt. Not like the cows will mind.`, clothes: "cutoffs and a t-shirt"});
+					wardrobeAssignment.push({text: `and opts to don a cheerleader outfit to help cheer the cows on.`, clothes: "a cheerleader outfit"});
 					wardrobeAssignment.push({text: `and dresses up as a succubus since ${he}'ll be drawing plenty of fluids.`, clothes: "a succubus outfit"});
 					wardrobeAssignment.push({text: `and slips into some spats and a tank top since ${he} feels a workout coming on.`, clothes: "spats and a tank top"});
 					if(isItemAccessible("Western clothing")) {
@@ -275,7 +275,7 @@ window.saChoosesOwnClothes = (function() {
 				wardrobeAssignment.push({text: `and wears a schoolgirl outfit to help keep ${his} charges focused on ${him}.`, clothes: "a schoolgirl outfit"});
 				wardrobeAssignment.push({text: `and dresses up as a succubus to give ${his} sex lessons an extra kick.`, clothes: "a succubus outfit"});
 				if(isItemAccessible("conservative clothing")) {
-					wardrobeAssignment.push({text: "and wears conservative clothes to not detract from this week's lesson.", clothes: "conservative clothing"});
+					wardrobeAssignment.push({text: `and wears conservative clothes to not detract from this week's lesson.`, clothes: "conservative clothing"});
 				}
 				if(isItemAccessible("a toga")) {
 					wardrobeAssignment.push({text: `and wraps ${himself} in a toga to model ${himself} after the philosophers of yore.`, clothes: "a toga"});
@@ -284,32 +284,32 @@ window.saChoosesOwnClothes = (function() {
 					wardrobeAssignment.push({text: `and settles for a comfortable maternity dress to support ${his} middle while ${he} lectures in front of the class all week.`, clothes: "a maternity dress"});
 				}
 			} else if(slave.assignment == "be the Wardeness") {
-				wardrobeAssignment.push({text: "and dons battledress, the better to intimidate the prisoners.", clothes: "battledress"});
-				wardrobeAssignment.push({text: "and slips into a scalemail bikini, the better to intimidate the prisoners.", clothes: "a scalemail bikini"});
-				wardrobeAssignment.push({text: "and dons a scandalous habit to make it perfectly clear that crossing this nun will result in sexual punishment.", clothes: "a fallen nuns habit"});
+				wardrobeAssignment.push({text: `and dons battledress, the better to intimidate the prisoners.`, clothes: "battledress"});
+				wardrobeAssignment.push({text: `and slips into a scalemail bikini, the better to intimidate the prisoners.`, clothes: "a scalemail bikini"});
+				wardrobeAssignment.push({text: `and dons a scandalous habit to make it perfectly clear that crossing this nun will result in sexual punishment.`, clothes: "a fallen nuns habit"});
 				if(isItemAccessible("stretch pants and a crop-top")) {
-					wardrobeAssignment.push({text: "and decides to take it easy by slipping into some stretch pants. They come off just as quickly as they come on, just in case.", clothes: "stretch pants and a crop-top"});
+					wardrobeAssignment.push({text: `and decides to take it easy by slipping into some stretch pants. They come off just as quickly as they come on, just in case.`, clothes: "stretch pants and a crop-top"});
 				}
 			} else if(slave.assignment == "be the Attendant") {
 				wardrobeAssignment.push({text: `and wears a string bikini, since it's all ${he} can wear that won't be ruined by all the moisture in the spa.`, clothes: "a string bikini"});
 				wardrobeAssignment.push({text: `but decides to go nude, since ${he}'ll be spending so much time in the water.`, clothes: "no clothing"});
 			} else if(slave.assignment == "rest") {
-				wardrobeAssignment.push({text: "and wears a comfortable t-shirt and cutoffs to relax.", clothes: "cutoffs and a t-shirt"});
+				wardrobeAssignment.push({text: `and wears a comfortable t-shirt and cutoffs to relax.`, clothes: "cutoffs and a t-shirt"});
 				wardrobeAssignment.push({text: `and slips into some attractive lingerie to enjoy ${himself} as ${he} unwinds.`, clothes: "attractive lingerie"});
-				wardrobeAssignment.push({text: "but decides that clothing takes too much work and would rather sleep nude.", clothes: "no clothing"});
+				wardrobeAssignment.push({text: `but decides that clothing takes too much work and would rather sleep nude.`, clothes: "no clothing"});
 				if(isItemAccessible("stretch pants and a crop-top")) {
-					wardrobeAssignment.push({text: "and slips into some comfy stretch pants to relax.", clothes: "stretch pants and a crop-top"});
+					wardrobeAssignment.push({text: `and slips into some comfy stretch pants to relax.`, clothes: "stretch pants and a crop-top"});
 				}
 				if(isItemAccessible("attractive lingerie for a pregnant woman") && slave.belly >= 1500) {
 					wardrobeAssignment.push({text: `and slips into some attractive lingerie to enjoy ${himself} as ${he} unwinds.`, clothes: "attractive lingerie for a pregnant woman"});
 				}
 				if(slave.fetish == "submissive") {
-					wardrobeAssignment.push({text: "and decides the best way to relax is tied up nice and tight.", clothes: "shibari ropes"});
+					wardrobeAssignment.push({text: `and decides the best way to relax is tied up nice and tight.`, clothes: "shibari ropes"});
 				}
 			} else if(slave.assignment == "get milked" || slave.assignment == "work in the dairy") {
 				wardrobeAssignment.push({text: `and wears sturdy lingerie to offer the best support to ${his} sore, milk-filled udders.`, clothes: "attractive lingerie"});
 				if(isItemAccessible("attractive lingerie for a pregnant woman") && slave.belly >= 1500) {
-					wardrobeAssignment.push({text: "and wears lingerie designed for milky mothers.", clothes: "attractive lingerie for a pregnant woman"});
+					wardrobeAssignment.push({text: `and wears lingerie designed for milky mothers.`, clothes: "attractive lingerie for a pregnant woman"});
 				}
 				if(isItemAccessible("a maternity dress") && slave.belly >= 10000) {
 					wardrobeAssignment.push({text: `and chooses a maternity dress since it is easy to free ${his} breasts from.`, clothes: "a maternity dress"});
@@ -321,37 +321,37 @@ window.saChoosesOwnClothes = (function() {
 				wardrobeAssignment.push({text: `and dons a slutty outfit. If ${his} breasts are going to hang out, might as well wear something to complement them.`, clothes: "a slutty outfit"});
 			} else if(slave.assignment == "guard you") {
 				wardrobeAssignment.push({text: `and wears a bodysuit to show off ${his} curves without hindering ${his} deadliness.`, clothes: "a comfortable bodysuit"});
-				wardrobeAssignment.push({text: "and wears a military uniform to look the part of the honor guard.", clothes: "a military uniform"});
-				wardrobeAssignment.push({text: "and wears a schutzstaffel uniform to look the part of the honor guard.", clothes: "a schutzstaffel uniform"});
-				wardrobeAssignment.push({text: "and wears a slutty schutzstaffel uniform to look the part of the honor guard.", clothes: "a slutty schutzstaffel uniform"});
-				wardrobeAssignment.push({text: "and wears a red army uniform to look the part of the honor guard.", clothes: "a red army uniform"});
-				wardrobeAssignment.push({text: "and wears a nice suit to make it clear you mean business.", clothes: "nice business attire"});
-				wardrobeAssignment.push({text: "and wears a mounty outfit to make it clear you mean business.", clothes: "a mounty outfit"});
+				wardrobeAssignment.push({text: `and wears a military uniform to look the part of the honor guard.`, clothes: "a military uniform"});
+				wardrobeAssignment.push({text: `and wears a schutzstaffel uniform to look the part of the honor guard.`, clothes: "a schutzstaffel uniform"});
+				wardrobeAssignment.push({text: `and wears a slutty schutzstaffel uniform to look the part of the honor guard.`, clothes: "a slutty schutzstaffel uniform"});
+				wardrobeAssignment.push({text: `and wears a red army uniform to look the part of the honor guard.`, clothes: "a red army uniform"});
+				wardrobeAssignment.push({text: `and wears a nice suit to make it clear you mean business.`, clothes: "nice business attire"});
+				wardrobeAssignment.push({text: `and wears a mounty outfit to make it clear you mean business.`, clothes: "a mounty outfit"});
 				wardrobeAssignment.push({text: `and wears a scalemail bikini to make ${himself} look fierce.`, clothes: "a scalemail bikini"});
 				if(isItemAccessible("a kimono")) {
-					wardrobeAssignment.push({text: "and wears a nice kimono to add an air of elegance to your presence.", clothes: "a kimono"});
+					wardrobeAssignment.push({text: `and wears a nice kimono to add an air of elegance to your presence.`, clothes: "a kimono"});
 				}
 			} else {
 				/*Chooses clothes according to assignment (exceptions allowed)*/
 				if(slave.assignment == "recruit girls") {
-					wardrobeAssignment.push({text: "and wears a flattering mini dress to appear sexy and carefree before those desperately seeking a better life.", clothes: "a mini dress"});
-					wardrobeAssignment.push({text: "and wears a cutoffs and a t-shirt to appear sexy and carefree before those desperately seeking a better life.", clothes: "cutoffs and a t-shirt"});
-					wardrobeAssignment.push({text: "and wears a nice suit to appear trustworthy before those desperately seeking a better life.", clothes: "nice business attire"});
-					wardrobeAssignment.push({text: "and wears a schoolgirl outfit to appear sexy and carefree before those desperately seeking a better life.", clothes: "a schoolgirl outfit"});
-					wardrobeAssignment.push({text: "and wears an opulent gown to showcase your wealth before those desperately seeking a better life.", clothes: "a ball gown"});
-					wardrobeAssignment.push({text: "and dresses as a succubus to attempt to lure any potential catches.", clothes: "a succubus outfit"});
+					wardrobeAssignment.push({text: `and wears a flattering mini dress to appear sexy and carefree before those desperately seeking a better life.`, clothes: "a mini dress"});
+					wardrobeAssignment.push({text: `and wears a cutoffs and a t-shirt to appear sexy and carefree before those desperately seeking a better life.`, clothes: "cutoffs and a t-shirt"});
+					wardrobeAssignment.push({text: `and wears a nice suit to appear trustworthy before those desperately seeking a better life.`, clothes: "nice business attire"});
+					wardrobeAssignment.push({text: `and wears a schoolgirl outfit to appear sexy and carefree before those desperately seeking a better life.`, clothes: "a schoolgirl outfit"});
+					wardrobeAssignment.push({text: `and wears an opulent gown to showcase your wealth before those desperately seeking a better life.`, clothes: "a ball gown"});
+					wardrobeAssignment.push({text: `and dresses as a succubus to attempt to lure any potential catches.`, clothes: "a succubus outfit"});
 					if(isItemAccessible("harem gauze")) {
 						wardrobeAssignment.push({text: `and dons ${his} finest silks to showcase the luxuries waiting would-be slaves.`, clothes: "harem gauze"});
 					}
 					if(isItemAccessible("stretch pants and a crop-top")) {
-						wardrobeAssignment.push({text: "and wears comfortable stretch pants to and crop-top to appear carefree before those desperately seeking a better life.", clothes: "stretch pants and a crop-top"});
+						wardrobeAssignment.push({text: `and wears comfortable stretch pants to and crop-top to appear carefree before those desperately seeking a better life.`, clothes: "stretch pants and a crop-top"});
 					}
 					if(isItemAccessible("conservative clothing")) {
-						wardrobeAssignment.push({text: "and wears normal clothing to suggest to those desperately seeking a better life that they can find it here with you.", clothes: "conservative clothing"});
+						wardrobeAssignment.push({text: `and wears normal clothing to suggest to those desperately seeking a better life that they can find it here with you.`, clothes: "conservative clothing"});
 					}
 				} else if(slave.assignment == "be the DJ") {
-					wardrobeAssignment.push({text: "and wears clubslut netting to look like the perfect easy club girl.", clothes: "clubslut netting"});
-					wardrobeAssignment.push({text: "and wears cutoffs and a t-shirt to look like the perfect easy club girl.", clothes: "cutoffs and a t-shirt"});
+					wardrobeAssignment.push({text: `and wears clubslut netting to look like the perfect easy club girl.`, clothes: "clubslut netting"});
+					wardrobeAssignment.push({text: `and wears cutoffs and a t-shirt to look like the perfect easy club girl.`, clothes: "cutoffs and a t-shirt"});
 					wardrobeAssignment.push({text: `and wears the slutty outfit ${he} can find to look like the perfect easy club girl.`, clothes: "a slutty outfit"});
 					wardrobeAssignment.push({text: `and wears nothing but slutty jewelry since ${he} loves the way it jingles to ${his} moves.`, clothes: "slutty jewelry"});
 					wardrobeAssignment.push({text: `and wears a skin tight bodysuit so nothing gets in the way of ${his} moves.`, clothes: "a comfortable bodysuit"});
@@ -367,7 +367,7 @@ window.saChoosesOwnClothes = (function() {
 					wardrobeAssignment.push({text: `and dresses as a schoolgirl in the hopes that you teach ${him} how to be a woman.`, clothes: "a schoolgirl outfit"});
 					wardrobeAssignment.push({text: `and dresses as a cheerleader so ${he} may cheer you on as you blow ${his} mind.`, clothes: "a cheerleader outfit"});
 					if(player.dick == 1) {
-						wardrobeAssignment.push({text: "and dresses as a slutty maid as you always come home with a stiff package that needs a thorough polishing.", clothes: "a slutty maid outfit"});
+						wardrobeAssignment.push({text: `and dresses as a slutty maid as you always come home with a stiff package that needs a thorough polishing.`, clothes: "a slutty maid outfit"});
 					}
 					wardrobeAssignment.push({text: `and, since you personally see that ${he} never goes hungry, ${he} dresses like the sex demoness ${he} is.`, clothes: "a succubus outfit"});
 					if(isItemAccessible("attractive lingerie for a pregnant woman") && slave.belly >= 10000 && slave.pregSource == -1) {
@@ -389,7 +389,7 @@ window.saChoosesOwnClothes = (function() {
 				} else if(slave.assignment == "work a glory hole") {
 					wardrobeAssignment.push({text: `but doesn't bother wearing anything, since no one can see ${his} clothing when ${he}'s immured inside a glory hole.`, clothes: "no clothing"});
 				} else if(slave.assignment == "take classes" || slave.assignment == "learn in the schoolroom") {
-					wardrobeAssignment.push({text: "and wears a schoolgirl outfit, since it seems most appropriate.", clothes: "a schoolgirl outfit"});
+					wardrobeAssignment.push({text: `and wears a schoolgirl outfit, since it seems most appropriate.`, clothes: "a schoolgirl outfit"});
 					wardrobeAssignment.push({text: `and wears a cheerleader outfit, since ${he} might as well be one of the popular girls.`, clothes: "a cheerleader outfit"});
 					if(isItemAccessible("conservative clothing")) {
 						wardrobeAssignment.push({text: `and wears normal clothing to not distract from ${his} lessons.`, clothes: "conservative clothing"});
@@ -409,11 +409,11 @@ window.saChoosesOwnClothes = (function() {
 					wardrobeAssignment.push({text: `and dresses ${himself} in a slutty suit to show ${he}'s in it for the ¤.`, clothes: "slutty business attire"});
 					wardrobeAssignment.push({text: `and wears a flattering mini dress to really strut ${his} stuff.`, clothes: "a mini dress"});
 				} else if(slave.assignment == "serve the public" || slave.assignment == "serve in the club") {
-					wardrobeAssignment.push({text: "and wears string lingerie to look fun and fuckable.", clothes: "a string bikini"});
-					wardrobeAssignment.push({text: "and throws together the sluttiest outfit since if you're going to slut you might as well go all out.", clothes: "a slutty outfit"});
+					wardrobeAssignment.push({text: `and wears string lingerie to look fun and fuckable.`, clothes: "a string bikini"});
+					wardrobeAssignment.push({text: `and throws together the sluttiest outfit since if you're going to slut you might as well go all out.`, clothes: "a slutty outfit"});
 					wardrobeAssignment.push({text: `and tosses on a slutty suit that screams ${he} needs a good fuck after a long day.`, clothes: "slutty business attire"});
 					wardrobeAssignment.push({text: `and dresses up as a slutty nurse; ${he} has just the technique to cure penile swelling.`, clothes: "a slutty nurse outfit"});
-					wardrobeAssignment.push({text: "and wears a cheerleader outfit to look energetic and fuckable.", clothes: "a cheerleader outfit"});
+					wardrobeAssignment.push({text: `and wears a cheerleader outfit to look energetic and fuckable.`, clothes: "a cheerleader outfit"});
 					if(isItemAccessible("a bunny outfit")) {
 						wardrobeAssignment.push({text: `and slips into a teddy to add some class to ${his} post.`, clothes: "a bunny outfit"});
 					}
@@ -436,31 +436,31 @@ window.saChoosesOwnClothes = (function() {
 				
 				/* Chooses clothes according to FS*/
 				if(V.arcologies[0].FSEgyptianRevivalist > 0) {
-					wardrobeFS.push({text: "and complements it with golden bangles, since no clothing is necessary for a sex slave in your warm and sunny arcology.", clothes: "slutty jewelry"});
+					wardrobeFS.push({text: `and complements it with golden bangles, since no clothing is necessary for a sex slave in your warm and sunny arcology.`, clothes: "slutty jewelry"});
 				} else if(V.arcologies[0].FSRomanRevivalist > 0) {
-					wardrobeFS.push({text: "and wears a toga to take part in your Roman revivalism.", clothes: "a toga"});
+					wardrobeFS.push({text: `and wears a toga to take part in your Roman revivalism.`, clothes: "a toga"});
 				} else if(V.arcologies[0].FSEdoRevivalist > 0) {
-					wardrobeFS.push({text: "and wears a kimono, overjoyed that such lovely clothing is now appropriate.", clothes: "a kimono"});
+					wardrobeFS.push({text: `and wears a kimono, overjoyed that such lovely clothing is now appropriate.`, clothes: "a kimono"});
 				} else if(V.arcologies[0].FSArabianRevivalist > 0) {
-					wardrobeFS.push({text: "and wears a harem outfit to look like a slave girl fit for a Sultan.", clothes: "harem gauze"});
+					wardrobeFS.push({text: `and wears a harem outfit to look like a slave girl fit for a Sultan.`, clothes: "harem gauze"});
 				} else if(V.arcologies[0].FSChineseRevivalist > 0) {
-					wardrobeFS.push({text: "and wears a brief qipao to show off and look Chinese at the same time.", clothes: "a slutty qipao"});
+					wardrobeFS.push({text: `and wears a brief qipao to show off and look Chinese at the same time.`, clothes: "a slutty qipao"});
 				} else if(V.arcologies[0].FSAztecRevivalist > 0) {
 					wardrobeFS.push({text: `and drapes a huipil over ${himself} to fit in with your Aztec revivalism.`, clothes: "a huipil"});
 				}
 				if(V.arcologies[0].FSGenderFundamentalist > 0) {
-					wardrobeFS.push({text: "and wears a cheerleader outfit to look like a hot slut.", clothes: "a cheerleader outfit"});
-					wardrobeFS.push({text: "and wears a bunny outfit to look like a slut from the glory days.", clothes: "a bunny outfit"});
+					wardrobeFS.push({text: `and wears a cheerleader outfit to look like a hot slut.`, clothes: "a cheerleader outfit"});
+					wardrobeFS.push({text: `and wears a bunny outfit to look like a slut from the glory days.`, clothes: "a bunny outfit"});
 					if(slave.bellyPreg >= 5000) {
 						wardrobeFS.push({text: `but decides to wear nothing at all; ${he}'s already pregnant, so ${he} just needs to be barefoot and naked to complete ${his} look.`, clothes: "no clothing"});
 					}
 				} else if(V.arcologies[0].FSGenderRadicalist > 0) {
 					wardrobeFS.push({text: `and eagerly slips into a skimpy maid outfit so ${he} can take advantage of its short skirt and ${his} lack of underwear`, clothes: "a slutty maid outfit"});
 					wardrobeFS.push({text: `and wears a cheerleader outfit that clearly shows off ${his} ass.`, clothes: "a cheerleader outfit"});
-					wardrobeFS.push({text: "and settles for some sexy succubutt.", clothes: "a succubus outfit"});
+					wardrobeFS.push({text: `and settles for some sexy succubutt.`, clothes: "a succubus outfit"});
 				}
 				if(V.arcologies[0].FSPaternalist > 0) {
-					wardrobeFS.push({text: "and wears conservative clothing, as permitted by your paternalism.", clothes: "conservative clothing"});
+					wardrobeFS.push({text: `and wears conservative clothing, as permitted by your paternalism.`, clothes: "conservative clothing"});
 					if(isItemAccessible("stretch pants and a crop-top")) {
 						wardrobeAssignment.push({text: `and wears the most comfortable stretch pants ${he} can find.`, clothes: "stretch pants and a crop-top"});
 					}
@@ -469,28 +469,28 @@ window.saChoosesOwnClothes = (function() {
 				}
 				if(V.arcologies[0].FSMaturityPreferentialist > 0) {
 					if(slave.visualAge >= 30) {
-						wardrobeFS.push({text: "and wears a slutty suit to look like the ideal horny older woman.", clothes: "slutty business attire"});
+						wardrobeFS.push({text: `and wears a slutty suit to look like the ideal horny older woman.`, clothes: "slutty business attire"});
 						wardrobeFS.push({text: `and wears only an apron to make ${himself} seem more matronly.`, clothes: "an apron"});
 					} else {
-						wardrobeFS.push({text: "and wears a formal suit to look more mature.", clothes: "nice business attire"});
+						wardrobeFS.push({text: `and wears a formal suit to look more mature.`, clothes: "nice business attire"});
 					}
 				} else if(V.arcologies[0].FSYouthPreferentialist > 0) {
-					wardrobeFS.push({text: "and wears a schoolgirl outfit to look younger.", clothes: "a schoolgirl outfit"});
-					wardrobeFS.push({text: "and wears a cheerleader outfit to look younger and more energetic.", clothes: "a cheerleader outfit"});
-					wardrobeFS.push({text: "and wears spats and a tank top to look younger and more energetic.", clothes: "spats and a tank top"});
+					wardrobeFS.push({text: `and wears a schoolgirl outfit to look younger.`, clothes: "a schoolgirl outfit"});
+					wardrobeFS.push({text: `and wears a cheerleader outfit to look younger and more energetic.`, clothes: "a cheerleader outfit"});
+					wardrobeFS.push({text: `and wears spats and a tank top to look younger and more energetic.`, clothes: "spats and a tank top"});
 				}
 				if(V.arcologies[0].FSPhysicalIdealist > 0) {
 					wardrobeFS.push({text: `and coats ${himself} in body oil to show off how ${he}'s part of your physical idealism.`, clothes: "body oil"});
 					wardrobeFS.push({text: `and slips into some spats for ${his} next workout.`, clothes: "spats and a tank top"});
 				} else if(V.arcologies[0].FSHedonisticDecadence > 0) {
-					wardrobeFS.push({text: "and throws on a very casual getup.", clothes: "stretch pants and a crop-top"});
-					wardrobeFS.push({text: "but decides against putting forth the effort and goes nude.", clothes: "no clothing"});
+					wardrobeFS.push({text: `and throws on a very casual getup.`, clothes: "stretch pants and a crop-top"});
+					wardrobeFS.push({text: `but decides against putting forth the effort and goes nude.`, clothes: "no clothing"});
 				}
 				if(V.arcologies[0].FSPastoralist > 0) {
 					wardrobeFS.push({text: `and wears Western clothing, since ${he} thinks it fits with pastoralism.`, clothes: "Western clothing"});
 					wardrobeFS.push({text: `and wears a swimsuit that leaves ${his} breasts uncovered.`, clothes: "a monokini"});
 					if(slave.lactation > 0) {
-						wardrobeFS.push({text: "and dresses up as a slutty wet nurse.", clothes: "a slutty nurse outfit"});
+						wardrobeFS.push({text: `and dresses up as a slutty wet nurse.`, clothes: "a slutty nurse outfit"});
 					}
 					wardrobeFS.push({text: `but decides to let ${his} breasts be free. Clothes will just get in the way.`, clothes: "no clothing"});
 				}
@@ -504,7 +504,7 @@ window.saChoosesOwnClothes = (function() {
 					wardrobeFS.push({text: `and decides squeezing into a latex suit will only complement ${his} unnatural appearance.`, clothes: "restrictive latex"});
 				}
 				if(V.arcologies[0].FSAssetExpansioninst > 0) {
-					wardrobeFS.push({text: "and decides to dress up like a young man's wet dream.", clothes: "a succubus outfit"});
+					wardrobeFS.push({text: `and decides to dress up like a young man's wet dream.`, clothes: "a succubus outfit"});
 					wardrobeFS.push({text: `and decides to wear a skimpy bikini to make ${his} assets look even larger.`, clothes: "a string bikini"});
 					wardrobeFS.push({text: `and decides to throw together a slutty outfit that highlight ${his} assets.`, clothes: "a slutty outfit"});
 					wardrobeFS.push ({text: `and decides to wear a monokini that clings to the assets it actually does conceal.`, clothes: "a monokini"});
@@ -525,9 +525,9 @@ window.saChoosesOwnClothes = (function() {
 				/*Chooses clothes according to fetishes, quirks, etc.*/
 				if(slave.attrXY > 70) {
 					if(slave.attrKnown == 1) {
-						wardrobeTastes.push({text: "and wears a schoolgirl outfit to show off a some T&A to attract boys.", clothes: "a schoolgirl outfit"});
-						wardrobeTastes.push({text: "and wears nothing but pretty lingerie to attract boys.", clothes: "attractive lingerie"});
-						wardrobeTastes.push({text: "and selects a slutty outfit that's sure to have men drooling.", clothes: "a slutty outfit"});
+						wardrobeTastes.push({text: `and wears a schoolgirl outfit to show off a some T&A to attract boys.`, clothes: "a schoolgirl outfit"});
+						wardrobeTastes.push({text: `and wears nothing but pretty lingerie to attract boys.`, clothes: "attractive lingerie"});
+						wardrobeTastes.push({text: `and selects a slutty outfit that's sure to have men drooling.`, clothes: "a slutty outfit"});
 						if(slave.butt > 3){
 							wardrobeTastes.push({text: `and slips on some cutoffs that are sure to have men checking out ${his} ass.`, clothes: "cutoffs and a t-shirt"});
 						}
@@ -538,9 +538,9 @@ window.saChoosesOwnClothes = (function() {
 							wardrobeTastes.push({text: `and dresses up as a busty succubus that pulls eyes to ${his} chest and leaves pants feeling tight.`, clothes: "a succubus outfit"});
 						}
 					} else {
-						wardrobeTastes.push({text: "and selects a schoolgirl outfit that shows off some T&A.", clothes: "a schoolgirl outfit"});
+						wardrobeTastes.push({text: `and selects a schoolgirl outfit that shows off some T&A.`, clothes: "a schoolgirl outfit"});
 						wardrobeTastes.push({text: `and wears pretty lingerie that shows off ${his} body.`, clothes: "attractive lingerie"});
-						wardrobeTastes.push({text: "and selects a slutty outfit that's sure to draw attention.", clothes: "a slutty outfit"});
+						wardrobeTastes.push({text: `and selects a slutty outfit that's sure to draw attention.`, clothes: "a slutty outfit"});
 						if(slave.butt > 3){
 							wardrobeTastes.push({text: `and slips on some cutoffs that shows off ${his} ass.`, clothes: "cutoffs and a t-shirt"});
 						}
@@ -548,19 +548,19 @@ window.saChoosesOwnClothes = (function() {
 							wardrobeAssignment.push({text: `and slips into a bunny outfit that hugs ${his} curves.`, clothes: "a bunny outfit"});
 						}
 						if(slave.boobs > 800) {
-							wardrobeTastes.push({text: "and dresses up as a busty succubus that's sure to draw eyes.", clothes: "a succubus outfit"});
+							wardrobeTastes.push({text: `and dresses up as a busty succubus that's sure to draw eyes.`, clothes: "a succubus outfit"});
 						}
 					}
 				}
 				if(slave.attrXX > 70) {
 					if(slave.attrKnown == 1) {
-						wardrobeTastes.push({text: "and wears a fashionable gown, since girls appreciate nice clothes.", clothes: "a slave gown"});
-						wardrobeTastes.push({text: "and wears nothing but pretty lingerie to give the girls a show.", clothes: "attractive lingerie"});
-						wardrobeTastes.push({text: "and wears a nice suit, since girls appreciate nice clothes.", clothes: "nice business attire"});
+						wardrobeTastes.push({text: `and wears a fashionable gown, since girls appreciate nice clothes.`, clothes: "a slave gown"});
+						wardrobeTastes.push({text: `and wears nothing but pretty lingerie to give the girls a show.`, clothes: "attractive lingerie"});
+						wardrobeTastes.push({text: `and wears a nice suit, since girls appreciate nice clothes.`, clothes: "nice business attire"});
 					} else {
-						wardrobeTastes.push({text: "and wears a fashionable gown.", clothes: "a slave gown"});
+						wardrobeTastes.push({text: `and wears a fashionable gown.`, clothes: "a slave gown"});
 						wardrobeTastes.push({text: `and wears pretty lingerie that shows off ${his} body.`, clothes: "attractive lingerie"});
-						wardrobeTastes.push({text: "and wears a nice suit, the reasons not entirely clear to you.", clothes: "nice business attire"});
+						wardrobeTastes.push({text: `and wears a nice suit, the reasons not entirely clear to you.`, clothes: "nice business attire"});
 					}
 				}
 				
@@ -575,7 +575,7 @@ window.saChoosesOwnClothes = (function() {
 				
 				/* quirks n flaws */
 				if(slave.behavioralQuirk == "sinful") {
-					wardrobeTastes.push({text: "and dresses up like a succubus because it makes $object feel naughty.", clothes: "a succubus outfit"});
+					wardrobeTastes.push({text: `and dresses up like a succubus because it makes $object feel naughty.`, clothes: "a succubus outfit"});
 				} else if(slave.behavioralQuirk == "fitness") {
 					wardrobeTastes.push({text: `and wears spats and a tank top to give ${himself} a sporty look.`, clothes: "spats and a tank top"});
 				}
@@ -596,7 +596,7 @@ window.saChoosesOwnClothes = (function() {
 						wardrobeTastes.push({text: `and wears shibari ropes to encourage others to dominate ${him}.`, clothes: "shibari ropes"});
 					} else if(slave.fetish == "dom") {
 						wardrobeTastes.push({text: `and wears a handsome suit, since ${he} likes other slaves to look up to ${him}.`, clothes: "nice business attire"});
-						wardrobeTastes.push({text: "and wears a full body latex catsuit to look the part of the whip cracking dom.", clothes: "a latex catsuit"});
+						wardrobeTastes.push({text: `and wears a full body latex catsuit to look the part of the whip cracking dom.`, clothes: "a latex catsuit"});
 					} else if(slave.fetish == "masochist") {
 						wardrobeTastes.push({text: `and wears painfully restrictive bondage gear, since ${he} likes the torment.`, clothes: "uncomfortable straps"});
 						if(isItemAccessible("chains")) {
@@ -614,7 +614,7 @@ window.saChoosesOwnClothes = (function() {
 					} else if(slave.fetish == "pregnancy") {
 						wardrobeTastes.push({text: `and wears a short maid dress, because ${he} wants to look motherly and fuckable at the same time.`, clothes: "a slutty maid outfit"});
 						if(isItemAccessible("a maternity dress") && canGetPregnant(slave)) {
-							wardrobeAssignment.push({text: "and wears a maternity dress in the hope someone fills out its middle.", clothes: "a maternity dress"});
+							wardrobeAssignment.push({text: `and wears a maternity dress in the hope someone fills out its middle.`, clothes: "a maternity dress"});
 						}
 					} else if(slave.fetish == "boobs") {
 						wardrobeTastes.push({text: `and wears a cheerleader outfit, since ${he} loves the way it hugs ${his} tits as ${he} moves.`, clothes: "a cheerleader outfit"});
@@ -622,19 +622,19 @@ window.saChoosesOwnClothes = (function() {
 					}
 				} else {
 					if(slave.fetish == "submissive") {
-						wardrobeTastes.push({text: "and strangely opts for restrictive latex.", clothes: "restrictive latex"});
-						wardrobeTastes.push({text: "and strangely opts for shibari ropes.", clothes: "shibari ropes"});
+						wardrobeTastes.push({text: `and strangely opts for restrictive latex.`, clothes: "restrictive latex"});
+						wardrobeTastes.push({text: `and strangely opts for shibari ropes.`, clothes: "shibari ropes"});
 					} else if(slave.fetish == "dom") {
 						wardrobeTastes.push({text: `and wears a handsome suit; ${he} seems to think highly of ${himself} in it.`, clothes: "nice business attire"});
 						wardrobeTastes.push({text: `and wears a full body latex catsuit; there is a strange look on ${his} face as ${he} wears it.`, clothes: "a latex catsuit"});
 					} else if(slave.fetish == "masochist") {
-						wardrobeTastes.push({text: "and strangely opts for painfully restrictive bondage gear.", clothes: "uncomfortable straps"});
+						wardrobeTastes.push({text: `and strangely opts for painfully restrictive bondage gear.`, clothes: "uncomfortable straps"});
 						if(isItemAccessible("chains")) {
-							wardrobeAssignment.push({text: "and strangely opts for painfully tight chains.", clothes: "chains"});
+							wardrobeAssignment.push({text: `and strangely opts for painfully tight chains.`, clothes: "chains"});
 						}
 					} else if(slave.fetish == "sadist") {
-						wardrobeTastes.push({text: "and wears an elegant gown for some reason.", clothes: "a slave gown"});
-						wardrobeTastes.push({text: "and wears a scalemail bikini; an odd choice.", clothes: "a scalemail bikini"});
+						wardrobeTastes.push({text: `and wears an elegant gown for some reason.`, clothes: "a slave gown"});
+						wardrobeTastes.push({text: `and wears a scalemail bikini; an odd choice.`, clothes: "a scalemail bikini"});
 					} else if(slave.fetish == "cumslut") {
 						wardrobeTastes.push({text: `and wears cutoffs and a t-shirt; ${he} can't stop licking ${his} lips.`, clothes: "cutoffs and a t-shirt"});
 					} else if(slave.fetish == "humiliation") {
@@ -704,7 +704,7 @@ window.saChoosesOwnClothes = (function() {
 			shoes.push({text: `${He} entered without shoes, and will leave the same.`, shoes: "none"});
 		} else if(slave.devotion <= 20) {
 			if(slave.heels == 0) {
-				shoes.push({text: "and wears comfortable flats,", shoes: "flats"});
+				shoes.push({text: `and wears comfortable flats,`, shoes: "flats"});
 			} else {
 				shoes.push({text: `and angrily wears the heels ${he} needs to walk,`, shoes: "heels"});
 			}
@@ -744,20 +744,20 @@ window.saChoosesOwnClothes = (function() {
 			
 		} else {
 			if(V.arcologies[0].FSEgyptianRevivalist > 0) {
-				neck.push({text: "dons a wesekh to support your ancient Egyptian pretensions,", collar: "ancient Egyptian"});
+				neck.push({text: `dons a wesekh to support your ancient Egyptian pretensions,`, collar: "ancient Egyptian"});
 			}
 			if(slave.fetish == "masochist") {
 				neck.push({text: `dons a tight steel collar around ${his} neck,`, collar: "tight steel"});
-				neck.push({text: "dons a painful leather collar,", collar: "uncomfortable leather"});
-				neck.push({text: "dons a painfully tight neck corset,", collar: "neck corset"});
+				neck.push({text: `dons a painful leather collar,`, collar: "uncomfortable leather"});
+				neck.push({text: `dons a painfully tight neck corset,`, collar: "neck corset"});
 			} else if(slave.fetish == "pregnancy" && (canGetPregnant(slave) || slave.pregKnown == 1)) {
 				neck.push({text: `dons a digital display that tells everything about ${his} womb,`, collar: "preg biometrics"});
 			} else if(slave.fetish == "boobs" && slave.boobs >= 1000) {
 				neck.push({text: `dons a cowbell to draw attention to ${his} luscious udders,`, collar: "leather with cowbell"});
 			}
 			neck.push({text: `decides ${his} neck needs no accenting,`, collar: "none"});
-			neck.push({text: "dons some pretty jewelry,", collar: "pretty jewelry"});
-			neck.push({text: "dons a lovely gold collar,", collar: "heavy gold"});
+			neck.push({text: `dons some pretty jewelry,`, collar: "pretty jewelry"});
+			neck.push({text: `dons a lovely gold collar,`, collar: "heavy gold"});
 			neck.push({text: `dons a simple silk ribbon around ${his} neck,`, collar: "silk ribbon"});
 		}
 		return jsEither(neck);
@@ -784,7 +784,7 @@ window.saChoosesOwnClothes = (function() {
 				if(slave.weight > 130) {
 					belly.push({text: `struggles to fit a fake pregnant belly around ${his} gut before giving up and hoping ${he} can pass as fecund,`, bellyAccessory: "none"});
 				} else {
-					belly.push({text: "straps on a fake pregnant belly to fit in with all the other pregnant girls,", bellyAccessory: jsEither(["a small empathy belly", "a medium empathy belly", "a large empathy belly"])});
+					belly.push({text: `straps on a fake pregnant belly to fit in with all the other pregnant girls,`, bellyAccessory: jsEither(["a small empathy belly", "a medium empathy belly", "a large empathy belly"])});
 				}
 			} else if(slave.belly < 1500 && slave.fetish == "pregnancy" && isItemAccessible("a small empathy belly") && slave.sexualFlaw != "breeder" && slave.weight <= 130) {
 				if(slave.fetishStrength <= 30) {
diff --git a/src/pregmod/eliteTakeOverFight.tw b/src/pregmod/eliteTakeOverFight.tw
index 4299092bc6bcf553de2d9e9b827f43218a54bc14..11d33b570ad18502ebe6566a99ef44abee19dcc8 100644
--- a/src/pregmod/eliteTakeOverFight.tw
+++ b/src/pregmod/eliteTakeOverFight.tw
@@ -277,7 +277,7 @@
 		<<goto "eliteTakeOverResult">>
 	<</link>>
 <<elseif $eliteLeft <= 9 && $rep >= 10000>>
-	Some of the citizens waiting outside your penthouse to see you hears the ruckus and rush inside, worried. Time freezes for a few seconds, while the remaining elite recover from their terror and the citizens digest the gory scene in front of them.
+	Some of the citizens waiting outside your penthouse to see you hear the ruckus and rush inside, worried. Time freezes for a few seconds, while the remaining elite recover from their terror and the citizens digest the gory scene in front of them.
 	The newcomers are quick to take your side. In little time the elites, outgunned and outnumbered, are neutralized.
 	<br>One of the more courageous citizens approaches you and asks "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>>, what should we do with them?" 
 	<br>
diff --git a/src/uncategorized/customSlave.tw b/src/uncategorized/customSlave.tw
index d4d0b6e8d46ec8a9a3cd27d4f7933bac2cc5ef13..df6ab83e67f3cdb8d64e3f9728b0a6d063edf160 100644
--- a/src/uncategorized/customSlave.tw
+++ b/src/uncategorized/customSlave.tw
@@ -7,18 +7,33 @@
 <br><br>
 
 <span id = "age">
-<<if $customSlave.age < 5>>3-4 years old.
+<<if $customSlave.age < 3>>2- years old.
+<<elseif $customSlave.age < 5>>3-4 years old.
 <<elseif $customSlave.age < 7>>5-6 years old.
 <<elseif $customSlave.age < 10>>7-9 years old.
 <<elseif $customSlave.age < 13>>10-12 years old.
 <<elseif $customSlave.age < 15>>13-14 years old.
 <<elseif $customSlave.age < 18>>15-17 years old.
 <<elseif $customSlave.age < 20>>18-19 years old.
-<<elseif $customSlave.age < 30>>20-29 years old.
+<<elseif $customSlave.age < 25>>20-24 years old.
+<<elseif $customSlave.age < 30>>25-29 years old.
 <<elseif $customSlave.age < 40>>30-39 years old.
-<<else>>40+ years old.
+<<elseif $customSlave.age < 50 && $retirementAge >= 50>>40-49 years old.
+<<elseif $customSlave.age < 50 && $retirementAge >= 40>>40+ years old.
+<<elseif $customSlave.age < 60 && $retirementAge >= 60>>50-59 years old.
+<<elseif $customSlave.age < 60 && $retirementAge >= 50>>50+ years old.
+<<elseif $customSlave.age < 70 && $retirementAge >= 70>>60-69 years old.
+<<elseif $customSlave.age < 70 && $retirementAge >= 60>>60+ years old.
+<<else>>70+ years old.
 <</if>>
 </span>
+<<if $minimumSlaveAge >= 0 && $minimumSlaveAge <= 2>>
+<<link "2-">>
+	<<set $customSlave.age = 2>>
+	<<CustomSlaveAge>>
+<</link>>
+|
+<</if>>
 <<if $minimumSlaveAge <= 3>>
 <<link "3-4">>
 	<<set $customSlave.age = 4>>
@@ -61,25 +76,81 @@
 <</link>>
 |
 <</if>>
+<<if $minimumSlaveAge <= 18>>
 <<link "18-19">>
 	<<set $customSlave.age = 19>>
 	<<CustomSlaveAge>>
 <</link>>
 |
-<<link "20-29">>
+<</if>>
+<<link "20-24">>
+	<<set $customSlave.age = 24>>
+	<<CustomSlaveAge>>
+<</link>>
+|
+<<link "25-29">>
 	<<set $customSlave.age = 29>>
 	<<CustomSlaveAge>>
 <</link>>
 |
+<<if $retirementAge >= 40>>
 <<link "30-39">>
 	<<set $customSlave.age = 39>>
 	<<CustomSlaveAge>>
 <</link>>
 |
+<<elseif $retirementAge >= 30>>
+<<link "30+">>
+	<<set $customSlave.age = 30>>
+	<<CustomSlaveAge>>
+<</link>>
+<<else>>
+<</if>>
+<<if $retirementAge >= 50>>
+<<link "40-49">>
+	<<set $customSlave.age = 49>>
+	<<CustomSlaveAge>>
+<</link>>
+|
+<<elseif $retirementAge >= 40>>
 <<link "40+">>
-	<<set $customSlave.age = 42>>
+	<<set $customSlave.age = 40>>
+	<<CustomSlaveAge>>
+<</link>>
+<<else>>
+<</if>>
+<<if $retirementAge >= 60>>
+<<link "50-59">>
+	<<set $customSlave.age = 59>>
+	<<CustomSlaveAge>>
+<</link>>
+|
+<<elseif $retirementAge >= 50>>
+<<link "50+">>
+	<<set $customSlave.age = 50>>
+	<<CustomSlaveAge>>
+<</link>>
+<<else>>
+<</if>>
+<<if $retirementAge >= 70>>
+<<link "60-69">>
+	<<set $customSlave.age = 69>>
+	<<CustomSlaveAge>>
+<</link>>
+|
+<<elseif $retirementAge >= 60>>
+<<link "60+">>
+	<<set $customSlave.age = 60>>
 	<<CustomSlaveAge>>
 <</link>>
+<<else>>
+<</if>>
+<<if $retirementAge >= 70>>
+<<link "70+">>
+	<<set $customSlave.age = 70>>
+	<<CustomSlaveAge>>
+<</link>>
+<</if>>
 
 <br>
 
@@ -398,7 +469,7 @@ Ethnicity: <span id = "ethnicity">
 	<<CustomSlaveRace>>
 <</link>>
 |
-<<link "Indo-aryan">>
+<<link "Indo-Aryan">>
 	<<set $customSlave.race = "indo-aryan">>
 	<<CustomSlaveRace>>
 <</link>>
@@ -418,10 +489,15 @@ Ethnicity: <span id = "ethnicity">
 	<<CustomSlaveRace>>
 <</link>>
 |
-<<link "Mixed race">>
+<<link "Mixed Race">>
 	<<set $customSlave.race = "mixed race">>
 	<<CustomSlaveRace>>
 <</link>>
+|
+<<link "Ethnicity is unimportant">>
+	<<set $customSlave.race = "ethnicity is unimportant">>
+	<<CustomSlaveRace>>
+<</link>>
 
 <br>
 
@@ -925,6 +1001,21 @@ Skin tone: <span id = "skin">
 <span id = "nationality">
 Nationality: $customSlave.nationality.
 </span>
+<<link "Slave">>
+	<<set $customSlave.nationality = "slave">>
+	<<CustomSlaveNationality>>
+<</link>>
+|
+<<link "Stateless">>
+	<<set $customSlave.nationality = "Stateless">>
+	<<CustomSlaveNationality>>
+<</link>>
+|
+<<link "Nationality is unimportant">>
+	<<set $customSlave.nationality = "Nationality is unimportant">>
+	<<CustomSlaveNationality>>
+<</link>>
+<br>
 <<for _i = 0; _i < setup.baseNationalities.length; _i++>>
 <<set _nation = setup.baseNationalities[_i]>>
 
diff --git a/src/uncategorized/seCustomSlaveDelivery.tw b/src/uncategorized/seCustomSlaveDelivery.tw
index 08366ac4172e5be76022b45574d4dc11adaebc41..47192f81bee4b49045b2d0870c91664a0bf64665 100644
--- a/src/uncategorized/seCustomSlaveDelivery.tw
+++ b/src/uncategorized/seCustomSlaveDelivery.tw
@@ -2,7 +2,10 @@
 
 <<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $showEncyclopedia = 1, $encyclopedia = "Enslaving People", $customSlaveOrdered = 0>>
 
-<<if $customSlave.age == 4>>
+<<if $customSlave.age == 2>>
+	<<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>>
+	<<set $activeSlaveOneTimeMaxAge = 2>>
+<<elseif $customSlave.age == 4>>
 	<<set $activeSlaveOneTimeMinAge = 3>>
 	<<set $activeSlaveOneTimeMaxAge = 4>>
 <<elseif $customSlave.age == 6>>
@@ -23,15 +26,54 @@
 <<elseif $customSlave.age == 19>>
 	<<set $activeSlaveOneTimeMinAge = 18>>
 	<<set $activeSlaveOneTimeMaxAge = 19>>
-<<elseif $customSlave.age == 29>>
+<<elseif $customSlave.age == 24>>
 	<<set $activeSlaveOneTimeMinAge = 20>>
+	<<set $activeSlaveOneTimeMaxAge = 24>>
+<<elseif $customSlave.age == 29>>
+	<<set $activeSlaveOneTimeMinAge = 25>>
 	<<set $activeSlaveOneTimeMaxAge = 29>>
+<<elseif $customSlave.age == 30 && $retirementAge == 30>>
+	<<set $activeSlaveOneTimeMinAge = 30>>
+	<<set $activeSlaveOneTimeMaxAge = 30>>
+<<elseif $customSlave.age == 30>>
+	<<set $activeSlaveOneTimeMinAge = 30>>
+	<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
 <<elseif $customSlave.age == 39>>
 	<<set $activeSlaveOneTimeMinAge = 30>>
 	<<set $activeSlaveOneTimeMaxAge = 39>>
-<<else>>
+<<elseif $customSlave.age == 40 && $retirementAge == 40>>
+	<<set $activeSlaveOneTimeMinAge = 40>>
+	<<set $activeSlaveOneTimeMaxAge = 40>>
+<<elseif $customSlave.age == 40>>
 	<<set $activeSlaveOneTimeMinAge = 40>>
 	<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
+<<elseif $customSlave.age == 49>>
+	<<set $activeSlaveOneTimeMinAge = 40>>
+	<<set $activeSlaveOneTimeMaxAge = 49>>
+<<elseif $customSlave.age == 50 && $retirementAge == 50>>
+	<<set $activeSlaveOneTimeMinAge = 50>>
+	<<set $activeSlaveOneTimeMaxAge = 50>>
+<<elseif $customSlave.age == 50>>
+	<<set $activeSlaveOneTimeMinAge = 50>>
+	<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
+<<elseif $customSlave.age == 59>>
+	<<set $activeSlaveOneTimeMinAge = 50>>
+	<<set $activeSlaveOneTimeMaxAge = 59>>
+<<elseif $customSlave.age == 60 && $retirementAge == 60>>
+	<<set $activeSlaveOneTimeMinAge = 60>>
+	<<set $activeSlaveOneTimeMaxAge = 60>>
+<<elseif $customSlave.age == 60>>
+	<<set $activeSlaveOneTimeMinAge = 60>>
+	<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
+<<elseif $customSlave.age == 69>>
+	<<set $activeSlaveOneTimeMinAge = 60>>
+	<<set $activeSlaveOneTimeMaxAge = 69>>
+<<elseif $customSlave.age == 70 && $retirementAge == 70>>
+	<<set $activeSlaveOneTimeMinAge = 70>>
+	<<set $activeSlaveOneTimeMaxAge = 70>>
+<<else>>
+	<<set $activeSlaveOneTimeMinAge = 70>>
+	<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
 <</if>>
 <<set $ageAdjustOverride = 1>>
 <<set $one_time_age_overrides_pedo_mode = 1>>
@@ -112,6 +154,41 @@
 <<set $activeSlave.devotion = random(-10,10)>>
 <<set $activeSlave.trust = random(-10,10)>>
 
+<<if $activeSlave.nationality == "Nationality is unimportant" && $activeSlave.race == "ethnicity is unimportant">>
+	<<set $activeSlave.nationality = hashChoice($nationalities)>>
+	<<run nationalityToRace($activeSlave)>>
+<<elseif $activeSlave.nationality == "Nationality is unimportant">>
+	<<switch $activeSlave.race>>
+	<<case "white">>
+		<<set $activeSlave.nationality = setup.whiteNationalities.random()>>
+	<<case "asian">>
+		<<set $activeSlave.nationality = setup.asianNationalities.random()>>
+	<<case "latina">>
+		<<set $activeSlave.nationality = setup.latinaNationalities.random()>>
+	<<case "black">>
+		<<set $activeSlave.nationality = setup.blackNationalities.random()>>
+	<<case "pacific islander">>
+		<<set $activeSlave.nationality = setup.pacificislanderNationalities.random()>>
+	<<case "southern european">>
+		<<set $activeSlave.nationality = setup.southerneuropeanNationalities.random()>>
+	<<case "amerindian">>
+		<<set $activeSlave.nationality = setup.amerindianNationalities.random()>>
+	<<case "semitic">>
+		<<set $activeSlave.nationality = setup.semiticNationalities.random()>>
+	<<case "middle eastern">>
+		<<set $activeSlave.nationality = setup.middleeasternNationalities.random()>>
+	<<case "indo-aryan">>
+		<<set $activeSlave.nationality = setup.indoaryanNationalities.random()>>
+	<<case "malay">>
+		<<set $activeSlave.nationality = setup.malayNationalities.random()>>
+	<<default>>
+		<<set $activeSlave.nationality = hashChoice($nationalities)>>
+	<</switch>>
+<<elseif $activeSlave.race == "ethnicity is unimportant">>
+	<<run nationalityToRace($activeSlave)>>
+<<else>>
+<</if>>
+
 <<if $activeSlave.race == "black">>
 	<<if $customSlave.skin == 0>><<set $activeSlave.skin = either("black", "brown", "dark brown")>><</if>>
 	<<set $activeSlave.hColor = either("black", "black", "black", "brown")>>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index 3b912facb06223bd33bcd4c14072f6848ed915ea..29757231fbb8173e8afe81a489c86cd2d469473f 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -2012,77 +2012,77 @@ As the remote surgery's long recovery cycle completes,
 <<case "body hair removal">>
 	<<if $activeSlave.underArmHStyle != "hairless">><<set $activeSlave.underArmHStyle = "bald">><</if>>
 	<<if $activeSlave.pubicHStyle != "hairless">><<set $activeSlave.pubicHStyle = "bald">><</if>>
-	When $pronoun <<if $activeSlave.amp == 1>>is carried<<else>>walks<</if>> out of the surgery $pronoun feels the breeze on $possessive skin and realizes that <<if $activeSlave.origHColor != "bald">>all hair below $possessive neck is missing<<else>>$pronoun is now completely hairless<</if>>.<br>
+	When $he <<if $activeSlave.amp == 1>>is carried<<else>>walks<</if>> out of the surgery $he feels the breeze on $his skin and realizes that <<if $activeSlave.origHColor != "bald">>all hair below $his neck is missing<<else>>$he is now completely hairless<</if>>.<br>
 	<<if $activeSlave.devotion > 50>>
-		$pronounCap is @@.hotpink;happy@@ with how smooth $possessive body has become and is already @@.mediumaquamarine;wondering@@ what new kinky things you have planned for $object.
+		$He is @@.hotpink;happy@@ with how smooth $his body has become and is already @@.mediumaquamarine;wondering@@ what new kinky things you have planned for $him.
 		<<set $activeSlave.trust += 5>>
 		<<set $activeSlave.devotion += 5>>
 	<<elseif $activeSlave.devotion >= -20>>
-		$possessiveCap new lack of body hair doesn't bother $object much, since it just means $pronoun needs to spend less time getting rid of any unseemly hairs.
+		$His new lack of body hair doesn't bother $him much, since it just means $he needs to spend less time getting rid of any unseemly hairs.
 		<<set $activeSlave.trust += 5>>
 	<<else>>
-		$pronounCap is @@.mediumorchid;sad@@ and @@.gold;frightened@@ that you would force this on $object.
+		$He is @@.mediumorchid;sad@@ and @@.gold;frightened@@ that you would force this on $him.
 		<<set $activeSlave.trust -= 5>>
 		<<set $activeSlave.devotion -= 5>>
 	<</if>>
-	<br><br>As this was a non-invasive procedure $possessive health was not affected.
+	<br><br>As this was a non-invasive procedure $his health was not affected.
 
 <<case "hair removal">>
 	<<set $activeSlave.hStyle = "bald">>
-	When $pronoun <<if $activeSlave.amp == 1>>is carried<<else>>walks<</if>> out of the surgery $pronoun immediately notices the chill on $possessive head and realizes that $pronoun is bald.<br>
+	When $he <<if $activeSlave.amp == 1>>is carried<<else>>walks<</if>> out of the surgery $he immediately notices the chill on $his head and realizes that $he is bald.<br>
 	<<if $activeSlave.devotion > 50>>
 		<<if ($activeSlave.fetish == "humiliation") && ($activeSlave.fetishStrength > 50)>>
-			$pronounCap is @@.hotpink;turned on@@ by how humiliating this is for $possessive and @@.mediumaquamarine;can't wait@@ for the next time you decide to show $possessive off.
+			$He is @@.hotpink;turned on@@ by how humiliating this is for $his and @@.mediumaquamarine;can't wait@@ for the next time you decide to show $his off.
 			<<set $activeSlave.trust += 5>>
 			<<set $activeSlave.devotion += 5>>
 		<<else>>
-			$pronounCap is very devoted to you so $possessive new condition doesn't affect $possessive as much as it would other slaves.
+			$He is very devoted to you so $his new condition doesn't affect $his as much as it would other slaves.
 		<</if>>
 	<<elseif $activeSlave.devotion >= -20>>
 		<<if ($activeSlave.fetish == "humiliation") && ($activeSlave.fetishStrength > 50)>>
-			$pronounCap is both @@.hotpink;turned on@@ and @@.gold;horrified@@ by this humiliation.
+			$He is both @@.hotpink;turned on@@ and @@.gold;horrified@@ by this humiliation.
 			<<set $activeSlave.trust -= 5>>
 			<<set $activeSlave.devotion += 5>>
 		<<else>>
-			$pronounCap thought $pronoun was used to slavery but this is @@.gold;too much@@.
+			$He thought $he was used to slavery but this is @@.gold;too much@@.
 			<<set $activeSlave.trust -= 5>>
 		<</if>>
 	<<else>>
-		$pronounCap is @@.gold;horrified@@ and @@.mediumorchid;angry@@ at this new humiliation.
+		$He is @@.gold;horrified@@ and @@.mediumorchid;angry@@ at this new humiliation.
 		<<set $activeSlave.trust -= 5>>
 		<<set $activeSlave.devotion -= 5>>
 	<</if>>
-	<br><br>As this was a non-invasive procedure $possessive health was not affected.
+	<br><br>As this was a non-invasive procedure $his health was not affected.
 
 <<case "retrograde virus injection NCS">>
-	The procedure spans the week, with $object spending every other day in the surgery room for a series of 4 sets of injections. $pronounCap feels worse each time a few hours after the injections.  $pronounCap doesn't quite know what it's about, just that $pronoun feels pretty bad. The process has <<if ($PC.medicine >= 100)>>you<<else>>the remote surgeon<</if>> inject $possessive body everywhere, over every few inches, leaving a small needle marks as the process runs that fade out within minutes.  Despite the marks fading the process is very invasive work, and leaves $pronoun @@.red;feeling weak and tired.@@<br><br>
+	The procedure spans the week, with $him spending every other day in the surgery room for a series of 4 sets of injections. $He feels worse each time a few hours after the injections. $He doesn't quite know what it's about, just that $he feels pretty bad. The process has <<if ($PC.medicine >= 100)>>you<<else>>the remote surgeon<</if>> inject $his body everywhere, over every few inches, leaving a small needle marks as the process runs that fade out within minutes.  Despite the marks fading the process is very invasive work, and leaves $he @@.red;feeling weak and tired.@@<br><br>
 	/*
 		Generate the changes, into variables to set contexts.
 	*/
-	<<set _hairChanges = 0, _hair = '', _hairLand = "at " + $possessive + " feet">>
+	<<set _hairChanges = 0, _hair = '', _hairLand = "at " + $his + " feet">>
 	<<if ($activeSlave.amp == 1)>>
-		<<set _hairLand = "below " + $object>>
+		<<set _hairLand = "below " + $him>>
 	<</if>>
 	<<if (($activeSlave.underArmHStyle != "hairless") && ($activeSlave.underArmHStyle != "bald"))>>
 		<<set _hairChanges++, $activeSlave.underArmHStyle = "bald">>
-		<<set _hair = "The first thing " + $pronoun + " notices is that " + $possessive + " armpit hair has just fallen out, in a small pile " + _hairLand + ".">>
+		<<set _hair = "The first thing " + $he + " notices is that " + $his + " armpit hair has just fallen out, in a small pile " + _hairLand + ".">>
 		<<if (($activeSlave.pubicHStyle != "hairless") && ($activeSlave.pubicHStyle != "bald"))>>
 			<<set _hairChanges++, $activeSlave.pubicHStyle = "bald">>
-			<<set _hair = _hair + " The same thing happens to " + $possessive + " pubic hair.">>
+			<<set _hair = _hair + " The same thing happens to " + $his + " pubic hair.">>
 		<</if>>
 	<<elseif $activeSlave.pubicHStyle != "hairless" && $activeSlave.pubicHStyle != "bald">>
 		<<set _hairChanges++, $activeSlave.pubicHStyle = "bald">>
-		<<set _hair = "The first thing " + $pronoun + " notices is that " + $possessive + " pubic hair has just fallen out, in a small pile " + _hairLand + ".">>
+		<<set _hair = "The first thing " + $he + " notices is that " + $his + " pubic hair has just fallen out, in a small pile " + _hairLand + ".">>
 	<</if>>
 	<<if canSee($activeSlave)>>
 		<<set _sense = "sees">>
-		$pronounCap inspects <<print $object>>self in the mirror.
+		$He inspects $himself in the mirror.
 	<<elseif $activeSlave.amp == 1>>
 		<<set _sense = "feels">>
-		$pronounCap examines <<print $object>>self with $possessive own hands.
+		$He examines $himself with $his own hands.
 	<<else>>
 		<<set _sense = "hears">>
-		$pronounCap listens as a menial slave describes $possessive new looks.
+		$He listens as a menial slave describes $his new looks.
 	<</if>>
 	<<set _genitalChanges = []>>
 	<<if $activeSlave.dick > 2>>
@@ -2105,11 +2105,11 @@ As the remote surgery's long recovery cycle completes,
 	<</if>>
 	<<set _physicalChanges = []>>
 	<<if (($activeSlave.shoulders-Math.abs($activeSlave.shouldersImplant) > -1) && ($activeSlave.hips-Math.abs($activeSlave.hipsImplant) > -1))>>
-		<<set _physicalChanges.push('both ' + $possessive + ' hips and shoulders are @@.orange;less wide,@@'), $activeSlave.hips -= 1, $activeSlave.shoulders -= 1>>
+		<<set _physicalChanges.push('both ' + $his + ' hips and shoulders are @@.orange;less wide,@@'), $activeSlave.hips -= 1, $activeSlave.shoulders -= 1>>
 	<<elseif ($activeSlave.shoulders-Math.abs($activeSlave.shouldersImplant) > -1)>>
-		<<set _physicalChanges.push($possessive + ' shoulders are @@.orange;less wide,@@'), $activeSlave.shoulders -= 1>>
+		<<set _physicalChanges.push($his + ' shoulders are @@.orange;less wide,@@'), $activeSlave.shoulders -= 1>>
 	<<elseif $activeSlave.hips-Math.abs($activeSlave.hipsImplant) > -1>>
-		<<set _physicalChanges.push($possessive + ' hips are @@.orange;less wide,@@'), $activeSlave.hips -= 1>>
+		<<set _physicalChanges.push($his + ' hips are @@.orange;less wide,@@'), $activeSlave.hips -= 1>>
 	<</if>>
 	<<if $activeSlave.visualAge < 18>>
 		<<set _averageHeight = Height.mean($activeSlave)>>
@@ -2121,39 +2121,39 @@ As the remote surgery's long recovery cycle completes,
 			<<elseif _heightDelta > -15>><<set _shrinkage = 2>>
 			<<else>><<set _shrinkage = 1>>
 			<</if>>
-			<<set _physicalChanges.push($pronoun + ' is a little @@.orange;shorter,@@'), $activeSlave.height -= _shrinkage>>
+			<<set _physicalChanges.push($he + ' is a little @@.orange;shorter,@@'), $activeSlave.height -= _shrinkage>>
 		<</if>>
 	<</if>>
 	<<set _statusChanges = []>>
 	<<if $activeSlave.visualAge > 18>>
-		<<set _statusChanges.push($pronounCap + ' feels a little @@.orange;younger.@@'), $activeSlave.visualAge -= 1>>
+		<<set _statusChanges.push($He + ' feels a little @@.orange;younger.@@'), $activeSlave.visualAge -= 1>>
 	<</if>>
 	<<if (($activeSlave.voice > 0) && ($activeSlave.voice < 3))>>
 		<<set _voiceLevel = "girly">>
 		<<if $activeSlave.voice < 2>><<set _voiceLevel = "feminine">><</if>>
-		<<set _voiceReaction = "It comes out far higher than it was before, " + $pronoun + " feels this new voice does not belong to " + $object + ".">>
+		<<set _voiceReaction = "It comes out far higher than it was before, " + $he + " feels this new voice does not belong to " + $him + ".">>
 		<<if ($activeSlave.devotion > 20)>>
-			<<set _voiceReaction = $pronounCap + " laughs at " + $possessive + " new voice happily as " + $pronoun + " gets used to it.">>
+			<<set _voiceReaction = $He + " laughs at " + $his + " new voice happily as " + $he + " gets used to it.">>
 		<<elseif ($activeSlave.devotion > -20)>>
-			<<set _voiceReaction = $pronounCap + " laughs grimly at " + $object + "self as " + $pronoun + " gets used to it.">>
+			<<set _voiceReaction = $He + " laughs grimly at " + $him + "self as " + $he + " gets used to it.">>
 		<</if>>
-		<<set _statusChanges.push($pronounCap + ' hears ' + $possessive + ' voice coming out as @@.orange;higher@@ and more ' + _voiceLevel + ' than it was before. ' + _voiceReaction), $activeSlave.voice += 1>>
+		<<set _statusChanges.push($He + ' hears ' + $his + ' voice coming out as @@.orange;higher@@ and more ' + _voiceLevel + ' than it was before. ' + _voiceReaction), $activeSlave.voice += 1>>
 	<</if>>
 	/*
 		Handle the display of the changes for the newly NCS'ed slave.
 	*/
 	<<set _numberChanges = _hairChanges + _statusChanges.length + _physicalChanges.length + _genitalChanges.length>>
 	<<if (_numberChanges <= 0)>>
-		Despite the long and arduous treatment, $pronoun has no idea what all of it was for. $pronounCap stands before you
+		Despite the long and arduous treatment, $he has no idea what all of it was for. $He stands before you
 		<<if ($activeSlave.devotion > 20)>>eager to learn what it's all about.
 		<<elseif ($activeSlave.devotion > -20)>>worried to discover what's happened to her.
 		<<else>>anxious about what you did to her, dreading the news.
 		<</if>>
 	<<else>>
-		Over the course of the treatment, $pronoun begins to feel the initial effects and on inspection, when $pronoun <<if $activeSlave.amp == 1>>is carried<<else>>walks<</if>> out of the surgery room, $pronoun feels somehow smaller and changed in <<if _numberChanges == 1>>at least one way<<elseif _numberChanges == 2>>two ways<<else>>several ways<</if>>.<br><br>
+		Over the course of the treatment, $he begins to feel the initial effects and on inspection, when $he <<if $activeSlave.amp == 1>>is carried<<else>>walks<</if>> out of the surgery room, $he feels somehow smaller and changed in <<if _numberChanges == 1>>at least one way<<elseif _numberChanges == 2>>two ways<<else>>several ways<</if>>.<br><br>
 		<<if  _hair != ''>>_hair<</if>>
 		<<if _genitalChanges.length > 0>>
-			$pronounCap can _sense that her junk's different now, it seems $possessive
+			$He can _sense that her junk's different now, it seems $his
 			<<if _genitalChanges.length > 2>>
 				<<for _sd = 0; _sd < _genitalChanges.length; _sd++>>
 					<<if _sd < _genitalChanges.length-1>>
@@ -2170,7 +2170,7 @@ As the remote surgery's long recovery cycle completes,
 			<</if>>
 		<</if>>
 		<<if _physicalChanges.length > 0>>
-			$pronounCap can <<if ((_genitalChanges.length > 0) || (_hairChanges > 0))>>also<</if>> _sense that her body has some physical changes, it seems to $possessive that
+			$He can <<if ((_genitalChanges.length > 0) || (_hairChanges > 0))>>also<</if>> _sense that her body has some physical changes, it seems to $his that
 			<<if _physicalChanges.length > 2>>
 				<<for _sd = 0; _sd < _physicalChanges.length; _sd++>>
 					<<if _sd < _physicalChanges.length-1>>
@@ -2184,11 +2184,11 @@ As the remote surgery's long recovery cycle completes,
 			<<else>>
 				_physicalChanges[0]
 			<</if>>
-			<<set _reaction = either('comes as a bit of a surprise', 'comes as quite a shock', "doesn't seem to phase " + $object, 'confirms her suspicions', $pronoun + ' finds interesting', $pronoun + " can't get over") + '.'>>
+			<<set _reaction = either('comes as a bit of a surprise', 'comes as quite a shock', "doesn't seem to phase " + $him, 'confirms her suspicions', $he + ' finds interesting', $he + " can't get over") + '.'>>
 			which _reaction
 		<</if>>
 		<<if _statusChanges.length > 0>>
-			$pronounCap can feel some <<if ((_genitalChanges.length > 0) || (_physicalChanges.length > 0) || (_hairChanges > 0))>>other<</if>> changes that are a little harder to describe.
+			$He can feel some <<if ((_genitalChanges.length > 0) || (_physicalChanges.length > 0) || (_hairChanges > 0))>>other<</if>> changes that are a little harder to describe.
 			<<for _sd = 0; _sd < _statusChanges.length; _sd++>>
 				_statusChanges[_sd]
 			<</for>>
@@ -2196,20 +2196,20 @@ As the remote surgery's long recovery cycle completes,
 	<</if>>
 
 	<br><br>
-	You explain that $pronoun's never going to grow older and $pronoun'll stay younger. You sit back and let $object absorb that data for a moment.
+	You explain that $he's never going to grow older and $he'll stay younger. You sit back and let $him absorb that data for a moment.
 	<br><br>
 	<<if $activeSlave.devotion > 20>>
-		$pronounCap is @@.hotpink;happy@@ with how young $possessive body has become<<if $activeSlave.visualAge > 26>>and is excited about the process continuing<</if>>.  $pronounCap is already @@.mediumaquamarine;wondering@@ what new kinky things you have planned for $object.
+		$He is @@.hotpink;happy@@ with how young $his body has become<<if $activeSlave.visualAge > 26>>and is excited about the process continuing<</if>>.  $He is already @@.mediumaquamarine;wondering@@ what new kinky things you have planned for $him.
 		<<set $activeSlave.trust += 5, $activeSlave.devotion += 5>>
 		<<if $activeSlave.visualAge > 26>><<set $activeSlave.devotion += 5>><</if>>
 	<<elseif $activeSlave.devotion >= -20>>
-		$pronounCap isn't thrilled with $possessive new younger body, but it doesn't bother $object much, since $pronoun knows it just better secures $possessive position in your arcology.  
+		$He isn't thrilled with $his new younger body, but it doesn't bother $him much, since $he knows it just better secures $his position in your arcology.  
 		<<if $activeSlave.visualAge > 26>>
-			$pronounCap does feel a little extra @@.mediumaquamarine;trust@@ that you would spend so much on an older slave like $object.
+			$He does feel a little extra @@.mediumaquamarine;trust@@ that you would spend so much on an older slave like $him.
 			<<set $activeSlave.trust += 5>>
 		<</if>>
 	<<else>>
-		$pronounCap is @@.mediumorchid;sad@@ and @@.gold;frightened@@ that you would force this curse of non-aging on $object.
+		$He is @@.mediumorchid;sad@@ and @@.gold;frightened@@ that you would force this curse of non-aging on $him.
 		<<set $activeSlave.trust -= 5, $activeSlave.devotion -= 5>>
 	<</if>>
 
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 1cfa5b7f6727badddee1f0af3f2c3e4b4f411a4d..0ef6de87e416c609713d35f7fbdce42def367d7f 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -14036,6 +14036,8 @@ $He has
 		<<if $showAgeDetail == 1>>
 			<<if $activeSlave.actualAge == 0>>
 				<<print 0+$week-$activeSlave.weekAcquired>> weeks
+			<<elseif $activeSlave.actualAge == 1>>
+				$activeSlave.actualAge year
 			<<else>>
 				$activeSlave.actualAge years
 			<</if>>
@@ -14044,6 +14046,8 @@ $He has
 			only
 			<<if $activeSlave.actualAge == 0>>
 				<<print 0+$week-$activeSlave.weekAcquired>> weeks
+			<<elseif $activeSlave.actualAge == 1>>
+				$activeSlave.actualAge year
 			<<else>>
 				$activeSlave.actualAge years
 			<</if>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 9a545edbf52a5f4a94a5cc195148163b17b16e5a..f650abb527bd57d83a7f6b87f274981f50c48a5e 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -1332,16 +1332,24 @@
 %/
 <<widget "CustomSlaveAge">>
 	<<replace #age>>
-		<<if $customSlave.age < 5>>3-4 years old.
+		<<if $customSlave.age < 3>>2- years old.
+		<<elseif $customSlave.age < 5>>3-4 years old.
 		<<elseif $customSlave.age < 7>>5-6 years old.
 		<<elseif $customSlave.age < 10>>7-9 years old.
 		<<elseif $customSlave.age < 13>>10-12 years old.
 		<<elseif $customSlave.age < 15>>13-14 years old.
 		<<elseif $customSlave.age < 18>>15-17 years old.
 		<<elseif $customSlave.age < 20>>18-19 years old.
-		<<elseif $customSlave.age < 30>>20-29 years old.
+		<<elseif $customSlave.age < 25>>20-24 years old.
+		<<elseif $customSlave.age < 30>>25-29 years old.
 		<<elseif $customSlave.age < 40>>30-39 years old.
-		<<else>>40+ years old.
+		<<elseif $customSlave.age < 50 && $retirementAge >= 50>>40-49 years old.
+		<<elseif $customSlave.age < 50 && $retirementAge >= 40>>40+ years old.
+		<<elseif $customSlave.age < 60 && $retirementAge >= 60>>50-59 years old.
+		<<elseif $customSlave.age < 60 && $retirementAge >= 50>>50+ years old.
+		<<elseif $customSlave.age < 70 && $retirementAge >= 70>>60-69 years old.
+		<<elseif $customSlave.age < 70 && $retirementAge >= 60>>60+ years old.
+		<<else>>70+ years old.
 		<</if>>
 	<</replace>>
 <</widget>>
@@ -1731,7 +1739,7 @@
 <<widget "CustomSlaveIntelligence">>
 	<<replace #intelligence>>
 		<<if $customSlave.intelligence >= 3>>Brilliant.
-		<<elseif $customSlave.intelligence == 2>>Very smart..
+		<<elseif $customSlave.intelligence == 2>>Very smart.
 		<<elseif $customSlave.intelligence == 1>>Smart.
 		<<elseif $customSlave.intelligence == 0>>Average intelligence.
 		<<elseif $customSlave.intelligence == -1>>Stupid.