diff --git a/src/npc/databases/dSlavesDatabase.tw b/src/npc/databases/dSlavesDatabase.tw
index 3c6d94cc2c997a701e8a34b07f4a90cbc9fa4c31..91ea99cdb6649697559410ff782633db7ec9cb61 100644
--- a/src/npc/databases/dSlavesDatabase.tw
+++ b/src/npc/databases/dSlavesDatabase.tw
@@ -411,7 +411,7 @@
 /*Reduced height, added entertainskill, added bitchy, changed eyes -BoneyM*/
 
 <<set _HS = clone($activeSlave)>>
-<<set _HS.slaveName = "Elisa", _HS.birthName = "Elisa", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = -55, _HS.muscles = 20, _HS.height = 145, _HS.eyeColor = "bright blue", _HS.hColor = "white-blonde", _HS.pubicHColor = "white-blonde", _HS.skin = "extremely pale", _HS.hStyle = "in a long braid", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 500, _HS.butt = 4, _HS.face = 55, _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.combatSkill = 1, _HS.intelligence = 1, _HS.intelligenceImplant = 1, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.behavioralFlaw = "arrogant", _HS.customDesc = "An iron-willed, recently captured figure of a prominent anti-Free City guerrilla party, who still clings strongly to traditional beliefs on Man's natural good, economic restriction, and monogamy. Excitable, girly and sweet in comparison to her natural brother, Martin, with a lovely singing voice. Prays quite often, if allowed.", _HS.mother = -100001, _HS.father = -100001>>
+<<set _HS.slaveName = "Elisa", _HS.birthName = "Elisa", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = -55, _HS.muscles = 20, _HS.height = 145, _HS.eyeColor = "bright blue", _HS.hColor = "white-blonde", _HS.pubicHColor = "white-blonde", _HS.skin = "extremely pale", _HS.hStyle = "in a long braid", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 500, _HS.butt = 4, _HS.face = 55, _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.combatSkill = 1, _HS.intelligence = 1, _HS.intelligenceImplant = 1, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.behavioralFlaw = "arrogant", _HS.customDesc = "An iron-willed, recently captured figure of a prominent anti-Free City guerrilla party, who still clings strongly to traditional beliefs on Man's natural good, economic restriction, and monogamy. Excitable, girly and sweet in comparison to her natural brother, Martin, with a lovely singing voice. Prays quite often, if allowed.", _HS.mother = -9997, _HS.father = -9996>>
 <<set $heroSlaves.push(clone(_HS))>>
 /*also hates pen*/
 /*martin's sibling*/
@@ -571,11 +571,11 @@
 <<if $familyTesting == 1>>
 
 <<set _HS = clone($activeSlave)>>
-<<set _HS.slaveName = "Camille", _HS.birthName = "Camille", _HS.origin = "She is half of a famous musical duo, along with her twin sister. They fled to the Free Cities.", _HS.career = "an aspiring pop star", _HS.prestige = 1, _HS.prestigeDesc = "She is a famed singer; citizens would pay top prices to feel her mouth around their dicks.", _HS.birthWeek = 16, _HS.actualAge = 23, _HS.phyiscalAge = 23, _HS.visuallAge = 23, _HS.health = 40, _HS.weight = -10, _HS.muscles = 10, _HS.height = 170, _HS.nationality = "American", _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.skin = "pale", _HS.hLength = 60, _HS.hStyle = "ass length, with thick luxurious bangs.", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.voice = 2, _HS.boobs = 300, _HS.boobShape = "perky", _HS.butt = 2, _HS.face = 100, _HS.lips = 25, _HS.earPiercing = 1, _HS.oralSkill = 15, _HS.entertainSkill = 100, _HS.energy = 50, _HS.attrXX = 80, _HS.fetish = "boobs", _HS.fetishStrength = 70, _HS.behavioralFlaw = "arrogant", _HS.sexualFlaw = "hates men", _HS.customDesc = "She has an identical twin sister named Kennerly, from whom she hates to be parted. They're from the former United States.", _HS.mother = -100002, _HS.father = -100002>>
+<<set _HS.slaveName = "Camille", _HS.birthName = "Camille", _HS.origin = "She is half of a famous musical duo, along with her twin sister. They fled to the Free Cities.", _HS.career = "an aspiring pop star", _HS.prestige = 1, _HS.prestigeDesc = "She is a famed singer; citizens would pay top prices to feel her mouth around their dicks.", _HS.birthWeek = 16, _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.health = 40, _HS.weight = -10, _HS.muscles = 10, _HS.height = 170, _HS.nationality = "American", _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.skin = "pale", _HS.hLength = 60, _HS.hStyle = "neat, with thick luxurious bangs.", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.voice = 2, _HS.boobs = 300, _HS.boobShape = "perky", _HS.butt = 2, _HS.face = 100, _HS.lips = 25, _HS.earPiercing = 1, _HS.oralSkill = 15, _HS.entertainSkill = 100, _HS.energy = 50, _HS.attrXX = 80, _HS.fetish = "boobs", _HS.fetishStrength = 70, _HS.behavioralFlaw = "arrogant", _HS.sexualFlaw = "hates men", _HS.customDesc = "She has an identical twin sister named Kennerly, from whom she hates to be parted. They're from the former United States.", _HS.mother = -9999, _HS.father = -9998>>
 <<set $heroSlaves.push(clone(_HS))>>
 
 <<set _HS = clone($activeSlave)>>
-<<set _HS.slaveName = "Kennerly", _HS.birthName = "Kennerly", _HS.origin = "She is half of a famous musical duo, along with her twin sister. They fled to the Free Cities.", _HS.career = "an aspiring pop star", _HS.prestige = 1, _HS.prestigeDesc = "She is a famed singer; citizens would pay top prices to feel her mouth around their dicks.", _HS.birthWeek = 16, _HS.actualAge = 23, _HS.phyiscalAge = 23, _HS.visuallAge = 23, _HS.health = 40, _HS.weight = 10, _HS.height = 167, _HS.nationality = "American", _HS.race = "white", _HS.markings = "beauty mark", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.skin = "pale", _HS.hLength = 60, _HS.hStyle = "ass length, with thick luxurious bangs.", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.voice = 2, _HS.boobs = 500, _HS.boobShape = "perky", _HS.butt = 2, _HS.face = 100, _HS.lips = 15, _HS.earPiercing = 1, _HS.navelPiercing = 1, _HS.oralSkill = 15, _HS.entertainSkill = 100, _HS.energy = 50, _HS.attrXX = 80, _HS.fetish = "boobs", _HS.fetishStrength = 70, _HS.behavioralFlaw = "arrogant", _HS.sexualFlaw = "hates men", _HS.customDesc = "She has an identical twin sister named Camille, from whom she hates to be parted. They're from the former United States.", _HS.mother = -100002, _HS.father = -100002>>
+<<set _HS.slaveName = "Kennerly", _HS.birthName = "Kennerly", _HS.origin = "She is half of a famous musical duo, along with her twin sister. They fled to the Free Cities.", _HS.career = "an aspiring pop star", _HS.prestige = 1, _HS.prestigeDesc = "She is a famed singer; citizens would pay top prices to feel her mouth around their dicks.", _HS.birthWeek = 16, _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.health = 40, _HS.weight = 10, _HS.height = 167, _HS.nationality = "American", _HS.race = "white", _HS.markings = "beauty mark", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.skin = "pale", _HS.hLength = 60, _HS.hStyle = "neat, with thick luxurious bangs.", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.voice = 2, _HS.boobs = 500, _HS.boobShape = "perky", _HS.butt = 2, _HS.face = 100, _HS.lips = 15, _HS.earPiercing = 1, _HS.navelPiercing = 1, _HS.oralSkill = 15, _HS.entertainSkill = 100, _HS.energy = 50, _HS.attrXX = 80, _HS.fetish = "boobs", _HS.fetishStrength = 70, _HS.behavioralFlaw = "arrogant", _HS.sexualFlaw = "hates men", _HS.customDesc = "She has an identical twin sister named Camille, from whom she hates to be parted. They're from the former United States.", _HS.mother = -9999, _HS.father = -9998>>
 <<set $heroSlaves.push(clone(_HS))>>
 
 <</if>>
diff --git a/src/npc/databases/ddSlavesDatabase.tw b/src/npc/databases/ddSlavesDatabase.tw
index 9e2b0d3ce0be8521ababa06dcb87cae6e818997b..5d343630195454879889927e9be21cc81c5aefc1 100644
--- a/src/npc/databases/ddSlavesDatabase.tw
+++ b/src/npc/databases/ddSlavesDatabase.tw
@@ -96,7 +96,7 @@
 /*likes mods*/
 
 <<set _HS = clone($activeSlave)>>
