diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index c69c02bacd8beccd34cd50ead42fbdec0cc49f16..42cbed2db3959728ac3be6ccd712c4d2f65d765d 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,11 +2,24 @@
 
 0.10.7.1-0.6.x
 
-8/16/2018
+8/18/2018
 
-	1
+	5
+	-removed deaf chance from standard slavegen
+	-restricted blindness to grateful careers in slavegen
+	-fixes
+
+	4
+	-areolea shape split from size
+	-player b-cups
+	-fixes
+
+8/17/2018
+
+	3
 	-new supremacist and subjugationist PA FS appearances
 	-hearing and deafness added
+	-fixes
 
 0.10.7.1-0.5.x
 
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index a1a148198abc4ba6d117a740d5db3090f69557c5..12a4ea7ab69d78d440494069f52c160265effcb0 100644
--- a/devNotes/twine JS.txt	
+++ b/devNotes/twine JS.txt	
@@ -37,6 +37,8 @@ if (typeof interpolate == "undefined") {
 	window.interpolate = interpolate;
 }
 
+config.history.maxStates = 1;
+
 window.isFullyPotent = function(slave) {
 	if (!slave) {
 		return null;
@@ -1429,9 +1431,9 @@ window.setPregType = function(actor) {
 	var ovum = 1;
 	var fertilityStack = 0;	// adds an increasing bonus roll for stacked fertility drugs
 
-	if(actor.broodmother < 1) { // Broodmothers should be not processed here. Necessary now.
+	if(actor.broodmother < 1) { /* Broodmothers should be not processed here. Necessary now.*/
 		if(typeof actor.readyOva == "number" && actor.readyOva != 0) {
-			ovum = actor.readyOva; //just single override; for delayed impregnation cases 
+			ovum = actor.readyOva;  /*just single override; for delayed impregnation cases */
 		} else if(actor.ID == -1) {
 			if(actor.birthMaster > 0) { // Predisposed to twins
 				if(actor.fertDrugs == 1) {
@@ -5364,7 +5366,7 @@ if(eventSlave.fetish != "mindbroken") {
 	}
 
 	if(eventSlave.boobs > 1200) {
-		if(eventSlave.areolae > 3) {
+		if(eventSlave.areolaeShape != "circle") {
 			if(eventSlave.devotion > 50) {
 				State.variables.RESSevent.push("shaped areolae");
 			}
@@ -6546,7 +6548,7 @@ if(eventSlave.fetish != "mindbroken") {
 	}
 
 	if(eventSlave.boobs > 1200) {
-		if(eventSlave.areolae > 3) {
+		if(eventSlave.areolaeShape != "circle") {
 			if(eventSlave.devotion > 50) {
 				State.variables.RESSevent.push("shaped areolae");
 			}
@@ -11054,20 +11056,6 @@ function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot c
 
 var lastActiveSlave, lastSlaves, lastPC;
 
-/*
-	To use, add something like:
-
-<div id="familyTree"></div>
-	<span id="familyTreeLink">
-		<<link "Pull up the file on her family tree.">>
-		<<replace #familyTreeLink>>
-			<<run renderFamilyTree($slaves, $activeSlave.ID)>>
-		<</replace>>
-	<</link>>
-</span>
-
-*/
-
 window.renderFamilyTree = function(slaves, filterID) {
 
 	var ftreeWidth,ftreeHeight;
@@ -11499,20 +11487,6 @@ window.buildFamilyTree = function(slaves = State.variables.slaves, filterID) {
 	return family_graph;
 };
 
-/*Old version. To use, do something like: 
-<div id="editFamily">
-	<div id="graph"></div>
-</div>
-
-<<run updateFamilyTree($activeSlave, $slaves, $PC)>>
-<script>updateFamilyTree()</script>
-If you want to update the tree, just re-call the run line.
-
-If there's no active slave, you can do:
-
-<<run updateFamilyTree(null, $slaves, $PC)>>
-*/
-
 window.updateFamilyTree = function(activeSlave = lastActiveSlave, slaves = lastSlaves, PC = lastPC) {
 	lastActiveSlave = activeSlave;
 	lastSlaves = slaves;
diff --git a/player variables documentation - Pregmod.txt b/player variables documentation - Pregmod.txt
index 59c033ddc8263cd5d7ade9de8a09c46bfa7372ad..3ff95be197a2fe1271ea69d8f801148eee72a3f9 100644
--- a/player variables documentation - Pregmod.txt	
+++ b/player variables documentation - Pregmod.txt	
@@ -42,11 +42,11 @@ preg:
 
 (uncommon in events)
 How far along the your pregnancy is (pregMood kicks in at 24+ weeks)
--2      menopausal
--1      contraceptives
- 0      not pregnant
+-2		menopausal
+-1		contraceptives
+ 0		not pregnant
  1 - 42 pregnant
- 43+    giving birth
+ 43+	giving birth
  
 pregType: 
 
@@ -67,18 +67,18 @@ belly:
 (uncommon in events)
 how big your belly is in CCs (preg only)
 thresholds
-100    - bloated
-1500   - early pregnancy
-5000   - obviously pregnant
-10000  - very pregnant
-15000  - full term
-30000  - full term twins
-45000  - full term triplets
-60000  - full term quads
-75000  - full term quints
-90000  - full term sextuplets
-105000 - full term septuplets
-120000 - full term octuplets
+100	- bloated
+1500	- early pregnancy
+5000	- obviously pregnant
+10000	- very pregnant
+15000	- full term
+30000	- full term twins
+45000	- full term triplets
+60000	- full term quads
+75000	- full term quints
+90000	- full term sextuplets
+105000	- full term septuplets
+120000	- full term octuplets
 
 mpreg:
 
@@ -118,22 +118,23 @@ boobsBonus:
 
 (rare in events)
 breast size
--1   - C-cup
--0.5 - D-cup
- 0   - DD-cup
- 1   - F-cup
- 2   - G-cup
- 3   - H-cup
+-3	- B-cup
+-2	- C-cup
+-1	- D-cup
+ 0	- DD-cup
+ 1	- F-cup
+ 2	- G-cup
+ 3	- H-cup
  
 degeneracy:
 
 How strong/are there rumors about you doing unsavory things with your slaves
-0  - 10  - occasional whispers
-11 - 25  - minor rumors
-26 - 50  - rumors
-51 - 75  - bad rumors
-70 - 100 - severe rumors
-101+     - life ruining rumors
+0	- 10	- occasional whispers
+11	- 25	- minor rumors
+26	- 50	- rumors
+51	- 75	- bad rumors
+70	- 100	- severe rumors
+101+		- life ruining rumors
 
 voiceImplant:
 
@@ -459,8 +460,8 @@ are you on fertility supplements
 forcedFertDrugs:
 
 have you been drugged with fertility drugs
-0  - no
-1+ - how many weeks they will remain in your system
+0	- no
+1+	- how many weeks they will remain in your system
 
 staminaPills:
 
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index d744f6b94accbe9e794d7f0cd4f03fdf8aa2d728..4c8330f0195944adf04086b6f0910f8370aa0e89 100644
--- a/slave variables documentation - Pregmod.txt	
+++ b/slave variables documentation - Pregmod.txt	
@@ -679,7 +679,7 @@ which hole to focus on when serving you
 indenture:
 
 How long her servitude will be.
--1  - not
+-1 - not
  0+ - number of weeks remaining
 
 indentureRestrictions:
@@ -1405,6 +1405,15 @@ slave areolae
 4 - heart shaped
 5 - star shaped
 
+areolaeShape:
+
+slave areolae shape
+accepts string
+
+"heart"
+"star"
+"circle"
+
 areolaePiercing:
 
 edge of areolae are pierced
@@ -3121,7 +3130,7 @@ How to set up your own hero slave.
 
 -The default slave template used:
 
-<<set $activeSlave = {slaveName: "blank", slaveSurname: 0, birthName: "blank", birthSurname: 0, genes: "XX", weekAcquired: 0, 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, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, visualAge: 18, physicalAge: 18, ovaryAge: 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", origEye: "brown", eyewear: "none", hears: 0, earwear: "none", earImplant: 0, origHColor: "brown", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, PLimb: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute",  nipplesPiercing: 0, nipplesAccessory: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, broodmother: 0, broodmotherFetuses: 0, broodmotherOnHold: 0, broodmotherCountDown: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, prostate: 0, balls: 0, scrotum: 0, ovaries: 0, 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", legAccessory: "none", buttplug: "none", buttplugAttachment: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, need: 0, 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, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customTitle: "", customTitleLisp: "", rudeTitle: 0, customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, pregKnown: 0, pregWeek: 0, belly: 0, bellyPreg: 0, bellyFluid: 0, bellyImplant: -1, bellySag: 0, bellySagPreg: 0, bellyPain: 0, cervixImplant: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, scars: 0, breedingMark: 0, underArmHStyle: "waxed", bodySwap: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0, bald: 0, origBodyOwner: "", death: "", hormoneBalance: 0, onDiet: 0, breastMesh: 0, slavesFathered: 0, PCChildrenFathered: 0, slavesKnockedUp: 0, PCKnockedUp: 0, origSkin: "white", vasectomy: 0, haircuts: 0, newGamePlus: 0, skillHG: 0, skillRC: 0, skillBG: 0, skillMD: 0, skillDJ: 0, skillNU: 0, skillTE: 0, skillAT: 0, skillST: 0, skillMM: 0, skillWA: 0, tankBaby: 0}>>
+<<set $activeSlave = {slaveName: "blank", slaveSurname: 0, birthName: "blank", birthSurname: 0, genes: "XX", pronoun: "she", possessive: "her", possessivePronoun: "hers", objectReflexive: "herself", object: "her", noun: "girl", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFeed: 0, pornFame: 0, pornFameSpending: 0, pornPrestige: 0, pornPrestigeDesc: 0, pornFameType: "none", pornFocus: "none", pornTypeGeneral: 0, pornTypeFuckdoll: 0, pornTypeRape: 0, pornTypePreggo: 0, pornTypeBBW: 0, pornTypeGainer: 0, pornTypeStud: 0, pornTypeLoli: 0, pornTypeDeepThroat: 0, pornTypeStruggleFuck: 0, pornTypePainal: 0, pornTypeTease: 0, pornTypeRomantic: 0, pornTypePervert: 0, pornTypeCaring: 0, pornTypeUnflinching: 0, pornTypeSizeQueen: 0, pornTypeNeglectful: 0, pornTypeCumAddict: 0, pornTypeAnalAddict: 0, pornTypeAttentionWhore: 0, pornTypeBreastGrowth: 0, pornTypeAbusive: 0, pornTypeMalicious: 0, pornTypeSelfHating: 0, pornTypeBreeder: 0, pornTypeSub: 0, pornTypeCumSlut: 0, pornTypeAnal: 0, pornTypeHumiliation: 0, pornTypeBoobs: 0, pornTypeDom: 0, pornTypeSadist: 0, pornTypeMasochist: 0, pornTypePregnancy: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, visualAge: 18, physicalAge: 18, ovaryAge: 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", origEye: "brown", eyewear: "none", hears: 0, earwear: "none", earImplant: 0, origHColor: "brown", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, PLimb: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, nipplesAccessory: 0, areolae: 0, areolaePiercing: 0, areolaeShape: "circle", boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, pregAdaptation: 50, broodmother: 0, broodmotherFetuses: 0, broodmotherOnHold: 0, broodmotherCountDown: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, prostate: 0, balls: 0, scrotum: 0, ovaries: 0, 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", legAccessory: "none", buttplug: "none", buttplugAttachment: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, need: 0, 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, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customTitle: "", customTitleLisp: "", rudeTitle: 0, customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, pregKnown: 0, pregWeek: 0, belly: 0, bellyPreg: 0, bellyFluid: 0, bellyImplant: -1, bellySag: 0, bellySagPreg: 0, bellyPain: 0, cervixImplant: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, scars: 0, breedingMark: 0, underArmHStyle: "waxed", bodySwap: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0, bald: 0, origBodyOwner: "", origBodyOwnerID: 0, death: "", hormoneBalance: 0, onDiet: 0, breastMesh: 0, slavesFathered: 0, PCChildrenFathered: 0, slavesKnockedUp: 0, PCKnockedUp: 0, origSkin: "white", vasectomy: 0, haircuts: 0, newGamePlus: 0, skillHG: 0, skillRC: 0, skillBG: 0, skillMD: 0, skillDJ: 0, skillNU: 0, skillTE: 0, skillAT: 0, skillST: 0, skillMM: 0, skillWA: 0, skillS: 0, skillE: 0, skillW: 0, tankBaby: 0, inducedNCS: 0, NCSyouthening: 0}>>
 
 Making your slave; add their name to the following, then go down the documentation adding in your changes.
 -each variable must be separated from the last by a comma followed by a space
diff --git a/src/art/vector/Boob.tw b/src/art/vector/Boob.tw
index 8ec493d0d506872873106864ce4d392d73110705..88160acbeeeaf79730c52e3ba606ba269e013842 100644
--- a/src/art/vector/Boob.tw
+++ b/src/art/vector/Boob.tw
@@ -42,7 +42,11 @@ _art_transform will affect the display.
   <</if>>
 <</if>>
 <<if _artSlave.clothes != "a cheerleader outfit" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "cutoffs and a t-shirt" && _artSlave.clothes != "a halter top dress" && _artSlave.clothes != "a mini dress" && _artSlave.clothes != "a leotard" && _artSlave.clothes != "a nice maid outfit" && _artSlave.clothes != "a slutty maid outfit" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a nice nurse outfit" && _artSlave.clothes != "a schoolgirl outfit" && _artSlave.clothes != "a scalemail bikini" && _artSlave.clothes != "a slutty nurse outfit" && _artSlave.clothes != "a ball gown" && _artSlave.clothes != "battledress" && _artSlave.clothes != "spats and a tank top" && _artSlave.clothes != "nice business attire" && _artSlave.clothes != "slutty business attire" && _artSlave.clothes != "a bunny outfit" && _artSlave.clothes != "conservative clothing" && _artSlave.clothes != "a huipil" && _artSlave.clothes != "a kimono" && _artSlave.clothes != "a slave gown" && _artSlave.clothes != "stretch pants and a crop-top" && _artSlave.clothes != "a maternity dress" && _artSlave.clothes != "a slutty qipao" && _artSlave.clothes != "a slutty outfit" && _artSlave.clothes != "harem gauze" && _artSlave.clothes != "attractive lingerie" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "attractive lingerie for a pregnant woman" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "an apron" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "a long qipao" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a mounty outfit" && _artSlave.clothes != "lederhosen" && _artSlave.clothes != "a dirndl" && _artSlave.clothes != "a biyelgee costume">>
-	<<if _artSlave.areolae == "0">>
+	<<if _artSlave.areolaeShape == "star">>
+		<<include Art_Vector_Boob_Areola_Star>>
+	<<elseif _artSlave.areolaeShape == "heart">>
+		<<include Art_Vector_Boob_Areola_Heart>>
+	<<elseif _artSlave.areolae == "0">>
 		<<include Art_Vector_Boob_Areola>>
 	<<elseif _artSlave.areolae == "2">>
 		<<include Art_Vector_Boob_Areola_Wide>>
@@ -50,10 +54,6 @@ _art_transform will affect the display.
 		<<include Art_Vector_Boob_Areola_Large>>
 	<<elseif _artSlave.areolae == "3">>
 		<<include Art_Vector_Boob_Areola_Huge>>
-	<<elseif _artSlave.areolae == "5">>
-		<<include Art_Vector_Boob_Areola_Star>>
-	<<elseif _artSlave.areolae == "4">>
-		<<include Art_Vector_Boob_Areola_Heart>>
 	<</if>>
 	<<if _artSlave.nipples == "tiny">>
 		<<include Art_Vector_Boob_NippleTiny>>
diff --git a/src/cheats/PCCheatMenu.tw b/src/cheats/PCCheatMenu.tw
index 8e371f076a537132d197e91076ab74ce85264c51..32d421e40ec48ea25e133426aee0267fb10cf1bb 100644
--- a/src/cheats/PCCheatMenu.tw
+++ b/src/cheats/PCCheatMenu.tw
@@ -38,7 +38,7 @@
 
 <br>''Boobs'': <<textbox "$PC.boobs" $PC.boobs "PCCheatMenu">> //0 - masculine chest (if title = 1) or flat chested (if title = 0)(WIP) 1 - feminine bust//
 <<if $PC.boobs > 0>>
-	<br>''BoobsBonus'': <<textbox "$PC.boobsBonus" $PC.boobsBonus "PCCheatMenu">> //breast size -1   - C-cup -0.5 - D-cup 0   - DD-cup 1   - F-cup 2   - G-cup 3   - H-cup//
+	<br>''BoobsBonus'': <<textbox "$PC.boobsBonus" $PC.boobsBonus "PCCheatMenu">> //breast size -3 B-cup -2 - C-cup -1 - D-cup 0 - DD-cup 1 - F-cup 2 - G-cup 3 - H-cup//
 	<br>''BoobsImplant'': <<textbox "$PC.boobsImplant" $PC.boobsImplant "PCCheatMenu">> //do you have breast implants 0 - no 1 - yes//
 <</if>>
 <br>''Skin'': <<textbox "$PC.skin" $PC.skin "PCCheatMenu">>
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index e47e98db98fca2fb1d1deff0c8cf497936d78ffe..2d9395f4c83ceba84c5b307faf157bad2a2b059f 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -2091,12 +2091,12 @@
 
 	''Breast Shape: @@.yellow;$tempSlave.boobShape@@''
 	<br>
-	<<radiobutton "$tempSlave.boobShape" "normal">> normal
-	<<radiobutton "$tempSlave.boobShape" "perky">> perky
-	<<radiobutton "$tempSlave.boobShape" "torpedo-shaped">> torpedo-shaped
-	<<radiobutton "$tempSlave.boobShape" "wide-set">> wide-set
-	<<radiobutton "$tempSlave.boobShape" "downward-facing">> downward-facing
-	<<radiobutton "$tempSlave.boobShape" "saggy">> saggy
+	<<radiobutton "$tempSlave.boobShape" "normal">> Normal
+	<<radiobutton "$tempSlave.boobShape" "perky">> Perky
+	<<radiobutton "$tempSlave.boobShape" "torpedo-shaped">> Torpedo-Shaped
+	<<radiobutton "$tempSlave.boobShape" "wide-set">> Wide-Set
+	<<radiobutton "$tempSlave.boobShape" "downward-facing">> Downward-Facing
+	<<radiobutton "$tempSlave.boobShape" "saggy">> Saggy
 
 	<br>
 
@@ -2104,14 +2104,14 @@
 	<<radiobutton "$tempSlave.nipples" "tiny">> Tiny
 	<<radiobutton "$tempSlave.nipples" "cute">> Cute
 	<<radiobutton "$tempSlave.nipples" "puffy">> Puffy
-	<<radiobutton "$tempSlave.nipples" "partially inverted">> Partially inverted
+	<<radiobutton "$tempSlave.nipples" "partially inverted">> Partially Inverted
 	<<radiobutton "$tempSlave.nipples" "inverted">> Inverted
 	<<radiobutton "$tempSlave.nipples" "huge">> Huge
 	<<radiobutton "$tempSlave.nipples" "fuckable">> Penetrable
 
 	<br>
 
-	''Areolae (Normal:0 to Huge:3): ''
+	''Areolae Size (Normal:0 to Huge:3): ''
 	<<switch $tempSlave.areolae>>
 	<<case 0>>@@.yellow;Normal@@
 	<<case 1>>@@.yellow;Large@@
@@ -2125,9 +2125,13 @@
 	<<radiobutton "$tempSlave.areolae" 1>> Large
 	<<radiobutton "$tempSlave.areolae" 2>> Wide
 	<<radiobutton "$tempSlave.areolae" 3>> Huge
-	<<radiobutton "$tempSlave.areolae" 4>> Heart-shaped
-	<<radiobutton "$tempSlave.areolae" 5>> Star-shaped
+	
 	<br>
+	
+	''Areolae Shape:''
+	<<textbox "$tempSlave.areolaeShape" $tempSlave.areolaeShape>>
+	<br>
+	
 <</widget>>
 
 <<widget ButtTab>>
diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index 99d92fbb6004807fceff04f6a5df77f27e5c72b7..ec805ddc2595500a5c1f5cf0439f61c9a7cf31e7 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -1,7 +1,7 @@
 :: init Nationalities [silently]
 
 <<set $minimumSlaveAge = variableAsNumber($minimumSlaveAge, 18, 3, 18)>>
-<<set $retirementAge = Math.clamp($retirementAge, 25, 120)>>
+<<set $retirementAge = variableAsNumber($retirementAge, 45, 25, 120)>>
 <<set $fertilityAge = variableAsNumber($fertilityAge, 13, 3, 18)>>
 <<set $potencyAge = variableAsNumber($potencyAge, 13, 3, 18)>>
 
@@ -98,7 +98,7 @@
 <<set _seed = ["east", "north", "northeast", "northwest", "south", "southeast", "southwest", "west"]>>
 <<set _govtypes = ["a committee", "a corporation", "an individual", "an oligarchy", "direct democracy", "elected officials"]>>
 	
-<<set $neighboringArcologies = Math.clamp($neighboringArcologies, 0, 8)>>
+<<set $neighboringArcologies = variableAsNumber($neighboringArcologies, 3, 0, 8)>>
 <<for $i = 0; $i <= $neighboringArcologies; $i++>>
 	<<set $activeArcology = {name: "Arcology X-", direction: "north", government: "an individual", leaderID: 0, honeymoon: 0, prosperity: 50, ownership: 50, minority: 20, PCminority: 0, demandFactor: 0, FSSupremacist: "unset", FSSupremacistRace: 0, FSSubjugationist: "unset", FSSubjugationistRace: 0, FSGenderRadicalist: "unset", FSGenderFundamentalist: "unset", FSPaternalist: "unset", FSDegradationist: "unset", FSBodyPurist: "unset", FSTransformationFetishist: "unset", FSYouthPreferentialist: "unset", FSMaturityPreferentialist: "unset", FSSlimnessEnthusiast: "unset", FSAssetExpansionist: "unset", FSPastoralist: "unset", FSPhysicalIdealist: "unset", FSChattelReligionist: "unset", FSRomanRevivalist: "unset", FSAztecRevivalist: "unset", FSEgyptianRevivalist: "unset", FSEdoRevivalist: "unset", FSArabianRevivalist: "unset", FSChineseRevivalist: "unset", FSNull: "unset", embargo: 1, embargoTarget: -1, influenceTarget: -1, influenceBonus: 0, CyberEconomic: 1, CyberEconomicTarget: -1, CyberReputation: 1, CyberReputationTarget: -1, rival: 0, FSRestart: "unset", FSRepopulationFocus: "unset", FSHedonisticDecadence: "unset", FSCummunism: "unset", FSIncestFetishist: "unset", FSGenderRadicalistResearch: 0, FSGenderFundamentalistResearch: 0, FSPaternalistResearch: 0, FSDegradationistResearch: 0, FSBodyPuristResearch: 0, FSTransformationFetishistResearch: 0, FSYouthPreferentialistResearch: 0, FSMaturityPreferentialistResearch: 0, FSSlimnessEnthusiastResearch: 0, FSAssetExpansionistResearch: 0, FSPastoralistResearch: 0, FSPhysicalIdealistResearch: 0, FSRepopulationFocusResearch: 0, FSRestartResearch: 0, FSHedonisticDecadenceResearch: 0, FSHedonisticDecadenceDietResearch: 0, FSCummunismResearch: 0, FSIncestFetishistResearch: 0}>>
 	<<if $i == 0>>
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index d0c43b9ad53cc9d6e8152e555f9e67e9591d15db..b2e50cff8fed9335329c19979a9e0a47d6de42a9 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -1,9 +1,9 @@
 :: Intro Summary [nobr]
 
-<<set $neighboringArcologies = Math.clamp($neighboringArcologies, 0, 8)>>
-<<set $FSCreditCount = Math.clamp($FSCreditCount, 4, 7)>>
-<<set $PC.actualAge = Math.clamp($PC.actualAge, 14, 80)>>
-<<set $PC.birthWeek = Math.clamp($PC.birthWeek, 0, 51)>>
+<<set $neighboringArcologies = variableAsNumber($neighboringArcologies, 3, 0, 8)>>
+<<set $FSCreditCount = variableAsNumber($FSCreditCount, 5, 4, 7)>>
+<<set $PC.actualAge = variableAsNumber($PC.actualAge, 35, 14, 80)>>
+<<set $PC.birthWeek = variableAsNumber($PC.birthWeek, 0, 0, 51)>>
 
 <<silently>>
 FertilityAge($fertilityAge)
@@ -13,7 +13,7 @@ You may review your settings before clicking "Continue" to begin.
 
 <br><br>
 <<set $minimumSlaveAge = variableAsNumber($minimumSlaveAge, 18, 3, 18)>>
-<<set $retirementAge = Math.clamp($retirementAge, 25, 120)>>
+<<set $retirementAge = variableAsNumber($retirementAge, 45, 25, 120)>>
 <<set $fertilityAge = variableAsNumber($fertilityAge, 13, 3, 18)>>
 <<set $potencyAge = variableAsNumber($potencyAge, 13, 3, 18)>>
 <<set $PC.mother = Number($PC.mother)>>
@@ -706,9 +706,11 @@ __''Player Character''__
 
 	<br>
 	<<switch $PC.boobsBonus>>
-		<<case -1>>
+		<<case -3>>
+			<<set _PCCreationBoobSize = "small B cups">>
+		<<case -2>>
 			<<set _PCCreationBoobSize = "unnoticeable C cups">>
-		<<case -0.5>>
+		<<case -1>>
 			<<set _PCCreationBoobSize = "unremarkable D cups">>
 		<<case 1>>
 			<<set _PCCreationBoobSize = "noticeable F cups">>
@@ -730,18 +732,18 @@ __''Player Character''__
 		Your breasts are ''_PCCreationBoobSize''
 		and ''_PCCreationBreast''.
 		<<if $PC.boobsBonus == 0>>
-			[[Go bigger|Intro Summary][$PC.boobsBonus = 2, $PC.boobsImplant = 0]] | [[Get implants|Intro Summary][$PC.boobsBonus = 2, $PC.boobsImplant = 1]] | [[Go smaller|Intro Summary][$PC.boobsBonus = -1, $PC.boobsImplant = 0]]
+			[[Go bigger|Intro Summary][$PC.boobsBonus = 2, $PC.boobsImplant = 0]] | [[Get implants|Intro Summary][$PC.boobsBonus = 2, $PC.boobsImplant = 1]] | [[Go smaller|Intro Summary][$PC.boobsBonus = -2, $PC.boobsImplant = 0]]
 		<<elseif $PC.boobsBonus == 2>>
 			[[Go smaller |Intro Summary][$PC.boobsBonus = 0, $PC.boobsImplant = 0]]
-		<<elseif $PC.boobsBonus == -1>>
-			[[Go Bigger |Intro Summary][$PC.boobsBonus = 0]]
+		<<elseif $PC.boobsBonus == -2>>
+			[[Go bigger |Intro Summary][$PC.boobsBonus = 0]]
 		<</if>>
 		| [[Remove them|Intro Summary][$PC.boobs = 0, $PC.boobsBonus = 0, $PC.boobsImplant = 0]]
 	<<else>>
 		<<if $PC.title == 1>>
-			Your chest is ''manly.'' [[Add breasts|Intro Summary][$PC.boobs = 1, $PC.boobsBonus = -1]]
+			Your chest is ''manly.'' [[Add breasts|Intro Summary][$PC.boobs = 1, $PC.boobsBonus = -2]]
 		<<else>>
-			You are ''flat chested.'' [[Grow breasts|Intro Summary][$PC.boobs = 1, $PC.boobsBonus = -1]]
+			You are ''flat chested.'' [[Grow breasts|Intro Summary][$PC.boobs = 1, $PC.boobsBonus = -2]]
 		<</if>>
 	<</if>>
 
@@ -907,10 +909,12 @@ __''Player Character''__
 			huge <<if $PC.boobsImplant == 1>>fake <</if>>breasts.
 		<<elseif $PC.boobsBonus == 3>>
 			giant<<if $PC.boobsImplant == 1>>, fake<</if>> cow tits.
-		<<elseif $PC.boobsBonus == -0.5>>
-			unremarkable breasts.
 		<<elseif $PC.boobsBonus == -1>>
+			unremarkable breasts.
+		<<elseif $PC.boobsBonus == -2>>
 			average breasts.
+		<<elseif $PC.boobsBonus == -3>>
+			small breasts.
 		<<else>>
 			noticeable breasts.
 		<</if>>
diff --git a/src/js/eventSelectionJS.tw b/src/js/eventSelectionJS.tw
index c2282fd3a72a33bd1771bd9ee35626fdfbde4bb9..15102f8b21d9fc6216b11b1bb643edb25f09b27a 100644
--- a/src/js/eventSelectionJS.tw
+++ b/src/js/eventSelectionJS.tw
@@ -1674,7 +1674,7 @@ if(eventSlave.fetish != "mindbroken") {
 	}
 
 	if(eventSlave.boobs > 1200) {
-		if(eventSlave.areolae > 3) {
+		if(eventSlave.areolaeShape != "circle") {
 			if(eventSlave.devotion > 50) {
 				State.variables.RESSevent.push("shaped areolae");
 			}
@@ -2856,7 +2856,7 @@ if(eventSlave.fetish != "mindbroken") {
 	}
 
 	if(eventSlave.boobs > 1200) {
-		if(eventSlave.areolae > 3) {
+		if(eventSlave.areolaeShape != "circle") {
 			if(eventSlave.devotion > 50) {
 				State.variables.RESSevent.push("shaped areolae");
 			}
diff --git a/src/npc/descriptions/fVagina.tw b/src/npc/descriptions/fVagina.tw
index c3ce6fb53e25bf577d98faa04811046245a07001..5f92da0702760febf498c1b945759e5599b06e6a 100644
--- a/src/npc/descriptions/fVagina.tw
+++ b/src/npc/descriptions/fVagina.tw
@@ -246,10 +246,12 @@ You call $him over so you can
 				$his breasts press against your own huge<<if $PC.boobsImplant == 1>>, firm<<else>>, soft<</if>> breasts;
 			<<elseif $PC.boobsBonus == 1>>
 				$his breasts press against your own big<<if $PC.boobsImplant == 1>>, perky<</if>> breasts;
-			<<elseif $PC.boobsBonus == -0.5>>
-				$his breasts press against your own breasts;
 			<<elseif $PC.boobsBonus == -1>>
+				$his breasts press against your own breasts;
+			<<elseif $PC.boobsBonus == -2>>
 				$his breasts press against your own average breasts;
+			<<elseif $PC.boobsBonus == -3>>
+				$his breasts press against your own small breasts;
 			<<elseif $PC.boobs == 1>>
 				$his breasts press against your own generous breasts;
 			<<elseif $PC.title == 0>>
@@ -394,10 +396,12 @@ You call $him over so you can
 					$his breasts press against your own huge<<if $PC.boobsImplant == 1>>, firm<<else>>, soft<</if>> breasts;
 				<<elseif $PC.boobsBonus == 1>>
 					$his breasts press against your own big<<if $PC.boobsImplant == 1>>, perky<</if>> breasts;
-				<<elseif $PC.boobsBonus == -0.5>>
-					$his breasts press against your own breasts;
 				<<elseif $PC.boobsBonus == -1>>
+					$his breasts press against your own breasts;
+				<<elseif $PC.boobsBonus == -2>>
 					$his breasts press against your own average breasts;
+				<<elseif $PC.boobsBonus == -3>>
+					$his breasts press against your own small breasts;
 				<<elseif $PC.boobs == 1>>
 					$his breasts press against your own generous breasts;
 				<<elseif $PC.title == 0>>
diff --git a/src/npc/uploadSlave.tw b/src/npc/uploadSlave.tw
index e754213ea14e98ae0e5464d5988f9f197a97cca2..c32b857d5f8f503b451dfa95a816639bae67f254 100644
--- a/src/npc/uploadSlave.tw
+++ b/src/npc/uploadSlave.tw
@@ -52,10 +52,10 @@ heightImplant: $activeSlave.heightImplant,
 nationality: "$activeSlave.nationality",
 race: "$activeSlave.race",
 markings: "none",
-eyes: "$activeSlave.eyes",
+eyes: $activeSlave.eyes,
 eyeColor: "$activeSlave.eyeColor",
 eyewear: "none",
-ears: "$activeSlave.hears",
+hears: $activeSlave.hears,
 earwear: "none",
 earImplant: 0,
 hColor: "$activeSlave.hColor",
@@ -82,6 +82,7 @@ nipplesPiercing: $activeSlave.nipplesPiercing,
 nipplesAccessory: $activeSlave.nipplesAccessory,
 areolae: $activeSlave.areolae,
 areolaePiercing: $activeSlave.areolaePiercing,
+areolaeShape: $activeSlave.areolaeShape,
 boobsTat: "$activeSlave.boobsTat",
 lactation: $activeSlave.lactation,
 lactationAdaptation: 0,
diff --git a/src/pregmod/electiveSurgery.tw b/src/pregmod/electiveSurgery.tw
index 7230ddeb9e314056363637b2e4e388912d8dc875..8b369c63e7513933e87c9fa757476c16c68c8531 100644
--- a/src/pregmod/electiveSurgery.tw
+++ b/src/pregmod/electiveSurgery.tw
@@ -154,15 +154,18 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
 		You have a @@.orange;hefty F-cup bust.@@
 		<br>[[Add additional breast tissue|PC Surgery Degradation][$PC.boobsBonus = 2, $cash -= 15000, $surgeryType = "breastEnlargement"]] | [[Have tissue removed|PC Surgery Degradation][$PC.boobsBonus = 0, $cash -= 5000, $surgeryType = "breastShrinkage"]]
 	<</if>>
-<<elseif $PC.boobsBonus == -0.5>>
-	You have a @@.orange;pair of D-cup breasts.@@
-	<br>[[Add additional fatty tissue|PC Surgery Degradation][$PC.boobsBonus = 0, $cash -= 15000, $surgeryType = "breastEnlargement"]] | [[Have fatty tissue removed|PC Surgery Degradation][$PC.boobsBonus = -1, $cash -= 5000, $surgeryType = "breastShrinkage"]] | [[Have them removed|PC Surgery Degradation][$PC.boobs = 0, $PC.boobsBonus = 0, $cash -= 5000, $surgeryType = "flatChest"]]
 <<elseif $PC.boobsBonus == -1>>
+	You have a @@.orange;pair of D-cup breasts.@@
+	<br>[[Add additional fatty tissue|PC Surgery Degradation][$PC.boobsBonus = 0, $cash -= 15000, $surgeryType = "breastEnlargement"]] | [[Have fatty tissue removed|PC Surgery Degradation][$PC.boobsBonus = -2, $cash -= 5000, $surgeryType = "breastShrinkage"]] | [[Have them removed|PC Surgery Degradation][$PC.boobs = 0, $PC.boobsBonus = 0, $cash -= 5000, $surgeryType = "flatChest"]]
+<<elseif $PC.boobsBonus == -2>>
 	You have a @@.orange;average pair of C-cup breasts.@@
-	<br>[[Add additional fatty tissue|PC Surgery Degradation][$PC.boobsBonus = -0.5, $cash -= 15000, $surgeryType = "breastEnlargement"]] | [[Have them removed|PC Surgery Degradation][$PC.boobs = 0, $PC.boobsBonus = 0, $cash -= 5000, $surgeryType = "flatChest"]] | //You lack sufficient fatty tissue to permit additional size reduction short of total breast removal.//
+	<br>[[Add additional fatty tissue|PC Surgery Degradation][$PC.boobsBonus = -1, $cash -= 15000, $surgeryType = "breastEnlargement"]] | [[Have fatty tissue removed|PC Surgery Degradation][$PC.boobsBonus = -3, $cash -= 5000, $surgeryType = "breastShrinkage"]] | [[Have them removed|PC Surgery Degradation][$PC.boobs = 0, $PC.boobsBonus = 0, $cash -= 5000, $surgeryType = "breastShrinkage"]] | //You lack sufficient fatty tissue to permit additional size reduction short of total breast removal.//
+<<elseif $PC.boobsBonus == -3>>
+	You have a @@.orange;small pair of B-cup breasts.@@
+	<br>[[Add additional fatty tissue|PC Surgery Degradation][$PC.boobsBonus = -2, $cash -= 15000, $surgeryType = "breastEnlargement"]] | [[Have them removed|PC Surgery Degradation][$PC.boobs = 0, $PC.boobsBonus = 0, $cash -= 5000, $surgeryType = "flatChest"]] | //You lack sufficient fatty tissue to permit additional size reduction short of total breast removal.//
 <<elseif $PC.boobs == 1>>
 	You have a @@.orange;big pair of DD breasts.@@
-	<br>[[Get a pair of breast implants|PC Surgery Degradation][$PC.boobsBonus = 1, $PC.boobsImplant = 1, $cash -= 10000, $surgeryType = "breastEnlargementImplant"]] | [[Add additional breast tissue|PC Surgery Degradation][$PC.boobsBonus = 1, $cash -= 15000, $surgeryType = "breastEnlargement"]] | [[Have fatty tissue removed|PC Surgery Degradation][$PC.boobsBonus = -0.5, $cash -= 5000, $surgeryType = "breastShrinkage"]] | [[Have them removed|PC Surgery Degradation][$PC.boobs = 0, $PC.boobsBonus = 0, $cash -= 5000, $surgeryType = "flatChest"]]
+	<br>[[Get a pair of breast implants|PC Surgery Degradation][$PC.boobsBonus = 1, $PC.boobsImplant = 1, $cash -= 10000, $surgeryType = "breastEnlargementImplant"]] | [[Add additional breast tissue|PC Surgery Degradation][$PC.boobsBonus = 1, $cash -= 15000, $surgeryType = "breastEnlargement"]] | [[Have fatty tissue removed|PC Surgery Degradation][$PC.boobsBonus = -1, $cash -= 5000, $surgeryType = "breastShrinkage"]] | [[Have them removed|PC Surgery Degradation][$PC.boobs = 0, $PC.boobsBonus = 0, $cash -= 5000, $surgeryType = "flatChest"]]
 <<elseif $PC.title == 1>>
 	You have a @@.orange;masculine chest.@@ At your request, breast tissue could be added until you have a healthy bust, though society is unlikely to approve.
 	<br>[[Get a pair of breasts|PC Surgery Degradation][$PC.boobs = 1, $PC.boobsBonus = -1, $cash -= 15000, $surgeryType = "breasts"]]
diff --git a/src/pregmod/fMarry.tw b/src/pregmod/fMarry.tw
index 6347fe577c031bd00d77a6741db79e544d64ee91..ee120e60c447ef6cf101f3da1bdc4215d8271798 100644
--- a/src/pregmod/fMarry.tw
+++ b/src/pregmod/fMarry.tw
@@ -277,7 +277,7 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
 	You leave $him to weep and consider $his fate. Despite $his "fortune", $he is still a slave, and undoubtedly knows that $his position could easily change should you tire of $him.
 	<<set _reactionType = 2>>
 <<else>>
-	$He doesn't really react to this. By no means does $he want to be your wife, but she's obedient enough to know that you are in charge. You leave $him to $his business, and go back to yours.
+	$He doesn't really react to this. By no means does $he want to be your wife, but $he's obedient enough to know that you are in charge. You leave $him to $his business, and go back to yours.
 	<<if $activeSlave.relationship != 0>>
 		<<if $activeSlave.relationship == -1>>
 			$He sighs at the realization that $he won't be allowed to be so promiscuous and will have to learn to focus $his attention on you.
@@ -355,7 +355,7 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
 		<<elseif $assistantAppearance == "amazon">>
 			_His2 avatar gives its medicine stick a shake.
 		<<elseif $assistantAppearance == "businesswoman">>
-			_Hi2s avatar snaps its fingers.
+			_His2 avatar snaps its fingers.
 		<<elseif ($assistantAppearance == "fairy") || ($assistantAppearance == "pregnant fairy")>>
 			_His2 avatar claps its hands twice, looking a bit disappointed at the lack of celebration.
 		<<elseif $assistantAppearance == "goddess">>
diff --git a/src/pregmod/fSlaveFeed.tw b/src/pregmod/fSlaveFeed.tw
index 1db91be048806a2eb4f2e26f7243e2e802a07dab..f1f61bf2666b849b74080e9caec0469adf64d878 100644
--- a/src/pregmod/fSlaveFeed.tw
+++ b/src/pregmod/fSlaveFeed.tw
@@ -42,27 +42,27 @@ The first necessary step is to prepare the milk cow and _his2 udders.
 <<elseif $activeSlave.mother == $milkTap.ID>>
 	This is easy enough, as $milkTap.slaveName fondly remembers nursing _his2 daughter. <<if $milkTap.lactation > 1>>$he is practically gushing milk with nostalgia<<else>>It takes minimal effort to get _his2 milk flowing<</if>>.
 <<elseif $activeSlave.father == $milkTap.ID>>
-	This is extremely tough, as $milkTap.slaveName is very uncomfortable breast feeding the $girl _he2 sired. <<if $milkTap.lactation > 1>>_Him2 excessive milk production quickly leaves _him2 eager for release, however<<else>>It takes some coaxing and kneading to get _his2 milk flowing and _him2 eager for relief<</if>>.
+	This is extremely tough, as $milkTap.slaveName is very uncomfortable breast feeding the $girl _he2 sired. <<if $milkTap.lactation > 1>>_His2 excessive milk production quickly leaves _him2 eager for release, however<<else>>It takes some coaxing and kneading to get _his2 milk flowing and _him2 eager for relief<</if>>.
 <<elseif $milkTap.mother == $activeSlave.ID>>
 	This is moderately tough, as $milkTap.slaveName finds it awkward to nurse _his2 own mother. <<if $milkTap.lactation > 1>>_His2 excessive milk production quickly leaves _him2 eager for release<<else>>It takes some coaxing and kneading to get _his2 milk flowing and _him2 eager for relief<</if>>.
 <<elseif $milkTap.father == $activeSlave.ID>>
-	This is very tough, as $milkTap.slaveName finds it weird to let _his2 father suckle from _him2. <<if $milkTap.lactation > 1>>$Him excessive milk production quickly leaves _him2 eager for release, however<<else>>It takes some coaxing and kneading to get _his2 milk flowing and _him2 eager for relief<</if>>.
+	This is very tough, as $milkTap.slaveName finds it weird to let _his2 father suckle from _him2. <<if $milkTap.lactation > 1>>_His2 excessive milk production quickly leaves _him2 eager for release, however<<else>>It takes some coaxing and kneading to get _his2 milk flowing and _him2 eager for relief<</if>>.
 <<elseif areSisters($activeSlave, $milkTap) == 1>>
 	This is easy enough, as $milkTap.slaveName wants _his2 twin to try _his2 milk, but only if $he can taste $hers too. <<if $milkTap.lactation > 1>>$he is practically gushing milk with excitement<<else>>It takes minimal effort to get _his2 milk flowing<</if>>.
 <<elseif areSisters($activeSlave, $milkTap) == 2>>
-	This is moderately tough, as $milkTap.slaveName is uncomfortable getting so intimate with _his2 sister. <<if $milkTap.lactation > 1>>_Him2 excessive milk production quickly leaves _him2 eager for release<<else>>It takes some coaxing and kneading to get _his2 milk flowing and _him2 eager for relief<</if>>.
+	This is moderately tough, as $milkTap.slaveName is uncomfortable getting so intimate with _his2 sister. <<if $milkTap.lactation > 1>>_His2 excessive milk production quickly leaves _him2 eager for release<<else>>It takes some coaxing and kneading to get _his2 milk flowing and _him2 eager for relief<</if>>.
 <<elseif areSisters($activeSlave, $milkTap) == 3>>
-	This is slightly difficult, as $milkTap.slaveName is uncomfortable getting so intimate with _his2 half-sister. <<if $milkTap.lactation > 1>>_Him2 excessive milk production quickly leaves _him2 eager for release<<else>>It takes some coaxing and kneading to get _his2 milk flowing and _him2 eager for relief<</if>>.
+	This is slightly difficult, as $milkTap.slaveName is uncomfortable getting so intimate with _his2 half-sister. <<if $milkTap.lactation > 1>>_His2 excessive milk production quickly leaves _him2 eager for release<<else>>It takes some coaxing and kneading to get _his2 milk flowing and _him2 eager for relief<</if>>.
 
 <<elseif $milkTap.relationTarget == $activeSlave.ID>>
 	<<if $milkTap.relation == "twin">>
 		This is easy enough, as $milkTap.slaveName wants _his2 twin to try _his2 milk, but only if $he can taste _his2's too. <<if $milkTap.lactation > 1>>_he2 is practically gushing milk with excitement<<else>>It takes minimal effort to get _his2 milk flowing<</if>>.
 	<<elseif $milkTap.relation == "sister">>
-		This is moderately tough, as $milkTap.slaveName is uncomfortable getting so intimate with _his2 sister. <<if $milkTap.lactation > 1>>_Hi2m excessive milk production quickly leaves _his2 eager for release<<else>>It takes some coaxing and kneading to get _his2 milk flowing and _his2 eager for relief<</if>>.
+		This is moderately tough, as $milkTap.slaveName is uncomfortable getting so intimate with _his2 sister. <<if $milkTap.lactation > 1>>_His2 excessive milk production quickly leaves _his2 eager for release<<else>>It takes some coaxing and kneading to get _his2 milk flowing and _his2 eager for relief<</if>>.
 	<<elseif $milkTap.relation == "mother">>
 		This is easy enough, as $milkTap.slaveName fondly remembers nursing _his2 daughter. <<if $milkTap.lactation > 1>>$he is practically gushing milk with nostalgia<<else>>It takes minimal effort to get _his2 milk flowing<</if>>.
 	<<elseif $milkTap.relation == "daughter">>
-		This is moderately tough, as $milkTap.slaveName finds it awkward to nurse _his2 own mother. <<if $milkTap.lactation > 1>>$Him excessive milk production quickly leaves _him2 eager for release<<else>>It takes some coaxing and kneading to get _his2 milk flowing and _him2 eager for relief<</if>>.
+		This is moderately tough, as $milkTap.slaveName finds it awkward to nurse _his2 own mother. <<if $milkTap.lactation > 1>>_His2 excessive milk production quickly leaves _him2 eager for release<<else>>It takes some coaxing and kneading to get _his2 milk flowing and _him2 eager for relief<</if>>.
 	<</if>>
 
 <<elseif ($milkTap.lactation > 1) && ($milkTap.devotion >= -20)>>
@@ -559,7 +559,7 @@ Next, you see to $activeSlave.slaveName.
 <<elseif $activeSlave.mother == $milkTap.ID>>
 	$milkTap.slaveName moans lewdly as _his2 daughter energetically sucks _his2 dick. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger with each orgasm until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his mother's cock and takes a seat facing the smiling $milkTap.slaveName while hiccuping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his mother's cock and takes a seat facing the smiling $milkTap.slaveName while hiccuping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his mother's cock and takes a seat facing the smiling $milkTap.slaveName while hiccuping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
 <<elseif $activeSlave.father == $milkTap.ID>>
-	$milkTap.slaveName moans lewdly as _hi2s daughter energetically sucks _his2 dick. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger with each orgasm until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his father's cock and takes a seat facing the smiling $milkTap.slaveName while hiccuping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his father's cock and takes a seat facing the smiling $milkTap.slaveName while hiccuping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his father's cock and takes a seat facing the smiling $milkTap.slaveName while hiccuping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
+	$milkTap.slaveName moans lewdly as _his2 daughter energetically sucks _his2 dick. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger with each orgasm until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his father's cock and takes a seat facing the smiling $milkTap.slaveName while hiccuping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his father's cock and takes a seat facing the smiling $milkTap.slaveName while hiccuping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his father's cock and takes a seat facing the smiling $milkTap.slaveName while hiccuping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
 <<elseif $milkTap.mother == $activeSlave.ID>>
 	$milkTap.slaveName moans lewdly as _his2 mother energetically sucks _his2 dick. You enjoy the show, specifically the sight of $activeSlave.slaveName's belly steadily growing larger with each orgasm until <<if $activeSlave.inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his daughter's cock and takes a seat facing the smiling $milkTap.slaveName while hiccuping<<if $activeSlave.amp != 1>> and rubbing $his gurgling stomach<</if>><<elseif $activeSlave.inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his daughter's cock and takes a seat facing the smiling $milkTap.slaveName while hiccuping<<if $activeSlave.amp != 1>> and teasing $his wobbling, gurgling stomach<</if>><<elseif $activeSlave.inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his daughter's cock and takes a seat facing the smiling $milkTap.slaveName while hiccuping<<if $activeSlave.amp != 1>> and teasing $his gurgling stomach<</if>><</if>>.
 <<elseif $milkTap.father == $activeSlave.ID>>
diff --git a/src/pregmod/fSlaveSlaveVagConsummate.tw b/src/pregmod/fSlaveSlaveVagConsummate.tw
index 367d7857f86b180eb441aae59ab64199f90be6f0..db6e2c16b13cdff1026f408e7aeb5887b50c31ed 100644
--- a/src/pregmod/fSlaveSlaveVagConsummate.tw
+++ b/src/pregmod/fSlaveSlaveVagConsummate.tw
@@ -38,7 +38,7 @@
 You take a look at the slave you selected.
 
 <<if ($slaverapistx.fetish == "dom") && ($slaverapistx.fetishStrength > 20) && ($slaverapistx.devotion >= -20)>>
-	Since $slaverapistx.slaveName loves to dominate others it's not hard to get _hi2s <<if $slaverapistx.dick > 0>>_dicksize dick<<else>>massive clit<</if>> ready.
+	Since $slaverapistx.slaveName loves to dominate others it's not hard to get _his2 <<if $slaverapistx.dick > 0>>_dicksize dick<<else>>massive clit<</if>> ready.
 	<<if ($slaverapistx.attrXX > 65)>>
 		With _his2 love of pussy, _he2 becomes aroused indecently fast.
 	<<else>>
diff --git a/src/pregmod/pcSurgeryDegredation.tw b/src/pregmod/pcSurgeryDegredation.tw
index 9f3f914859bbb7bc61f7b1788310ecea8a9cd43d..90bca901690d66b51e00402c4d366a18b80670de 100644
--- a/src/pregmod/pcSurgeryDegredation.tw
+++ b/src/pregmod/pcSurgeryDegredation.tw
@@ -22,13 +22,13 @@
 	After a few hours, you awaken in the recovery wing with a sore chest. <<if $PC.belly >= 10000>>Struggling to sit<<else>>Sitting<</if>> up, you immediately notice how much lighter your breasts are. Pulling the covers off yourself, you observe your implant free boobs in the mirror-covered wall across from your bed. "So do you like them?", asks the surgeon's assistant, seating herself behind you and wrapping her hands around to your natural breasts. "We made sure to tighten them up a bit, get rid of that sag from not having the silicone pouch in them anymore." She begins groping your breasts, feeling for any oddities. "I know you're still a little sore, but bear with it." She moves on to your nipples and begins teasing them. <<if $PC.preg > 30 || $PC.births > 0>>She lets out a surprised squeak when a gush of milk escapes your breasts and a moan escapes your lips. "<<if $PC.pregKnown == 1>>Should have expected that with the pregnancy and all.<<else>>You did recently have a child didn't you? Or have you just been enjoying your nipples too much?<</if>> Either way, this is a good thing. Your breasts work."<</if>> You can't help but moan under your building arousal as she massages and teases your breasts. "Enjoying yourself are we? Let me finish you off." She sneaks a hand down to your <<if $PC.dick == 1>>stiff prick and begins stroking its length, quickly bringing you to orgasm and relieving you of your built up tension.<<else>>stiff clit and begins teasing it as well, quickly bringing you to orgasm and relieving you of your built up tension.<</if>> She states, while licking her fingers, "I always did enjoy the way you taste. Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Satisfied, you lie back down to sleep off the rest of the anesthesia before returning to your arcology.
 	
 <<case "breastShrinkage">>
-	After a few hours, you awaken in the recovery wing with a sore chest. <<if $PC.belly >= 10000>>Struggling to sit<<else>>Sitting<</if>> up, you immediately notice how much lighter your breasts are. Pulling the covers off yourself, you observe your smaller <<if $PC.boobsBonus == 2>>G-cup<<elseif $PC.boobsBonus == 1>>F-cup<<elseif $PC.boobsBonus == -0.5>>D-cup<<elseif $PC.boobsBonus == -1>>C-cup<<else>>DD<</if>> boobs in the mirror-covered wall across from your bed. "So do you like them?", asks the surgeon's assistant, seating herself behind you and wrapping her hands around to your shrunken breasts. "We made sure to tighten them up a bit, get rid of that sagginess from weight and the mass removed." She begins groping your breasts, feeling for any oddities. "I know you're still a little sore, but bear with it." She moves on to your nipples and begins teasing them. <<if $PC.preg > 30 || $PC.births > 0>>She lets out a surprised squeak when a gush of milk escapes your breasts and a moan escapes your lips. "<<if $PC.pregKnown == 1>>Should have expected that with the pregnancy and all.<<else>>You did recently have a child didn't you? Or have you just been enjoying your nipples too much?<</if>> Either way, this is a good thing. Your breasts work."<</if>> You can't help but moan under your building arousal as she massages and teases your breasts. "Enjoying yourself are we? Let me finish you off." She sneaks a hand down to your <<if $PC.dick == 1>>stiff prick and begins stroking its length, quickly bringing you to orgasm and relieving you of your built up tension.<<else>>stiff clit and begins teasing it as well, quickly bringing you to orgasm and relieving you of your built up tension.<</if>> She states, while licking her fingers, "I always did enjoy the way you taste. Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Satisfied, you lie back down to sleep off the rest of the anesthesia before returning to your arcology.
+	After a few hours, you awaken in the recovery wing with a sore chest. <<if $PC.belly >= 10000>>Struggling to sit<<else>>Sitting<</if>> up, you immediately notice how much lighter your breasts are. Pulling the covers off yourself, you observe your smaller <<if $PC.boobsBonus == 2>>G-cup<<elseif $PC.boobsBonus == 1>>F-cup<<elseif $PC.boobsBonus == -1>>D-cup<<elseif $PC.boobsBonus == -2>>C-cup<<elseif $PC.boobsBonus == -3>>B-cup<<else>>DD<</if>> boobs in the mirror-covered wall across from your bed. "So do you like them?", asks the surgeon's assistant, seating herself behind you and wrapping her hands around to your shrunken breasts. "We made sure to tighten them up a bit, get rid of that sagginess from weight and the mass removed." She begins groping your breasts, feeling for any oddities. "I know you're still a little sore, but bear with it." She moves on to your nipples and begins teasing them. <<if $PC.preg > 30 || $PC.births > 0>>She lets out a surprised squeak when a gush of milk escapes your breasts and a moan escapes your lips. "<<if $PC.pregKnown == 1>>Should have expected that with the pregnancy and all.<<else>>You did recently have a child didn't you? Or have you just been enjoying your nipples too much?<</if>> Either way, this is a good thing. Your breasts work."<</if>> You can't help but moan under your building arousal as she massages and teases your breasts. "Enjoying yourself are we? Let me finish you off." She sneaks a hand down to your <<if $PC.dick == 1>>stiff prick and begins stroking its length, quickly bringing you to orgasm and relieving you of your built up tension.<<else>>stiff clit and begins teasing it as well, quickly bringing you to orgasm and relieving you of your built up tension.<</if>> She states, while licking her fingers, "I always did enjoy the way you taste. Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Satisfied, you lie back down to sleep off the rest of the anesthesia before returning to your arcology.
 	
 <<case "breastEnlargementImplant">>
 	After a few hours, you awaken in the recovery wing with a sore chest. <<if $PC.belly >= 10000 || $PC.boobsBonus == 3>>Struggling to sit<<else>>Sitting<</if>> up, you immediately notice how much heavier your breasts are. Pulling the covers off yourself, you observe your new, round <<if $PC.boobsBonus == 2>>G-cup<<elseif $PC.boobsBonus == 1>>F-cup<<else>>H-cup<</if>> boobs in the mirror-covered wall across from your bed. "So do you like them?", asks the surgeon's assistant, seating herself behind you and wrapping her hands around to your heaving breasts. "We did everything we could to keep them looking natural, <<if $PC.boobsBonus == 2>>but you can definitely tell<<elseif $PC.boobsBonus == 1>>and I say we did a pretty good job<<else>>but the implants were way too big for that<</if>>." She begins groping your breasts, feeling the implant within for any oddities. "I know you're still a little sore, but bear with it." She moves on to your nipples and begins teasing them. <<if $PC.preg > 30 || $PC.births > 0>>She lets out a surprised squeak when a gush of milk escapes your breasts and a moan escapes your lips. "<<if $PC.pregKnown == 1>>Should have expected that with the pregnancy and all.<<else>>You did recently have a child didn't you? Or have you just been enjoying your nipples too much?<</if>> Either way, this is a good thing. Your breasts work."<</if>> You can't help but moan under your building arousal as she massages and teases your implant laden breasts. "Enjoying yourself are we? Let me finish you off." She sneaks a hand down to your <<if $PC.dick == 1>>stiff prick and begins stroking its length, quickly bringing you to orgasm and relieving you of your built up tension.<<else>>stiff clit and begins teasing it as well, quickly bringing you to orgasm and relieving you of your built up tension.<</if>> She states, while licking her fingers, "I always did enjoy the way you taste. Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Satisfied, you lie back down to sleep off the rest of the anesthesia before returning to your arcology.
 	
 <<case "breastEnlargement">>
-	After a few hours, you awaken in the recovery wing with a sore chest. <<if $PC.belly >= 10000 || $PC.boobsBonus == 3>>Struggling to sit<<else>>Sitting<</if>> up, you immediately notice how much heavier your breasts are. Pulling the covers off yourself, you observe your new, soft <<if $PC.boobsBonus == 3>>H-cup<<elseif $PC.boobsBonus == 2>>G-cup<<elseif $PC.boobsBonus == 1>>F-cup<<elseif $PC.boobsBonus == -0.5>>D-cup<<elseif $PC.boobsBonus == -1>>C-cup<<else>>DD<</if>> boobs in the mirror-covered wall across from your bed. "So do you like them?", asks the surgeon's assistant, seating herself behind you and wrapping her hands around to your heaving breasts. "We did everything we could to keep them perky, <<if $PC.boobsBonus == 3>>quite a feat given their size<<else>>not that hard given your natural perk<</if>>." She begins groping your breasts, feeling the added mass for any oddities. "I know you're still a little sore, but bear with it." She moves on to your nipples and begins teasing them. <<if $PC.preg > 30 || $PC.births > 0>>She lets out a surprised squeak when a gush of milk escapes your breasts and a moan escapes your lips. "<<if $PC.pregKnown == 1>>Should have expected that with the pregnancy and all.<<else>>You did recently have a child didn't you? Or have you just been enjoying your nipples too much?<</if>> Either way, this is a good thing. Your breasts work."<</if>> You can't help but moan under your building arousal as she massages and teases your fat tits. "Enjoying yourself are we? Let me finish you off." She sneaks a hand down to your <<if $PC.dick == 1>>stiff prick and begins stroking its length, quickly bringing you to orgasm and relieving you of your built up tension.<<else>>stiff clit and begins teasing it as well, quickly bringing you to orgasm and relieving you of your built up tension.<</if>> She states, while licking her fingers, "I always did enjoy the way you taste. Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Satisfied, you lie back down to sleep off the rest of the anesthesia before returning to your arcology.
+	After a few hours, you awaken in the recovery wing with a sore chest. <<if $PC.belly >= 10000 || $PC.boobsBonus == 3>>Struggling to sit<<else>>Sitting<</if>> up, you immediately notice how much heavier your breasts are. Pulling the covers off yourself, you observe your new, soft <<if $PC.boobsBonus == 3>>H-cup<<elseif $PC.boobsBonus == 2>>G-cup<<elseif $PC.boobsBonus == 1>>F-cup<<elseif $PC.boobsBonus == -1>>D-cup<<elseif $PC.boobsBonus == -2>>C-cup<<elseif $PC.boobsBonus == -3>>B-cup<<else>>DD<</if>> boobs in the mirror-covered wall across from your bed. "So do you like them?", asks the surgeon's assistant, seating herself behind you and wrapping her hands around to your heaving breasts. "We did everything we could to keep them perky, <<if $PC.boobsBonus == 3>>quite a feat given their size<<else>>not that hard given your natural perk<</if>>." She begins groping your breasts, feeling the added mass for any oddities. "I know you're still a little sore, but bear with it." She moves on to your nipples and begins teasing them. <<if $PC.preg > 30 || $PC.births > 0>>She lets out a surprised squeak when a gush of milk escapes your breasts and a moan escapes your lips. "<<if $PC.pregKnown == 1>>Should have expected that with the pregnancy and all.<<else>>You did recently have a child didn't you? Or have you just been enjoying your nipples too much?<</if>> Either way, this is a good thing. Your breasts work."<</if>> You can't help but moan under your building arousal as she massages and teases your fat tits. "Enjoying yourself are we? Let me finish you off." She sneaks a hand down to your <<if $PC.dick == 1>>stiff prick and begins stroking its length, quickly bringing you to orgasm and relieving you of your built up tension.<<else>>stiff clit and begins teasing it as well, quickly bringing you to orgasm and relieving you of your built up tension.<</if>> She states, while licking her fingers, "I always did enjoy the way you taste. Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Satisfied, you lie back down to sleep off the rest of the anesthesia before returning to your arcology.
 	
 <<case "flatChest">>
 	After a few hours, you awaken in the recovery wing with a sore chest. <<if $PC.belly >= 10000>>Struggling to sit<<else>>Sitting<</if>> up, you immediately notice the absence of the usual weight on your chest. Pulling the covers off yourself, you observe your flat chest in the mirror-covered wall across from your bed. "So do you like it?", asks the surgeon's assistant, seating herself behind you and wrapping her hands around to your chest. "I honestly couldn't live without my pair." She begins groping your chest, feeling for any oddities. "I know you're still a little sore, but bear with it." She moves on to your nipples and begins teasing them. <<if $PC.preg > 30 || $PC.births > 0>>She lets out a surprised squeak when a gush of milk escapes your tits and a moan escapes your lips. "<<if $PC.pregKnown == 1>>Should have expected that with the pregnancy and all.<<else>>You did recently have a child didn't you? Or have you just been enjoying your nipples too much?<</if>> Either way, this is a good thing. Your breasts still work, but it's still strange coming from such a flat chest."<</if>> You can't help but moan under your building arousal as she massages and teases your nipples. "Enjoying yourself are we? Let me finish you off." She sneaks a hand down to your <<if $PC.dick == 1>>stiff prick and begins stroking its length, quickly bringing you to orgasm and relieving you of your built up tension.<<else>>stiff clit and begins teasing it as well, quickly bringing you to orgasm and relieving you of your built up tension.<</if>> She states, while licking her fingers, "I always did enjoy the way you taste. Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Satisfied, you lie back down to sleep off the rest of the anesthesia before returning to your arcology.
@@ -194,7 +194,7 @@
 		your dick is gone, along with the rest of your male reproductive organs, leaving you with a pussy, a new fertile set of ovaries and a fresh womb. You can't tell much more until you get a good feel of it, but you're too sore to try.<<if $PC.boobs == 0>> You do take a moment to fondle your new C-cup breasts though; they feel nice.<</if>> 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 and placing a hand on your belly. "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. Now, this might be uncomfortable, but it would be best to check if your new parts are functioning correctly." She circles around until she is between your legs and disappears between your thighs. You feel face brush your inner legs as she brings her mouth to your fresh pussy and begins to enthusiastically eat you out. She is quite good at her job and quickly brings you to climax; your new vagina squirting girl cum across her face. She raises from your crotch and licks her lips. "Your new taste is good too. Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around. Oh! And before you leave, we'll write a prescription for some birth control for you. You don't have to use it, but it'll be there for you." Exhausted from the procedure, you settle back down to play with your tits and recover for the rest of your stay.
-	<<if $PC.boobs == 0>><<set $PC.boobs = 1, $PC.boobsBonus = -1>><</if>>
+	<<if $PC.boobs == 0>><<set $PC.boobs = 1, $PC.boobsBonus = -2>><</if>>
 	
 <<case "male2hermfemale">>
 	After a few hours, you awaken in the recovery wing with a distinct soreness between your legs and in your lower belly. You pull the covers off of yourself to catch sight of the result of the surgery and find
@@ -204,7 +204,7 @@
 		<<if $PC.ballsImplant < 1>>your new pussy peeking from under your testicles<<else>>that your balls are big enough to completely obscure your new pussy<</if>>. Your lower belly is slightly larger too, likely from your new womb. You can't tell much more until you get a good feel of it, but you're too sore to try.<<if $PC.boobs == 0>> You do take a moment to fondle your new C-cup breasts though; they feel nice.<</if>> 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 and placing a hand on your belly. "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. Now, this might be uncomfortable, but it would be best to check if your new parts are functioning correctly." She circles around until she is between your legs and disappears between your thighs. You feel <<if $PC.ballsImplant > 1>>her lift your engorged sack and leave it resting atop her head<<else>>her head brush against your sack<</if>> as she brings her mouth to your fresh pussy and begins to enthusiastically eat you out. She is quite good at her job and quickly brings you to climax; your new vagina squirting girl cum across her face and your neglected dick spraying cum across your belly. She raises from your crotch to lick up your wayward cum. "I always did like the taste of you and your new flavor is good too. Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around. Oh! And before you leave, we'll write a prescription for some birth control for you. You don't have to use it, but it'll be there for you. Just try not to mix your two halves, unless you want to watch your middle steadily swell with your own child." Exhausted from the procedure, you settle back down to play with your tits and recover for the rest of your stay.
-	<<if $PC.boobs == 0>><<set $PC.boobs = 1, $PC.boobsBonus = -1>><</if>>
+	<<if $PC.boobs == 0>><<set $PC.boobs = 1, $PC.boobsBonus = -2>><</if>>
 
 <<case "female2male">>
 	After a few hours, you awaken in the recovery wing with a distinct soreness between your legs and in your lower belly. You pull the covers off of yourself to catch sight of the result of the surgery and find
diff --git a/src/pregmod/personalNotes.tw b/src/pregmod/personalNotes.tw
index dbb55a085442a42577bd042ed7bdd94c1375142b..b1e785238422da441357bcc56dc8339a0cd59906 100644
--- a/src/pregmod/personalNotes.tw
+++ b/src/pregmod/personalNotes.tw
@@ -9,24 +9,34 @@
 <<PlayerButt>>
 <<if $PC.boobs == 1 && $PC.boobsImplant == 0>>
 	<<if $PC.preg == 31>>
-		<<if $PC.boobsBonus == 0>>
+		<<if $PC.boobsBonus == 2>>
+			<<if random(1,100) > 90>>
+				Your already huge breasts have @@.lime;grown even more enormous@@ with your new pregnancy. Quick measurements show you've gone up yet another a cup size over the course of your pregnancy.
+				<<set $PC.boobsBonus++>>
+			<</if>>
+		<<elseif $PC.boobsBonus == 1>>
+			<<if random(1,100) > 75>>
+				Your already large breasts have @@.lime;grown even larger@@ with your new pregnancy. Quick measurements show you've gone up another cup size or so over the course of your pregnancy.
+				<<set $PC.boobsBonus++>>
+			<</if>>
+		<<elseif $PC.boobsBonus == 0>>
 			<<if random(1,100) > 75>>
 				Your breasts have @@.lime;grown larger@@ to feed your coming child. Quick measurements show you've gone up a cup size over the course of your pregnancy.
 				<<set $PC.boobsBonus++>>
 			<</if>>
 		<<elseif $PC.boobsBonus == -1>>
 			<<if random(1,100) > 80>>
-				Your breasts have been really @@.lime;swollen@@ lately with your new pregnancy. Quick measurements show you've gone up nearly two cup sizes. You may want to consider getting a breast reduction.
+				Your breasts have @@.lime;grown a bit larger@@ to feed your coming child. Quick measurements show you've gone up nearly two cup sizes over the course of your pregnancy.
 				<<set $PC.boobsBonus++>>
 			<</if>>
-		<<elseif $PC.boobsBonus == 1>>
-			<<if random(1,100) > 75>>
-				Your already large breasts have @@.lime;grown even larger@@ with your new pregnancy. Quick measurements show you've gone up another cup size or so over the course of your pregnancy.
+		<<elseif $PC.boobsBonus == -2>>
+			<<if random(1,100) > 80>>
+				Your once small breasts have @@.lime;become very swollen@@ lately with your new pregnancy. Quick measurements show you've gone up a cup size over the course of your pregnancy.
 				<<set $PC.boobsBonus++>>
 			<</if>>
-		<<elseif $PC.boobsBonus == 2>>
-			<<if random(1,100) > 90>>
-				Your already huge breasts have @@.lime;grown even more enormous@@ with your new pregnancy. Quick measurements show you've gone up yet another a cup size over the course of your pregnancy.
+		<<elseif $PC.boobsBonus == -3>>
+			<<if random(1,100) > 75>>
+				Your once tiny breasts have @@.lime;become swollen@@ lately with your new pregnancy. Quick measurements show you've actually gone up a cup size over the course of your pregnancy.
 				<<set $PC.boobsBonus++>>
 			<</if>>
 		<</if>>
diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw
index b5bc4a328ddf88635a2c1f6cbe68e36c722d78c4..79c4533a0ca2857aed7e01a00b58f5e7ef4ac494 100644
--- a/src/pregmod/widgets/bodyswapWidgets.tw
+++ b/src/pregmod/widgets/bodyswapWidgets.tw
@@ -93,6 +93,7 @@
 <<set $args[0].nipplesAccessory = $args[1].nipplesAccessory>>
 <<set $args[0].areolae = $args[1].areolae>>
 <<set $args[0].areolaePiercing = $args[1].areolaePiercing>>
+<<set $args[0].areolaeShape = $args[1].areolaeShape>>
 <<set $args[0].boobsTat = $args[1].boobsTat>>
 <<set $args[0].lactation = $args[1].lactation>>
 <<set $args[0].lactationAdaptation = $args[1].lactationAdaptation>>
diff --git a/src/pregmod/widgets/playerDescriptionWidgets.tw b/src/pregmod/widgets/playerDescriptionWidgets.tw
index ec31743235ee03e0b7c13bd25be1f4a16832d120..7fb6c07a90ea5420d1d82f5ce5d9397ca72b964c 100644
--- a/src/pregmod/widgets/playerDescriptionWidgets.tw
+++ b/src/pregmod/widgets/playerDescriptionWidgets.tw
@@ -50,7 +50,7 @@
 		<<elseif $PC.markings == "heavily freckled">>
 			They are covered in freckles, which are particularly dense in the cleft between them.
 		<</if>>
-	<<elseif $PC.boobsBonus == -0.5>>
+	<<elseif $PC.boobsBonus == -1>>
 		you have a @@.orange;pair of D-cup breasts.@@ They are nice, perky and bounce pleasantly as you fuck your slaves.
 		<<if $PC.preg > 30 || $PC.births > 0>>
 			Your breasts feel bigger lately; likely a side effect of your lactation.
@@ -60,7 +60,7 @@
 		<<elseif $PC.markings == "heavily freckled">>
 			They are covered in freckles, which are particularly dense in the cleft between them.
 		<</if>>
-	<<elseif $PC.boobsBonus == -1>>
+	<<elseif $PC.boobsBonus == -2>>
 		you have a @@.orange;pair of C-cup breasts.@@ They are nice and perky, with just a little bounce when you fuck your slaves.
 		<<if $PC.preg > 30 || $PC.births > 0>>
 			Your breasts feel bigger lately; likely a side effect of your lactation.
@@ -70,6 +70,16 @@
 		<<elseif $PC.markings == "heavily freckled">>
 			They are covered in freckles, which are particularly dense in the cleft between them.
 		<</if>>
+	<<elseif $PC.boobsBonus == -3>>
+		you have a @@.orange;pair of B-cup breasts.@@ They are nice and perky, with almost no bounce when you fuck your slaves.
+		<<if $PC.preg > 30 || $PC.births > 0>>
+			Your breasts feel bigger lately; likely a side effect of your lactation.
+		<</if>>
+		<<if $PC.markings == "freckles">>
+			The tops of your breasts and your cleavage are lightly freckled.
+		<<elseif $PC.markings == "heavily freckled">>
+			They are covered in freckles, which are particularly dense in the cleft between them.
+		<</if>>
 	<<elseif $PC.boobs == 1>>
 		you have a @@.orange;healthy pair of DD breasts.@@ They are nice, perky and jiggle pleasantly with your every move.
 		<<if $PC.preg > 30 || $PC.births > 0>>
@@ -185,7 +195,7 @@
 		<<if $PC.preg > 30 || $PC.births > 0>>
 			Your breasts feel bigger lately; likely a side effect of your lactation, though you could do without the wet spots forming over your nipples.
 		<</if>>
-	<<elseif $PC.boobsBonus == -0.5>>
+	<<elseif $PC.boobsBonus == -1>>
 		Your breasts are certainly
 		<<if $PC.markings == "freckles">>
 			eye-catching with light freckling on the tops and in your cleavage.
@@ -198,7 +208,7 @@
 		<<if $PC.preg > 30 || $PC.births > 0>>
 			Your breasts feel bigger lately; likely a side effect of your lactation, though you could do without the wet spots forming over your nipples.
 		<</if>>
-	<<elseif $PC.boobsBonus == -1>>
+	<<elseif $PC.boobsBonus == -2>>
 		Your breasts are fairly average, at least to old world 
 		<<if $PC.markings == "freckles">>
 			standards, with light freckling on the tops and in your cleavage.
@@ -211,6 +221,19 @@
 		<<if $PC.preg > 30 || $PC.births > 0>>
 			Your breasts feel bigger lately; likely a side effect of your lactation, though you could do without the wet spots forming over your nipples.
 		<</if>>
+	<<elseif $PC.boobsBonus == -3>>
+		Your breasts are considered small by most
+		<<if $PC.markings == "freckles">>
+			standards, with light freckling on the tops and in your cleavage.
+		<<elseif $PC.markings == "heavily freckled">>
+			standards, and covered in freckles, which are particularly dense in the cleft between them.
+		<<else>>
+			standards.
+		<</if>>
+		Their size makes them extremely perky, at the cost of having little to no bounce.
+		<<if $PC.preg > 30 || $PC.births > 0>>
+			Your breasts feel bigger lately; likely a side effect of your lactation, though you could do without the wet spots forming over your nipples.
+		<</if>>
 	<<elseif $PC.boobs == 1>>
 		Your breasts are on the larger side of things<<if $PC.preg > 30 || $PC.births > 0>>, though you could do without the wet spots forming over your nipples<</if>>.
 		<<if $PC.markings == "freckles">>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 91820e96c4e9d466fb9968d9ab8bee6091cf4dde..37d44b24c44bb0f5e414be9473cd514e59f5a1b0 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -309,6 +309,9 @@
 <<if ndef $PC.storedCum>>
 	<<set $PC.storedCum = 0>>
 <</if>>
+<<if $PC.boobsBonus == -0.5>>
+	<<set $PC.boobsBonus = -1>>
+<</if>>
 
 <<if ndef $universalRulesImmobileSlavesMaintainMuscles>>
 	<<set $universalRulesImmobileSlavesMaintainMuscles = 0>>
@@ -2436,6 +2439,18 @@ Setting missing slave variables:
 	<<set _Slave.backTat = 0>>
 <</if>>
 
+<<if ndef _Slave.areolaeShape>>
+	<<if _Slave.areolae == 4>>
+		<<set _Slave.areolaeShape = "heart">>
+		<<set _Slave.areolae = 3>>
+	<<elseif _Slave.areolae == 5>>
+		<<set _Slave.areolaeShape = "star">>
+		<<set _Slave.areolae = 3>>
+	<<else>>
+		<<set _Slave.areolaeShape = "circle">>
+	<</if>>
+<</if>>
+
 <<if ndef _Slave.hStyle>>
 	<<set _Slave.hColor = either("black", "blonde", "red", "brown")>>
 <</if>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index e2fc70a5b5bcfe62a13a55a56cc231ba00caf10f..23a5eb3df2a892610b2bc71b749038951e982d50 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -1326,7 +1326,7 @@ into your bedroom. Since she is not allowed to ask questions, she says nothing,
 
 <<case "shaped areolae">>
 
-<<EventNameLink $activeSlave>>'s breasts are real works of art. <<if $activeSlave.boobsImplant > 0>>Her massive fake tits dominate her figure,<<else>>Her massive, sagging natural tits dominate her figure,<</if>> but the real attention getter are her unique, <<if $activeSlave.areolae == 4>>heart-shaped<<else>>star-shaped<</if>> areolae. The darker flesh around her nipples would be - should be - circular in any other woman, and the cute <<if $activeSlave.areolae == 4>>hearts<<else>>stars<</if>> around $activeSlave.slaveName's nipples are proof of just how much you've modified her. She's devoted to you, so much so that she loves showing off her special assets.
+<<EventNameLink $activeSlave>>'s breasts are real works of art. <<if $activeSlave.boobsImplant > 0>>Her massive fake tits dominate her figure,<<else>>Her massive, sagging natural tits dominate her figure,<</if>> but the real attention getter are her unique, <<if $activeSlave.areolaeShape == "heart">>heart-shaped<<elseif $activeSlave.areolaeShape == "star">>star-shaped<</if>> areolae. The darker flesh around her nipples would be - should be - circular in any other woman, and the cute <<if $activeSlave.areolaeShape == "heart">>hearts<<elseif $activeSlave.areolaeShape == "star">>stars<</if>> around $activeSlave.slaveName's nipples are proof of just how much you've modified her. She's devoted to you, so much so that she loves showing off her special assets.
 
 <<case "huge tits">>
 
@@ -2145,10 +2145,12 @@ As her gaze travels down your body towards the floor,
 		huge<<if $PC.boobsImplant == 1>>, clearly fake<<else>>, heavy<</if>> breasts
 	<<elseif $PC.boobsBonus == 1>>
 		big<<if $PC.boobsImplant == 1>>, perky<</if>> breasts
-	<<elseif $PC.boobsBonus == -0.5>>
-		handfilling breasts
 	<<elseif $PC.boobsBonus == -1>>
+		handfilling breasts
+	<<elseif $PC.boobsBonus == -2>>
 		average breasts
+	<<elseif $PC.boobsBonus == -3>>
+		small breasts
 	<<elseif $PC.boobs == 1>>
 		generous breasts
 	<</if>>
@@ -2161,10 +2163,12 @@ As her gaze travels down your body towards the floor,
 		huge, bare<<if $PC.boobsImplant == 1>>, clearly fake<<else>>, heavy<</if>> breasts
 	<<elseif $PC.boobsBonus == 1>>
 		big, bare<<if $PC.boobsImplant == 1>>, perky<</if>> breasts
-	<<elseif $PC.boobsBonus == -0.5>>
-		handfilling, bare breasts
 	<<elseif $PC.boobsBonus == -1>>
+		handfilling, bare breasts
+	<<elseif $PC.boobsBonus == -2>>
 		average, bare breasts
+	<<elseif $PC.boobsBonus == -3>>
+		small, bare breasts
 	<<elseif $PC.boobs == 1>>
 		generous, bare breasts
 	<</if>>
@@ -9344,7 +9348,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
 			$arcologies[0].name's clubs.
 		<</if>>
 	<</if>>
-	$activeSlave.slaveName <<if canSee($activeSlave)>>is blinded by the silk over her face<<else>>may not be able to see<</if>>, but she can still hear the appreciative murmurs of onlookers as they eye her magnificent breasts with their <<if $activeSlave.areolae == 4>>heart-shaped<<else>>star-shaped<</if>> areolae. She shivers a little with suppressed pride. @@.hotpink;Her devotion to you has increased,@@ and @@.green;your reputation as a person with unique property grows.@@
+	$activeSlave.slaveName <<if canSee($activeSlave)>>is blinded by the silk over her face<<else>>may not be able to see<</if>>, but she can still hear the appreciative murmurs of onlookers as they eye her magnificent breasts with their <<if $activeSlave.areolaeShape == "heart">>heart-shaped<<elseif $activeSlave.areolaeShape == "star">>star-shaped<</if>> areolae. She shivers a little with suppressed pride. @@.hotpink;Her devotion to you has increased,@@ and @@.green;your reputation as a person with unique property grows.@@
 	<<set $activeSlave.devotion += 4>>
 	<<set $rep += 100>>
 	<</replace>>
@@ -9352,7 +9356,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
 <br><<link "Use that pride as an advertisement">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	There's all sorts of business going on in $arcologies[0].name, from flesh rented or bought down to more pedestrian affairs. Advertisement never goes amiss. You place $activeSlave.slaveName naked on a slowly rotating pedestal surrounded by a clear plastiglass tube on a busy thoroughfare in the lower parts of $arcologies[0].name. These devices are often used to display slaves for sale or slave whores for rent; $activeSlave.slaveName is simply identified by your name as arcology owner, which is thus @@.yellowgreen;identified with business prosperity.@@ She spends the day serving as eye candy for passersby, rotating gently on the pedestal as she shows off her body, giving pride of place to her <<if $activeSlave.areolae == 4>>heart-shaped<<else>>star-shaped<</if>> areolae. She loves all the attention, and @@.hotpink;her devotion to you has increased.@@
+	There's all sorts of business going on in $arcologies[0].name, from flesh rented or bought down to more pedestrian affairs. Advertisement never goes amiss. You place $activeSlave.slaveName naked on a slowly rotating pedestal surrounded by a clear plastiglass tube on a busy thoroughfare in the lower parts of $arcologies[0].name. These devices are often used to display slaves for sale or slave whores for rent; $activeSlave.slaveName is simply identified by your name as arcology owner, which is thus @@.yellowgreen;identified with business prosperity.@@ She spends the day serving as eye candy for passersby, rotating gently on the pedestal as she shows off her body, giving pride of place to her <<if $activeSlave.areolaeShape == "heart">>heart-shaped<<elseif $activeSlave.areolaeShape == "star">>star-shaped<</if>> areolae. She loves all the attention, and @@.hotpink;her devotion to you has increased.@@
 	<<set $activeSlave.devotion += 4>>
 	<<set $cash += 100>>
 	<</replace>>
@@ -11908,7 +11912,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
 		<<set $activeSlave.nipplesPiercing = 2>>
 	<<elseif ($activeSlave.fetish == "pregnancy") && ($activeSlave.fetishKnown == 1)>>
 		<<if $activeSlave.belly >= 10001>>
-			hold her _belly stomach steady and pierce her navel with the largest, heaviest ring available. There is a lewd <<if canSee($activeSlave)>>glint in her eye<<else>>look on her face<</if>> as she feels the new weight settle against her middle. She rises very carefully, trying to her new piercing from moving, and @@.hotpink;smiles devotedly@@ at you. Soon enough, all eyes will be on her belly as she waddles by.
+			hold her _belly stomach steady and pierce her navel with the largest, heaviest ring available. There is a lewd <<if canSee($activeSlave)>>glint in her eye<<else>>look on her face<</if>> as she feels the new weight settle against her middle. She rises very carefully, trying to keep her new piercing from moving, and @@.hotpink;smiles devotedly@@ at you. Soon enough, all eyes will be on her belly as she waddles by.
 			<<set $activeSlave.navelPiercing = 2>>
 		<<else>>
 			activate the ink gun, its low buzzing drawing a moan of anticipation out of $activeSlave.slaveName. Working at a touchscreen, you exercise your artistic talents, beautifying her <<if $activeSlave.belly >= 150>> _belly stomach<<else>>abdomen<</if>> with an inducement to fuck her.
@@ -20001,7 +20005,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
 	and then slide off of her to instruct your servants to fix the doorframe before they carry her to her duties for the day.
 	<<set $activeSlave.health -= 20, $activeSlave.trust -= 20>>
 	<</replace>>
-<</link>>
+<</link>><<if canDoVaginal($activeSlave) && ($activeSlave.vagina == 0)>>//This option will take virginity//<<elseif !canDoVaginal($activeSlave) && canDoAnal($activeSlave) && ($activeSlave.anus == 0)>> //This option will take anal virginity//<</if>>
 <br><<link "Fuck her">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
@@ -20073,11 +20077,11 @@ You tell her kindly that you understand, and that she'll be trained to address t
 	<br>
 	<<set $activeSlave.health -= 10, $activeSlave.trust -= 10>>
 	<</replace>>
-<</link>>
-<br><<link "Try the "Butter Strategy"">>
+<</link>><<if canDoVaginal($activeSlave) && ($activeSlave.vagina == 0)>>//This option will take virginity//<<elseif !canDoVaginal($activeSlave) && canDoAnal($activeSlave) && ($activeSlave.anus == 0)>> //This option will take anal virginity//<</if>>
+<br><<link "Try the 'Butter Strategy'">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-You ponder her predicament for a moment before settling on a solution. You procure an industrial sized jar of curative laced moisturizing butter--specially formulated to ease the strain of hypermassive pregnancy--and explain to your slave that, to free her, you're going to need to completely cover her in it so that she can squeeze through. 
+	You ponder her predicament for a moment before settling on a solution. You procure an industrial sized jar of curative laced moisturizing butter--specially formulated to ease the strain of hypermassive pregnancy--and explain to your slave that, to free her, you're going to need to completely cover her in it so that she can squeeze through. 
 	<<if $activeSlave.devotion > 95>> 
 		She grins at you and then huffs, pretending to be put off by the idea. 
 	<<elseif $activeSlave.devotion > 50>> 
@@ -20091,41 +20095,46 @@ You ponder her predicament for a moment before settling on a solution. You procu
 	<<else>> 
 		She laughs derisively at you after you describe your idea, then motions for you to get on with it.
 	<</if>> 
-You move toward her and slather a generous helping of the stuff over her back and 
-	<<if $activeSlave.butt > 5>> 
+	You move toward her and slather a generous helping of the stuff over her back and 
+	<<if $activeSlave.butt > 10>> 
 		couch smothering ass,
-	<<elseif $activeSlave.butt > 2>> 
+	<<elseif $activeSlave.butt > 4>> 
 		fat ass cheeks,
 	<<else>>
 		petite ass,
 	<</if>> 
-for the sake of "being thorough." You then move forward, covering the parts of her belly you can reach from behind and taking special care to 
+	for the sake of "being thorough." You then move forward, covering the parts of her belly you can reach from behind and taking special care to 
 	<<if ($activeSlave.boobs >= 20000)>> 
-		massage the soft butter into every inch of her colossal tits, noting with satisfaction as her distant nipples,stuck on the other side of the doorway with the bulk of her room filling breasts, harden with arousal. 
+		massage the soft butter into every inch of her colossal tits, noting with satisfaction as her distant nipples, stuck on the other side of the doorway with the bulk of her room filling breasts, harden with arousal. 
 	<<elseif ($activeSlave.boobs >= 12000)>> 
 		massage the soft butter into her massive tits as they push up between the arch of the doorway and her bulging belly. You note with satisfaction as her nipples harden with arousal. 
 	<<elseif ($activeSlave.boobs >= 7000)>> 
-		massage the soft butter into her monstrous tits, enjoying the struggle it takes to heft each butterslick, glistening watermelon with both hands. You note with satisfaction as her nipples harden with arousal. 
+		massage the soft butter into her monstrous tits, enjoying the struggle it takes to heft each butterslick, glistening melon with both hands. You note with satisfaction as her nipples harden with arousal. 
 	<<elseif ($activeSlave.boobs >= 3000)>> 
-		massage the soft butter into each of her huge, headsized tits. Your slave cranes her head back a bit to avoid being smothered by her own breasts as you work the butter into them, but you can tell she's aroused by what you're doing--her nipples have turned hard as rocks. 
-	<<elseif ($activeSlave.boobsImplant > 250)>> 
+		massage the soft butter into each of her huge tits. Your slave cranes her head back a bit to avoid being smothered by her own breasts as you work the butter into them, but you can tell she's aroused by what you're doing--her nipples have turned hard as rocks. 
+	<<elseif Math.floor($activeSlave.boobsImplant/$activeSlave.boobs) >= .60>>
 		massage the soft butter into her fat, fake titties, noting with satisfaction as her nipples harden with arousal. 
 	<<elseif ($activeSlave.boobs >= 650)>> 
 		massage the soft butter into her big tits, noting with satisfaction as her nipples harden with arousal. 
 	<<elseif ($activeSlave.boobs >= 300)>> 
 		massage the soft butter into her small, girlish chest, noting with satisfaction as her nipples harden with arousal.
 	<</if>>
-<br><br>
-Satisfied with your covering of your slave's back half, you then resolve to work on her front. Getting down on your hands and knees, you crawl through the narrow triangle of space between the base of your slave's massive belly, the floor, and the doorway. It's a tight squeeze, and you take longer than you need to in order to enjoy the sound of your slave groaning as you squeeze up against her sweaty, buttered up belly, but you eventually make it through. Taking generous handfuls of butter, you slick up the front half of your slave's stomach, starting at the flattened nub of her pressure obliterated belly button and slowly working your way up to the round oval of baby packed flesh being constricted by the doorway. 
-<br><br>
-With your slave's body dripping with the thick moisturizer, you call out to her to start pulling her belly through the doorway, pushing your body up against her stomach to help push. You didn't bother to strip your clothes while buttering her body and, as you crush up against her and heave, again and again, against the sheer mass of her abdomen, you can't help but get aroused by the way your greasy clothes rub between your body and hers with each motion. At first, her belly is so firmly lodged that it doesn't move, but momentum eventually builds up and, with an audible "pop," the poor baby laden breeder finally breaks free from her containment, falling onto her back and pulling you with her into an absurd, buttery mass of flailing limbs and giggles. You take some time to flip her into a position where she won't be crushed by the weight of her own womb, and then take some more time to enjoy the fruits of your labors.
-<br><br>
-Once finished, you allow your servants to carry your @@.hotpink;thoroughly satisfied slave@@ to the baths and instruct them to continuously expand the doorway, as necessary, to attempt to prevent her getting stuck again.
-<br>
-<<set $activeSlave.devotion += 10>>
-
-		<</replace>>
-	<</link>>
+	<br><br>
+	Satisfied with your covering of your slave's back half, you then resolve to work on her front. Getting down on your hands and knees, you crawl through the narrow triangle of space between the base of your slave's massive belly, the floor, and the doorway. It's a tight squeeze, and you take longer than you need to in order to enjoy the sound of your slave groaning as you rub up against her sweaty, buttered up belly, but you eventually make it through. Taking generous handfuls of butter, you slick up the front half of your slave's stomach, starting at the flattened nub of her pressure obliterated belly button and slowly working your way up to the round oval of baby packed flesh being constricted by the doorway. 
+	<br><br>
+	With your slave's body dripping with the thick moisturizer, you call out to her to start pulling her belly through the doorway, pushing your body up against her stomach to help push. You didn't bother to strip your clothes while buttering her gravid figure and, as you crush up against her and heave, again and again, against the sheer mass of her abdomen, you can't help but get aroused by the way your greasy clothes rub between your body and hers with each motion. At first, her belly is so firmly lodged that it doesn't move, but momentum eventually builds up and, with an audible "pop," the poor baby laden breeder finally breaks free from her containment, falling onto her back and pulling you with her into an absurd, buttery mass of flailing limbs and giggles. You take some time to flip her into a position where she won't be crushed by the weight of her own womb, and then take some more time to enjoy the fruits of your labors.
+	<br><br>
+	Once finished, you allow your servants to carry your @@.hotpink;thoroughly satisfied slave@@ to the baths for a needed cleaning. You could pay to have the door widened, but then you wouldn't have such a perfect excuse to lather her in cream, would you?
+	<<set $activeSlave.devotion += 5>>
+	<</replace>>
+<</link>>
+<br><<link "Leave her to figure it out">>
+	<<EventNameDelink $activeSlave>>
+	<<replace "#result">>
+	You leave her to get herself out of this situation and return to your daily affairs, though not without focusing a camera on the distraught breeder first. For several hours enjoy the sight of her backside struggling to squeeze through the doorway before she finally manages to figure it out. She @@.mediumorchid;blames you@@ for this indignity and @@.gold;worries@@ about what else you have waiting to torment her.
+	<<set $activeSlave.devotion -= 2, $activeSlave.trust -= 2>>
+	<</replace>>
+<</link>>
 
 <<default>>
 	<br>ERROR: bad RESS event $RESSevent
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index a811c9d641e686b599c15ac2f53602f7f58a1232..82fe0d9330b9a0a3777e76e46cfab7c73b45c505 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -316,7 +316,7 @@ $dairyNameCaps
 		<</for>>
 	<</link>>
 	<<if _NewPop > $dormitory>>
-		@@.red/Dormitory capacity will be exceeded.@@
+		@@.red;Dormitory capacity will be exceeded.@@
 	<</if>>
 <</if>>
 
diff --git a/src/uncategorized/generateXXSlave.tw b/src/uncategorized/generateXXSlave.tw
index c5deb89c0682d92eb33f84a1d15e3be2c4100dbf..8237e9b77f48ee02174666f039ca595933032338 100644
--- a/src/uncategorized/generateXXSlave.tw
+++ b/src/uncategorized/generateXXSlave.tw
@@ -186,14 +186,13 @@
 <<if ($activeSlave.physicalAge > random(0,100))>>
 	<<set $activeSlave.eyes = -1>>
 	<<if random(0,100) > 90>>
-		<<set $activeSlave.eyes = -2>>
+		<<if setup.gratefulCareers.includes($activeSlave.career)>>
+			<<set $activeSlave.eyes = -2>>
+		<</if>>
 	<</if>>
 <</if>>
-<<if ($activeSlave.physicalAge > random(0,100))>>
+<<if ($activeSlave.physicalAge > random(30,100))>>
 	<<set $activeSlave.hears = -1>>
-	<<if random(0,100) > 90>>
-		<<set $activeSlave.hears = -2>>
-	<</if>>
 <</if>>
 
 
diff --git a/src/uncategorized/generateXYSlave.tw b/src/uncategorized/generateXYSlave.tw
index 461e03a0d4095a3fe276e3167c4819ae95662786..7537f1e26d42c9013d5ded3853d5fab81da7fd06 100644
--- a/src/uncategorized/generateXYSlave.tw
+++ b/src/uncategorized/generateXYSlave.tw
@@ -95,14 +95,13 @@
 <<if ($activeSlave.physicalAge > random(0,100))>>
 	<<set $activeSlave.eyes = -1>>
 	<<if random(0,100) > 90>>
-		<<set $activeSlave.eyes = -2>>
+		<<if setup.gratefulCareers.includes($activeSlave.career)>>
+			<<set $activeSlave.eyes = -2>>
+		<</if>>
 	<</if>>
 <</if>>
-<<if ($activeSlave.physicalAge > random(0,100))>>
+<<if ($activeSlave.physicalAge > random(30,100))>>
 	<<set $activeSlave.hears = -1>>
-	<<if random(0,100) > 90>>
-		<<set $activeSlave.hears = -2>>
-	<</if>>
 <</if>>
 
 /% Since we use nationality for height effects we need to initialize it now instead of later on like in vanilla Free Cities. %/
diff --git a/src/uncategorized/initRules.tw b/src/uncategorized/initRules.tw
index aaf8c51768ee4e10d5c1dc0409c37c5d5d6c9c96..99970dc2edb2a0f70be1f849b63d21eb95191a4d 100644
--- a/src/uncategorized/initRules.tw
+++ b/src/uncategorized/initRules.tw
@@ -102,6 +102,7 @@
 	pornFameSpending: "no default setting",
 	dietGrowthSupport: 0,
 	eyewear: "no default setting",
+	earwear: "no default setting",
 	assignment: [],
 	excludeAssignment: [],
 	setAssignment: "no default setting",
@@ -225,6 +226,7 @@
 	pornFameSpending: "no default setting",
 	dietGrowthSupport: 0,
 	eyewear: "no default setting",
+	earwear: "no default setting",
 	assignment: [],
 	excludeAssignment: [],
 	setAssignment: "no default setting",
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 340a7245a78e247193bc1af2c8b73b9834b90e8f..ecf03febf3c29ea8d0af463cd04bf27159986e59 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -1485,10 +1485,12 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
 					huge<<if $PC.boobsImplant == 1>>, fake<</if>>, milk laden breasts.
 				<<elseif $PC.boobsBonus == 1>>
 					large<<if $PC.boobsImplant == 1>>, fake<</if>>, milk laden breasts.
-				<<elseif $PC.boobsBonus == -0.5>>
-					milk laden breasts.
 				<<elseif $PC.boobsBonus == -1>>
+					milk laden breasts.
+				<<elseif $PC.boobsBonus == -2>>
 					small, milk laden breasts.
+				<<elseif $PC.boobsBonus == -3>>
+					tiny, milk laden breasts.
 				<<elseif $PC.boobs == 1>>
 					big, milk laden breasts.
 				<<else>>
@@ -1511,7 +1513,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
 	<</if>>
 <</if>>
 
-<<if $PC.boobs == 1 && $activeSlave.boobs < (800+(200*$PC.boobsBonus)) && $activeSlave.boobs >= 300>>
+<<if $PC.boobs == 1 && $activeSlave.boobs < (900+((500/3)*$PC.boobsBonus)) && $activeSlave.boobs >= 300>>
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;
 	<<link "Let your ample bust dominate $his pathetic one">>
 		<<replace "#introResult">>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index b19d6ac12e85e1e507a707f250d046702ced5249..9fe7aced3c6179fe196d54c7397a0c3af2dc5245 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -92,6 +92,7 @@
 		<<set $activeSlave.nipplesPiercing = 0>>
 		<<set $activeSlave.areolae = 0>>
 		<<set $activeSlave.areolaePiercing = 0>>
+		<<set $activeSlave.areolaeShape = "circle">>
 		<<set $activeSlave.lactation = 0>>
 		<<set $activeSlave.hipsImplant = 0>>
 		<<set $activeSlave.buttImplant = 0>>
@@ -514,6 +515,8 @@ She waits anxiously for your decision.
 <<set $activeSlave.health = random(20,40)>>
 <<set $activeSlave.minorInjury = "">>
 <<set $activeSlave.eyewear = "none">>
+<<set $activeSlave.earwear = "none">>
+<<set $activeSlave.earImplant = 0>>
 <<set $activeSlave.voiceImplant = 0>>
 <<set $activeSlave.shouldersImplant = 0>>
 <<set $activeSlave.boobsTat = 0>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index d2d45fc073bfda23b05854da326cfa139264dd4b..3b458d50bfa055e12080adf3992ea0e2133982f3 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -488,12 +488,12 @@ Work on her chest:
 <<elseif ($activeSlave.areolae > 1) && ($activeSlave.areolae < 4)>>
 	<<if $activeSlave.indentureRestrictions < 2>>
 	$He has big areolae that could be reshaped into a pattern. Graft skin to make $his areolae:
-		[[Heart-shaped|Surgery Degradation][$activeSlave.areolae = 4,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "areolae"]]
-		 | [[Star-shaped|Surgery Degradation][$activeSlave.areolae = 5,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "areolae"]] |
+		[[Heart-shaped|Surgery Degradation][$activeSlave.areolaeShape = "heart",$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "areolae"]]
+		 | [[Star-shaped|Surgery Degradation][$activeSlave.areolaeShape = "star",$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "areolae"]] |
 	<</if>>
-<<elseif $activeSlave.areolae == 4>>
+<<elseif $activeSlave.areolaeShape == "heart">>
 	$His huge areolae have been surgically altered to be heart-shaped.
-<<else>>
+<<elseif $activeSlave.areolaeShape == "star">>
 	$His huge areolae have been surgically altered to be star-shaped.
 <</if>>
 <<if $activeSlave.areolae > 1>>
diff --git a/src/uncategorized/saPleaseYou.tw b/src/uncategorized/saPleaseYou.tw
index 8ef2a795d6f0cece7b5c045aee492907fb5e4f9b..f3a3d0375daffffd74fb37f4f1ca3c860a61c0e1 100644
--- a/src/uncategorized/saPleaseYou.tw
+++ b/src/uncategorized/saPleaseYou.tw
@@ -299,7 +299,7 @@ serves you this week.
 			<<if ($slaves[$i].fetish == "mindbroken")>>
 				unaware of your intent to use $his mouth.
 			<<elseif ($slaves[$i].trust < -20)>>
-				$He spends the week in terrified compliance with your use of $his <<if ($PC.dick == 1)>>throat<<else>>mouth<</if>>.
+				in terrified compliance with your use of $his <<if ($PC.dick == 1)>>throat<<else>>mouth<</if>>.
 			<<elseif ($slaves[$i].devotion < -20)>>
 				struggling and gagging as you <<if ($PC.dick == 1)>>throatfuck $him<<else>>ride $his face<</if>>.
 			<<elseif ($slaves[$i].devotion <= 20)>>
diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw
index a2bd355c5f01d663c718f66eddb97dfac9f1962b..e6fdcce454abe151a590e884ca8e162038878818 100644
--- a/src/uncategorized/sellSlave.tw
+++ b/src/uncategorized/sellSlave.tw
@@ -671,7 +671,7 @@ __Bids Received__
 <<elseif ($activeSlave.anusTat > 1) && ($activeSlave.buttTat > 1) && (random(1,100) > 80)>>
 	<br>''<<print cashFormat($seed)>>'' from a citizen who is clearly aroused by her slutty tattoos.
 	<<set $seed = 1>>
-<<elseif ($activeSlave.boobs > 800) && ($activeSlave.areolae > 3) && (random(1,100) > 80)>>
+<<elseif ($activeSlave.boobs > 800) && ($activeSlave.areolaeShape != "circle") && (random(1,100) > 80)>>
 	<br>''<<print cashFormat($seed)>>'' from a citizen who can't take his eyes off her unique areolae.
 	<<set $seed = 1>>
 <<elseif ($activeSlave.clit > 2) && (random(1,100) > 80)>>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index a2f7a922fe4139072e96d5547b00b9b23840a03d..a1a5545f705fd3fb9d522d42b2e28ddf6e210437 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -584,11 +584,11 @@ As the remote surgery's long recovery cycle completes,
 
 <<case "areolae">>
 	<<if ($activeSlave.devotion > 20) && ($activeSlave.fetish == "boobs") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)>>
-		<<if $activeSlave.amp != 1>>$He's barely out of the surgery before $he's playing with her new nipples despite the pain.<<else>>$He's barely out of the surgery before $he's rubbing her new nipples against anything $he can reach, despite the pain.<</if>> $He's @@.hotpink;deliriously happy@@ with your changes to what $he thinks of as her primary sexual organs, so much so that $he now @@.mediumaquamarine;trusts@@ your plans for $his body. As with all surgery @@.red;$his health has been slightly affected.@@
+		<<if $activeSlave.amp != 1>>$He's barely out of the surgery before $he's playing with $his new nipples despite the pain.<<else>>$He's barely out of the surgery before $he's rubbing $his new nipples against anything $he can reach, despite the pain.<</if>> $He's @@.hotpink;deliriously happy@@ with your changes to what $he thinks of as $his primary sexual organs, so much so that $he now @@.mediumaquamarine;trusts@@ your plans for $his body. As with all surgery @@.red;$his health has been slightly affected.@@
 		<<set $activeSlave.trust += 4>>
 		<<set $activeSlave.devotion += 4>>
 	<<elseif ($activeSlave.devotion > 50)>>
-		<<if $activeSlave.amp != 1>>$He runs a finger over her new nipples experimentally and turns to you with a smile to show them off. $He's still sore, so $he doesn't touch them much, but $he turns from side to side to let you see them from all angles.<<else>>$He bounces a little to feel the new nipples capping her tits turns $his torso to you with a smile to show them off. $He's still sore, so $he doesn't move too violently, but $he wiggles $himself a little to show off.<</if>> @@.hotpink;$He's happy with your changes to $his nipples.@@ As with all surgery @@.red;$his health has been slightly affected.@@
+		<<if $activeSlave.amp != 1>>$He runs a finger over $his new nipples experimentally and turns to you with a smile to show them off. $He's still sore, so $he doesn't touch them much, but $he turns from side to side to let you see them from all angles.<<else>>$He bounces a little to feel the new nipples capping her tits turns $his torso to you with a smile to show them off. $He's still sore, so $he doesn't move too violently, but $he wiggles $himself a little to show off.<</if>> @@.hotpink;$He's happy with your changes to $his nipples.@@ As with all surgery @@.red;$his health has been slightly affected.@@
 		<<set $activeSlave.devotion += 4>>
 	<<elseif ($activeSlave.devotion >= -20)>>
 		<<if canSee($activeSlave)>>$He eyes her new nipples skeptically<<else>>The cool air flowing over her new nipples draws a skeptical expression to her face<</if>>. <<if $activeSlave.amp != 1>>$He's still sore, so $he doesn't touch them.<<else>>$He's still sore, so $he keeps $his body still.<</if>> $He's come to terms with the fact that $he's a slave, so $he isn't much affected mentally despite the surprise of having $his nipples reshaped. As with all surgery @@.red;$his health has been slightly affected.@@ $He is @@.gold;sensibly fearful@@ of your total power over $his body.
@@ -1364,7 +1364,7 @@ As the remote surgery's long recovery cycle completes,
 
 <<case "teeth">>
 	<<if ($activeSlave.devotion > 50)>>
-		$He clearly feels quite normal except for a vague ache around her jaw. It takes a good while for $him to figure out what has happened, but eventually $he gets enough sensation in her mouth to realize that $he is wearing prosthetic teeth that $he can remove. $He gasps with shock, but figures out the idea quickly enough by experimentally <<if $activeSlave.amp != 1>>sucking on two fingers.<<else>>simulating oral sex with her own tongue.<</if>> @@.hotpink;$He has become more submissive due to your radical reshaping of $his body.@@ Since the surgery was invasive, @@.red;$his health has been greatly affected.@@
+		$He clearly feels quite normal except for a vague ache around her jaw. It takes a good while for $him to figure out what has happened, but eventually $he gets enough sensation in $his mouth to realize that $he is wearing prosthetic teeth that $he can remove. $He gasps with shock, but figures out the idea quickly enough by experimentally <<if $activeSlave.amp != 1>>sucking on two fingers.<<else>>simulating oral sex with $his own tongue.<</if>> @@.hotpink;$He has become more submissive due to your radical reshaping of $his body.@@ Since the surgery was invasive, @@.red;$his health has been greatly affected.@@
 		<<set $activeSlave.devotion += 4>>
 	<<elseif ($activeSlave.devotion > 20)>>
 		$He clearly feels quite normal except for a vague ache around her jaw. It takes a good while for $him to figure out what has happened, but eventually $he gets enough sensation in her mouth to realize that $he is wearing prosthetic teeth that $he can remove. $He gasps with shock, but eventually her shoulders slump and $he tries to carry on. $He isn't much affected mentally. Since the surgery was invasive, @@.red;$his health has been greatly affected.@@
diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index 0425a1fb7afa2f0d555b4d20072862c329c51d75..0990b8508791fdb6dd78ff85d093f43a73a24357 100644
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw
@@ -615,7 +615,7 @@
 			<<else>>
 				a strap-on up the butt, doggy style. _partnerSlave.slaveName is using a
 				<<if ($activeSlave.anus > 2)>>
-					massive fake phallus to satisfy $hi2 _activeSlaveRel's gaping hole.
+					massive fake phallus to satisfy $his _activeSlaveRel's gaping hole.
 				<<elseif ($activeSlave.anus > 1)>>
 					decent-sized fake phallus to stretch $his _activeSlaveRel's asshole.
 				<<else>>
@@ -3979,7 +3979,7 @@
 	<<case "a mounty outfit">>
 		$His uniform slacks can be slipped off $his hips to bare $his butthole.
 	<<case "a dirndl">>
-		$His dress can be easily lifted to access $his her bare ass.
+		$His dress can be easily lifted to access $his bare ass.
 	<<case "lederhosen">>
 		$His tight shorts can be slipped off $his hips to bare $his butthole.
 	<<case "a biyelgee costume">>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 4520e13925d57bd809c9e8633049cd5020f8acaa..970a973edce1cf725fdc0aba5ad3606550656624 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -1241,14 +1241,14 @@ $His
 					$His areolae are unusually wide, eye-catching circles of _nipColor skin around each nipple.
 			<<case 3>>
 					$His _nipColor areolae are unnaturally broad, covering much of the <<if $activeSlave.boobShape == "saggy">>bottom<<else>>front<</if>> of each breast.
-			<<case 4>>
-				<<if $activeSlave.boobShape == "saggy">>$His motherly boobs point downward, though, leaving only the curved top of each heart visible.<</if>>
-					$His huge _nipColor areolae are heart-shaped, an obvious surgical alteration.
-			<<case 5>>
-					$His huge _nipColor areolae are star-shaped, an obvious surgical alteration.
 			<<default>>
 					$His $activeSlave.nipples nipples are surrounded by a minimal _nipColor areolae.
 			<</switch>>
+			<<if $activeSlave.areolaeShape == "heart">>
+				$His _nipColor areolae are heart-shaped, an obvious surgical alteration.<<if $activeSlave.boobShape == "saggy">> $His motherly boobs point downward, though, leaving only the curved top of each heart visible.<</if>>
+			<<elseif $activeSlave.areolaeShape == "star">>
+				$His _nipColor areolae are star-shaped, an obvious surgical alteration.<<if $activeSlave.boobShape == "saggy">> $His motherly boobs point downward, though, leaving only the pointed top of each star visible.<</if>>
+			<</if>>
 		<<else>>
 			<<areolaePiercingDescription>>
 		<</if>>
@@ -4746,12 +4746,14 @@ $He's got a
 
 <<widget "earDescription">>
 /* ear shape description here */
-<<if $activeSlave.hears == -1>>
-	$His hearing is noticeably impaired,
-<<elseif $activeSlave.hears < -1>>
-	$He is completely deaf,
+<<if $activeSlave.hears < 0>>
+	<<if $activeSlave.hears == -1>>
+		$His hearing is noticeably impaired,
+	<<elseif $activeSlave.hears < -1>>
+		$He is completely deaf,
+	<</if>>
+	but this isn't obvious just by looking at $his ears.
 <</if>>
-but this isn't obvious just by looking at $his ears.
 <</widget>>
 
 <<widget "faceDescription">>
@@ -6328,7 +6330,7 @@ $He has
 	<<if $activeSlave.belly >= 1000000>>
 		<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
 		<<elseif $activeSlave.bellyImplant > 0>>
-			$activeSlave.slaveName's unfathomable, hyper-swollen, implant-filled belly makes a mockery of $his corset; it holds on only with custom lacing and, even then, is more plastered to her back than wrapped around her stomach.
+			$activeSlave.slaveName's unfathomable, hyper-swollen, implant-filled belly makes a mockery of $his corset; it holds on only with custom lacing and, even then, is more plastered to $his back than wrapped around $his stomach.
 		<<else>>
 			$activeSlave.slaveName's unfathomable, hyper-swollen pregnancy makes a mockery of $his corset; despite this, even the light pressure applied to it by the failing lacings of the garment has $his packed-tight womb on the brink of rupturing. $His brood squirms as much as they possibly can under the pressure.
 		<</if>>
@@ -7185,7 +7187,7 @@ $He has
 	<<if $activeSlave.belly >= 1000000>>
 		<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
 		<<elseif $activeSlave.bellyImplant > 0>>
-			$activeSlave.slaveName's unfathomable, hyper-swollen, implant-filled belly is wrapped with tight chains. Despite how tightly they're pulled together, they fail to sink into the firm globe of her belly at all, shifting over it and agitating $his flesh with each of $his movements.
+			$activeSlave.slaveName's unfathomable, hyper-swollen, implant-filled belly is wrapped with tight chains. Despite how tightly they're pulled together, they fail to sink into the firm globe of $his belly at all, shifting over it and agitating $his flesh with each of $his movements.
 		<<else>>
 			$activeSlave.slaveName's unfathomable, hyper-swollen pregnant belly is wrapped with tight chains. It bulges so extremely that the outlines of entire infants can be seen pressed up to either side of the chains, sometimes overlapping them so that flesh rubs up against flesh; every motion inside $him is excruciating.
 		<</if>>
@@ -12176,16 +12178,16 @@ $He has
 	<<if $activeSlave.belly >= 1000000>>
 		<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
 		<<elseif $activeSlave.bellyImplant > 0>>
-			$activeSlave.slaveName's cheerleader top rests atop $his unfathomable, hyper-swollen, implant-filled belly, giving the impression that $he is about to give birth to her entire school.
+			$activeSlave.slaveName's cheerleader top rests atop $his unfathomable, hyper-swollen, implant-filled belly, giving the impression that $he is about to give birth to $his entire school.
 		<<else>>
-			$activeSlave.slaveName's cheerleader top rests atop $his unfathomable, hyper-swollen pregnant belly, giving the impression that $he is about to give birth to her entire school.
+			$activeSlave.slaveName's cheerleader top rests atop $his unfathomable, hyper-swollen pregnant belly, giving the impression that $he is about to give birth to $his entire school.
 		<</if>>
 	<<elseif $activeSlave.belly >= 750000>>
 		<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
 		<<elseif $activeSlave.bellyImplant > 0>>
-			$activeSlave.slaveName's cheerleader top rests atop $his monolithic, implant-filled belly, giving the impression that $he is pregnant with the rest of her entire squad.
+			$activeSlave.slaveName's cheerleader top rests atop $his monolithic, implant-filled belly, giving the impression that $he is pregnant with the rest of $his entire squad.
 		<<else>>
-			$activeSlave.slaveName's cheerleader top rests atop $his monolithic pregnant belly, giving the impression that $he is pregnant with the rest of her entire squad.
+			$activeSlave.slaveName's cheerleader top rests atop $his monolithic pregnant belly, giving the impression that $he is pregnant with the rest of $his entire squad.
 		<</if>>
 	<<elseif $activeSlave.bellyPreg >= 600000>>
 		$activeSlave.slaveName's cheerleader top rests atop $his titanic bulging pregnant belly clearly displaying that this cheerleader has fucked the entire school.
@@ -12521,16 +12523,16 @@ $He has
 	<<if $activeSlave.belly >= 1000000>>
 		<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
 		<<elseif $activeSlave.bellyImplant > 0>>
-			$activeSlave.slaveName's unfathomable, hyper-swollen, implant-filled belly is so enormous that the largest obi in the world could never wrap around it. As a result, $he leaves $his kimono open. It pools around $her when she rests atop her belly's incredible mass, causing her to resemble a geisha in repose due to her immobility.
+			$activeSlave.slaveName's unfathomable, hyper-swollen, implant-filled belly is so enormous that the largest obi in the world could never wrap around it. As a result, $he leaves $his kimono open. It pools around $him when $he rests atop $his belly's incredible mass, causing $him to resemble a geisha in repose due to $his immobility.
 		<<else>>
-			$activeSlave.slaveName's unfathomable, hyper-swollen pregnancy is so enormous that the largest obi in the world could never wrap around it. As a result, $he leaves $his kimono open. It pools around $her when she rests atop her belly's incredible, brood swollen mass, causing her to resemble nothing more than a geisha in repose, rocking on an ocean of undulating flesh.
+			$activeSlave.slaveName's unfathomable, hyper-swollen pregnancy is so enormous that the largest obi in the world could never wrap around it. As a result, $he leaves $his kimono open. It pools around $him when $he rests atop $his belly's incredible, brood swollen mass, causing $him to resemble nothing more than a geisha in repose, rocking on an ocean of undulating flesh.
 		<</if>>
 	<<elseif $activeSlave.belly >= 750000>>
 		<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
 		<<elseif $activeSlave.bellyImplant > 0>>
-			$activeSlave.slaveName's monolithic, implant-filled belly is so enormous that there is no way for $his obi to ever wrap around it to tie $his kimono. As a result, $he leaves $his kimono open. It pools around $her when she rests atop her belly's incredible mass.
+			$activeSlave.slaveName's monolithic, implant-filled belly is so enormous that there is no way for $his obi to ever wrap around it to tie $his kimono. As a result, $he leaves $his kimono open. It pools around $him when $he rests atop $his belly's incredible mass.
 		<<else>>
-			$activeSlave.slaveName's monolithic pregnant belly is so enormous that there is no way for $his obi to ever wrap around it to tie $his kimono. As a result, $he leaves $his kimono open. It pools around $her when she rests atop her belly's incredible mass.
+			$activeSlave.slaveName's monolithic pregnant belly is so enormous that there is no way for $his obi to ever wrap around it to tie $his kimono. As a result, $he leaves $his kimono open. It pools around $him when $he rests atop $his belly's incredible mass.
 		<</if>>
 	<<elseif $activeSlave.bellyPreg >= 600000>>
 		$activeSlave.slaveName's titanic bulging pregnant belly parts the front of $his kimono leaving it gracefully hanging to its sides.
@@ -13004,14 +13006,14 @@ $He has
 	<<if $activeSlave.belly >= 1000000>>
 		<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
 		<<elseif $activeSlave.bellyImplant > 0>>
-			Your breeding focused society finds $his unfathomable, hyper-swollen, implant-filled belly near the pinacle of fashion despite her inability to have children.
+			Your breeding focused society finds $his unfathomable, hyper-swollen, implant-filled belly near the pinacle of fashion despite $his inability to have children.
 		<<else>>
 			Your breeding focused society finds $his unfathomable, hyper-swollen pregnant belly the perfect realization of the fashionable ideal.
 		<</if>>
 	<<elseif $activeSlave.belly >= 750000>>
 		<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
 		<<elseif $activeSlave.bellyImplant > 0>>
-			Your breeding focused society finds $his monolithic implant-filled belly highly fashionable despite her inability to have children.
+			Your breeding focused society finds $his monolithic implant-filled belly highly fashionable despite $his inability to have children.
 		<<else>>
 			Your breeding focused society finds $his monolithic pregnant belly near to the perfect realization of the fashionable ideal.
 		<</if>>
diff --git a/src/utility/descriptionWidgetsPiercings.tw b/src/utility/descriptionWidgetsPiercings.tw
index 82bdb116ed9a5f322ee018b70e9c11ac2c45d462..b303d4ffda99f86be9a0d44b1c92d93732de75ec 100644
--- a/src/utility/descriptionWidgetsPiercings.tw
+++ b/src/utility/descriptionWidgetsPiercings.tw
@@ -193,28 +193,25 @@
 	<<set $seed = nippleColor($activeSlave)>>
 	<<if $activeSlave.fuckdoll == 0>>
 		<<if $activeSlave.areolaePiercing > 0>>
-		<<switch $activeSlave.areolae>>
-		<<case 1>>
-			$His areolae form large, lovely circles of $seed	skin around each nipple.
-			$He has stud piercings around their borders, enhancing the contrast.
-		<<case 2>>
-			$His areolae are unusually wide, eye-catching circles of $seed skin around each nipple.
-			$He has stud piercings around their borders, enhancing the contrast.
-		<<case 3>>
-			$His $seed areolae are unnaturally broad, covering much of the <<if $activeSlave.boobShape == "saggy">>bottom<<else>>front<</if>> of each breast.
-			$He has many stud piercings around their edges, forming a metal border between $seed nipple and breast.
-		<<case 4>>
-			$His huge $seed areolae are heart-shaped, an obvious surgical alteration.
-			<<if $activeSlave.boobShape == "saggy">>$His motherly boobs point downward, though, leaving only the curved top of each heart visible.<</if>>
-			Their borders are defined by stud piercings with pink stones.
-		<<case 5>>
-			$His huge $seed areolae are star-shaped, an obvious surgical alteration.
-			<<if $activeSlave.boobShape == "saggy">>$His motherly boobs point downward, though, leaving only the pointed top of each star visible.<</if>>
-			Their borders are defined by shiny stud piercings.
-		<<default>>
-			$He has stud piercings in circles around the edges of $his minimal $seed areolae.
-			$His $activeSlave.nipples nipples are surrounded by a minimal $seed areolae.
-		<</switch>>
+			<<switch $activeSlave.areolae>>
+			<<case 1>>
+				$His areolae form large, lovely circles of $seed skin around each nipple.
+				$He has stud piercings around their borders, enhancing the contrast.
+			<<case 2>>
+				$His areolae are unusually wide, eye-catching circles of $seed skin around each nipple.
+				$He has stud piercings around their borders, enhancing the contrast.
+			<<case 3>>
+				$His $seed areolae are unnaturally broad, covering much of the <<if $activeSlave.boobShape == "saggy">>bottom<<else>>front<</if>> of each breast.
+				$He has many stud piercings around their edges, forming a metal border between $seed nipple and breast.
+			<<default>>
+				$He has stud piercings in circles around the edges of $his minimal $seed areolae.
+				$His $activeSlave.nipples nipples are surrounded by a minimal $seed areolae.
+			<</switch>>
+			<<if $activeSlave.areolaeShape == "heart">>
+				$His $seed areolae are heart-shaped, an obvious surgical alteration. Their borders are defined by stud piercings with pink stones.<<if $activeSlave.boobShape == "saggy">> $His motherly boobs point downward, though, leaving only the curved top of each heart visible.<</if>>
+			<<elseif $activeSlave.areolaeShape == "star">>
+				$His $seed areolae are star-shaped, an obvious surgical alteration. Their borders are defined by shiny stud piercings.<<if $activeSlave.boobShape == "saggy">> $His motherly boobs point downward, though, leaving only the pointed top of each star visible.<</if>>
+			<</if>>
 		<</if>>
 	<</if>>
 <</widget>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index f28e9eca46a40ac8fc67bda81802908debd96bbc..461cb0f85eabbf45e22dab123cbf7ac198955e32 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -6,7 +6,8 @@
 	Called from Gen XX, Gen XY, CheatMode DB, InitNationalities.
 %/
 <<widget "BaseSlave">>
-	<<set $activeSlave = {slaveName: "blank", slaveSurname: 0, birthName: "blank", birthSurname: 0, genes: "XX", pronoun: "she", possessive: "her", possessivePronoun: "hers", objectReflexive: "herself", object: "her", noun: "girl", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFeed: 0, pornFame: 0, pornFameSpending: 0, pornPrestige: 0, pornPrestigeDesc: 0, pornFameType: "none", pornFocus: "none", pornTypeGeneral: 0, pornTypeFuckdoll: 0, pornTypeRape: 0, pornTypePreggo: 0, pornTypeBBW: 0, pornTypeGainer: 0, pornTypeStud: 0, pornTypeLoli: 0, pornTypeDeepThroat: 0, pornTypeStruggleFuck: 0, pornTypePainal: 0, pornTypeTease: 0, pornTypeRomantic: 0, pornTypePervert: 0, pornTypeCaring: 0, pornTypeUnflinching: 0, pornTypeSizeQueen: 0, pornTypeNeglectful: 0, pornTypeCumAddict: 0, pornTypeAnalAddict: 0, pornTypeAttentionWhore: 0, pornTypeBreastGrowth: 0, pornTypeAbusive: 0, pornTypeMalicious: 0, pornTypeSelfHating: 0, pornTypeBreeder: 0, pornTypeSub: 0, pornTypeCumSlut: 0, pornTypeAnal: 0, pornTypeHumiliation: 0, pornTypeBoobs: 0, pornTypeDom: 0, pornTypeSadist: 0, pornTypeMasochist: 0, pornTypePregnancy: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, visualAge: 18, physicalAge: 18, ovaryAge: 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", origEye: "brown", pupil: "circular", sclerae: "white", eyewear: "none", hears: 0, earwear: "none", earImplant: 0, origHColor: "brown", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, PLimb: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute",  nipplesPiercing: 0, nipplesAccessory: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, pregAdaptation: 50, broodmother: 0, broodmotherFetuses: 0, broodmotherOnHold: 0, broodmotherCountDown: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, prostate: 0, balls: 0, scrotum: 0, ovaries: 0, 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", legAccessory: "none", buttplug: "none", buttplugAttachment: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, need: 0, 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, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customTitle: "", customTitleLisp: "", rudeTitle: 0, customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, pregKnown: 0, pregWeek: 0, belly: 0, bellyPreg: 0, bellyFluid: 0, bellyImplant: -1, bellySag: 0, bellySagPreg: 0, bellyPain: 0, cervixImplant: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, scars: 0, breedingMark: 0, underArmHStyle: "waxed", bodySwap: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0, bald: 0, origBodyOwner: "", origBodyOwnerID: 0, death: "", hormoneBalance: 0, onDiet: 0, breastMesh: 0, slavesFathered: 0, PCChildrenFathered: 0, slavesKnockedUp: 0, PCKnockedUp: 0, origSkin: "white", vasectomy: 0, haircuts: 0, newGamePlus: 0, skillHG: 0, skillRC: 0, skillBG: 0, skillMD: 0, skillDJ: 0, skillNU: 0, skillTE: 0, skillAT: 0, skillST: 0, skillMM: 0, skillWA: 0, skillS: 0, skillE: 0, skillW: 0, tankBaby: 0, inducedNCS: 0, NCSyouthening: 0}>>
+	<<set $activeSlave = {slaveName: "blank", slaveSurname: 0, birthName: "blank", birthSurname: 0, genes: "XX", pronoun: "she", possessive: "her", possessivePronoun: "hers", objectReflexive: "herself", object: "her", noun: "girl", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFeed: 0, pornFame: 0, pornFameSpending: 0, pornPrestige: 0, pornPrestigeDesc: 0, pornFameType: "none", pornFocus: "none", pornTypeGeneral: 0, pornTypeFuckdoll: 0, pornTypeRape: 0, pornTypePreggo: 0, pornTypeBBW: 0, pornTypeGainer: 0, pornTypeStud: 0, pornTypeLoli: 0, pornTypeDeepThroat: 0, pornTypeStruggleFuck: 0, pornTypePainal: 0, pornTypeTease: 0, pornTypeRomantic: 0, pornTypePervert: 0, pornTypeCaring: 0, pornTypeUnflinching: 0, pornTypeSizeQueen: 0, pornTypeNeglectful: 0, pornTypeCumAddict: 0, pornTypeAnalAddict: 0, pornTypeAttentionWhore: 0, pornTypeBreastGrowth: 0, pornTypeAbusive: 0, pornTypeMalicious: 0, pornTypeSelfHating: 0, pornTypeBreeder: 0, pornTypeSub: 0, pornTypeCumSlut: 0, pornTypeAnal: 0, pornTypeHumiliation: 0, pornTypeBoobs: 0, pornTypeDom: 0, pornTypeSadist: 0, pornTypeMasochist: 0, pornTypePregnancy: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, visualAge: 18, physicalAge: 18, ovaryAge: 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", origEye: "brown", pupil: "circular", sclerae: "white", eyewear: "none", hears: 0, earwear: "none", earImplant: 0, origHColor: "brown", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, PLimb: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, nipplesAccessory: 0, areolae: 0, areolaePiercing: 0, areolaeShape: "circle", boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, pregAdaptation: 50, broodmother: 0, broodmotherFetuses: 0, broodmotherOnHold: 0, broodmotherCountDown: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, prostate: 0, balls: 0, scrotum: 0, ovaries: 0, 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", legAccessory: "none", buttplug: "none", buttplugAttachment: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, need: 0, 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, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customTitle: "", customTitleLisp: "", rudeTitle: 0, customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, pregKnown: 0, pregWeek: 0, belly: 0, bellyPreg: 0, bellyFluid: 0, bellyImplant: -1, bellySag: 0, bellySagPreg: 0, bellyPain: 0, cervixImplant: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, scars: 0, breedingMark: 0, underArmHStyle: "waxed", bodySwap: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0, bald: 0, origBodyOwner: "", origBodyOwnerID: 0, death: "", hormoneBalance: 0, onDiet: 0, breastMesh: 0, slavesFathered: 0, PCChildrenFathered: 0, slavesKnockedUp: 0, PCKnockedUp: 0, origSkin: "white", vasectomy: 0, haircuts: 0, newGamePlus: 0, skillHG: 0, skillRC: 0, skillBG: 0, skillMD: 0, skillDJ: 0, skillNU: 0, skillTE: 0, skillAT: 0, skillST: 0, skillMM: 0, skillWA: 0, skillS: 0, skillE: 0, skillW: 0, tankBaby: 0, inducedNCS: 0, NCSyouthening: 0}>>
+>>>>>>> 270ebeebb6191f6e365abc7d49935f4e8c53cdd1
 <</widget>>
 
 /%
@@ -4505,9 +4506,9 @@
 	your corporation
 <<case "neighbor">>
 	<<if $args[1]>>
-	    <<print $arcologies[$args[1]].name>>
+		<<print $arcologies[$args[1]].name>>
 	<<else>>
-	    <<print $arcologies[1].name>>
+		<<print $arcologies[1].name>>
 	<</if>>
 <<case "kidnappers">>
 	the Kidnappers' Market
@@ -4541,24 +4542,24 @@
 	The Futanari Sisters
 <<case HA>>
 	The Hippolyta Academy
-<<case "low tier criminals" "gangs and smugglers"  "white collar" "military prison">>
+<<case "low tier criminals" "gangs and smugglers" "white collar" "military prison">>
 	the prisoner sale
 <<default>>
-    Someone messed up.  _market is not known.
+	Someone messed up. _market is not known.
 
 <</switch>>
 <</widget>>
 
 /%
-   Call as <<MarketNamePeriod 'market' ['arcology']>>
+	Call as <<MarketNamePeriod 'market' ['arcology']>>
 	If $args[0] is undefined, will generate a kidnapper's market slave.
 	If $args[0] is "corporate" and $args[1] is undefined, will use neighboring arcology 1.
 %/
 <<widget MarketNamePeriod>>
 <<if $args[0]>>
-    <<set _market = $args[0]>>
+	<<set _market = $args[0]>>
 <<else>>
-    <<set _market = "kidnappers">>
+	<<set _market = "kidnappers">>
 <</if>>
 
 <<switch _market>>
@@ -4566,9 +4567,9 @@
 	your corporation.
 <<case "neighbor">>
 	<<if $args[1]>>
-	    <<print $arcologies[$args[1]].name>>.
+		<<print $arcologies[$args[1]].name>>.
 	<<else>>
-	    <<print $arcologies[1].name>>.
+		<<print $arcologies[1].name>>.
 	<</if>>
 <<case "kidnappers">>
 	the Kidnappers' Market.
@@ -4602,10 +4603,10 @@
 	The Futanari Sisters.
 <<case HA>>
 	The Hippolyta Academy.
-<<case "low tier criminals" "gangs and smugglers"  "white collar" "military prison">>
+<<case "low tier criminals" "gangs and smugglers" "white collar" "military prison">>
 	the prisoner sale.
 <<default>>
-    Someone messed up.  _market is not known.
+	Someone messed up. _market is not known.
 
 <</switch>>
 <</widget>>
@@ -4622,7 +4623,7 @@
 	<<if $activeSlave.faceShape == "masculine">>
 		<<set $activeSlave.faceShape = "sensual">>
 	<</if>>
-	<<if $activeSlave.boobShape == "saggy" ||  $activeSlave.boobShape == "downward-facing">>
+	<<if $activeSlave.boobShape == "saggy" || $activeSlave.boobShape == "downward-facing">>
 		<<set $activeSlave.boobShape = "perky">>
 	<</if>>
 	<<set $activeSlave.eyes = 1, $activeSlave.hears = 0, $activeSlave.voice = 2>>
@@ -4632,7 +4633,7 @@
 			<<set $activeSlave.devotion = random(96,100), $activeSlave.trust = random(96, 100), $activeSlave.energy = random(96,100), $activeSlave.health = random(51,60), $activeSlave.intelligenceImplant = 1, $activeSlave.intelligence = 3, $activeSlave.combatSkill = 1>>
 			<<set $activeSlave.career = either("a bodyguard", "a law enforcement officer", "a revolutionary", "a soldier", "a transporter", "an assassin", "in a militia", "a bouncer", "a bounty hunter", "a gang member", "a mercenary", "a prison guard", "a private detective", "a security guard", "a street thug", "an enforcer")>>
 		<<case "Bodyguard">>
-			<<set $activeSlave.devotion = 90, $activeSlave.trust = 80, $activeSlave.health = random(80,95), $activeSlave.muscles = random(30,70), $activeSlave.height =  Math.round(Height.random($activeSlave, {skew: 3, spread: .2, limitMult: [1, 4]})), $activeSlave.health = 100, $activeSlave.weight = random(-10,10), $activeSlave.teeth = either("pointy", "normal"), $activeSlave.amp = either(-4, -4, 0, 0, 0, 0), $activeSlave.combatSkill = 1>>
+			<<set $activeSlave.devotion = 90, $activeSlave.trust = 80, $activeSlave.health = random(80,95), $activeSlave.muscles = random(30,70), $activeSlave.height = Math.round(Height.random($activeSlave, {skew: 3, spread: .2, limitMult: [1, 4]})), $activeSlave.health = 100, $activeSlave.weight = random(-10,10), $activeSlave.teeth = either("pointy", "normal"), $activeSlave.amp = either(-4, -4, 0, 0, 0, 0), $activeSlave.combatSkill = 1>>
 			<<set $activeSlave.career = either("a bodyguard", "a kunoichi", "a law enforcement officer", "a military brat", "a revolutionary", "a soldier", "a transporter", "an assassin", "in a militia")>>
 		<<case "Wardeness">>
 			<<set $activeSlave.devotion = 80, $activeSlave.trust = 80, $activeSlave.health = random(80,95), $activeSlave.energy = random(80,100), $activeSlave.sexualFlaw = either("malicious", "none", "none", "none", "none"), $activeSlave.fetish = "sadist", $activeSlave.fetishStrength = 100, $activeSlave.muscles = random(50,80), $activeSlave.combatSkill = 1>>
@@ -4667,7 +4668,7 @@
 			<<set $activeSlave.actualAge = random(36,$retirementAge-3)>>
 			<<set $activeSlave.physicalAge = $activeSlave.actualAge, $activeSlave.visualAge = $activeSlave.actualAge, $activeSlave.ovaryAge = $activeSlave.actualAge>>
 		<<case "Motherly Attendant">>
-			<<set  $activeSlave.devotion = 90, $activeSlave.trust = 90, $activeSlave.health = random(80,95), $activeSlave.fetish = "submissive", $activeSlave.fetishStrength = 100, $activeSlave.face = random(60,90)>>
+			<<set $activeSlave.devotion = 90, $activeSlave.trust = 90, $activeSlave.health = random(80,95), $activeSlave.fetish = "submissive", $activeSlave.fetishStrength = 100, $activeSlave.face = random(60,90)>>
 			<<set $activeSlave.career = either("a counselor", "a dispatch officer", "a lifeguard", "a masseuse", "a psychologist", "a therapist"), $activeSlave.birthsTotal = random(1,3), $activeSlave.pregKnown = 1, $activeSlave.preg = random(20,35), $activeSlave.pregWeek = $activeSlave.preg, $activeSlave.pregType = 1>>
 			<<run SetBellySize($activeSlave)>>
 			<<set $activeSlave.actualAge = random(36,$retirementAge-3)>>