diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 8e08c1c4cee0be9e610487f10c52cd1b5d852e87..91c86e6a64de7d278b5bde5f6298908ebaf88df1 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -12,11 +12,17 @@
 		<<PMODinit $slaves[$i]>>
 		<<if $slaves[$i].mother > 0>>
 			<<set $slaves[$i].mother += 1200000>>
+		<<elseif $freshPC == 1 && $slaves[$i].mother == -1>>
+			<<set $slaves[$i].mother = $missingParentID>>
+			<<set $slaves[$i].mother -= 1200000>>
 		<<elseif $slaves[$i].mother < -1>>
 			<<set $slaves[$i].mother -= 1200000>>
 		<</if>>
 		<<if $slaves[$i].father > 0>>
 			<<set $slaves[$i].father += 1200000>>
+		<<elseif $freshPC == 1 && $slaves[$i].father == -1>>
+			<<set $slaves[$i].father = $missingParentID>>
+			<<set $slaves[$i].father -= 1200000>>
 		<<elseif $slaves[$i].father < -1>>
 			<<set $slaves[$i].father -= 1200000>>
 		<</if>>
@@ -1409,7 +1415,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
 <<set $nextLink to "EW Slaves">>
 
 <<set $customSlaveOrdered = 0>>
-<<set $customSlave to {slaveName: "custom", birthName: "custom", weekAcquired: 1, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race:"white", markings: "none", eyes: 1, eyeColor: "brown", hColor: "brown", pubicHColor: "brown", skin: 0, hLength: 60, hStyle: 0, pubicHStyle: "neat", waist: 0, corsetPiercing: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 500, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute",  nipplesPiercing: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 2, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "no default setting", tonguePiercing: 0, vagina: 1, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregType: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 1, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, balls: 0, scrotum: 0, ovaries: 1, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules:"restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", buttplug: "none", intelligence: 0,  intelligenceImplant: 0, energy: 50, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, actualAge: 18, visualAge: 18, physicalAge: 18, mother: 0, father: 0, sisters: 0, daughters: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: []}>>
+<<set $customSlave to {slaveName: "custom", birthName: "custom", weekAcquired: 1, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race:"white", markings: "none", eyes: 1, eyeColor: "brown", eyeWear: "none", hColor: "brown", pubicHColor: "brown", skin: 0, hLength: 60, hStyle: 0, pubicHStyle: "neat", waist: 0, corsetPiercing: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 500, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute",  nipplesPiercing: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 2, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "no default setting", tonguePiercing: 0, vagina: 1, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregType: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 1, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, balls: 0, scrotum: 0, ovaries: 1, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules:"restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", buttplug: "none", intelligence: 0,  intelligenceImplant: 0, energy: 50, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, actualAge: 18, visualAge: 18, physicalAge: 18, mother: 0, father: 0, sisters: 0, daughters: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: []}>>
 
 <<set $huskSlaveOrdered = 0>>
 <<set $huskSlave = {age: 18, nationality: "slave", race: "white", sex: 1, virgin: 0}>>
diff --git a/src/npc/databases/cheatmodeDatabase.tw b/src/npc/databases/cheatmodeDatabase.tw
index 8d3fb2dfc514f9db35fb9f9adf22c94a76df66f7..645d52ac602390ba23c7683a76961c2876185ba3 100644
--- a/src/npc/databases/cheatmodeDatabase.tw
+++ b/src/npc/databases/cheatmodeDatabase.tw
@@ -10,7 +10,7 @@
 //There are quite a few left; their names are _HS.slaveName,//
 
 <<set _HS = clone($activeSlave)>>
-<<set _HS.slaveName = "Cornelia", _HS.birthName = "Cora", _HS.ID = 990001, _HS.relation = "mother", _HS.relationTarget = 990002, _HS.relationship = 4, _HS.relationshipTarget = 990000, _HS.assignment = "whore", _HS.birthWeek = random(0,51), _HS.actualAge = 36, _HS.physicalAge = 36, _HS.visualAge = 36, _HS.ageImplant = 1, _HS.health = 10, _HS.devotion = 100, _HS.muscles = 20, _HS.height = 190, _HS.race = "black", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "dark", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.waist = 1, _HS.boobs = 1200, _HS.boobsImplant = 1000, _HS.areolae = 2, _HS.butt = 5, _HS.buttImplant = 3, _HS.face = 1, _HS.faceImplant = 2, _HS.lips = 35, _HS.lipsImplant = 10, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 3, _HS.anus = 2, _HS.balls = 1, _HS.ovaries = 1, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 100, _HS.clothes = "a slave gown", _HS.energy = 65, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "A large letter S is branded into the back of her left hand.", _HS.customDesc = "She speaks with the demeaning accent of slaves from the Old South.">>
+<<set _HS.slaveName = "Cornelia", _HS.birthName = "Cora", _HS.ID = 990001, _HS.relation = "mother", _HS.relationTarget = 990002, _HS.relationship = 4, _HS.relationshipTarget = 990000, _HS.assignment = "whore", _HS.birthWeek = random(0,51), _HS.actualAge = 36, _HS.physicalAge = 36, _HS.visualAge = 36, _HS.ageImplant = 1, _HS.health = 10, _HS.devotion = 100, _HS.muscles = 20, _HS.height = 190, _HS.race = "black", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "dark", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.waist = 1, _HS.boobs = 1200, _HS.boobsImplant = 1000, _HS.areolae = 2, _HS.butt = 5, _HS.buttImplant = 3, _HS.face = 1, _HS.faceImplant = 2, _HS.lips = 35, _HS.lipsImplant = 10, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 3, _HS.anus = 2, _HS.balls = 1, _HS.ovaries = 1, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 100, _HS.clothes = "a slave gown", _HS.energy = 65, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "A large letter S is branded into the back of her left hand.", _HS.customDesc = "She speaks with the demeaning accent of slaves from the Old South.", _HS.pubertyXY = 1>>
 <<AddSlave _HS>>
 <<set _dump = $heroSlaves.pluck(0)>>
 //_HS.slaveName,//
diff --git a/src/pregmod/pcSurgeryDegredation.tw b/src/pregmod/pcSurgeryDegredation.tw
index 9247ce606334f88a9bd8448346a2c3c08f3f57d7..278c78512cdc8e8b609369b2f96cceb9a983aaeb 100644
--- a/src/pregmod/pcSurgeryDegredation.tw
+++ b/src/pregmod/pcSurgeryDegredation.tw
@@ -48,7 +48,7 @@
 	
 <<case "ballEnlargement">>
 	After a few hours, you awaken in the recovery wing with a distinct soreness <<if $PC.ballsImplant == 3>>and the sense that something massive is pushing your legs apart<<elseif $PC.ballsImplant == 2>>and tight feeling between your legs<<else>>between your legs<</if>>. You pull the covers off of yourself to catch sight of the result of the sugery and
-	<<if $PC.boobsBonus == 3 && elseif $PC.preg >= 30>>
+	<<if $PC.boobsBonus == 3 && $PC.preg >= 30>>
 		find that not only can you barely see around your breasts, but any attempts to do so are immediatly thwarted by your big, pregnant belly. You settle for a position peaking over your tits but around your middle to view the mirror-covered wall across from your bed. Your balls are much bigger than you expected them to be after the surgery.
 	<<elseif $PC.boobsBonus == 3>>
 		find that your enormous breasts make it difficult to get a good look so you settle for the mirror-covered wall across from your bed. Your balls are much bigger than you expected them to be after the surgery.
@@ -61,7 +61,7 @@
 	
 <<case "ballShrinkage">>
 	After a few hours, you awaken in the recovery wing with a distinct soreness <<if $PC.ballsImplant == 2>>and tight feeling between your legs<<else>>between your legs<</if>>. You pull the covers off of yourself to catch sight of the result of the sugery and
-	<<if $PC.boobsBonus == 3 && elseif $PC.preg >= 30>>
+	<<if $PC.boobsBonus == 3 && $PC.preg >= 30>>
 		find that not only can you barely see around your breasts, but any attempts to do so are immediatly thwarted by your big, pregnant belly. You settle for a position peaking over your tits but around your middle to view the mirror-covered wall across from your bed. Your balls are now closer to the typical size one would expect.
 	<<elseif $PC.boobsBonus == 3>>
 		find that your enormous breasts make it difficult to get a good look so you settle for the mirror-covered wall across from your bed. Your balls are now closer to the typical size one would expect.
@@ -74,7 +74,7 @@
 	
 <<case "tightPussy">>
 	After a few hours, you awaken in the recovery wing with a distinct soreness between your legs. You pull the covers off of yourself to catch sight of the result of the sugery and
-	<<if $PC.boobsBonus == 3 && elseif $PC.preg >= 30>>
+	<<if $PC.boobsBonus == 3 && $PC.preg >= 30>>
 		find that not only can you barely see around your breasts, but any attempts to do so are immediatly thwarted by your big, pregnant belly. You settle for a position peaking over your tits but around your middle to view the mirror-covered wall across from your bed. Your pussy isn't gaping, so that's a good sign. You can't tell much more until you get a good feel of it.
 	<<elseif $PC.boobsBonus == 3>>
 		find that your enormous breasts make it difficult to get a good look so you settle for the mirror-covered wall across from your bed. Your pussy isn't gaping, so that's a good sign. You can't tell much more until you get a good feel of it.
@@ -91,10 +91,37 @@
 	<</if>>
 	
 
-<<case "herm2female">>WIP
-<<case "herm2male">>WIP
-<<case "herm2truefemale">>WIP
-<<case "herm2truemale">>WIP
+<<case "herm2female">>
+	After a few hours, you awaken in the recovery wing with a distinct soreness between your legs. You pull the covers off of yourself to catch sight of the result of the sugery and
+	<<if $PC.boobsBonus == 3>>
+		find that your enormous breasts make it difficult to get a good look so you settle for the mirror-covered wall across from your bed. Your penis is gone, leaving you with just a vagina. Given the soreness in your lower belly, your prostate and other male reproductive organs have been removed as well. You can't tell much more until you get a good feel of it.
+	<<else>>
+		find your penis and testicles removed, leaving you with just a vagina. Given the soreness in your lower belly, your prostate and other male reproductive organs have been removed as well.
+	<</if>>
+	"So, how do you feel?", asks the surgeon's assistant, seating herself beside you and resting a hand your your pubic mound, making you wince in discomfort. "I'd take it easy for a few days, your body is going to take some time to get used to not having a penis anymore and to recover. Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Exhausted from the procedure, you settle back down to sleep off the rest of the anesthesia before returning to your arcology.
+
+<<case "herm2male">>
+	After a few hours, you awaken in the recovery wing with a distinct soreness between your legs. You pull the covers off of yourself to catch sight of the result of the sugery and
+	<<if $PC.boobsBonus == 3>>
+		find that your enormous breasts make it difficult to get a good look so you settle for the mirror-covered wall across from your bed. Your pussy is gone, leaving you with just a cock and balls. Given the soreness in your lower belly, your womb and ovaries are gone too. You can't tell much more until you get a good feel of it.
+	<<else>>
+		find your pussy is gone, leaving you with just a cock and balls. Given the soreness in your lower belly, your womb and ovaries are gone too.
+	<</if>>
+	"So, how do you feel?", asks the surgeon's assistant, seating herself beside you and resting a hand your your pubic mound, making you wince in discomfort. "I'd take it easy for a few days, your body is going to take some time to recover from surgery. Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Exhausted from the procedure, you settle back down to sleep off the rest of the anesthesia before returning to your arcology.
+
+<<case "herm2truefemale">>
+	After a few hours, you awaken in the recovery wing with a distinct soreness between your legs and pain practically all over your body. You pull the covers off of yourself to catch sight of the result of the sugery and
+	<<if $PC.boobsBonus == 3>>
+		find that your enormous breasts make it difficult to get a good look so you settle for the mirror-covered wall across from your bed. Your penis is gone, leaving you with just a vagina. Given the soreness in your lower belly, your prostate and other male reproductive organs have been removed as well. You can't tell much more until you get a good feel of it. Your body has also undergone large-scale reconstructive surgery; it is unlikely anyone will recognize you a man anymore.
+	<<else>>
+		find your penis and testicles removed, leaving you with just a vagina. Given the soreness in your lower belly, your prostate and other male reproductive organs have been removed as well. You can't tell much more until you get a good feel of it, but you're too sore to try. Your body has also undergone large-scale reconstructive surgery; it is unlikely anyone will recognize you a man anymore.
+	<</if>>
+	"So, how do you feel?", asks the surgeon's assistant, seating herself beside you. "I'd take it easy for the rest of the week, your body is going to take some time to get used to not having a penis anymore and to recover from all the changes. But if it makes you feel any better, you certainly are a lovely woman. Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Exhausted from the procedure, you settle back down to recover for the rest of your stay.
+	
+<<case "herm2truemale">>
+	After a few hours, you awaken in the recovery wing with a distinct soreness between your legs and pain practically all over your body. You pull the covers off of yourself to catch sight of the result of the sugery and find your pussy is gone, leaving you with just a cock and balls. Given the soreness in your lower belly, your womb and ovaries are gone too. You can't tell much more until you get a good feel of it, but you're too sore to try. Your body has also undergone large-scale reconstructive surgery; it is unlikely anyone will recognize you a woman anymore.
+	<</if>>
+	"So, how do you feel?", asks the surgeon's assistant, seating herself beside you. "I'd take it easy for the rest of the week, your body is going to take some time to recover from all the changes. But if it makes you feel any better, you certainly are a handsome man. Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Exhausted from the procedure, you settle back down to recover for the rest of your stay.
 
 <<case "male2female">>WIP
 <<case "male2herm">>WIP
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index b0aa864075e39cbbcf7eac30289780b669b5abbf..300d9e89195f68368678bd5444a4007ed3748a2d 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -168,7 +168,8 @@ __Facilities__
 
 <br>
 
-<<if $AProsperityCap > 120 && $familyTesting == 1>>
+<<if $familyTesting == 1>>
+<<if $AProsperityCap > 120>>
 <<if $incubator == 0>>
 	[[Install an incubation chamber to rapidly age children|Manage Arcology][$cash -= Math.trunc(100000*$upgradeMultiplierArcology), $incubator to 1]]
 	//Costs ¤<<print Math.trunc(100000*$upgradeMultiplierArcology)>>//
@@ -178,6 +179,7 @@ __Facilities__
 <<elseif $AProsperityCap >= 100 && $AProsperityCap <= 120>>
 	//Installation of a child aging facility will require the arcology's electrical infrastructure to be overhauled.//
 <</if>>
+<</if>>
 
 <br><br>
 
diff --git a/src/uncategorized/saChoosesOwnJob.tw b/src/uncategorized/saChoosesOwnJob.tw
index ae573d99c5e0a43c45c1e8d772641bada0c82623..4f83d815f3671bf8424bfc7a9b30d71cf02d72ab 100644
--- a/src/uncategorized/saChoosesOwnJob.tw
+++ b/src/uncategorized/saChoosesOwnJob.tw
@@ -384,54 +384,36 @@
 	<</if>>
 <<else>>
 	<<if ($slaves[$i].whoreSkill > $slaves[$i].entertainSkill)>>
-	<<if $brothel > 0>>
-		decides to work in $brothelName, since she thinks herself a better whore than a public slut.
-		<<set $slaves[$i].assignment to "work in the brothel">>
-		<<set $slaves[$i].assignmentVisible to 0>>
-	<<else>>
-		decides to whore, since she thinks herself a better whore than a public slut.
-		<<set $slaves[$i].assignment to "whore">>
-		<<set $slaves[$i].assignmentVisible to 1>>
-	<</if>>
+		<<if $brothel > 0>>
+			decides to work in $brothelName, since she thinks herself a better whore than a public slut.
+			<<set $slaves[$i].assignment to "work in the brothel">>
+			<<set $slaves[$i].assignmentVisible to 0>>
+		<<else>>
+			decides to whore, since she thinks herself a better whore than a public slut.
+			<<set $slaves[$i].assignment to "whore">>
+			<<set $slaves[$i].assignmentVisible to 1>>
+		<</if>>
 	<<elseif ($slaves[$i].entertainSkill >= $slaves[$i].whoreSkill)>>
-	<<if $club > 0>>
-		decides to be a club girl, since she thinks herself a better public slut than a whore.
-		<<set $slaves[$i].assignment to "serve in the club">>
-		<<set $slaves[$i].assignmentVisible to 0>>
-	<<else>>
-		decides to serve the public, since she thinks herself a better public slut than a whore.
-		<<set $slaves[$i].assignment to "serve the public">>
-		<<set $slaves[$i].assignmentVisible to 1>>
-	<</if>>
-	<<else>>
-	<<if $brothel > 0>>
-		decides to join her sisters and work in $brothelName.
-		<<set $slaves[$i].assignment to "work in the brothel">>
-		<<set $slaves[$i].assignmentVisible to 0>>
-	<<else>>
-		decides to prostitute herself to help you upgrade $arcologies[0].name and improve everyone's life.
-		<<set $slaves[$i].assignment to "whore">>
-		<<set $slaves[$i].assignmentVisible to 1>>
-	<</if>>
+		<<if $club > 0>>
+			decides to be a club girl, since she thinks herself a better public slut than a whore.
+			<<set $slaves[$i].assignment to "serve in the club">>
+			<<set $slaves[$i].assignmentVisible to 0>>
+		<<else>>
+			decides to serve the public, since she thinks herself a better public slut than a whore.
+			<<set $slaves[$i].assignment to "serve the public">>
+			<<set $slaves[$i].assignmentVisible to 1>>
+		<</if>>
+	<<else>>
+		<<if $brothel > 0>>
+			decides to join her sisters and work in $brothelName.
+			<<set $slaves[$i].assignment to "work in the brothel">>
+			<<set $slaves[$i].assignmentVisible to 0>>
+		<<else>>
+			decides to prostitute herself to help you upgrade $arcologies[0].name and improve everyone's life.
+			<<set $slaves[$i].assignment to "whore">>
+			<<set $slaves[$i].assignmentVisible to 1>>
+		<</if>>
 	<</if>>
 <</if>>
 
 <</if>>
-
-<<if ($slaves[$i].assignment is "choose her own job")>>
-	<<if canWalk($slaves[$i])>>
-	<<if $servantsQuarters > 0>>
-		isn't strongly inclined towards any other assignment, so she goes to live in $servantsQuartersName.
-		<<set $slaves[$i].assignment to "work as a servant">>
-		<<set $slaves[$i].assignmentVisible to 0>>
-	<<else>>
-		isn't strongly inclined towards any other assignment, so she decides to work as a servant.
-		<<set $slaves[$i].assignment to "be a servant">>
-		<<set $slaves[$i].assignmentVisible to 1>>
-	<</if>>
-	<<else>>
-	isn't strongly inclined towards an assignment, and can't be a servant without arms and legs, so she just rests.
-	<<set $slaves[$i].assignment to "rest">>
-	<<set $slaves[$i].assignmentVisible to 1>>
-	<</if>>
-<</if>>