-<<set _HS.slaveName = "Martin", _HS.birthName = "Martin", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = -55, _HS.muscles = 20, _HS.height = 190, _HS.eyeColor = "bright blue", _HS.hColor = "white", _HS.pubicHColor = "white", _HS.skin = "extremely pale", _HS.hLength = 15, _HS.hStyle = "short and in a boyish cut", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 100, _HS.butt = 4, _HS.face = 55, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 3, _HS.prostate = 1, _HS.balls = 3, _HS.anusTat = "bleached", _HS.combatSkill = 1, _HS.intelligence = 1, _HS.intelligenceImplant = 1, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.behavioralFlaw = "arrogant", _HS.customDesc = "An iron-willed, recently captured figure of a prominent anti-Free City guerrilla party, who still clings strongly to traditional beliefs on Man's natural good, economic restriction, and monogamy. Excitable, girly and sweet in comparison to her natural sister, Elisa, with a lovely singing voice. Prays quite often, if allowed.", _HS.mother = -100001, _HS.father = -100001>>
+<<set _HS.slaveName = "Martin", _HS.birthName = "Martin", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = -55, _HS.muscles = 20, _HS.height = 190, _HS.eyeColor = "bright blue", _HS.hColor = "white", _HS.pubicHColor = "white", _HS.skin = "extremely pale", _HS.hLength = 15, _HS.hStyle = "short and in a boyish cut", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 100, _HS.butt = 4, _HS.face = 55, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 3, _HS.prostate = 1, _HS.balls = 3, _HS.anusTat = "bleached", _HS.combatSkill = 1, _HS.intelligence = 1, _HS.intelligenceImplant = 1, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.behavioralFlaw = "arrogant", _HS.customDesc = "An iron-willed, recently captured figure of a prominent anti-Free City guerrilla party, who still clings strongly to traditional beliefs on Man's natural good, economic restriction, and monogamy. Excitable, girly and sweet in comparison to her natural sister, Elisa, with a lovely singing voice. Prays quite often, if allowed.", _HS.mother = -9997, _HS.father = -9996>>
 <<set $heroSlaves.push(clone(_HS))>>
 /*also hates pen*/
 /*elisa's sibling*/
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index ec61b378cd6871331ed856ffe42799b9713a102e..3961b971a618ee0926aaf0eeb008b8d8f27a5909 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -82,9 +82,6 @@ __You are customizing this slave:__
 	<<StartingGirlsWorkaround>>
 <</if>>
 
-<<if ($activeSlave.dick == 0) && ($activeSlave.vagina == -1)>>
-	<<set $activeSlave.vagina = 0>>
-<</if>>
 <<if ($activeSlave.dick == 0)>>
 	<<set $activeSlave.foreskin = 0>>
 <</if>>
@@ -787,7 +784,7 @@ Her nationality is $activeSlave.nationality.
 <<else>>Gaping.
 <</if>>
 </span>
-<<if $activeSlave.dick > 0>><<link "No vagina">><<set $activeSlave.vagina = -1, $activeSlave.preg = 0,$activeSlave.pregSource = 0,$activeSlave.pubertyXX = 0,$activeSlave.pubertyAgeXX = $fertilityAge, $activeSlave.ovaries = 0>><<replace "#vagina">>//No vagina.//<</replace>><<StartingGirlsCost>><</link>><<else>>//No vagina//<</if>> | 
+<<link "No vagina">><<set $activeSlave.vagina = -1, $activeSlave.preg = 0,$activeSlave.pregSource = 0,$activeSlave.pubertyXX = 0,$activeSlave.pubertyAgeXX = $fertilityAge, $activeSlave.ovaries = 0>><<replace "#vagina">>//No vagina.//<</replace>><<StartingGirlsCost>><</link>> |
 <<link "Virgin">><<set $activeSlave.vagina = 0, $activeSlave.preg = -1, $activeSlave.ovaries = 1>><<replace "#vagina">>@@color:lime;Virgin.@@<</replace>><<StartingGirlsVaginalSkill>><<StartingGirlsCost>><</link>> |
 <<link "Normal">><<set $activeSlave.vagina = 1, $activeSlave.preg = -1, $activeSlave.ovaries = 1>><<replace "#vagina">>Normal.<</replace>><<StartingGirlsVaginalSkill>><<StartingGirlsCost>><</link>> |
 <<link "Veteran">><<set $activeSlave.vagina = 2, $activeSlave.preg = -1, $activeSlave.ovaries = 1>><<replace "#vagina">>Veteran.<</replace>><<StartingGirlsVaginalSkill>><<StartingGirlsCost>><</link>> |
@@ -864,79 +861,78 @@ Her nationality is $activeSlave.nationality.
 
 <span id="dickblock">
 <<if $seeDicks != 0 || $makeDicks == 1>>
-<br>''Penis:''
-<span id="dick">
-<<if $activeSlave.dick == 0>>None.
-<<elseif $activeSlave.dick == 1>>Tiny.
-<<elseif $activeSlave.dick == 2>>Small.
-<<elseif $activeSlave.dick == 3>>Normal.
-<<elseif $activeSlave.dick == 4>>Large.
-<<else>>Massive.
-<</if>>
-</span>
-<<link "No penis">><<set $activeSlave.dick = 0,$activeSlave.balls = 0,$activeSlave.clit = 0,$activeSlave.pubertyXY = 0,$activeSlave.pubertyAgeXY = $potencyAge>><<replace "#dick">>None.<</replace>><<StartingGirlsCost>><</link>> |
-<<link "Tiny">><<set $activeSlave.dick = 1,$activeSlave.clit = 0>><<replace "#dick">>Tiny.<</replace>><<StartingGirlsCost>><</link>> |
-<<link "Small">><<set $activeSlave.dick = 2,$activeSlave.clit = 0>><<replace "#dick">>Small.<</replace>><<StartingGirlsCost>><</link>> |
-<<link "Normal">><<set $activeSlave.dick = 3,$activeSlave.clit = 0>><<replace "#dick">>Normal.<</replace>><<StartingGirlsCost>><</link>> |
-<<link "Large">><<set $activeSlave.dick = 4,$activeSlave.clit = 0>><<replace "#dick">>Large.<</replace>><<StartingGirlsCost>><</link>> |
-<<link "Massive">><<set $activeSlave.dick = 5,$activeSlave.clit = 0>><<replace "#dick">>Massive.<</replace>><<StartingGirlsCost>><</link>>
-<<if $activeSlave.dick > 0>>
-&nbsp;&nbsp;&nbsp;&nbsp;''Foreskin:''
-<span id="foreskin">
-<<if $activeSlave.foreskin == 0>>None.
-<<elseif $activeSlave.foreskin == 1>>Tiny.
-<<elseif $activeSlave.foreskin == 2>>Small.
-<<elseif $activeSlave.foreskin == 3>>Normal.
-<<elseif $activeSlave.foreskin == 4>>Large.
-<<else>>Massive.<</if>>
-</span>
-<<if $seeCircumcision == 1>><<link "Circumcised">><<set $activeSlave.foreskin = 0>><<replace "#foreskin">>None.<</replace>><<StartingGirlsCost>><</link>> |<</if>>
-<<link "Tiny">><<set $activeSlave.foreskin = 1>><<replace "#foreskin">>Tiny.<</replace>><<StartingGirlsCost>><</link>> |
-<<link "Small">><<set $activeSlave.foreskin = 2>><<replace "#foreskin">>Small.<</replace>><<StartingGirlsCost>><</link>> |
-<<link "Normal">><<set $activeSlave.foreskin = 3>><<replace "#foreskin">>Normal.<</replace>><<StartingGirlsCost>><</link>> |
-<<link "Large">><<set $activeSlave.foreskin = 4>><<replace "#foreskin">>Large.<</replace>><<StartingGirlsCost>><</link>> |
-<<link "Massive">><<set $activeSlave.foreskin = 5>><<replace "#foreskin">>Massive.<</replace>><<StartingGirlsCost>><</link>>
-<br>''Testicles:''
-<span id="balls">
-<<if $activeSlave.balls == 0>>None.
-<<elseif $activeSlave.balls == 1>>Vestigial.
-<<elseif $activeSlave.balls == 2>>Small.
-<<elseif $activeSlave.balls == 3>>Normal.
-<<elseif $activeSlave.balls == 4>>Large.
-<<else>>Massive.<</if>>
-</span>
-<<link "No testicles">><<set $activeSlave.balls = 0,$activeSlave.pubertyXY = 0,$activeSlave.pubertyAgeXY = $potencyAge>><<replace "#balls">>None.<</replace>><<StartingGirlsCost>><</link>> |
-<<link "Vestigial">><<set $activeSlave.balls = 1>><<replace "#balls">>Vestigial.<</replace>><<StartingGirlsCost>><</link>> |
-<<link "Small">><<set $activeSlave.balls = 2>><<replace "#balls">>Small.<</replace>><<StartingGirlsCost>><</link>> |
-<<link "Normal">><<set $activeSlave.balls = 3>><<replace "#balls">>Normal.<</replace>><<StartingGirlsCost>><</link>> |
-<<link "Large">><<set $activeSlave.balls = 4>><<replace "#balls">>Large.<</replace>><<StartingGirlsCost>><</link>> |
-<<link "Massive">><<set $activeSlave.balls = 5>><<replace "#balls">>Massive.<</replace>><<StartingGirlsCost>><</link>>
-&nbsp;&nbsp;&nbsp;&nbsp;''Puberty:''<<textbox "$activeSlave.pubertyAgeXY" $activeSlave.pubertyAgeXY "Starting Girls">>
-<<if $activeSlave.balls > 0>>
-&nbsp;&nbsp;&nbsp;&nbsp;''Ballsack:''
-<span id="scrotum">
-<<if $activeSlave.scrotum == 0>>None.
-<<elseif $activeSlave.scrotum == 1>>Tiny.
-<<elseif $activeSlave.scrotum == 2>>Small.
-<<elseif $activeSlave.scrotum == 3>>Normal.
-<<elseif $activeSlave.scrotum == 4>>Large.
-<<else>>Massive.<</if>>
-</span>
-<<link "None">><<set $activeSlave.scrotum = 0>><<replace "#scrotum">>None.<</replace>><<StartingGirlsCost>><</link>> |
-<<link "Tiny">><<set $activeSlave.scrotum = 1>><<replace "#scrotum">>Tiny.<</replace>><<StartingGirlsCost>><</link>> |
-<<link "Small">><<set $activeSlave.scrotum = 2>><<replace "#scrotum">>Small.<</replace>><<StartingGirlsCost>><</link>> |
-<<link "Normal">><<set $activeSlave.scrotum = 3>><<replace "#scrotum">>Normal.<</replace>><<StartingGirlsCost>><</link>> |
-<<link "Large">><<set $activeSlave.scrotum = 4>><<replace "#scrotum">>Large.<</replace>><<StartingGirlsCost>><</link>> |
-<<link "Massive">><<set $activeSlave.scrotum = 5>><<replace "#scrotum">>Massive.<</replace>><<StartingGirlsCost>><</link>>
-<br>''Puberty:''
-<span id="Mpub">
-<<if $activeSlave.pubertyXY == 1>>Postpubescent.
-<<else>>Prepubescent.
-<</if>>
-</span>
-<<link "Postpubescent">><<set $activeSlave.pubertyXY = 1>><<replace "#Mpub">>Postpubescent.<</replace>><<StartingGirlsCost>><</link>> | <<link "Prepubescent">><<set $activeSlave.pubertyXY = 0,$activeSlave.pubertyAgeXY = $potencyAge>><<replace "#Mpub">>Prepubescent.<</replace>><<StartingGirlsCost>><</link>>
-<</if>>
-<</if>>
+	<br>''Penis:''
+	<span id="dick">
+	<<if $activeSlave.dick == 0>>None.
+	<<elseif $activeSlave.dick == 1>>Tiny.
+	<<elseif $activeSlave.dick == 2>>Small.
+	<<elseif $activeSlave.dick == 3>>Normal.
+	<<elseif $activeSlave.dick == 4>>Large.
+	<<else>>Massive.<</if>>
+	</span>
+	<<link "No penis">><<set $activeSlave.dick = 0,$activeSlave.balls = 0,$activeSlave.clit = 0,$activeSlave.pubertyXY = 0,$activeSlave.pubertyAgeXY = $potencyAge>><<replace "#dick">>None.<</replace>><<StartingGirlsCost>><</link>> |
+	<<link "Tiny">><<set $activeSlave.dick = 1,$activeSlave.clit = 0>><<replace "#dick">>Tiny.<</replace>><<StartingGirlsCost>><</link>> |
+	<<link "Small">><<set $activeSlave.dick = 2,$activeSlave.clit = 0>><<replace "#dick">>Small.<</replace>><<StartingGirlsCost>><</link>> |
+	<<link "Normal">><<set $activeSlave.dick = 3,$activeSlave.clit = 0>><<replace "#dick">>Normal.<</replace>><<StartingGirlsCost>><</link>> |
+	<<link "Large">><<set $activeSlave.dick = 4,$activeSlave.clit = 0>><<replace "#dick">>Large.<</replace>><<StartingGirlsCost>><</link>> |
+	<<link "Massive">><<set $activeSlave.dick = 5,$activeSlave.clit = 0>><<replace "#dick">>Massive.<</replace>><<StartingGirlsCost>><</link>>
+	<<if $activeSlave.dick > 0>>
+		&nbsp;&nbsp;&nbsp;&nbsp;''Foreskin:''
+		<span id="foreskin">
+		<<if $activeSlave.foreskin == 0>>None.
+		<<elseif $activeSlave.foreskin == 1>>Tiny.
+		<<elseif $activeSlave.foreskin == 2>>Small.
+		<<elseif $activeSlave.foreskin == 3>>Normal.
+		<<elseif $activeSlave.foreskin == 4>>Large.
+		<<else>>Massive.<</if>>
+		</span>
+		<<if $seeCircumcision == 1>><<link "Circumcised">><<set $activeSlave.foreskin = 0>><<replace "#foreskin">>None.<</replace>><<StartingGirlsCost>><</link>> |<</if>>
+		<<link "Tiny">><<set $activeSlave.foreskin = 1>><<replace "#foreskin">>Tiny.<</replace>><<StartingGirlsCost>><</link>> |
+		<<link "Small">><<set $activeSlave.foreskin = 2>><<replace "#foreskin">>Small.<</replace>><<StartingGirlsCost>><</link>> |
+		<<link "Normal">><<set $activeSlave.foreskin = 3>><<replace "#foreskin">>Normal.<</replace>><<StartingGirlsCost>><</link>> |
+		<<link "Large">><<set $activeSlave.foreskin = 4>><<replace "#foreskin">>Large.<</replace>><<StartingGirlsCost>><</link>> |
+		<<link "Massive">><<set $activeSlave.foreskin = 5>><<replace "#foreskin">>Massive.<</replace>><<StartingGirlsCost>><</link>>
+	<</if>>
+	<br>''Testicles:''
+	<span id="balls">
+	<<if $activeSlave.balls == 0>>None.
+	<<elseif $activeSlave.balls == 1>>Vestigial.
+	<<elseif $activeSlave.balls == 2>>Small.
+	<<elseif $activeSlave.balls == 3>>Normal.
+	<<elseif $activeSlave.balls == 4>>Large.
+	<<else>>Massive.<</if>>
+	</span>
+	<<link "No testicles">><<set $activeSlave.balls = 0,$activeSlave.pubertyXY = 0,$activeSlave.pubertyAgeXY = $potencyAge>><<replace "#balls">>None.<</replace>><<StartingGirlsCost>><</link>> |
+	<<link "Vestigial">><<set $activeSlave.balls = 1>><<replace "#balls">>Vestigial.<</replace>><<StartingGirlsCost>><</link>> |
+	<<link "Small">><<set $activeSlave.balls = 2>><<replace "#balls">>Small.<</replace>><<StartingGirlsCost>><</link>> |
+	<<link "Normal">><<set $activeSlave.balls = 3>><<replace "#balls">>Normal.<</replace>><<StartingGirlsCost>><</link>> |
+	<<link "Large">><<set $activeSlave.balls = 4>><<replace "#balls">>Large.<</replace>><<StartingGirlsCost>><</link>> |
+	<<link "Massive">><<set $activeSlave.balls = 5>><<replace "#balls">>Massive.<</replace>><<StartingGirlsCost>><</link>>
+	&nbsp;&nbsp;&nbsp;&nbsp;''Puberty:''<<textbox "$activeSlave.pubertyAgeXY" $activeSlave.pubertyAgeXY "Starting Girls">>
+	<<if $activeSlave.balls > 0>>
+		&nbsp;&nbsp;&nbsp;&nbsp;''Ballsack:''
+		<span id="scrotum">
+		<<if $activeSlave.scrotum == 0>>None.
+		<<elseif $activeSlave.scrotum == 1>>Tiny.
+		<<elseif $activeSlave.scrotum == 2>>Small.
+		<<elseif $activeSlave.scrotum == 3>>Normal.
+		<<elseif $activeSlave.scrotum == 4>>Large.
+		<<else>>Massive.<</if>>
+		</span>
+		<<link "None">><<set $activeSlave.scrotum = 0>><<replace "#scrotum">>None.<</replace>><<StartingGirlsCost>><</link>> |
+		<<link "Tiny">><<set $activeSlave.scrotum = 1>><<replace "#scrotum">>Tiny.<</replace>><<StartingGirlsCost>><</link>> |
+		<<link "Small">><<set $activeSlave.scrotum = 2>><<replace "#scrotum">>Small.<</replace>><<StartingGirlsCost>><</link>> |
+		<<link "Normal">><<set $activeSlave.scrotum = 3>><<replace "#scrotum">>Normal.<</replace>><<StartingGirlsCost>><</link>> |
+		<<link "Large">><<set $activeSlave.scrotum = 4>><<replace "#scrotum">>Large.<</replace>><<StartingGirlsCost>><</link>> |
+		<<link "Massive">><<set $activeSlave.scrotum = 5>><<replace "#scrotum">>Massive.<</replace>><<StartingGirlsCost>><</link>>
+		<br>''Puberty:''
+		<span id="Mpub">
+		<<if $activeSlave.pubertyXY == 1>>Postpubescent.
+		<<else>>Prepubescent.
+		<</if>>
+		</span>
+		<<link "Postpubescent">><<set $activeSlave.pubertyXY = 1>><<replace "#Mpub">>Postpubescent.<</replace>><<StartingGirlsCost>><</link>> | <<link "Prepubescent">><<set $activeSlave.pubertyXY = 0,$activeSlave.pubertyAgeXY = $potencyAge>><<replace "#Mpub">>Prepubescent.<</replace>><<StartingGirlsCost>><</link>>
+	<</if>>
 <</if>>
 </span>
 
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index a8c5b9a30b5245302c2737f42df1d6ffeb944c96..60d53ffac0390ffa1c8bf31e56358c62d2e721e6 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -26,7 +26,7 @@ A 1% interest in $arcologies[0].name is worth ¤$price and will require a transa
 	[[Buy|Manage Arcology][$cash -= $price+10000, $arcologies[0].ownership += 1, $arcologies[0].demandFactor += 5]]
 	<<if $arcologies[0].ownership+$arcologies[0].minority <= 90>>
 	<<if $cash > $price*10>>
-		[[x10|Manage Arcology][$cash -= ($price*10)+10000, $arcologies[0].ownership += 10, $arcologies[0].demandFactor += 50]]
+		| [[10%|Manage Arcology][$cash -= ($price*10)+10000, $arcologies[0].ownership += 10, $arcologies[0].demandFactor += 50]]
 		//Transaction costs will only be paid once//
 	<</if>>
 	<</if>>
@@ -34,7 +34,7 @@ A 1% interest in $arcologies[0].name is worth ¤$price and will require a transa
 <<if $arcologies[0].ownership > 0>>
 	[[Sell|Manage Arcology][$cash += $price, $arcologies[0].ownership -= 1, $arcologies[0].demandFactor -= 5]]
 	<<if $arcologies[0].ownership >= 10>>
-		| [[Sell 10%|Manage Arcology][$cash += $price*10, $arcologies[0].ownership -= 10, $arcologies[0].demandFactor -= 50]]
+		| [[10%|Manage Arcology][$cash += $price*10, $arcologies[0].ownership -= 10, $arcologies[0].demandFactor -= 50]]
 	<</if>>
 <</if>>
 <<if $arcologies[0].ownership+$arcologies[0].minority < 100>>
diff --git a/src/uncategorized/neighborInteract.tw b/src/uncategorized/neighborInteract.tw
index e2f9f61d7a8a231ec53303b781a462a8e10ad6b1..5f44caf3aa93be523390c0a4168d3356ce35ac3b 100644
--- a/src/uncategorized/neighborInteract.tw
+++ b/src/uncategorized/neighborInteract.tw
@@ -171,7 +171,7 @@ A 1% interest in $activeArcology.name is worth ¤$seed and will require a transa
 	[[Buy|Neighbor Interact][$buyArcologyDirection = $activeArcology.direction, $transaction = 1]]
 	<<if ($activeArcology.ownership + $activeArcology.PCminority + $activeArcology.minority <= 90)>>
 	<<if $cash > 10*($seed)>>
-		[[Buy 10%|Neighbor Interact][$buyArcologyDirection = $activeArcology.direction, $transaction = 10]]
+		| [[10%|Neighbor Interact][$buyArcologyDirection = $activeArcology.direction, $transaction = 10]]
 		//Transaction costs will only be paid once//
 	<</if>>
 	<</if>>
@@ -180,7 +180,7 @@ A 1% interest in $activeArcology.name is worth ¤$seed and will require a transa
 <<if $activeArcology.PCminority > 0>>
 	[[Sell|Neighbor Interact][$sellArcologyDirection = $activeArcology.direction, $transaction = 1]]
 	<<if $activeArcology.PCminority >= 10>>
-		| [[Sell 10%|Neighbor Interact][$sellArcologyDirection = $activeArcology.direction, $transaction = 10]]
+		| [[10%|Neighbor Interact][$sellArcologyDirection = $activeArcology.direction, $transaction = 10]]
 	<</if>>
 <</if>>
 <br>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index c590170cc1fe6db853ec69a5de73c94412e0ac7e..740610e989b5a47d25ca7c9f757dc7e35dd68846 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -11,7 +11,7 @@
 		<<silently>><<include "SA chooses own clothes">><</silently>>
 		<<set _Slave = $slaves[_i]>>
 	<</if>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
 	<<if "be your Head Girl" == _Slave.assignment>>''HG''
 	<<elseif "recruit girls" == _Slave.assignment>>''RC''
 	<<elseif "guard you" == _Slave.assignment>>''BG''
@@ -20,29 +20,29 @@
 	<<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 <<case "Personal Attention Select">>
 	<<if (_Slave.assignmentVisible != 1) || (_Slave.fuckdoll > 0)>><<continue>><</if>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
 	<<print "[[_Slave.slaveName|Personal Attention Select][$personalAttention = $slaves["+_i+"].ID, $activeSlave = $slaves["+_i+"], $personalAttentionChanged = 1]]">>
 <<case "Agent Select">>
 <<if (_Slave.assignmentVisible == 1) && (_Slave.fuckdoll == 0) && (_Slave.assignment != "guard you") && (_Slave.assignment != "recruit girls") && (_Slave.assignment != "be your Head Girl") && (_Slave.devotion >= 20) && (_Slave.intelligence > 0) && (_Slave.intelligenceImplant > 0) && canWalk(_Slave) && canSee(_Slave) && canTalk(_Slave) && _Slave.pregType < 50 && _Slave.breedingMark != 1>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Agent Workaround][$i = "+_i+"]]">>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Agent Workaround][$i = "+_i+"]]">>
 <<else>>
 	<<continue>>
 <</if>>
 <<case "BG Select">>
 <<if (_Slave.assignmentVisible == 1) && (_Slave.fuckdoll == 0) && (_Slave.devotion > 50) && (_Slave.assignment != "guard you") && (_Slave.assignment != "recruit girls") && (_Slave.assignment != "be your Head Girl") && canWalk(_Slave) && canSee(_Slave) && _Slave.breedingMark != 1>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Bodyguard Workaround][$i = "+_i+"]]">>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Bodyguard Workaround][$i = "+_i+"]]">>
 <<else>>
 	<<continue>>
 <</if>>
 <<case "Recruiter Select">>
 <<if (_Slave.assignmentVisible == 1) && (_Slave.fuckdoll == 0) && (_Slave.devotion > 50) && (_Slave.assignment != "guard you") && (_Slave.assignment != "recruit girls") && (_Slave.assignment != "be your Head Girl") && canWalk(_Slave) && canSee(_Slave) && canTalk(_Slave)>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Recruiter Workaround][$i = "+_i+"]]">>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Recruiter Workaround][$i = "+_i+"]]">>
 <<else>>
 	<<continue>>
 <</if>>
 <<case "HG Select">>
 <<if (_Slave.assignmentVisible == 1) && (_Slave.fuckdoll == 0) && (_Slave.devotion > 50) && (_Slave.assignment != "guard you") && (_Slave.assignment != "recruit girls") && (_Slave.assignment != "be your Head Girl") && canWalk(_Slave) && canSee(_Slave) && canTalk(_Slave)>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|HG Workaround][$i = "+_i+"]]">>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|HG Workaround][$i = "+_i+"]]">>
 <<else>>
 	<<continue>>
 <</if>>
@@ -50,7 +50,7 @@
 <<if _Slave.fuckdoll > 0>><<continue>><</if>>
 <<if $Flag == 0>>
 	<<if (_Slave.assignmentVisible == 1) && (_Slave.assignment != "be your Head Girl") && (_Slave.indentureRestrictions <= 0) && _Slave.breedingMark != 1>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 	<<else>>
 		<<continue>>
 	<</if>>
@@ -58,12 +58,12 @@
 	<<if _Slave.assignment != "live with your Head Girl">>
 		<<continue>>
 	<<else>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 	<</if>>
 <</if>>
 <<case "Subordinate Targeting">>
 <<if (_Slave.devotion >= -20) && (_Slave.fuckdoll == 0) && ($activeSlave.ID != _Slave.ID)>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Subordinate Targeting][$activeSlave.subTarget = $slaves["+_i+"].ID]]">>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Subordinate Targeting][$activeSlave.subTarget = $slaves["+_i+"].ID]]">>
 <<else>>
 	<<continue>>
 <</if>>
@@ -73,7 +73,7 @@
 	<<if _Slave.assignment == "rest in the spa">><<continue>><</if>>
 	<<if (_Slave.health < 20) || (_Slave.trust < 60) || (_Slave.devotion <= 60) || (_Slave.fetish == "mindbroken")>>
 	<<if _Slave.devotion >= -20  || _Slave.fetish == "mindbroken">>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 	<<else>>
 		<br>//_Slave.slaveName cannot be trusted in the spa//
 		<<continue>>
@@ -86,18 +86,18 @@
 	<<if _Slave.assignment != "rest in the spa">>
 		<<continue>>
 	<<else>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 	<</if>>
 <<else>>
 	<<if _Slave.ID != $Attendant.ID>>
 		<<continue>>
 	<<else>>
-		<<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+		<<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 	<</if>>
 <</if>>
 <<case "Attendant Select">>
 <<if (_Slave.assignmentVisible == 1) && (_Slave.fuckdoll == 0) && (_Slave.devotion > 50) && canWalk(_Slave)>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Attendant Workaround][$i = "+_i+"]]">>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Attendant Workaround][$i = "+_i+"]]">>
 <<else>>
 	<<continue>>
 <</if>>
@@ -107,7 +107,7 @@
 	<<if _Slave.assignment == "work in the brothel">><<continue>><</if>>
 	<<if _Slave.breedingMark != 1>>
 	<<if (_Slave.devotion > 50) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50) || (_Slave.trust > 50)>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves[" + _i + "]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves[" + _i + "]]]">>
 	<<else>>
 		<br>//_Slave.slaveName must be either more fearful of you or devoted to you//
 		<<continue>>
@@ -120,18 +120,18 @@
 	<<if _Slave.assignment != "work in the brothel">>
 		<<continue>>
 	<<else>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 	<</if>>
 <<else>>
 	<<if _Slave.ID != $Madam.ID>>
 		<<continue>>
 	<<else>>
-		<<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+		<<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 	<</if>>
 <</if>>
 <<case "Madam Select">>
 <<if (_Slave.assignmentVisible == 1) && (_Slave.fuckdoll == 0) && (_Slave.devotion > 50) && (_Slave.intelligence > -2) && canWalk(_Slave) && canSee(_Slave) && _Slave.breedingMark != 1>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Madam Workaround][$i = "+_i+"]]">>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Madam Workaround][$i = "+_i+"]]">>
 <<else>>
 	<<continue>>
 <</if>>
@@ -141,7 +141,7 @@
 	<<if _Slave.assignment == "serve in the club">><<continue>><</if>>
 	<<if _Slave.breedingMark != 1>>
 	<<if (_Slave.devotion > 50) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50) || (_Slave.trust > 50)>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 	<<else>>
 		<br>//_Slave.slaveName must be either more fearful of you or devoted to you//
 		<<continue>>
@@ -154,18 +154,18 @@
 	<<if _Slave.assignment != "serve in the club">>
 		<<continue>>
 	<<else>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 	<</if>>
 <<else>>
 	<<if _Slave.ID != $DJ.ID>>
 		<<continue>>
 	<<else>>
-		<<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+		<<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 	<</if>>
 <</if>>
 <<case "DJ Select">>
 <<if (_Slave.assignmentVisible == 1) && (_Slave.fuckdoll == 0) && (_Slave.devotion > 50) && (_Slave.intelligence > -2) && canWalk(_Slave) && _Slave.breedingMark != 1>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|DJ Workaround][$i = "+_i+"]]">>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|DJ Workaround][$i = "+_i+"]]">>
 <<else>>
 	<<continue>>
 <</if>>
@@ -174,7 +174,7 @@
 <<if $Flag == 0>>
 	<<if _Slave.assignment == "get treatment in the clinic">><<continue>><</if>>
 	<<if (_Slave.health < 20) || ((_Slave.chem > 15) && ($clinicUpgradeFilters == 1)) || ((_Slave.bellyImplant > 100) && ($bellyImplants == 1)) || _Slave.preg > 1>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 	<<else>>
 		<br>//_Slave.slaveName cannot benefit from the clinic//
 		<<continue>>
@@ -183,18 +183,18 @@
 	<<if _Slave.assignment != "get treatment in the clinic">>
 		<<continue>>
 	<<else>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 	<</if>>
 <<else>>
 	<<if _Slave.ID != $Nurse.ID>>
 		<<continue>>
 	<<else>>
-		<<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+		<<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 	<</if>>
 <</if>>
 <<case "Nurse Select">>
 <<if (_Slave.assignmentVisible == 1) && (_Slave.fuckdoll == 0) && (_Slave.devotion > 50) && canWalk(_Slave) && canSee(_Slave)>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Nurse Workaround][$i = "+_i+"]]">>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Nurse Workaround][$i = "+_i+"]]">>
 <<else>>
 	<<continue>>
 <</if>>
@@ -204,7 +204,7 @@
 	<<if _Slave.assignment == "learn in the schoolroom">><<continue>><</if>>
 	<<if (_Slave.devotion >= -20) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50)>>
 		<<if (_Slave.intelligenceImplant < 1) || (_Slave.accent+$schoolroomUpgradeLanguage > 2) || (_Slave.oralSkill <= 10) || (_Slave.whoreSkill <= 10) || (_Slave.entertainSkill <= 10) || (_Slave.analSkill < 1) || ((_Slave.vaginalSkill < 1) && (_Slave.vagina > 0))>>
-			<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+			<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 		<<else>>
 			<br>//_Slave.slaveName already has a basic education//
 			<<continue>>
@@ -217,18 +217,18 @@
 	<<if _Slave.assignment != "learn in the schoolroom">>
 		<<continue>>
 	<<else>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 	<</if>>
 <<else>>
 	<<if _Slave.ID != $Schoolteacher.ID>>
 		<<continue>>
 	<<else>>
-		<<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+		<<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 	<</if>>
 <</if>>
 <<case "Schoolteacher Select">>
 <<if (_Slave.assignmentVisible == 1) && (_Slave.fuckdoll == 0) && (_Slave.devotion > 50) && canTalk(_Slave) && canWalk(_Slave) && canSee(_Slave)>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Schoolteacher Workaround][$i = "+_i+"]]">>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Schoolteacher Workaround][$i = "+_i+"]]">>
 <<else>>
 	<<continue>>
 <</if>>
@@ -253,7 +253,7 @@
 			<<if (_Slave.devotion > 20) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) ||  (_Slave.trust < -50) || (_Slave.amp == 1) || ($dairyRestraintsUpgrade == 1)>>
 				<<if ($dairyStimulatorsSetting < 2) || (_Slave.anus > 2) || ($dairyPrepUpgrade == 1)>>
 					<<if ($dairyPregSetting < 2) || (_Slave.vagina > 2) || (_Slave.ovaries == 0) || ($dairyPrepUpgrade == 1)>>
-						<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+						<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 						<<else>>
 							<br>//_Slave.slaveName's vagina cannot accommodate current machine settings//
 							<<continue>>
@@ -278,18 +278,18 @@
 	<<if _Slave.assignment != "work in the dairy">>
 		<<continue>>
 	<<else>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 	<</if>>
 <<else>>
 	<<if _Slave.ID != $Milkmaid.ID>>
 		<<continue>>
 	<<else>>
-		<<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+		<<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 	<</if>>
 <</if>>
 <<case "Milkmaid Select">>
 <<if (_Slave.assignmentVisible == 1) && (_Slave.fuckdoll == 0) && (_Slave.devotion > 20) && canWalk(_Slave) && canSee(_Slave)>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Milkmaid Workaround][$i = "+_i+"]]">>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Milkmaid Workaround][$i = "+_i+"]]">>
 <<else>>
 	<<continue>>
 <</if>>
@@ -298,7 +298,7 @@
 <<if $Flag == 0>>
 	<<if _Slave.assignment == "work as a servant">><<continue>><</if>>
 	<<if (_Slave.devotion >= -20) || ((_Slave.devotion >= -50) && (_Slave.trust <= 20)) || (_Slave.trust < -20)>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 	<<else>>
 		<br>//_Slave.slaveName must be either more fearful of you or devoted to you//
 		<<continue>>
@@ -307,18 +307,18 @@
 	<<if _Slave.assignment != "work as a servant">>
 		<<continue>>
 	<<else>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 	<</if>>
 <<else>>
 	<<if _Slave.ID != $Stewardess.ID>>
 		<<continue>>
 	<<else>>
-		<<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+		<<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 	<</if>>
 <</if>>
 <<case "Stewardess Select">>
 <<if (_Slave.assignmentVisible == 1) && (_Slave.fuckdoll == 0) && (_Slave.devotion > 50) && (_Slave.intelligence > -2) && canWalk(_Slave) && canSee(_Slave)>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Stewardess Workaround][$i = "+_i+"]]">>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Stewardess Workaround][$i = "+_i+"]]">>
 <<else>>
 	<<continue>>
 <</if>>
@@ -326,7 +326,7 @@
 <<if $Flag == 0>>
 	<<if _Slave.assignment == "serve in the master suite">><<continue>><</if>>
 	<<if (_Slave.devotion > 20) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50)>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves[" + _i + "]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves[" + _i + "]]]">>
 	<<else>>
 		<br>//_Slave.slaveName is not sufficiently broken for the master suite//
 		<<continue>>
@@ -335,26 +335,26 @@
 	<<if _Slave.assignment != "serve in the master suite">>
 		<<continue>>
 	<<else>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
 		<<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 	<</if>>
 <<else>>
 	<<if _Slave.ID != $Concubine.ID>>
 		<<continue>>
 	<<else>>
-		<<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+		<<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 	<</if>>
 <</if>>
 <<case "Concubine Select">>
 <<if (_Slave.assignmentVisible == 1) && (_Slave.fuckdoll == 0) && (_Slave.devotion > 50) && _Slave.amp != 1>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Concubine Workaround][$i = "+_i+"]]">>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Concubine Workaround][$i = "+_i+"]]">>
 <<else>>
 	<<continue>>
 <</if>>
 <<case "Cellblock">>
 <<if $Flag == 0>>
 	<<if (_Slave.assignment != "be confined in the cellblock") && ((_Slave.devotion < -20) && (_Slave.trust >= -20)) || ((_Slave.devotion < -50) && (_Slave.trust >= -50))>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 	<<else>>
 		<<continue>>
 	<</if>>
@@ -362,18 +362,18 @@
 	<<if _Slave.assignment != "be confined in the cellblock">>
 		<<continue>>
 	<<else>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 	<</if>>
 <<else>>
 	<<if _Slave.ID != $Wardeness.ID>>
 		<<continue>>
 	<<else>>
-		<<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+		<<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 	<</if>>
 <</if>>
 <<case "Wardeness Select">>
 <<if (_Slave.assignmentVisible == 1) && (_Slave.fuckdoll == 0) && (_Slave.devotion > 50) && canWalk(_Slave) & canSee(_Slave)>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
 	<<print "[[_Slave.slaveName|Wardeness Workaround][$i = "+_i+"]]">>
 <<else>>
 	<<continue>>
@@ -383,7 +383,7 @@
 	<<if (_Slave.assignmentVisible != 1) || (($arcade <= $arcadeSlaves) && ($arcadeUpgradeFuckdolls != 1))>><<continue>><</if>>
 	<<if _Slave.breedingMark != 1>>
 	<<if (_Slave.indentureRestrictions <= 0)>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 	<<else>>
 		<br>//_Slave.slaveName's indenture forbids arcade service.//
 		<<continue>>
@@ -396,7 +396,7 @@
 	<<if _Slave.assignment != "be confined in the arcade">>
 		<<continue>>
 	<<else>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 	<</if>>
 <</if>>
 <<case "Pit">>
@@ -416,7 +416,7 @@
 			<<if ($fighterIDs.includes(_Slave.ID))>>
 				<<continue>>
 			<<else>>
-				<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Assign][$i = "+_i+"]]">>
+				<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Assign][$i = "+_i+"]]">>
 			<</if>>
 		<<else>>
 			<<continue>>
@@ -426,7 +426,7 @@
 	<</if>>
 <<else>>
 	<<if $fighterIDs.includes(_Slave.ID)>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Retrieve][$i = "+_i+"]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Retrieve][$i = "+_i+"]]">>
 	<<else>>
 		<<continue>>
 	<</if>>
@@ -435,7 +435,7 @@
 <<if _Slave.fuckdoll > 0>><<continue>><</if>>
 <<if $Flag == 0>>
 	<<if canWalk(_Slave) && ($Lurcher.ID != _Slave.ID)>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Assign][$i = "+_i+"]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Assign][$i = "+_i+"]]">>
 	<<else>>
 		<<continue>>
 	<</if>>
@@ -443,7 +443,7 @@
 	<<if $Lurcher.ID != _Slave.ID>>
 		<<continue>>
 	<<else>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Retrieve][$i = "+_i+"]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Retrieve][$i = "+_i+"]]">>
 	<</if>>
 <</if>>
 <<case "New Game Plus">>
@@ -494,7 +494,7 @@
 <</if>>
 <<case "Matchmaking">>
 	<<if ($slaves[_i].assignmentVisible != 1) || ($slaves[_i].devotion < 100) || ($slaves[_i].relationship != $activeSlave.relationship) || ($slaves[_i].ID == $activeSlave.ID)>><<continue>><</if>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 <</switch>>
 
 <<set _Slave.energy = Math.clamp(_Slave.energy, 0, 100)>>
@@ -3207,7 +3207,7 @@ _Slave.faceShape face.
 	<<continue>>
 <<case "HG Select">>
 <<if $HGCareers.includes(_Slave.career)>>
-	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
+	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has applicable career experience.@@
 <</if>>
 <<case "Head Girl Suite">>
 <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
@@ -3219,11 +3219,11 @@ _Slave.faceShape face.
 <</if>>
 <<case "Recruiter Select">>
 <<if $recruiterCareers.includes(_Slave.career)>>
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;@@color:lime;Has an applicable career experience.@@
+	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has applicable career experience.@@
 <</if>>
 <<case "BG Select">>
 <<if $bodyguardCareers.includes(_Slave.career)>>
-	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
+	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has applicable career experience.@@
 <</if>>
 <<case "Spa">>
 <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
@@ -3237,7 +3237,7 @@ _Slave.faceShape face.
 <</if>>
 <<case "Attendant Select">>
 <<if $attendantCareers.includes(_Slave.career)>>
-	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
+	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has applicable career experience.@@
 <</if>>
 <<case "Brothel">>
 <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
@@ -3251,7 +3251,7 @@ _Slave.faceShape face.
 <</if>>
 <<case "Madam Select">>
 <<if $madamCareers.includes(_Slave.career)>>
-	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
+	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has applicable career experience.@@
 <</if>>
 <<case "Club">>
 <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
@@ -3272,7 +3272,7 @@ _Slave.faceShape face.
 <</if>>
 <<case "DJ Select">>
 <<if $DJCareers.includes(_Slave.career)>>
-	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
+	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has applicable career experience.@@
 <</if>>
 <<case "Clinic">>
 <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
@@ -3289,7 +3289,7 @@ _Slave.faceShape face.
 <</if>>
 <<case "Nurse Select">>
 <<if $nurseCareers.includes(_Slave.career)>>
-	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
+	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has applicable career experience.@@
 <</if>>
 <<case "Schoolroom">>
 <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
@@ -3303,7 +3303,7 @@ _Slave.faceShape face.
 <</if>>
 <<case "Schoolteacher Select">>
 <<if $schoolteacherCareers.includes(_Slave.career)>>
-	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
+	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has applicable career experience.@@
 <</if>>
 <<case "Dairy">>
 <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
@@ -3317,7 +3317,7 @@ _Slave.faceShape face.
 <</if>>
 <<case "Milkmaid Select">>
 <<if $milkmaidCareers.includes(_Slave.career)>>
-	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
+	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has applicable career experience.@@
 <</if>>
 <<case "Servants' Quarters">>
 <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
@@ -3331,7 +3331,7 @@ _Slave.faceShape face.
 <</if>>
 <<case "Stewardess Select">>
 <<if $stewardessCareers.includes(_Slave.career)>>
-	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
+	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has applicable career experience.@@
 <</if>>
 <<case "Master Suite">>
 <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
@@ -3355,7 +3355,7 @@ _Slave.faceShape face.
 <</if>>
 <<case "Wardeness Select">>
 <<if $wardenessCareers.includes(_Slave.career)>>
-	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
+	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has applicable career experience.@@
 <</if>>
 <<case "New Game Plus">>
 	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
diff --git a/src/utility/artWidgets.tw b/src/utility/artWidgets.tw
index a736ed18d6db1dd36cbb71b828780bc65950c364..c994de732f0e4624d165c21576b3eff5009db72a 100644
--- a/src/utility/artWidgets.tw
+++ b/src/utility/artWidgets.tw
@@ -360,14 +360,6 @@ $args[2]: icon UI Display for vector art, 1 for on.
 	<<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/boob " +_boobSize +".svg'" + "/></object>">>
 	<<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/boob " +_boobSize + " areola.svg'" + "/></object>">>
 <</if>>
-<<if $args[0].nipplesPiercing == 1>>
-	<<print "<object type='image/svg+xml' data=" + _folderLoc + "/body/addon/boob " +_boobSize +" piercing.svg'" + "/></object>">>
-<<elseif $args[0].nipplesPiercing == 2>>
-	<<print "<object type='image/svg+xml' data=" + _folderLoc + "/body/addon/boob " +_boobSize +" piercing heavy.svg'" + "/></object>">>
-<</if>>
-<<if $args[0].areolaePiercing == 1>>
-	<<print "<object type='image/svg+xml' data=" + _folderLoc + "/body/addon/boob " +_boobSize +" areola piercing.svg'" + "/></object>">>
-<</if>>
 
 /% Scrotum %/
 <<if $args[0].scrotum > 0>>
@@ -407,9 +399,6 @@ $args[2]: icon UI Display for vector art, 1 for on.
 <<if $args[0].vagina > 0>>
 	<<if $args[0].dick > 0>>
 		<div class="highPenis">
-		<<if $args[0].scrotum > 0>>
-			<<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/ball " + _ballSize + ".svg'" + "/></object>">>
-		<</if>>
 		<<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/penis " + _penisSize + ".svg'" + "/></object>">>
 
 /* 000-250-006 */
@@ -417,12 +406,12 @@ $args[2]: icon UI Display for vector art, 1 for on.
 /* 000-250-006 */
 
 	<</if>>
+	<<if $args[0].scrotum > 0>>
+		<<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/ball " + _ballSize + ".svg'" + "/></object>">>
+	<</if>>
 <<else>>
 	<<if $args[0].dick > 0>>
 		/*<div class="lowPenis">*/
-		<<if $args[0].scrotum > 0>>
-			<<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/ball " + _ballSize + ".svg'" + "/></object>">>
-		<</if>>
 		<<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/penis " + _penisSize + ".svg'" + "/></object>">>
 
 /* 000-250-006 */
@@ -430,7 +419,20 @@ $args[2]: icon UI Display for vector art, 1 for on.
 /* 000-250-006 */
 
 	<</if>>
+	<<if $args[0].scrotum > 0>>
+		<<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/ball " + _ballSize + ".svg'" + "/></object>">>
+	<</if>>
+<</if>>
+<</if>>
+
+/% piercings %/
+<<if $args[0].nipplesPiercing == 1>>
+	<<print "<object type='image/svg+xml' data=" + _folderLoc + "/body/addon/boob " +_boobSize +" piercing.svg'" + "/></object>">>
+<<elseif $args[0].nipplesPiercing == 2>>
+	<<print "<object type='image/svg+xml' data=" + _folderLoc + "/body/addon/boob " +_boobSize +" piercing heavy.svg'" + "/></object>">>
 <</if>>
+<<if $args[0].areolaePiercing == 1>>
+	<<print "<object type='image/svg+xml' data=" + _folderLoc + "/body/addon/boob " +_boobSize +" areola piercing.svg'" + "/></object>">>
 <</if>>
 
 /% clavicle %/
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 7e462936eac46e4b8a9a883307976f98cb1f247e..2bccf2749166a634ed62472fbd6af96adba7cb15 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -1315,7 +1315,7 @@ $possessiveCap
 		The piercings are tantalizingly visible under the gauze.
 		<</switch>>
 	<</if>>
-	<<if ($activeSlave.brand != 0) && ($activeSlave.brandLocation == "left breast") || ($activeSlave.brandLocation == "right breast") || ($activeSlave.brandLocation == "breasts")>>
+	<<if ($activeSlave.brand != 0) && (($activeSlave.brandLocation == "left breast") || ($activeSlave.brandLocation == "right breast") || ($activeSlave.brandLocation == "breasts"))>>
 		$pronounCap has $activeSlave.brand branded into the flesh of one of $possessive $activeSlave.brandLocation.
 	<</if>>
 	<<switch $activeSlave.boobsTat>>
@@ -2051,7 +2051,7 @@ $pronounCap's got a
 	<<case "Asian art">>
 		Each of $possessive buttocks bears a tattoo of a coiled dragon, advancing meaningfully towards $possessive anus.
 	<</switch>>
-	<<if ($activeSlave.brand != 0) && ($activeSlave.brandLocation == "left buttock") || ($activeSlave.brandLocation == "right buttock") || ($activeSlave.brandLocation == "buttocks") || ($activeSlave.brandLocation == "left thigh") || ($activeSlave.brandLocation == "right thigh") || ($activeSlave.brandLocation == "thighs")>>
+	<<if ($activeSlave.brand != 0) && (($activeSlave.brandLocation == "left buttock") || ($activeSlave.brandLocation == "right buttock") || ($activeSlave.brandLocation == "buttocks") || ($activeSlave.brandLocation == "left thigh") || ($activeSlave.brandLocation == "right thigh") || ($activeSlave.brandLocation == "thighs"))>>
 		$pronounCap has $activeSlave.brand branded into the flesh of $possessive $activeSlave.brandLocation.
 	<</if>>
 	<<switch $activeSlave.legsTat>>
@@ -3823,7 +3823,7 @@ $pronounCap's got a
 
 <<if ($activeSlave.dick > 0) || ($activeSlave.balls > 0)>>
 <<if $activeSlave.prostate == 0>>
-	Though it's not externally apparent, $possessive's prostate has been removed, giving her ejaculations less body<<if $activeSlave.anus != 0>> and reducing the stimulation $pronoun feels during anal sex<</if>>.
+	Though it's not externally apparent, $possessive prostate has been removed, giving her ejaculations less body<<if $activeSlave.anus != 0>> and reducing the stimulation $pronoun feels during anal sex<</if>>.
 <</if>>
 <</if>>
 
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 9d7faf6da760290e2e231680b8f5dd6442cce4cf..65b46bbf0feb3275eab7aa9fd6f970c7a1aeca71 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -369,17 +369,15 @@
 	<</replace>>
 
 	<<replace "#dickblock">>
-		<<if $seeDicks != 0 || $makeDicks == 1>>
-		<br>
-		''Penis:''
+	<<if $seeDicks != 0 || $makeDicks == 1>>
+		<br>''Penis:''
 		<span id="dick">
 		<<if $activeSlave.dick == 0>>None.
 		<<elseif $activeSlave.dick == 1>>Tiny.
 		<<elseif $activeSlave.dick == 2>>Small.
 		<<elseif $activeSlave.dick == 3>>Normal.
 		<<elseif $activeSlave.dick == 4>>Large.
-		<<else>>Massive.
-		<</if>>
+		<<else>>Massive.<</if>>
 		</span>
 		<<link "No penis">><<set $activeSlave.dick = 0,$activeSlave.balls = 0,$activeSlave.clit = 0,$activeSlave.pubertyXY = 0,$activeSlave.pubertyAgeXY = $potencyAge>><<replace "#dick">>None.<</replace>><<StartingGirlsCost>><</link>> |
 		<<link "Tiny">><<set $activeSlave.dick = 1,$activeSlave.clit = 0>><<replace "#dick">>Tiny.<</replace>><<StartingGirlsCost>><</link>> |
@@ -388,24 +386,23 @@
 		<<link "Large">><<set $activeSlave.dick = 4,$activeSlave.clit = 0>><<replace "#dick">>Large.<</replace>><<StartingGirlsCost>><</link>> |
 		<<link "Massive">><<set $activeSlave.dick = 5,$activeSlave.clit = 0>><<replace "#dick">>Massive.<</replace>><<StartingGirlsCost>><</link>>
 		<<if $activeSlave.dick > 0>>
-		&nbsp;&nbsp;&nbsp;&nbsp;
-		''Foreskin:''
-		<span id="foreskin">
-		<<if $activeSlave.foreskin == 0>>None.
-		<<elseif $activeSlave.foreskin == 1>>Tiny.
-		<<elseif $activeSlave.foreskin == 2>>Small.
-		<<elseif $activeSlave.foreskin == 3>>Normal.
-		<<elseif $activeSlave.foreskin == 4>>Large.
-		<<else>>Massive.<</if>>
-		</span>
-		<<if $seeCircumcision == 1>><<link "Circumcised">><<set $activeSlave.foreskin = 0>><<replace "#foreskin">>None.<</replace>><<StartingGirlsCost>><</link>> |<</if>>
-		<<link "Tiny">><<set $activeSlave.foreskin = 1>><<replace "#foreskin">>Tiny.<</replace>><<StartingGirlsCost>><</link>> |
-		<<link "Small">><<set $activeSlave.foreskin = 2>><<replace "#foreskin">>Small.<</replace>><<StartingGirlsCost>><</link>> |
-		<<link "Normal">><<set $activeSlave.foreskin = 3>><<replace "#foreskin">>Normal.<</replace>><<StartingGirlsCost>><</link>> |
-		<<link "Large">><<set $activeSlave.foreskin = 4>><<replace "#foreskin">>Large.<</replace>><<StartingGirlsCost>><</link>> |
-		<<link "Massive">><<set $activeSlave.foreskin = 5>><<replace "#foreskin">>Massive.<</replace>><<StartingGirlsCost>><</link>>
-		<br>
-		''Testicles:''
+			&nbsp;&nbsp;&nbsp;&nbsp;''Foreskin:''
+			<span id="foreskin">
+			<<if $activeSlave.foreskin == 0>>None.
+			<<elseif $activeSlave.foreskin == 1>>Tiny.
+			<<elseif $activeSlave.foreskin == 2>>Small.
+			<<elseif $activeSlave.foreskin == 3>>Normal.
+			<<elseif $activeSlave.foreskin == 4>>Large.
+			<<else>>Massive.<</if>>
+			</span>
+			<<if $seeCircumcision == 1>><<link "Circumcised">><<set $activeSlave.foreskin = 0>><<replace "#foreskin">>None.<</replace>><<StartingGirlsCost>><</link>> |<</if>>
+			<<link "Tiny">><<set $activeSlave.foreskin = 1>><<replace "#foreskin">>Tiny.<</replace>><<StartingGirlsCost>><</link>> |
+			<<link "Small">><<set $activeSlave.foreskin = 2>><<replace "#foreskin">>Small.<</replace>><<StartingGirlsCost>><</link>> |
+			<<link "Normal">><<set $activeSlave.foreskin = 3>><<replace "#foreskin">>Normal.<</replace>><<StartingGirlsCost>><</link>> |
+			<<link "Large">><<set $activeSlave.foreskin = 4>><<replace "#foreskin">>Large.<</replace>><<StartingGirlsCost>><</link>> |
+			<<link "Massive">><<set $activeSlave.foreskin = 5>><<replace "#foreskin">>Massive.<</replace>><<StartingGirlsCost>><</link>>
+		<</if>>
+		<br>''Testicles:''
 		<span id="balls">
 		<<if $activeSlave.balls == 0>>None.
 		<<elseif $activeSlave.balls == 1>>Vestigial.
@@ -420,36 +417,33 @@
 		<<link "Normal">><<set $activeSlave.balls = 3>><<replace "#balls">>Normal.<</replace>><<StartingGirlsCost>><</link>> |
 		<<link "Large">><<set $activeSlave.balls = 4>><<replace "#balls">>Large.<</replace>><<StartingGirlsCost>><</link>> |
 		<<link "Massive">><<set $activeSlave.balls = 5>><<replace "#balls">>Massive.<</replace>><<StartingGirlsCost>><</link>>
-		&nbsp;&nbsp;&nbsp;&nbsp;
-		''Puberty:''<<textbox "$activeSlave.pubertyAgeXY" $activeSlave.pubertyAgeXY "Starting Girls">>
+		&nbsp;&nbsp;&nbsp;&nbsp;''Puberty:''<<textbox "$activeSlave.pubertyAgeXY" $activeSlave.pubertyAgeXY "Starting Girls">>
 		<<if $activeSlave.balls > 0>>
-		&nbsp;&nbsp;&nbsp;&nbsp;
-		''Ballsack:''
-		<span id="scrotum">
-		<<if $activeSlave.scrotum == 0>>None.
-		<<elseif $activeSlave.scrotum == 1>>Tiny.
-		<<elseif $activeSlave.scrotum == 2>>Small.
-		<<elseif $activeSlave.scrotum == 3>>Normal.
-		<<elseif $activeSlave.scrotum == 4>>Large.
-		<<else>>Massive.<</if>>
-		</span>
-		<<link "None">><<set $activeSlave.scrotum = 0>><<replace "#scrotum">>None.<</replace>><<StartingGirlsCost>><</link>> |
-		<<link "Tiny">><<set $activeSlave.scrotum = 1>><<replace "#scrotum">>Tiny.<</replace>><<StartingGirlsCost>><</link>> |
-		<<link "Small">><<set $activeSlave.scrotum = 2>><<replace "#scrotum">>Small.<</replace>><<StartingGirlsCost>><</link>> |
-		<<link "Normal">><<set $activeSlave.scrotum = 3>><<replace "#scrotum">>Normal.<</replace>><<StartingGirlsCost>><</link>> |
-		<<link "Large">><<set $activeSlave.scrotum = 4>><<replace "#scrotum">>Large.<</replace>><<StartingGirlsCost>><</link>> |
-		<<link "Massive">><<set $activeSlave.scrotum = 5>><<replace "#scrotum">>Massive.<</replace>><<StartingGirlsCost>><</link>>
-		<br>''Puberty:''
-		<span id="Mpub">
-		<<if $activeSlave.pubertyXY == 1>>Postpubescent.
-		<<else>>Prepubescent.
-		<</if>>
-		</span>
-		<<link "Postpubescent">><<set $activeSlave.pubertyXY = 1>><<replace "#Mpub">>Postpubescent.<</replace>><<StartingGirlsCost>><</link>> | 
-		<<link "Prepubescent">><<set $activeSlave.pubertyXY = 0,$activeSlave.pubertyAgeXY = $potencyAge>><<replace "#Mpub">>Prepubescent.<</replace>><<StartingGirlsCost>><</link>>
-		<</if>>
-		<</if>>
+			&nbsp;&nbsp;&nbsp;&nbsp;''Ballsack:''
+			<span id="scrotum">
+			<<if $activeSlave.scrotum == 0>>None.
+			<<elseif $activeSlave.scrotum == 1>>Tiny.
+			<<elseif $activeSlave.scrotum == 2>>Small.
+			<<elseif $activeSlave.scrotum == 3>>Normal.
+			<<elseif $activeSlave.scrotum == 4>>Large.
+			<<else>>Massive.<</if>>
+			</span>
+			<<link "None">><<set $activeSlave.scrotum = 0>><<replace "#scrotum">>None.<</replace>><<StartingGirlsCost>><</link>> |
+			<<link "Tiny">><<set $activeSlave.scrotum = 1>><<replace "#scrotum">>Tiny.<</replace>><<StartingGirlsCost>><</link>> |
+			<<link "Small">><<set $activeSlave.scrotum = 2>><<replace "#scrotum">>Small.<</replace>><<StartingGirlsCost>><</link>> |
+			<<link "Normal">><<set $activeSlave.scrotum = 3>><<replace "#scrotum">>Normal.<</replace>><<StartingGirlsCost>><</link>> |
+			<<link "Large">><<set $activeSlave.scrotum = 4>><<replace "#scrotum">>Large.<</replace>><<StartingGirlsCost>><</link>> |
+			<<link "Massive">><<set $activeSlave.scrotum = 5>><<replace "#scrotum">>Massive.<</replace>><<StartingGirlsCost>><</link>>
+			<br>''Puberty:''
+			<span id="Mpub">
+			<<if $activeSlave.pubertyXY == 1>>Postpubescent.
+			<<else>>Prepubescent.
+			<</if>>
+			</span>
+			<<link "Postpubescent">><<set $activeSlave.pubertyXY = 1>><<replace "#Mpub">>Postpubescent.<</replace>><<StartingGirlsCost>><</link>> | 
+			<<link "Prepubescent">><<set $activeSlave.pubertyXY = 0,$activeSlave.pubertyAgeXY = $potencyAge>><<replace "#Mpub">>Prepubescent.<</replace>><<StartingGirlsCost>><</link>>
 		<</if>>
+	<</if>>
 	<</replace>>
 
 	<<replace "#prostate">>
@@ -1441,13 +1435,10 @@
 		<<elseif $customSlave.vagina == 0>>Vaginal virgin.
 		<<else>>Normal vagina.
 		<</if>>
-		<<if $customSlave.dick > 0>>
 		<<link "No vagina">>
 			<<set $customSlave.vagina = -1, $customSlave.preg = -2, $customSlave.ovaries = 0>>
 			<<CustomSlaveVagina>>
 		<</link>>
-		<<else>>//No vagina//
-		<</if>>
 	<</replace>>
 <</widget>>