diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 8fd576f3415e7f88d161c968bbe434511b4d1921..5217f55ce2f00d994e395f333fce4f512152a206 100644
--- a/slave variables documentation - Pregmod.txt	
+++ b/slave variables documentation - Pregmod.txt	
@@ -293,7 +293,11 @@ pornPrestigeDesc:
 description to go with above pornPrestige
 accepts string
 
-pornFameType:
+porn:
+
+porn performance of the slave. Has the following properties:
+
+porn.fameType:
 
 what porn she is known for
 "none"
@@ -333,7 +337,7 @@ what porn she is known for
 "unspeakable"
 "huge insertion"
 
-pornFocus:
+porn.focus:
 
 what aspect of her the upgraded studio is focusing on for porn
 "none"
@@ -373,177 +377,177 @@ what aspect of her the upgraded studio is focusing on for porn
 "unflinching"
 "size queen"
 
-pornTypeGeneral:
+porn.fame.general:
 
 generic porn fame
 accepts int
 
-pornTypeFuckdoll:
+porn.fame.fuckdoll:
 
 fuckdoll porn fame
 accepts int
 
-pornTypeRape:
+porn.fame.rape:
 
 rape porn fame
 accepts int
 
-pornTypePreggo:
+porn.fame.preggo:
 
 preggo porn fame
 accepts int
 
-pornTypeBBW:
+porn.fame.BBW:
 
 BBW porn fame
 accepts int
 
-pornTypeGainer:
+porn.fame.gainer:
 
 weight gain porn fame
 accepts int
 
-pornTypeStud:
+porn.fame.stud:
 
 well hung porn fame
 accepts int
 
-pornTypeLoli:
+porn.fame.loli:
 
 underage porn fame
 accepts int
 
-pornTypeDeepThroat:
+porn.fame.deepThroat:
 
 gagfuck queen porn fame
 accepts int
 
-pornTypeStruggleFuck:
+porn.fame.struggleFuck:
 
 strugglefuck queen porn fame
 accepts int
 
-pornTypePainal:
+porn.fame.painal:
 
 painal queen porn fame
 accepts int
 
-pornTypeTease:
+porn.fame.tease:
 
 tease porn fame
 accepts int
 
-pornTypeRomantic:
+porn.fame.romantic:
 
 romantic porn fame
 accepts int
 
-pornTypePervert:
+porn.fame.pervert:
 
 pervert porn fame
 accepts int
 
-pornTypeCaring:
+porn.fame.caring:
 
 caring porn fame
 accepts int
 
-pornTypeUnflinching:
+porn.fame.unflinching:
 
 unflinching porn fame
 accepts int
 
-pornTypeSizeQueen:
+porn.fame.sizeQueen:
 
 size queen porn fame
 accepts int
 
-pornTypeNeglectful:
+porn.fame.neglectful:
 
 neglectful porn fame
 accepts int
 
-pornTypeCumAddict:
+porn.fame.cumAddict:
 
 cum addict porn fame
 accepts int
 
-pornTypeAnalAddict:
+porn.fame.analAddict:
 
 anal addict porn fame
 accepts int
 
-pornTypeAttentionWhore:
+porn.fame.attentionWhore:
 
 attention whore porn fame
 accepts int
 
-pornTypeBreastGrowth:
+porn.fame.breastGrowth:
 
 breast growth porn fame
 accepts int
 
-pornTypeAbusive:
+porn.fame.abusive:
 
 abusive porn fame
 accepts int
 
-pornTypeMalicious:
+porn.fame.malicious:
 
 malicious porn fame
 accepts int
 
-pornTypeSelfHating:
+porn.fame.selfHating:
 
 self hating porn fame
 accepts int
 
-pornTypeBreeder:
+porn.fame.breeder:
 
 breeder porn fame
 accepts int
 
-pornTypeSub:
+porn.fame.sub:
 
 submissive porn fame
 accepts int
 
-pornTypeCumSlut:
+porn.fame.cumSlut:
 
 cumslut porn fame
 accepts int
 
-pornTypeAnal:
+porn.fame.anal:
 
 buttslut porn fame
 accepts int
 
-pornTypeHumiliation:
+porn.fame.humiliation:
 
 humiliation porn fame
 accepts int
 
-pornTypeBoobs:
+porn.fame.boobs:
 
 boob porn fame
 accepts int
 
-pornTypeDom:
+porn.fame.dom:
 
 dom porn fame
 accepts int
 
-pornTypeSadist:
+porn.fame.sadist:
 
 sadist porn fame
 accepts int
 
-pornTypeMasochist:
+porn.fame.masochist:
 
 masochist porn fame
 accepts int
 
-pornTypePregnancy:
+porn.fame.pregnancy:
 
 pregnancy porn fame
 accepts int
@@ -3616,9 +3620,7 @@ Not currently used, will work similarly to the cash variables above
 
 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", 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", origRace: "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", underArmHColor: "brown", eyebrowHColor: "brown", origSkin: "light", skin: "light", hLength: 60, eyebrowFullness: "natural", hStyle: "short", pubicHStyle: "neat", underArmHStyle: "neat", eyebrowHStyle: "natural", 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, superfetation: 0, ovaImplant: 0, wombImplant: "none", 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, bodySwap: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, reservedChildrenNursery: 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, prematureBirth: 0, premature: 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, skillMT: 0, skillST: 0, skillMM: 0, skillFA: 0, skillWA: 0, skillS: 0, skillE: 0, skillW: 0, tankBaby: 0, geneMods: {NCS: 0, rapidCellGrowth: 0}, NCSyouthening: 0, override_Race: 0, override_Skin: 0, override_Eye_Color: 0, override_H_Color: 0, override_Pubic_H_Color: 0, override_Arm_H_Color: 0, override_Brow_H_Color: 0, albinismOverride: 0, missingEyes: 0, missingArms: 0, missingLegs: 0, slaveCost: 0, lifetimeCashExpenses: 0, lifetimeCashIncome: 0, lastWeeksCashIncome: 0, lifetimeRepExpenses: 0, lifetimeRepIncome: 0, lastWeeksRepIncome: 0, chastityVagina = 0, chastityPenis = 0, chastityAnus = 0, smells: 0, tastes: 0}>>
+-The default slave template used is defined in src/js/SlaveState.js
 
 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
@@ -3626,7 +3628,7 @@ Making your slave; add their name to the following, then go down the documentati
 -if your slave's variable matches the default, you do not have to list it
 -strings MUST be in " or your slave will not compile properly
 
-<<set _HS = {}>>
+<<set _HS =  App.Entity.SlaveState.makeSkeleton()>>
 <<set _HS.slaveName = "STANDARD", _HS.birthName = "STANDARD", _HS.ID = _i++>>
 <<set $heroSlaves.push(_HS)>>
 
diff --git a/src/endWeek/saPorn.js b/src/endWeek/saPorn.js
index 2804472deb42f6dff2df62f54f8e098f9d8619d8..fea7013dedb26444c9d3ff878d4761ec26a8e83e 100644
--- a/src/endWeek/saPorn.js
+++ b/src/endWeek/saPorn.js
@@ -3,110 +3,110 @@
 window.getHighestPorn = /** @param {App.Entity.SlaveState} slave */ function(slave) {
 	let max = {value: 0, type: "none"};
 
-	if (slave.pornTypeGeneral > max.value) {
-		max = {value: slave.pornTypeGeneral, type: "generic"};
+	if (slave.porn.fame.general > max.value) {
+		max = {value: slave.porn.fame.general, type: "generic"};
 	}
-	if (slave.pornTypeFuckdoll > max.value) {
-		max = {value: slave.pornTypeFuckdoll, type: "fuckdoll"};
+	if (slave.porn.fame.fuckdoll > max.value) {
+		max = {value: slave.porn.fame.fuckdoll, type: "fuckdoll"};
 	}
-	if (slave.pornTypeRape > max.value) {
-		max = {value: slave.pornTypeRape, type: "rape"};
+	if (slave.porn.fame.rape > max.value) {
+		max = {value: slave.porn.fame.rape, type: "rape"};
 	}
-	if (slave.pornTypePreggo > max.value) {
-		max = {value: slave.pornTypePreggo, type: "preggo"};
+	if (slave.porn.fame.preggo > max.value) {
+		max = {value: slave.porn.fame.preggo, type: "preggo"};
 	}
-	if (slave.pornTypeBBW > max.value) {
-		max = {value: slave.pornTypeBBW, type: "BBW"};
+	if (slave.porn.fame.BBW > max.value) {
+		max = {value: slave.porn.fame.BBW, type: "BBW"};
 	}
-	if (slave.pornTypeGainer > max.value) {
-		max = {value: slave.pornTypeGainer, type: "weight gain"};
+	if (slave.porn.fame.gainer > max.value) {
+		max = {value: slave.porn.fame.gainer, type: "weight gain"};
 	}
-	if (slave.pornTypeStud > max.value) {
-		max = {value: slave.pornTypeStud, type: "big dick"};
+	if (slave.porn.fame.stud > max.value) {
+		max = {value: slave.porn.fame.stud, type: "big dick"};
 	}
-	if (slave.pornTypeLoli > max.value) {
-		max = {value: slave.pornTypeLoli, type: "underage"};
+	if (slave.porn.fame.loli > max.value) {
+		max = {value: slave.porn.fame.loli, type: "underage"};
 	}
-	if (slave.pornTypeDeepThroat > max.value) {
-		max = {value: slave.pornTypeDeepThroat, type: "deepthroat"};
+	if (slave.porn.fame.deepThroat > max.value) {
+		max = {value: slave.porn.fame.deepThroat, type: "deepthroat"};
 	}
-	if (slave.pornTypeStruggleFuck > max.value) {
-		max = {value: slave.pornTypeStruggleFuck, type: "unwilling"};
+	if (slave.porn.fame.struggleFuck > max.value) {
+		max = {value: slave.porn.fame.struggleFuck, type: "unwilling"};
 	}
-	if (slave.pornTypePainal > max.value) {
-		max = {value: slave.pornTypePainal, type: "hardcore anal"};
+	if (slave.porn.fame.painal > max.value) {
+		max = {value: slave.porn.fame.painal, type: "hardcore anal"};
 	}
-	if (slave.pornTypeTease > max.value) {
-		max = {value: slave.pornTypeTease, type: "softcore"};
+	if (slave.porn.fame.tease > max.value) {
+		max = {value: slave.porn.fame.tease, type: "softcore"};
 	}
-	if (slave.pornTypeRomantic > max.value) {
-		max = {value: slave.pornTypeRomantic, type: "romantic"};
+	if (slave.porn.fame.romantic > max.value) {
+		max = {value: slave.porn.fame.romantic, type: "romantic"};
 	}
-	if (slave.pornTypePervert > max.value) {
-		max = {value: slave.pornTypePervert, type: "really perverted"};
+	if (slave.porn.fame.pervert > max.value) {
+		max = {value: slave.porn.fame.pervert, type: "really perverted"};
 	}
-	if (slave.pornTypeCaring > max.value) {
-		max = {value: slave.pornTypeCaring, type: "voyeur"};
+	if (slave.porn.fame.caring > max.value) {
+		max = {value: slave.porn.fame.caring, type: "voyeur"};
 	}
-	if (slave.pornTypeUnflinching > max.value) {
-		max = {value: slave.pornTypeUnflinching, type: "unspeakable"};
+	if (slave.porn.fame.unflinching > max.value) {
+		max = {value: slave.porn.fame.unflinching, type: "unspeakable"};
 	}
-	if (slave.pornTypeSizeQueen > max.value) {
-		max = {value: slave.pornTypeSizeQueen, type: "huge insertion"};
+	if (slave.porn.fame.sizeQueen > max.value) {
+		max = {value: slave.porn.fame.sizeQueen, type: "huge insertion"};
 	}
-	if (slave.pornTypeNeglectful > max.value) {
-		max = {value: slave.pornTypeNeglectful, type: "orgasm denial"};
+	if (slave.porn.fame.neglectful > max.value) {
+		max = {value: slave.porn.fame.neglectful, type: "orgasm denial"};
 	}
-	if (slave.pornTypeCumAddict > max.value) {
-		max = {value: slave.pornTypeCumAddict, type: "cum addiction"};
+	if (slave.porn.fame.cumAddict > max.value) {
+		max = {value: slave.porn.fame.cumAddict, type: "cum addiction"};
 	}
-	if (slave.pornTypeAnalAddict > max.value) {
-		max = {value: slave.pornTypeAnalAddict, type: "anal addiction"};
+	if (slave.porn.fame.analAddict > max.value) {
+		max = {value: slave.porn.fame.analAddict, type: "anal addiction"};
 	}
-	if (slave.pornTypeAttentionWhore > max.value) {
-		max = {value: slave.pornTypeAttentionWhore, type: "exhibition"};
+	if (slave.porn.fame.attentionWhore > max.value) {
+		max = {value: slave.porn.fame.attentionWhore, type: "exhibition"};
 	}
-	if (slave.pornTypeBreastGrowth > max.value) {
-		max = {value: slave.pornTypeBreastGrowth, type: "breast expansion"};
+	if (slave.porn.fame.breastGrowth > max.value) {
+		max = {value: slave.porn.fame.breastGrowth, type: "breast expansion"};
 	}
-	if (slave.pornTypeAbusive > max.value) {
-		max = {value: slave.pornTypeAbusive, type: "abuse"};
+	if (slave.porn.fame.abusive > max.value) {
+		max = {value: slave.porn.fame.abusive, type: "abuse"};
 	}
-	if (slave.pornTypeMalicious > max.value) {
-		max = {value: slave.pornTypeMalicious, type: "sexual torture"};
+	if (slave.porn.fame.malicious > max.value) {
+		max = {value: slave.porn.fame.malicious, type: "sexual torture"};
 	}
-	if (slave.pornTypeSelfHating > max.value) {
-		max = {value: slave.pornTypeSelfHating, type: "self hating"};
+	if (slave.porn.fame.selfHating > max.value) {
+		max = {value: slave.porn.fame.selfHating, type: "self hating"};
 	}
-	if (slave.pornTypeBreeder > max.value) {
-		max = {value: slave.pornTypeBreeder, type: "breeder"};
+	if (slave.porn.fame.breeder > max.value) {
+		max = {value: slave.porn.fame.breeder, type: "breeder"};
 	}
-	if (slave.pornTypeSub > max.value) {
-		max = {value: slave.pornTypeSub, type: "submissive"};
+	if (slave.porn.fame.sub > max.value) {
+		max = {value: slave.porn.fame.sub, type: "submissive"};
 	}
-	if (slave.pornTypeCumSlut > max.value) {
-		max = {value: slave.pornTypeCumSlut, type: "cum"};
+	if (slave.porn.fame.cumSlut > max.value) {
+		max = {value: slave.porn.fame.cumSlut, type: "cum"};
 	}
-	if (slave.pornTypeAnal > max.value) {
-		max = {value: slave.pornTypeAnal, type: "buttslut"};
+	if (slave.porn.fame.anal > max.value) {
+		max = {value: slave.porn.fame.anal, type: "buttslut"};
 	}
-	if (slave.pornTypeHumiliation > max.value) {
-		max = {value: slave.pornTypeHumiliation, type: "humiliating"};
+	if (slave.porn.fame.humiliation > max.value) {
+		max = {value: slave.porn.fame.humiliation, type: "humiliating"};
 	}
-	if (slave.pornTypeBoobs > max.value) {
-		max = {value: slave.pornTypeBoobs, type: "breast"};
+	if (slave.porn.fame.boobs > max.value) {
+		max = {value: slave.porn.fame.boobs, type: "breast"};
 	}
-	if (slave.pornTypeDom > max.value) {
-		max = {value: slave.pornTypeDom, type: "dominant"};
+	if (slave.porn.fame.dom > max.value) {
+		max = {value: slave.porn.fame.dom, type: "dominant"};
 	}
-	if (slave.pornTypeSadist > max.value) {
-		max = {value: slave.pornTypeSadist, type: "sadistic"};
+	if (slave.porn.fame.sadist > max.value) {
+		max = {value: slave.porn.fame.sadist, type: "sadistic"};
 	}
-	if (slave.pornTypeMasochist > max.value) {
-		max = {value: slave.pornTypeMasochist, type: "masochistic"};
+	if (slave.porn.fame.masochist > max.value) {
+		max = {value: slave.porn.fame.masochist, type: "masochistic"};
 	}
-	if (slave.pornTypePregnancy > max.value) {
-		max = {value: slave.pornTypePregnancy, type: "pregnancy fetish"};
+	if (slave.porn.fame.pregnancy > max.value) {
+		max = {value: slave.porn.fame.pregnancy, type: "pregnancy fetish"};
 	}
 
 	return max;
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 800c2f125d15013f341b26c50f890326e61d862d..2508553d8b50acc3534c62cc2970162c6968000e 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -286,6 +286,14 @@ __''Slave age settings''__
 
 <br>
 
+<<options $pedo_mode>>
+	<<option 0 "Normal mode">>
+		Randomly generated slaves will generate normally.
+	<<option 1 "Loli mode" "$minimumSlaveAge = 5">>
+		Nearly all randomly generated slaves will be under the age of 18, although custom slaves and slaves related to specific events may be older.
+<</options>>
+<br>
+
 <<if $minimumSlaveAge < 3>>
 	<<set $minimumSlaveAge = 3>>
 <<elseif $minimumSlaveAge < 18>>
@@ -323,13 +331,6 @@ __''Slave age settings''__
 	<<comment>>
 		May cause issues with New Game and initial slaves if set below 45.
 <</options>>
-<br>
-<<options $pedo_mode>>
-	<<option 0 "Normal mode">>
-		Randomly generated slaves will generate normally.
-	<<option 1 "Loli mode" "$minimumSlaveAge = 5">>
-		Nearly all randomly generated slaves will be under the age of 18, although custom slaves and slaves related to specific events may be older.
-<</options>>
 
 <br>
 <<if $fertilityAge < 3>>
@@ -573,7 +574,6 @@ __''The Free City''__
 	<<comment>>
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 		5 is default, 4 behaves the same as pre-patch 0.9.9.0, max is 7.
-		Make sure to hit enter to confirm.
 		This option cannot be changed during the game
 <</options>>
 
diff --git a/src/facilities/nursery/longChildDescription.tw b/src/facilities/nursery/longChildDescription.tw
index 16f2b93a3e51cfc06a33460a7b89d24b791913e2..1c7eb0f0ffcf6ad0495fe5a38670d83e3311b48a 100644
--- a/src/facilities/nursery/longChildDescription.tw
+++ b/src/facilities/nursery/longChildDescription.tw
@@ -355,7 +355,7 @@ $he's
 		<</if>>
 	<</if>>
 
-	<<eyeDescription>>
+	<<= App.Desc.Eyes($activeChild)>>
 
 	<<if $activeChild.fetish == "mindbroken">>
 		However, @@.coral;$his mind is fundamentally broken;@@ everything $he experiences will quickly be forgotten.
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 9f96d205aae06983d48a63cb8ead06e5c6197b27..d0d4bc172409e54b4c0b1cf841e21de24817df14 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -142,7 +142,7 @@ You should have received a copy of the GNU General Public License along with thi
 		<<if $slaves[_i].relation != 0>>
 			<<set _seed = 0, _rt = $slaves[_i].relationTarget, _ID = $slaves[_i].ID>>
 			<<set _j = $slaveIndices[_rt]>>
-			<<if def _j && $slaves[_j].relationTarget == _ID>>
+			<<if (def _j) && $slaves[_j].relationTarget == _ID>>
 				<<set _seed = 1>>
 			<</if>>
 			<<if _seed == 0>>
@@ -152,7 +152,7 @@ You should have received a copy of the GNU General Public License along with thi
 		<<if $slaves[_i].relationship > 0>>
 			<<set _seed = 0, _rt = $slaves[_i].relationshipTarget, _ID = $slaves[_i].ID>>
 			<<set _j = $slaveIndices[_rt]>>
-			<<if def _j && $slaves[_j].relationshipTarget == _ID>>
+			<<if (def _j) && $slaves[_j].relationshipTarget == _ID>>
 				<<set _seed = 1>>
 			<</if>>
 			<<if _seed == 0>>
diff --git a/src/interaction/main/mainLinks.js b/src/interaction/main/mainLinks.js
index beb5e84d1faa78f240aa3ebacedc528a6a040172..c2e7c0e9e0d51d1400c799a8c3e63d6ee4b688d0 100644
--- a/src/interaction/main/mainLinks.js
+++ b/src/interaction/main/mainLinks.js
@@ -8,19 +8,17 @@ App.UI.View.MainLinks = function() {
 	"use strict";
 	const V = State.variables;
 	const PA = Array.isArray(V.personalAttention) ? V.personalAttention.map(function(x) { return getSlave(x.ID); }) : [];
-	var r = ``;
+	let r = ``;
 	if (V.HeadGirl) {
-		var pronouns = getPronouns(V.HeadGirl);
-		var he = pronouns.pronoun;
-		var him = pronouns.object;
-		var his = pronouns.possessive;
-		var hers = pronouns.possessivePronoun;
-		var himself = pronouns.objectReflexive;
-		var boy = pronouns.noun;
-		var He = capFirstChar(he);
-		var His = capFirstChar(his);
-		var sl = V.slaves.length;
-		var cl = V.completedOrgans.length;
+		var pronouns = getPronouns(V.HeadGirl),
+			he = pronouns.pronoun,
+			him = pronouns.object,
+			his = pronouns.possessive,
+			hers = pronouns.possessivePronoun,
+			himself = pronouns.objectReflexive,
+			boy = pronouns.noun,
+			He = capFirstChar(he),
+			His = capFirstChar(his);
 	}
 
 	if (V.PCWounded === 1) {
@@ -64,7 +62,7 @@ App.UI.View.MainLinks = function() {
 				r += `This week you will learn hacking.`;
 				break;
 			case "proclamation":
-				r += `This week you plan to issue a proclamation about ${proclamationType}.`;
+				r += `This week you plan to issue a proclamation about ${V.proclamationType}.`;
 				break;
 			case "technical accidents":
 				r += `This week you plan to sell your technical skills to the highest bidder.`;
@@ -126,85 +124,58 @@ App.UI.View.MainLinks = function() {
 		}
 	}
 
-	
-	/* cycle through slaves, for each slave cycle through completed organs and track how many are of the interrogated slave (and if organs have a slaves to be implanted on)
 	if (V.completedOrgans.length > 0) {
-		let validOrgans = 0;
-		for (let dwj = 0; dwj < sl; dwj++) {
-			/* the original code has a <<capture>>, not sure if we need one here
+		/* first remove any organs with no corresponding slave */
+		V.completedOrgans = V.completedOrgans.filter(organ => {
+			return (typeof organ === 'object' && getSlave(organ.ID) !== undefined);
+		});
+		/* cycle through slaves, for each slave cycle through completed organs and track how many are of the interrogated slave (and if organs have a slaves to be implanted on) */
+		for (let i = 0; i < V.slaves.length; i++) {
 			let slaveOrgans = 0;
-			for (let dwk = 0; dwk < cl; dwk++) {
-				if ((V.completedOrgans[dwk] !== 0) && (V.completedOrgans[dwk].ID === V.slaves[dwk].ID)) {
+			V.completedOrgans.forEach(organ => {
+				if (organ.ID === V.slaves[i].ID)
 					slaveOrgans++;
-					validOrgans++;
-				}
-			}
-			/* if the interrogated slave has one or more organs ready:
+			});
+			/* if the interrogated slave has one or more organs ready: */
 			if (slaveOrgans > 0) {
-				r += `<br><span class=yellow>The fabricator has completed `;
+				r += '<br><span class=yellow>The fabricator has completed ';
 				if (slaveOrgans > 1) {
-					r += slaveOrgans + ` organs`;
+					r += `${slaveOrgans} organs`;
 				} else {
-					r += `an organ`;
+					r += 'an organ';
 				}
-				r += ` for </span><<link "<<print $slaves[_dwi].slaveName>>">><<set $activeSlave = $slaves[_dwi]>><<goto "Slave Interact">>
-				<</link>>
-				, <span class=yellow> which `;
+				r += ` for </span><<link "<<print $slaves[${i}].slaveName>>">><<set $activeSlave = $slaves[${i}]>><<goto "Slave Interact">><</link>>, <span class=yellow> which `;
 				if (slaveOrgans > 1) {
-					r += `are`;
+					r += 'are';
 				} else {
-					r += `is`;
+					r += 'is';
 				} 
-				r += ` ready to be implanted.</span>`;
-			}
-		}
-		
-		/* if the check returns true it means there are organs without slaves associated to. I think this was the purpose of the _validHost check in the original code
-		if (validOrgans < cl) {
-			let sl;
-			for (let dwl = 0; dwl < cl; dwl++) {
-				let isValid = 0;
-				for (let dwm = 0; dwm < sl; dwm++) {
-					if ((V.completedOrgans[dwm] !== 0) && (V.completedOrgans[dwm].ID === V.slaves[dwm].ID)) {
-						isValid = 1;
-					}
-				}
-				if (isValid === 0) {
-					V.completedOrgans.deleteAt(dwm);
-				}
+				r += ' ready to be implanted.</span>';
 			}
 		}
 	}
 
 	if (V.limbsCompleted > 0) {
-		let ll = V.limbs.length;
-		for (let dwn = 0; dwn < ll; dwn++) {
-			let validHost = 0;
-			for (let dwo = 0; dwo < sl; dwo++) {
-				let slave = V.slaves[dwn];
-				if ((V.limbs[dwn] !== 0) && (V.limbs[dwn].ID === slave.ID)) {
-					validHost = 1;
-					if (limbs[dwn].weeksToCompletion <= 0) {
-						r += `<br><span class=yellow>The facility has completed a set of limbs for</span> <span id="name"><<print "[[SlaveFullName(_Slave)|Slave Interact][$activeSlave = $slaves[" + _dwi + "]]]">></span>, <span class=yellow> which is ready to be attached.</span>`;
-					}
+		for (let j = 0; j < V.limbs.length; j++) {
+			if (typeof V.limbs[j] === 'object' || getSlave(V.limbs[j].ID) !== undefined) {
+				let i = V.slaveIndices[V.limbs[j].ID];
+				if (V.limbs[j].weeksToCompletion <= 0) {
+					r += `<br><span class=yellow>The facility has completed a set of limbs for</span> <span id="name"><<print "[[SlaveFullName($slaves[${i}])|Slave Interact][$activeSlave = $slaves[${i}]]]">></span>, <span class=yellow> which is ready to be attached.</span>`;
 				}
-			}
-			if (validHost === 0) {
-				let dump = V.limbs.deleteAt(dwn);
-				dwn--;
+			} else {
+				V.limbs.splice(j, 1);
+				j--;
 			}
 		}
 	}
 
-	if (cl > 0 && V.limbsCompleted > 0) {
-		r += `<br>[[Implant and Attach|Multiple Organ Implant]] <span class=yellow>all organs and limbs that are ready.</span>`;
-	} else if (cl > 0) {
-		r += `<br>[[Implant|Multiple Organ Implant]] <span class=yellow>all organs that are ready for implantation.</span>`;
+	if (V.completedOrgans.length > 0 && V.limbsCompleted > 0) {
+		r += `<br>[[Implant and Attach|Multiple Organ Implant]] <span class=yellow>all organs and limbs that are ready.</span><br>`;
+	} else if (V.completedOrgans.length > 0) {
+		r += `<br>[[Implant|Multiple Organ Implant]] <span class=yellow>all organs that are ready for implantation.</span><br>`;
 	} else if (V.limbsCompleted > 0) {
-		r += `<br>[[Attach|Multiple Organ Implant]] <span class=yellow>all sets of limbs that are ready to be attached.</span>`;
+		r += `<br>[[Attach|Multiple Organ Implant]] <span class=yellow>all sets of limbs that are ready to be attached.</span><br>`;
 	}
-	*/
-	r += `<<MainLinks>><br>`;
 
 	if (V.slaveCostFactor > 1.05) {
 		r += `<span class=yellow>There is a bull market for slaves; the price of slaves is very high.</span>`;
@@ -247,5 +218,5 @@ App.UI.View.MainLinks = function() {
 		}
 	}
 	return r;
-}
-/* CLOSE MAIN */
\ No newline at end of file
+};
+/* CLOSE MAIN */
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index cb19ef1633b043421895c8004dd298e1e50b6f24..eb71a9720937419070e9fc4c6cec88f73bddab1b 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -3,12 +3,100 @@
  * Encapsulates the full description of a slave state. Serializable by the SugarCube state
  * management.
  */
+
+/**
+ * Encapsulates porn performance of a slave. Used inside of the
+ * App.Entity.SlaveState class.
+ * @ref App.Entity.SlaveState
+ */
+App.Entity.SlavePornPerformanceState = class SlavePornPerformanceState {
+	constructor() {
+		/** what porn she is known for */
+		this.fameType = "none";
+		/** what aspect of her the upgraded studio is focusing on for porn */
+		this.focus = "none";
+		this.fame = {
+			/** generic porn fame */
+			general: 0,
+			/** fuckdoll porn fame */
+			fuckdoll: 0,
+			/** rape porn fame */
+			rape: 0,
+			/** preggo porn fame */
+			preggo: 0,
+			/** BBW porn fame */
+			BBW: 0,
+			/** weight gain porn fame */
+			gainer: 0,
+			/** well hung porn fame */
+			stud: 0,
+			/** underage porn fame */
+			loli: 0,
+			/** gagfuck queen porn fame */
+			deepThroat: 0,
+			/** strugglefuck queen porn fame */
+			struggleFuck: 0,
+			/** painal queen porn fame */
+			painal: 0,
+			/** tease porn fame */
+			tease: 0,
+			/** romantic porn fame */
+			romantic: 0,
+			/** pervert porn fame */
+			pervert: 0,
+			/** caring porn fame */
+			caring: 0,
+			/** unflinching porn fame */
+			unflinching: 0,
+			/** size queen porn fame */
+			sizeQueen: 0,
+			/** neglectful porn fame */
+			neglectful: 0,
+			/** cum addict porn fame */
+			cumAddict: 0,
+			/** anal addict porn fame */
+			analAddict: 0,
+			/** attention whore porn fame */
+			attentionWhore: 0,
+			/** breast growth porn fame */
+			breastGrowth: 0,
+			/** abusive porn fame */
+			abusive: 0,
+			/** malicious porn fame */
+			malicious: 0,
+			/** self hating porn fame */
+			selfHating: 0,
+			/** breeder porn fame */
+			breeder: 0,
+			/** submissive porn fame */
+			sub: 0,
+			/** cumslut porn fame */
+			cumSlut: 0,
+			/** buttslut porn fame */
+			anal: 0,
+			/** humiliation porn fame */
+			humiliation: 0,
+			/** boob porn fame */
+			boobs: 0,
+			/** dom porn fame */
+			dom: 0,
+			/** sadist porn fame */
+			sadist: 0,
+			/** masochist porn fame */
+			masochist: 0,
+			/** pregnancy porn fame*/
+			pregnancy: 0
+		};
+	}
+};
+
 App.Entity.SlaveState = class SlaveState {
 
 	constructor() {
 		/** Slave's current name */
 		this.slaveName = "blank";
-		/** Slave's current surname */
+		/** Slave's current surname
+		 * @type {string|number} */
 		this.slaveSurname = 0;
 		/** slave's original name */
 		this.birthName = "blank";
@@ -55,80 +143,8 @@ App.Entity.SlaveState = class SlaveState {
 		/** description to go with @see pornPrestige
 		 * @type {string|number} */
 		this.pornPrestigeDesc = 0;
-		/** what porn she is known for */
-		this.pornFameType = "none";
-		/** what aspect of her the upgraded studio is focusing on for porn */
-		this.pornFocus = "none";
-		/** generic porn fame */
-		this.pornTypeGeneral = 0;
-		/** fuckdoll porn fame */
-		this.pornTypeFuckdoll = 0;
-		/** rape porn fame */
-		this.pornTypeRape = 0;
-		/** preggo porn fame */
-		this.pornTypePreggo = 0;
-		/** BBW porn fame */
-		this.pornTypeBBW = 0;
-		/** weight gain porn fame */
-		this.pornTypeGainer = 0;
-		/** well hung porn fame */
-		this.pornTypeStud = 0;
-		/** underage porn fame */
-		this.pornTypeLoli = 0;
-		/** gagfuck queen porn fame */
-		this.pornTypeDeepThroat = 0;
-		/** strugglefuck queen porn fame */
-		this.pornTypeStruggleFuck = 0;
-		/** painal queen porn fame */
-		this.pornTypePainal = 0;
-		/** tease porn fame */
-		this.pornTypeTease = 0;
-		/** romantic porn fame */
-		this.pornTypeRomantic = 0;
-		/** pervert porn fame */
-		this.pornTypePervert = 0;
-		/** caring porn fame */
-		this.pornTypeCaring = 0;
-		/** unflinching porn fame */
-		this.pornTypeUnflinching = 0;
-		/** size queen porn fame */
-		this.pornTypeSizeQueen = 0;
-		/** neglectful porn fame */
-		this.pornTypeNeglectful = 0;
-		/** cum addict porn fame */
-		this.pornTypeCumAddict = 0;
-		/** anal addict porn fame */
-		this.pornTypeAnalAddict = 0;
-		/** attention whore porn fame */
-		this.pornTypeAttentionWhore = 0;
-		/** breast growth porn fame */
-		this.pornTypeBreastGrowth = 0;
-		/** abusive porn fame */
-		this.pornTypeAbusive = 0;
-		/** malicious porn fame */
-		this.pornTypeMalicious = 0;
-		/** self hating porn fame */
-		this.pornTypeSelfHating = 0;
-		/** breeder porn fame */
-		this.pornTypeBreeder = 0;
-		/** submissive porn fame */
-		this.pornTypeSub = 0;
-		/** cumslut porn fame */
-		this.pornTypeCumSlut = 0;
-		/** buttslut porn fame */
-		this.pornTypeAnal = 0;
-		/** humiliation porn fame */
-		this.pornTypeHumiliation = 0;
-		/** boob porn fame */
-		this.pornTypeBoobs = 0;
-		/** dom porn fame */
-		this.pornTypeDom = 0;
-		/** sadist porn fame */
-		this.pornTypeSadist = 0;
-		/** masochist porn fame */
-		this.pornTypeMasochist = 0;
-		/** pregnancy porn fame*/
-		this.pornTypePregnancy = 0;
+		/** porn fame */
+		this.porn = new App.Entity.SlavePornPerformanceState();
 		/** reason for prestige
 		 * @type {string|number} */
 		this.prestigeDesc = 0;
@@ -2275,6 +2291,9 @@ App.Entity.SlaveState = class SlaveState {
 	 */
 	static makeSkeleton() {
 		return {
+			porn: {
+				fame: {	}
+			}
 		};
 	}
 };
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index 1d0e4c00bca0dc6896a46c455bce5f9635440818..ccd173225e9d7b22d595ab3d48a8282b2e8abf76 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -12,6 +12,34 @@ App.Entity.Utils.SlaveDataSchemeCleanup = (function () {
 
 	/** @param {App.Entity.SlaveState} slave */
 	function SlaveDataSchemeCleanup(slave) { // eslint-disable-line no-unused-vars
+		migratePorn(slave);
+	}
+
+	/** @param {App.Entity.SlaveState} slave */
+	function migratePorn(slave) {
+		if (!slave.hasOwnProperty("porn")) {
+			slave.porn = new App.Entity.SlavePornPerformanceState();
+			const pornType = "pornType";
+			const pornTypeLength = pornType.length;
+			for (let prop in slave) {
+				if (prop.startsWith("pornType")) {
+					let fameName = prop.substr(pornTypeLength);
+					// lowercase firs charachter
+					fameName = fameName.charAt(0).toLowerCase() + fameName.substr(1);
+					slave.porn.fame[fameName] = slave[prop];
+					delete slave[prop];
+				}
+			}
+			if (slave.hasOwnProperty("pornFameType")) {
+				slave.porn.fameType = slave["pornFameType"];
+				delete slave["pornFameType"];
+			}
+
+			if (slave.hasOwnProperty("pornFocus")) {
+				slave.porn.focus = slave["pornFocus"];
+				delete slave["pornFocus"];
+			}
+		}
 
 	}
 })();
@@ -475,47 +503,47 @@ window.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() {
 		if (typeof slave.pornPrestigeDesc !== "string") {
 			slave.pornPrestigeDesc = 0;
 		}
-		if (typeof slave.pornFameType !== "string") {
-			slave.pornFameType = "none";
-		}
-		if (typeof slave.pornFocus !== "string") {
-			slave.pornFocus = "none";
-		}
-		slave.pornTypeGeneral = Math.max(+slave.pornTypeGeneral, 0) || 0;
-		slave.pornTypeFuckdoll = Math.max(+slave.pornTypeFuckdoll, 0) || 0;
-		slave.pornTypeRape = Math.max(+slave.pornTypeRape, 0) || 0;
-		slave.pornTypePreggo = Math.max(+slave.pornTypePreggo, 0) || 0;
-		slave.pornTypeBBW = Math.max(+slave.pornTypeBBW, 0) || 0;
-		slave.pornTypeGainer = Math.max(+slave.pornTypeGainer, 0) || 0;
-		slave.pornTypeStud = Math.max(+slave.pornTypeStud, 0) || 0;
-		slave.pornTypeLoli = Math.max(+slave.pornTypeLoli, 0) || 0;
-		slave.pornTypeDeepThroat = Math.max(+slave.pornTypeDeepThroat, 0) || 0;
-		slave.pornTypeStruggleFuck = Math.max(+slave.pornTypeStruggleFuck, 0) || 0;
-		slave.pornTypePainal = Math.max(+slave.pornTypePainal, 0) || 0;
-		slave.pornTypeTease = Math.max(+slave.pornTypeTease, 0) || 0;
-		slave.pornTypeRomantic = Math.max(+slave.pornTypeRomantic, 0) || 0;
-		slave.pornTypePervert = Math.max(+slave.pornTypePervert, 0) || 0;
-		slave.pornTypeCaring = Math.max(+slave.pornTypeCaring, 0) || 0;
-		slave.pornTypeUnflinching = Math.max(+slave.pornTypeUnflinching, 0) || 0;
-		slave.pornTypeSizeQueen = Math.max(+slave.pornTypeSizeQueen, 0) || 0;
-		slave.pornTypeNeglectful = Math.max(+slave.pornTypeNeglectful, 0) || 0;
-		slave.pornTypeCumAddict = Math.max(+slave.pornTypeCumAddict, 0) || 0;
-		slave.pornTypeAnalAddict = Math.max(+slave.pornTypeAnalAddict, 0) || 0;
-		slave.pornTypeAttentionWhore = Math.max(+slave.pornTypeAttentionWhore, 0) || 0;
-		slave.pornTypeBreastGrowth = Math.max(+slave.pornTypeBreastGrowth, 0) || 0;
-		slave.pornTypeAbusive = Math.max(+slave.pornTypeAbusive, 0) || 0;
-		slave.pornTypeMalicious = Math.max(+slave.pornTypeMalicious, 0) || 0;
-		slave.pornTypeSelfHating = Math.max(+slave.pornTypeSelfHating, 0) || 0;
-		slave.pornTypeBreeder = Math.max(+slave.pornTypeBreeder, 0) || 0;
-		slave.pornTypeSub = Math.max(+slave.pornTypeSub, 0) || 0;
-		slave.pornTypeCumSlut = Math.max(+slave.pornTypeCumSlut, 0) || 0;
-		slave.pornTypeAnal = Math.max(+slave.pornTypeAnal, 0) || 0;
-		slave.pornTypeHumiliation = Math.max(+slave.pornTypeHumiliation, 0) || 0;
-		slave.pornTypeBoobs = Math.max(+slave.pornTypeBoobs, 0) || 0;
-		slave.pornTypeDom = Math.max(+slave.pornTypeDom, 0) || 0;
-		slave.pornTypeSadist = Math.max(+slave.pornTypeSadist, 0) || 0;
-		slave.pornTypeMasochist = Math.max(+slave.pornTypeMasochist, 0) || 0;
-		slave.pornTypePregnancy = Math.max(+slave.pornTypePregnancy, 0) || 0;
+		if (typeof slave.porn.fameType !== "string") {
+			slave.porn.fameType = "none";
+		}
+		if (typeof slave.porn.focus !== "string") {
+			slave.porn.focus = "none";
+		}
+		slave.porn.fame.general = Math.max(+slave.porn.fame.general, 0) || 0;
+		slave.porn.fame.fuckdoll = Math.max(+slave.porn.fame.fuckdoll, 0) || 0;
+		slave.porn.fame.rape = Math.max(+slave.porn.fame.rape, 0) || 0;
+		slave.porn.fame.preggo = Math.max(+slave.porn.fame.preggo, 0) || 0;
+		slave.porn.fame.BBW = Math.max(+slave.porn.fame.BBW, 0) || 0;
+		slave.porn.fame.gainer = Math.max(+slave.porn.fame.gainer, 0) || 0;
+		slave.porn.fame.stud = Math.max(+slave.porn.fame.stud, 0) || 0;
+		slave.porn.fame.loli = Math.max(+slave.porn.fame.loli, 0) || 0;
+		slave.porn.fame.deepThroat = Math.max(+slave.porn.fame.deepThroat, 0) || 0;
+		slave.porn.fame.struggleFuck = Math.max(+slave.porn.fame.struggleFuck, 0) || 0;
+		slave.porn.fame.painal = Math.max(+slave.porn.fame.painal, 0) || 0;
+		slave.porn.fame.tease = Math.max(+slave.porn.fame.tease, 0) || 0;
+		slave.porn.fame.romantic = Math.max(+slave.porn.fame.romantic, 0) || 0;
+		slave.porn.fame.pervert = Math.max(+slave.porn.fame.pervert, 0) || 0;
+		slave.porn.fame.caring = Math.max(+slave.porn.fame.caring, 0) || 0;
+		slave.porn.fame.unflinching = Math.max(+slave.porn.fame.unflinching, 0) || 0;
+		slave.porn.fame.sizeQueen = Math.max(+slave.porn.fame.sizeQueen, 0) || 0;
+		slave.porn.fame.neglectful = Math.max(+slave.porn.fame.neglectful, 0) || 0;
+		slave.porn.fame.cumAddict = Math.max(+slave.porn.fame.cumAddict, 0) || 0;
+		slave.porn.fame.analAddict = Math.max(+slave.porn.fame.analAddict, 0) || 0;
+		slave.porn.fame.attentionWhore = Math.max(+slave.porn.fame.attentionWhore, 0) || 0;
+		slave.porn.fame.breastGrowth = Math.max(+slave.porn.fame.breastGrowth, 0) || 0;
+		slave.porn.fame.abusive = Math.max(+slave.porn.fame.abusive, 0) || 0;
+		slave.porn.fame.malicious = Math.max(+slave.porn.fame.malicious, 0) || 0;
+		slave.porn.fame.selfHating = Math.max(+slave.porn.fame.selfHating, 0) || 0;
+		slave.porn.fame.breeder = Math.max(+slave.porn.fame.breeder, 0) || 0;
+		slave.porn.fame.sub = Math.max(+slave.porn.fame.sub, 0) || 0;
+		slave.porn.fame.cumSlut = Math.max(+slave.porn.fame.cumSlut, 0) || 0;
+		slave.porn.fame.anal = Math.max(+slave.porn.fame.anal, 0) || 0;
+		slave.porn.fame.humiliation = Math.max(+slave.porn.fame.humiliation, 0) || 0;
+		slave.porn.fame.boobs = Math.max(+slave.porn.fame.boobs, 0) || 0;
+		slave.porn.fame.dom = Math.max(+slave.porn.fame.dom, 0) || 0;
+		slave.porn.fame.sadist = Math.max(+slave.porn.fame.sadist, 0) || 0;
+		slave.porn.fame.masochist = Math.max(+slave.porn.fame.masochist, 0) || 0;
+		slave.porn.fame.pregnancy = Math.max(+slave.porn.fame.pregnancy, 0) || 0;
 	}
 
 	/** @param {App.Entity.SlaveState} slave */
@@ -1051,47 +1079,47 @@ window.childPornDatatypeCleanup = function childPornDatatypeCleanup(child) {
 	if (typeof child.pornPrestigeDesc !== "string") {
 		child.pornPrestigeDesc = 0;
 	}
-	if (typeof child.pornFameType !== "string") {
-		child.pornFameType = "none";
-	}
-	if (typeof child.pornFocus !== "string") {
-		child.pornFocus = "none";
-	}
-	child.pornTypeGeneral = Math.max(+child.pornTypeGeneral, 0) || 0;
-	child.pornTypeFuckdoll = Math.max(+child.pornTypeFuckdoll, 0) || 0;
-	child.pornTypeRape = Math.max(+child.pornTypeRape, 0) || 0;
-	child.pornTypePreggo = Math.max(+child.pornTypePreggo, 0) || 0;
-	child.pornTypeBBW = Math.max(+child.pornTypeBBW, 0) || 0;
-	child.pornTypeGainer = Math.max(+child.pornTypeGainer, 0) || 0;
-	child.pornTypeStud = Math.max(+child.pornTypeStud, 0) || 0;
-	child.pornTypeLoli = Math.max(+child.pornTypeLoli, 0) || 0;
-	child.pornTypeDeepThroat = Math.max(+child.pornTypeDeepThroat, 0) || 0;
-	child.pornTypeStruggleFuck = Math.max(+child.pornTypeStruggleFuck, 0) || 0;
-	child.pornTypePainal = Math.max(+child.pornTypePainal, 0) || 0;
-	child.pornTypeTease = Math.max(+child.pornTypeTease, 0) || 0;
-	child.pornTypeRomantic = Math.max(+child.pornTypeRomantic, 0) || 0;
-	child.pornTypePervert = Math.max(+child.pornTypePervert, 0) || 0;
-	child.pornTypeCaring = Math.max(+child.pornTypeCaring, 0) || 0;
-	child.pornTypeUnflinching = Math.max(+child.pornTypeUnflinching, 0) || 0;
-	child.pornTypeSizeQueen = Math.max(+child.pornTypeSizeQueen, 0) || 0;
-	child.pornTypeNeglectful = Math.max(+child.pornTypeNeglectful, 0) || 0;
-	child.pornTypeCumAddict = Math.max(+child.pornTypeCumAddict, 0) || 0;
-	child.pornTypeAnalAddict = Math.max(+child.pornTypeAnalAddict, 0) || 0;
-	child.pornTypeAttentionWhore = Math.max(+child.pornTypeAttentionWhore, 0) || 0;
-	child.pornTypeBreastGrowth = Math.max(+child.pornTypeBreastGrowth, 0) || 0;
-	child.pornTypeAbusive = Math.max(+child.pornTypeAbusive, 0) || 0;
-	child.pornTypeMalicious = Math.max(+child.pornTypeMalicious, 0) || 0;
-	child.pornTypeSelfHating = Math.max(+child.pornTypeSelfHating, 0) || 0;
-	child.pornTypeBreeder = Math.max(+child.pornTypeBreeder, 0) || 0;
-	child.pornTypeSub = Math.max(+child.pornTypeSub, 0) || 0;
-	child.pornTypeCumSlut = Math.max(+child.pornTypeCumSlut, 0) || 0;
-	child.pornTypeAnal = Math.max(+child.pornTypeAnal, 0) || 0;
-	child.pornTypeHumiliation = Math.max(+child.pornTypeHumiliation, 0) || 0;
-	child.pornTypeBoobs = Math.max(+child.pornTypeBoobs, 0) || 0;
-	child.pornTypeDom = Math.max(+child.pornTypeDom, 0) || 0;
-	child.pornTypeSadist = Math.max(+child.pornTypeSadist, 0) || 0;
-	child.pornTypeMasochist = Math.max(+child.pornTypeMasochist, 0) || 0;
-	child.pornTypePregnancy = Math.max(+child.pornTypePregnancy, 0) || 0;
+	if (typeof child.porn.fameType !== "string") {
+		child.porn.fameType = "none";
+	}
+	if (typeof child.porn.focus !== "string") {
+		child.porn.focus = "none";
+	}
+	child.porn.fame.general = Math.max(+child.porn.fame.general, 0) || 0;
+	child.porn.fame.fuckdoll = Math.max(+child.porn.fame.fuckdoll, 0) || 0;
+	child.porn.fame.rape = Math.max(+child.porn.fame.rape, 0) || 0;
+	child.porn.fame.preggo = Math.max(+child.porn.fame.preggo, 0) || 0;
+	child.porn.fame.BBW = Math.max(+child.porn.fame.BBW, 0) || 0;
+	child.porn.fame.gainer = Math.max(+child.porn.fame.gainer, 0) || 0;
+	child.porn.fame.stud = Math.max(+child.porn.fame.stud, 0) || 0;
+	child.porn.fame.loli = Math.max(+child.porn.fame.loli, 0) || 0;
+	child.porn.fame.deepThroat = Math.max(+child.porn.fame.deepThroat, 0) || 0;
+	child.porn.fame.struggleFuck = Math.max(+child.porn.fame.struggleFuck, 0) || 0;
+	child.porn.fame.painal = Math.max(+child.porn.fame.painal, 0) || 0;
+	child.porn.fame.tease = Math.max(+child.porn.fame.tease, 0) || 0;
+	child.porn.fame.romantic = Math.max(+child.porn.fame.romantic, 0) || 0;
+	child.porn.fame.pervert = Math.max(+child.porn.fame.pervert, 0) || 0;
+	child.porn.fame.caring = Math.max(+child.porn.fame.caring, 0) || 0;
+	child.porn.fame.unflinching = Math.max(+child.porn.fame.unflinching, 0) || 0;
+	child.porn.fame.sizeQueen = Math.max(+child.porn.fame.sizeQueen, 0) || 0;
+	child.porn.fame.neglectful = Math.max(+child.porn.fame.neglectful, 0) || 0;
+	child.porn.fame.cumAddict = Math.max(+child.porn.fame.cumAddict, 0) || 0;
+	child.porn.fame.analAddict = Math.max(+child.porn.fame.analAddict, 0) || 0;
+	child.porn.fame.attentionWhore = Math.max(+child.porn.fame.attentionWhore, 0) || 0;
+	child.porn.fame.breastGrowth = Math.max(+child.porn.fame.breastGrowth, 0) || 0;
+	child.porn.fame.abusive = Math.max(+child.porn.fame.abusive, 0) || 0;
+	child.porn.fame.malicious = Math.max(+child.porn.fame.malicious, 0) || 0;
+	child.porn.fame.selfHating = Math.max(+child.porn.fame.selfHating, 0) || 0;
+	child.porn.fame.breeder = Math.max(+child.porn.fame.breeder, 0) || 0;
+	child.porn.fame.sub = Math.max(+child.porn.fame.sub, 0) || 0;
+	child.porn.fame.cumSlut = Math.max(+child.porn.fame.cumSlut, 0) || 0;
+	child.porn.fame.anal = Math.max(+child.porn.fame.anal, 0) || 0;
+	child.porn.fame.humiliation = Math.max(+child.porn.fame.humiliation, 0) || 0;
+	child.porn.fame.boobs = Math.max(+child.porn.fame.boobs, 0) || 0;
+	child.porn.fame.dom = Math.max(+child.porn.fame.dom, 0) || 0;
+	child.porn.fame.sadist = Math.max(+child.porn.fame.sadist, 0) || 0;
+	child.porn.fame.masochist = Math.max(+child.porn.fame.masochist, 0) || 0;
+	child.porn.fame.pregnancy = Math.max(+child.porn.fame.pregnancy, 0) || 0;
 };
 
 window.childRelationDatatypeCleanup = function childRelationDatatypeCleanup(child) {
diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js
new file mode 100644
index 0000000000000000000000000000000000000000..5bc628e1c2ea204c4469581d446299709712ef96
--- /dev/null
+++ b/src/js/descriptionWidgets.js
@@ -0,0 +1,250 @@
+/* eslint-disable no-unused-vars */
+/* eslint-disable no-undef */
+App.Desc.Eyes = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+	"use strict";
+	const V = State.variables;
+	let r = ``;
+	var pronouns = getPronouns(V.HeadGirl);
+	var he = pronouns.pronoun;
+	var him = pronouns.object;
+	var his = pronouns.possessive;
+	var hers = pronouns.possessivePronoun;
+	var himself = pronouns.objectReflexive;
+	var boy = pronouns.noun;
+	var He = capFirstChar(he);
+	var His = capFirstChar(his);
+
+	if (slave.eyes === -2) {
+		const HC = hasVisibleHeterochromia(slave) ? 1 : 0;
+		if (slave.eyeColor !== "empty") {
+			r += `${His} eyes are dull`;
+			if (V.saleDescription && V.PC.medicine >= 50 || V.PC.slaving >= 50) {
+				r += `, unfocused`;
+				if (HC) {
+					r += `, heterochromatic,`;
+				}
+				r += ` and clearly nonfunctional`
+			} else {
+				if (HC) {
+					r += `, heterochromatic,`;
+				}
+				r += ` and unfocused`;
+			}
+			r += `, `;
+		} else {
+			r += `${His} gaze is empty.`
+		}
+		if (slave.intelligence > 95) {
+			r += `but ${his} facial expressions reveal ${he} is incisive, quick, cunning;`;
+			if (slave.intelligence+slave.intelligenceImplant >= 130) {
+				r += `with ${his} education, ${he} is so far <span class=deepskyblue>beyond brilliant</span> that ${he} is nearly peerless.`;
+			} else if (slave.intelligenceImplant >= 15) {
+				r += `${he} is both <span class=deepskyblue>brilliant</span> and `;
+				if (slave.intelligenceImplant >= 30) {
+					r += `well `;
+				}
+				r += `educated.`;
+			} else {
+				r += `${he} is so <span class=deepskyblue>brilliant</span> that ${his} `;
+				if (slave.intelligenceImplant > 0) {
+					r += `meager `;
+				} else {
+					r += `lack of `;
+				}
+				r += ` education is unimportant.`;
+			}
+		} else if(slave.intelligence > 50) {
+			if (slave.intelligence+slave.intelligenceImplant > 95) {
+				r += `but ${his} facial expressions reveal ${he} is incisive, quick, cunning; with ${his} education, ${he} can be considered <span class=deepskyblue>brilliant.</span>`;
+			} else if (slave.intelligenceImplant >= 15) {
+				r += `but ${his} face is alive with intelligence; ${he} is both <span class=deepskyblue>highly intelligent</span> and `;
+				if (slave.intelligenceImplant >= 30) {
+					r += `well `;
+				}
+				r += `educated.`;
+			} else {
+				r += `but ${his} face is alive with intelligence; ${he} is so <span class=deepskyblue>highly intelligent</span> that ${his}`;
+				if (slave.intelligenceImplant > 0) {
+					r += `meager`;
+				} else {
+					r += `lack of`;
+				}
+				r += ` education is unimportant.`;
+			}
+		} else if (slave.intelligence > 15) {
+			if (slave.intelligence+slave.intelligenceImplant > 50) {
+				r += `but ${his} face is alive with intelligence; with ${his} education, ${he} can be considered <span class=deepskyblue>highly intelligent.</span>`;
+			} else if (slave.intelligenceImplant >= 15) {
+				r += `but ${his} facial expressions reveal ${his} cleverness; ${he} is of <span class=deepskyblue>above average intelligence</span> and `;
+				if (slave.intelligenceImplant >= 30) {
+					r += `well `;
+				}
+				r += `educated.`;
+			} else {
+				r += `but ${his} facial expressions reveal ${his} cleverness; ${he} is of <span class=deepskyblue>above average intelligence</span> despite being undereducated.`;
+			}
+		} else if (slave.intelligence >= -15) {
+			if (slave.intelligence+slave.intelligenceImplant > 15) {
+				r += `but ${his} facial expressions reveal ${his} cleverness; with ${his} education, ${he} can be considered of <span class=deepskyblue>above average intelligence.</span>`;
+			} else if (slave.intelligenceImplant >= 15) {
+				r += `but ${his} facial expressions reveal ${his} alertness; ${he} is of average intelligence due to being`;
+				if (slave.intelligenceImplant >= 30) {
+					r += `well `;
+				}
+				r += `educated.`;
+			} else {
+				r += `but ${his} facial expressions reveal ${his} alertness; ${he} is of average intelligence and is undereducated.`;
+			}
+		} else if (slave.intelligence >= -50) {
+			if (slave.intelligence+slave.intelligenceImplant >= -15) {
+				r += `but ${his} facial expressions reveal ${his} alertness; with ${his} education, ${he} can be considered of average intelligence.`;
+			} else if (slave.intelligenceImplant >= 15) {
+				r += `but ${his} facial expressions reveal ${he} is rather dim; ${he} is of <span class=orangered>below average intelligence</span> despite having been `;
+				if (slave.intelligenceImplant >= 30) {
+					r += `thoroughly `;
+				}
+				r += `educated.`;
+			} else {
+				r += `but ${his} facial expressions reveal ${he} is rather dim; ${he} is of <span class=orangered>below average intelligence</span> and is poorly educated.`;
+			}
+		} else if (slave.intelligence >= -95) {
+			if (slave.intelligence+slave.intelligenceImplant >= -50) {
+				r += `but ${his} facial expressions reveal ${he} is rather dim; even with ${his} education, ${he} can only be considered of <span class=orangered>below average intelligence.</span>`;
+			} else if (slave.intelligenceImplant >= 15) {
+				r += `but ${his} facial expressions reveal ${he} is as dull as ${his} eyes; ${he} is <span class=orangered>quite stupid</span> despite having `;
+				if (slave.intelligenceImplant >= 30) {
+					r += `an advanced`;
+				} else {
+					r += `some`;
+				}
+				r += ` education.`;
+			} else {
+				r += `but ${his} facial expressions reveal ${he} is as dull as ${his} eyes; ${he} is <span class=orangered>quite stupid</span> and ignorant.`;
+			}
+		} else {
+			r += `though you doubt it would be much different if ${he} could see;`;
+			if (slave.intelligence+slave.intelligenceImplant >= -95) {
+				r += `even with ${his} education, ${he} is still <span class=orangered>really stupid.</span>`;
+			} else if (slave.intelligenceImplant > 0) {
+				r += `${he} is <span class=orangered>a moron,</span> yet somehow still remembers the basics of an education.`;
+			} else {
+				r += `${he} is <span class=orangered>a moron,</span> and ignorant to boot.`;
+			}
+		}
+	} else {
+		if (slave.intelligence > 95) {
+			r += `${His} ${App.Desc.EyeColor(slave)}-eyed gaze is incisive, quick, cunning;`;
+			if (slave.intelligence+slave.intelligenceImplant >= 130) {
+				r += `with ${his} education, ${he} is so far <span class=deepskyblue>beyond brilliant</span> that ${he} is nearly peerless.`;
+			} else if (slave.intelligenceImplant >= 15) {
+				r += `${he} is both <span class=deepskyblue>brilliant</span> and `;
+				if (slave.intelligenceImplant >= 30) {
+					r += `well `;
+				}
+				r += `educated.`;
+			} else {
+				r += `${he} is so <span class=deepskyblue>brilliant</span> that ${his} `;
+				if (slave.intelligenceImplant > 0) {
+					r += `meager`;
+				} else {
+					r += `lack of`;
+				}
+				r += `education is unimportant.`;
+			}
+		} else if (slave.intelligence > 50) {
+			r += `${His} ${App.Desc.EyeColor(slave)}-eyed gaze is incisive, quick, cunning; with ${his} education, ${he} can be considered <span class=deepskyblue>brilliant.</span>`;
+			if (slave.intelligence+slave.intelligenceImplant > 95) {
+				r += `${His} ${App.Desc.EyeColor(slave)} eyes are alive with intelligence; ${he} is both <span class=deepskyblue>highly intelligent</span> and `;
+			} else if (slave.intelligenceImplant >= 15) {
+				r += `well `;
+				if (slave.intelligenceImplant >= 30) {
+					r += `educated.`;
+				}
+				r += `${His} ${App.Desc.EyeColor(slave)} eyes are alive with intelligence; ${he} is so <span class=deepskyblue>highly intelligent</span> that ${his} `;
+			} else {
+				r += `meager`;
+				if (slave.intelligenceImplant > 0) {
+					r += `lack of`;
+				} else {
+					r += ` education is unimportant.`;
+				}
+			}
+		} else if (slave.intelligence > 15) {
+			r += `${His} ${App.Desc.EyeColor(slave)} eyes are `;
+			if (slave.intelligence+slave.intelligenceImplant >= 50) {
+				r += `alive with intelligence; with ${his} education, ${he} can be considered <span class=deepskyblue>highly intelligent.</span>`;
+			} else if (slave.intelligenceImplant >= 15) {
+				r += `clever; ${he} is of <span class=deepskyblue>above average intelligence</span> and `;
+				if (slave.intelligenceImplant >= 30) {
+					r += `well `;
+				}
+				r += `educated.`;
+			} else {
+				r += `clever; ${he} is of <span class=deepskyblue>above average intelligence</span> despite being undereducated.`;
+			}
+		} else if (slave.intelligence >= -15) {
+			r += `${His} ${App.Desc.EyeColor(slave)} eyes are `;
+			if (slave.intelligence+slave.intelligenceImplant >= 15) {
+				r += `clever; with ${his} education, ${he} can be considered of <span class=deepskyblue>above average intelligence.</span>`;
+			}else if (slave.intelligenceImplant >= 15) {
+				r += `alert; ${he} is of average intelligence due to being `;
+				if (slave.intelligenceImplant >= 30) {
+					r += `well `;
+				}
+				r += `educated.`;
+			} else {
+				r += `alert; ${he} is of average intelligence and is undereducated.`;
+			}
+		} else if (slave.intelligence >= -50) {
+			r += `${His} ${App.Desc.EyeColor(slave)} eyes are `;
+			if (slave.intelligence+slave.intelligenceImplant >= -15) {
+				r += `alert; with ${his} education, ${he} can be considered of average intelligence.`;
+			} else if (slave.intelligenceImplant >= 15) {
+				r += `dim; ${he} is of <span class=orangered>below average intelligence</span> despite having been `;
+				if (slave.intelligenceImplant >= 30) {
+					r += `thoroughly `;
+				} else {
+					r += `educated.`;
+				}
+				r += `dim; ${he} is of <span class=orangered>below average intelligence</span> and is poorly educated.`;
+			} else {
+				r += `dim; even with ${his} education, ${he} can only be considered of <span class=orangered>below average intelligence.</span>`;
+			}
+		} else if (slave.intelligence >= -95) {
+			r += `${His} ${App.Desc.EyeColor(slave)} eyes are `;
+			if (slave.intelligence+slave.intelligenceImplant >= -50) {
+				r += `dull; ${he} is <span class=orangered>quite stupid</span> despite having `;
+			} else if (slave.intelligenceImplant >= 15) {
+				r += `an advanced`;
+				if (slave.intelligenceImplant >= 30) {
+					r += `some`;
+				}
+				r += ` education.`;
+			} else {
+				r += `dull; ${he} is <span class=orangered>quite stupid</span> and ignorant.`;
+			}
+		} else {
+			r += `${His} ${App.Desc.EyeColor(slave)}-eyed gaze betrays near-total insensibility;`;
+			if (slave.intelligence+slave.intelligenceImplant >= -95) {
+				r += `even with ${his} education, ${he} is still <span class=orangered>really stupid.</span>`;
+			} else if (slave.intelligenceImplant > 0) {
+				r += `${he} is <span class=orangered>a moron,</span> yet somehow still remembers the basics of an education.`;
+			} else {
+				r += `${he} is <span class=orangered>a moron,</span> and ignorant to boot.`;
+			}
+		}
+	}
+	return r;
+}
+
+App.Desc.EyeColor = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+	"use strict";
+	let r;
+
+	if (hasVisibleHeterochromia(slave)) {
+		r = `heterochromatic ${slave.eyeColor} and ${slave.geneticQuirks.heterochromatia}`;
+	} else {
+		r = `${slave.eyeColor}`;
+	}
+	return r;
+}
\ No newline at end of file
diff --git a/src/npc/agent/agentCompany.tw b/src/npc/agent/agentCompany.tw
index 6f52669924c1ab83dbc960ddba727303139a1b58..8fa5040024220220592ff3d5aaa9d5ad37060a84 100644
--- a/src/npc/agent/agentCompany.tw
+++ b/src/npc/agent/agentCompany.tw
@@ -29,7 +29,7 @@ Working in $activeArcology.name's penthouse office, $subSlave.slaveName gets a v
 
 <br><br>
 
-_His2 question is answered when you bring $activeSlave.slaveName in close, putting $him in $subSlave.slaveName's view. $subSlave.slaveName's <<eyeColor $subSlave>> eyes fly open with pleased surprise, but before _he2 can speak, $activeSlave.slaveName goes first.
+_His2 question is answered when you bring $activeSlave.slaveName in close, putting $him in $subSlave.slaveName's view. $subSlave.slaveName's <<= App.Desc.EyeColor $subSlave>> eyes fly open with pleased surprise, but before _he2 can speak, $activeSlave.slaveName goes first.
 <<if !canTalk($activeSlave)>>
 	Unable to speak $himself, $he simply makes a heart shape with $his hands in view of the video call, and blows $his <<if $activeSlave.relationship == 4>>lover<<else>>wife<</if>> a kiss.
 <<else>>
diff --git a/src/npc/agent/agentWorkaround.tw b/src/npc/agent/agentWorkaround.tw
index e882cc102acc50142c069fa10298bcc7538b02c0..989c35a3372ea9912b7d64b87ead64d2940aae80 100644
--- a/src/npc/agent/agentWorkaround.tw
+++ b/src/npc/agent/agentWorkaround.tw
@@ -32,7 +32,7 @@
 <<set $desc = SlaveTitle($slaves[$i])>>
 <<setLocalPronouns $slaves[$i]>>
 
-You order $slaves[$i].slaveName to come into your office for orders. The devoted $desc has no prior warning that this is anything unusual, and from the <<if $slaves[$i].energy > 95>>horny glint<<else>>glow of sexual availability<</if>> in $his <<eyeColor $slaves[$i]>> eyes as $he <<if canWalk($slaves[$i])>>enters<<else>>is helped in<</if>>, $he <<if $slaves[$i].energy > 95>>seems to be hoping<<else>>wouldn't mind hearing<</if>> that you've called $him in for a quick fuck. In fact, the matter at hand is about as far as it could possibly be from that, on the spectrum of interactions between <<= properMaster()>> and slave.
+You order $slaves[$i].slaveName to come into your office for orders. The devoted $desc has no prior warning that this is anything unusual, and from the <<if $slaves[$i].energy > 95>>horny glint<<else>>glow of sexual availability<</if>> in $his <<= App.Desc.EyeColor $slaves[$i]>> eyes as $he <<if canWalk($slaves[$i])>>enters<<else>>is helped in<</if>>, $he <<if $slaves[$i].energy > 95>>seems to be hoping<<else>>wouldn't mind hearing<</if>> that you've called $him in for a quick fuck. In fact, the matter at hand is about as far as it could possibly be from that, on the spectrum of interactions between <<= properMaster()>> and slave.
 
 <br><br>You offer $him, without preamble, agency on your behalf in $activeArcology.name. As a $woman of intelligence, $he knows the basics of such an arrangement, but $he's stunned into silence by the offer, so you outline it briefly. Having a slave lead an arcology would be too much, even for the most open minded of Free Cities societies. So, $he would be freed, albeit subject to a set of private, restrictive contracts that would allow you to recall $him if you wish, and require $him to follow your directions, if you give $him any. But other than that, $he would be the effective leader of an entire arcology. It's an unusual arrangement, but one that's becoming more common as multiple arcologies come under united control.
 
diff --git a/src/npc/descriptions/fLips.tw b/src/npc/descriptions/fLips.tw
index cc147ebc4e224abec364cdd0a6a496e2b9b53e46..d02470336760556ba153e3cf5701789442150eae 100644
--- a/src/npc/descriptions/fLips.tw
+++ b/src/npc/descriptions/fLips.tw
@@ -176,7 +176,7 @@ You tell $activeSlave.slaveName to
 
 <<if passage() != "Slave Interact">>
 	<<set _fl = $slaveIndices[$activeSlave.ID]>>
-	<<if def _fl != -1>>
+	<<if def _fl>>
 		<<set $slaves[_fl] = $activeSlave>>
 	<</if>>
 <</if>>
diff --git a/src/npc/fKiss.tw b/src/npc/fKiss.tw
index a75b5f986a2a4546abf398e8c99f5bdc5c056f89..60d3bf1df4d4371e41f1afc0b065011436ba8bce 100644
--- a/src/npc/fKiss.tw
+++ b/src/npc/fKiss.tw
@@ -40,7 +40,7 @@ You tell $activeSlave.slaveName to
 <<elseif ($activeSlave.relationship == -2)>>
 	$He hurriedly complies, happy to be near the object of $his longing. Once $he's close, you take a moment to gaze deeply
 	<<if canSee($activeSlave)>>
-		into $his <<eyeColor>> eyes. $He finds the intense look from the _womanP $he loves overwhelming, and $his eyes flick downward after a moment.
+		into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he loves overwhelming, and $his eyes flick downward after a moment.
 	<<else>>
 		upon $his face. $He senses the intense look from the _womanP $he loves and finds it overwhelming, and after a moment glances away.
 	<</if>>
@@ -51,28 +51,28 @@ You tell $activeSlave.slaveName to
 	<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
 		$He complies in a wifely fashion, moving $his body as $he approaches to best catch your desire. Once $he's close, you take a moment to gaze deeply
 		<<if canSee($activeSlave)>>
-			into $his <<eyeColor>> eyes. $He finds the intense look from the _womanP $he's married to affirming, and looks down with a smile, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>>.
+			into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's married to affirming, and looks down with a smile, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>>.
 		<<else>>
 			upon $his face. $He senses the intense look from the _womanP $he's married to and finds it affirming, and looks down with a smile.
 		<</if>>
 	<<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
 		$He complies. Once $he's close, you take a moment to gaze deeply
 		<<if canSee($activeSlave)>>
-			into $his <<eyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to disturbing, and quickly breaks eye contact.
+			into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to disturbing, and quickly breaks eye contact.
 		<<else>>
 			upon $his face. $He senses the intense look from the _womanP $he's forcibly married to and finds it disturbing, and quickly turns $his face away.
 		<</if>>
 	<<elseif $activeSlave.devotion < -20>>
 		$He complies fearfully. Once $he's close, you take a moment to gaze deeply
 		<<if canSee($activeSlave)>>
-			into $his tearing <<eyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to horrifying, and quickly breaks eye contact.
+			into $his tearing <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to horrifying, and quickly breaks eye contact.
 		<<else>>
 			upon $his tear-streaked face. $He senses the intense look from the _womanP $he's forcibly married to and finds it horrifying, and quickly turns $his face away.
 		<</if>>
 	<<else>>
 		$He complies obediently. Once $he's close, you take a moment to gaze deeply
 		<<if canSee($activeSlave)>>
-			into $his <<eyeColor>> eyes. $He finds the intense look from the _womanP $he's married to reassuring, and looks down with a slight smile, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>>.
+			into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's married to reassuring, and looks down with a slight smile, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>>.
 		<<else>>
 			upon $his face. $He senses the intense look from the _womanP $he's married to and finds it reassuring, and looks down with a slight smile.
 		<</if>>
@@ -80,7 +80,7 @@ You tell $activeSlave.slaveName to
 <<elseif ($activeSlave.devotion > 75)>>
 	$He hurriedly complies, happy to be near you. Once $he's close, you take a moment to gaze deeply
 	<<if canSee($activeSlave)>>
-		into $his <<eyeColor>> eyes. $He finds the intense look from $his beloved <<= WrittenMaster($activeSlave)>> disconcerting, and $his eyes flick downward after a moment.
+		into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from $his beloved <<= WrittenMaster($activeSlave)>> disconcerting, and $his eyes flick downward after a moment.
 	<<else>>
 		upon $his face. $He senses the intense look from $his beloved <<= WrittenMaster()>> and finds it disconcerting, and after a moment glances away.
 	<</if>>
@@ -88,35 +88,35 @@ You tell $activeSlave.slaveName to
 <<elseif ($activeSlave.devotion > 50)>>
 	$He hurriedly complies, happy to be near you. Once $he's close, you take a moment to gaze deeply
 	<<if canSee($activeSlave)>>
-		into $his <<eyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> disconcerting, and $he looks down after a moment, blushing.
+		into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> disconcerting, and $he looks down after a moment, blushing.
 	<<else>>
 		upon $his face. $He finds the intense attention from $his <<= WrittenMaster()>>disconcerting, and $he looks down after a moment, blushing.
 	<</if>>
 <<elseif ($activeSlave.devotion > 20)>>
 	$He hurriedly complies, happy to be near you. Once $he's close, you take a moment to gaze deeply
 	<<if canSee($activeSlave)>>
-		into $his <<eyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, blushing nervously.
+		into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, blushing nervously.
 	<<else>>
 		upon $his face. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, blushing nervously.
 	<</if>>
 <<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust >= -20)>>
 	$He visibly considers disobedience, but decides that complying with such an apparently harmless order is safe, for now. Once $he's close, you take a moment to gaze deeply
 	<<if canSee($activeSlave)>>
-		into $his <<eyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, $his lower lip trembling with nervousness.
+		into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, $his lower lip trembling with nervousness.
 	<<else>>
 		upon $his face. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and turns away after a moment, $his lower lip trembling with nervousness.
 	<</if>>
 <<elseif ($activeSlave.trust < -20)>>
 	The command terrifies $him, but $he's more frightened still of the consequences of disobedience, and $he complies. Once $he's close, you take a moment to gaze deeply
 	<<if canSee($activeSlave)>>
-		into $his <<eyeColor>> eyes. After a mere instant of locked gazes, $he looks down fearfully, and begins to shake with terror, tears leaking silently down $his cheeks.
+		into $his <<= App.Desc.EyeColor>> eyes. After a mere instant of locked gazes, $he looks down fearfully, and begins to shake with terror, tears leaking silently down $his cheeks.
 	<<else>>
 		upon $his face. After a mere instant of locked faces, $he looks down fearfully, and begins to shake with terror, tears leaking silently down $his cheeks.
 	<</if>>
 <<else>>
 	$He pauses, obviously considering whether to resist, but eventually decides to save $his strength to fight more onerous orders, and gives in. Once $he's close, you take a moment to gaze deeply
 	<<if canSee($activeSlave)>>
-		into $his <<eyeColor>> eyes. $He stares back, but after a few moments $he loses the contest of wills and looks down.
+		into $his <<= App.Desc.EyeColor>> eyes. $He stares back, but after a few moments $he loses the contest of wills and looks down.
 	<<else>>
 		upon $his face. $He faces you defiantly, but after a few moments $he loses the contest of wills and looks down.
 	<</if>>
@@ -135,16 +135,16 @@ Then, you gently raise $his <<if $activeSlave.face > 95>>heartrendingly beautifu
 	<<if $activeSlave.fetish == "mindbroken">>
 		$His mouth opens to accept the kiss, and is compliant with your questing tongue. You kiss your broken wife deeply. $His posture remains completely unchanged. Being kissed affects $him as little as being penetrated, being struck, being loved, or being your wife: not at all. When you pull away,
 		<<if canSee($activeSlave)>>
-			$his <<eyeColor>> eyes track you carefully, awaiting further use of $his body.
+			$his <<= App.Desc.EyeColor>> eyes track you carefully, awaiting further use of $his body.
 		<<else>>
 			$he exposes $himself to you, awaiting further use of $his body.
 		<</if>>
 	<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
 		$His mouth accepts yours with love, matching itself perfectly to your insistent lips and tongue.<<if ($activeSlave.teeth == "pointy")>> (Though you're quite careful around $his sharp dentition.)<</if>> $He melts into you, sighing ever so gently. When you finally break the kiss, $his mouth freezes in the shape it was in when last your lips touched, and a momentary look of longing crosses $his face.<<if ($activeSlave.amp != 1)>> A hand reaches dumbly up to $his mouth to trace $his lips where yours last touched.<</if>>
 		<<if ($activeSlave.accent >= 3)>>
-			$He does $his best to communicate love with $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
+			$He does $his best to communicate love with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
 		<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
-			$He does $his best to communicate love with $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>facial expressions<</if>>.
+			$He does $his best to communicate love with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>.
 		<<elseif !canTalk($activeSlave)>>
 			$He signs that $he loves you.
 		<<else>>
@@ -169,7 +169,7 @@ Then, you gently raise $his <<if $activeSlave.face > 95>>heartrendingly beautifu
 			$He asks nervously before cringing, "I-i<<s>> that it, <<Master>>?"
 		<</if>>
 	<<else>>
-		$He accepts the kiss willingly. As you are so close to $him, you sense considerable turmoil in the <<if ($activeSlave.physicalAge > 30)>>$woman<<else>>$girl<</if>>; $he's doing $his duty as a wife by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your lips and tongue. When you finally break the kiss, <<if canSee($activeSlave)>>$his <<eyeColor>> eyes gaze into yours searchingly<<else>>$he gazes at you<</if>>, looking for answers that are not there.
+		$He accepts the kiss willingly. As you are so close to $him, you sense considerable turmoil in the <<if ($activeSlave.physicalAge > 30)>>$woman<<else>>$girl<</if>>; $he's doing $his duty as a wife by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your lips and tongue. When you finally break the kiss, <<if canSee($activeSlave)>>$his <<= App.Desc.EyeColor>> eyes gaze into yours searchingly<<else>>$he gazes at you<</if>>, looking for answers that are not there.
 		<<if (($activeSlave.amp == 1) && (!canTalk($activeSlave)))>>
 			$His <<if canSee($activeSlave)>>eyes beg<<else>>expression begs<</if>> for an answer: is that it?
 		<<elseif !canTalk($activeSlave)>>
@@ -181,16 +181,16 @@ Then, you gently raise $his <<if $activeSlave.face > 95>>heartrendingly beautifu
 <<elseif ($activeSlave.fetish == "mindbroken")>>
 	$His mouth opens to accept the kiss, and is compliant with your questing tongue. $His posture remains completely unchanged. Being kissed affects $him as little as being penetrated, being struck, or being loved: not at all. When you pull away,
 	<<if canSee($activeSlave)>>
-		$his <<eyeColor>> eyes track you carefully, awaiting further use of $his body.
+		$his <<= App.Desc.EyeColor>> eyes track you carefully, awaiting further use of $his body.
 	<<else>>
 		$he exposes $himself to you, awaiting further use of $his body.
 	<</if>>
 <<elseif ($activeSlave.relationship == -2)>>
 	$His mouth accepts yours with love, matching itself perfectly to your insistent lips and tongue.<<if ($activeSlave.teeth == "pointy")>> (Though you're quite careful around $his sharp dentition.)<</if>> $He melts into you, sighing ever so gently. When you finally break the kiss, $his mouth freezes in the shape it was in when last your lips touched, and a momentary look of longing crosses $his face.<<if ($activeSlave.amp != 1)>> A hand reaches dumbly up to $his mouth to trace $his lips where yours last touched.<</if>>
 	<<if ($activeSlave.accent >= 3)>>
-		$He does $his best to communicate love with $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
+		$He does $his best to communicate love with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
 	<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
-		$He does $his best to communicate love with $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>facial expressions<</if>>.
+		$He does $his best to communicate love with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>.
 	<<elseif !canTalk($activeSlave)>>
 		$He signs that $he loves you.
 	<<else>>
@@ -199,9 +199,9 @@ Then, you gently raise $his <<if $activeSlave.face > 95>>heartrendingly beautifu
 <<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "dom") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
 	$He giggles into you and kisses you back with vigor, $his head pressing insistently forward. The two of you make out rather aggressively<<if ($activeSlave.teeth == "pointy")>>, $his sharp teeth drawing a bit of blood from your lips and tongue<</if>>. $He takes $his tendency towards sexual dominance right up to the edge of insubordination, $his active tongue only retreating when yours presses against it. When you finally shove $him away, $he's breathing hard through $his grin.
 	<<if ($activeSlave.accent >= 3)>>
-		$He does $his best to communicate excitement with $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
+		$He does $his best to communicate excitement with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
 	<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
-		$He does $his best to communicate excitement with $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>facial expressions<</if>>.
+		$He does $his best to communicate excitement with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>.
 	<<elseif !canTalk($activeSlave)>>
 		$He signs that $he liked that.
 	<<else>>
@@ -210,9 +210,9 @@ Then, you gently raise $his <<if $activeSlave.face > 95>>heartrendingly beautifu
 <<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "cumslut") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
 	$He stiffens with arousal. $His sexuality is complex, focusing on cum, but with a heavy layer of oral fixation. As your tongue plunders $his mouth, $he reacts almost as though $he's receiving oral, whimpering and moaning into you and pressing $himself lewdly against your <<if $PC.boobs == 1>>prominent breasts<<else>>manly chest<</if>>.<<if ($activeSlave.teeth == "pointy")>> $He's very careful to avoid spearing your tongue with $his sharp teeth.<</if>> $He achieves a weak orgasm before you tire of making out with $him.
 	<<if ($activeSlave.accent >= 3)>>
-		$He does $his best to communicate undiminished lust with $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
+		$He does $his best to communicate undiminished lust with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
 	<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
-		$He does $his best to communicate undiminished lust with $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>facial expressions<</if>>.
+		$He does $his best to communicate undiminished lust with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>.
 	<<elseif !canTalk($activeSlave)>>
 		$He signs that $he liked that.
 	<<else>>
@@ -221,16 +221,16 @@ Then, you gently raise $his <<if $activeSlave.face > 95>>heartrendingly beautifu
 <<elseif ($activeSlave.devotion > 50)>>
 	$His mouth accepts yours with devotion, matching itself carefully to your insistent lips and tongue.<<if ($activeSlave.teeth == "pointy")>> $He is exquisitely careful to keep $his sharp teeth clear of you.<</if>> $He presses $himself against you, $his warmth wonderful against your <<if $PC.boobs == 1>>soft breasts<<else>>manly chest<</if>>. When you finally break the kiss, $he runs $his tongue rapturously across $his moistened lips<<if ($activeSlave.amp != 1)>> and then runs a finger across them as well<</if>>, an openly sexual look on $his $activeSlave.skin face.
 	<<if ($activeSlave.accent >= 3)>>
-		$He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>facial expressions<</if>>, since $he's not confident in $his ability to express it in $language.
+		$He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>, since $he's not confident in $his ability to express it in $language.
 	<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
-		$He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>facial expressions<</if>>.
+		$He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>.
 	<<elseif !canTalk($activeSlave)>>
 		$He signs that $he loves you.
 	<<else>>
 		"I love you, <<Master>>," $he <<say>>s forthrightly.
 	<</if>>
 <<elseif ($activeSlave.devotion > 20)>>
-	$He accepts the kiss willingly. As you are so close to $him, you sense considerable turmoil in the <<if ($activeSlave.physicalAge > 30)>>$woman<<else>>$girl<</if>>; $he's doing $his duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your lips and tongue. When you finally break the kiss, <<if canSee($activeSlave)>>$his <<eyeColor>> eyes gaze into yours searchingly<<else>>$he gazes at you<</if>>, looking for answers that are not there.
+	$He accepts the kiss willingly. As you are so close to $him, you sense considerable turmoil in the <<if ($activeSlave.physicalAge > 30)>>$woman<<else>>$girl<</if>>; $he's doing $his duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your lips and tongue. When you finally break the kiss, <<if canSee($activeSlave)>>$his <<= App.Desc.EyeColor>> eyes gaze into yours searchingly<<else>>$he gazes at you<</if>>, looking for answers that are not there.
 	<<if (($activeSlave.amp == 1) && (!canTalk($activeSlave)))>>
 		$His <<if canSee($activeSlave)>>eyes beg<<else>>expression begs<</if>> for an answer: is that it?
 	<<elseif !canTalk($activeSlave)>>
diff --git a/src/player/actions/fCaress.tw b/src/player/actions/fCaress.tw
index 62d521dc97661e00ea90e0d22666eee3b3913f8f..60ec33b2b8d2b4803d239752781ae01bf558a99a 100644
--- a/src/player/actions/fCaress.tw
+++ b/src/player/actions/fCaress.tw
@@ -26,31 +26,31 @@ You tell $activeSlave.slaveName to
 <<if ($activeSlave.fetish == "mindbroken") && ($activeSlave.relationship != -3)>>
 	$He complies mechanically. $He remembers that when <<= WrittenMaster()>>'s commands are not obeyed, there is punishment.
 <<elseif ($activeSlave.relationship == -2)>>
-	$He eagerly complies, happy to be near the object of $his longing. Once $he's close, you hold $his face in your palms and gaze deeply into $his <<eyeColor>> eyes. $He finds the intense look from the _womanP $he loves overwhelming, and $his eyes flick downward after a moment. $He blushes furiously.
+	$He eagerly complies, happy to be near the object of $his longing. Once $he's close, you hold $his face in your palms and gaze deeply into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he loves overwhelming, and $his eyes flick downward after a moment. $He blushes furiously.
 <<elseif ($activeSlave.relationship == -3)>>
 	<<if $activeSlave.fetish == "mindbroken">>
-		$He complies mechanically. $He remembers that when <<= WrittenMaster()>>'s commands are not obeyed, there is punishment. Once $he's close, you hold $his face in your palms and look into $his blank <<eyeColor>> eyes. $He doesn't react.
+		$He complies mechanically. $He remembers that when <<= WrittenMaster()>>'s commands are not obeyed, there is punishment. Once $he's close, you hold $his face in your palms and look into $his blank <<= App.Desc.EyeColor>> eyes. $He doesn't react.
 	<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
-		$He happily complies, eager to be close to the _womanP who married $him. Once $he's close, you hold $his face in your palms and look into $his <<eyeColor>> eyes. $He finds the intense look from the _womanP $he's married to affirming, and looks down with a smile<<if canSee($activeSlave)>>, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>><</if>>.
+		$He happily complies, eager to be close to the _womanP who married $him. Once $he's close, you hold $his face in your palms and look into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's married to affirming, and looks down with a smile<<if canSee($activeSlave)>>, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>><</if>>.
 	<<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
-		$He complies. Once $he's close, you hold $his face in your palms and look into $his <<eyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to disturbing, and <<if canSee($activeSlave)>> breaks eye contact<<else>> turns $his face away<</if>>.
+		$He complies. Once $he's close, you hold $his face in your palms and look into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to disturbing, and <<if canSee($activeSlave)>> breaks eye contact<<else>> turns $his face away<</if>>.
 	<<elseif $activeSlave.devotion < -20>>
-		$He complies out of fear. Once $he's close, you hold $his shaking face in your palms and look into $his teary <<eyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to terrifying, and <<if canSee($activeSlave)>> breaks eye contact<<else>> turns $his face away<</if>>.
+		$He complies out of fear. Once $he's close, you hold $his shaking face in your palms and look into $his teary <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to terrifying, and <<if canSee($activeSlave)>> breaks eye contact<<else>> turns $his face away<</if>>.
 	<<else>>
-		$He complies obediently. Once $he's close, you hold $his face in your palms and look into $his <<eyeColor>> eyes. $He finds the intense look from the _womanP $he's married to reassuring, and looks down with a slight smile<<if canSee($activeSlave)>>, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>><</if>>.
+		$He complies obediently. Once $he's close, you hold $his face in your palms and look into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's married to reassuring, and looks down with a slight smile<<if canSee($activeSlave)>>, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>><</if>>.
 	<</if>>
 <<elseif ($activeSlave.devotion > 75)>>
-	$He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and look into $his <<eyeColor>> eyes. $He finds the intense look from $his beloved <<= WrittenMaster()>> disconcerting, and $his eyes flick downward after a moment. $He blushes furiously.
+	$He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and look into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from $his beloved <<= WrittenMaster()>> disconcerting, and $his eyes flick downward after a moment. $He blushes furiously.
 <<elseif ($activeSlave.devotion > 50)>>
-	$He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and look into $his <<eyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster($activeSlave)>> disconcerting, and $he looks down after a moment, blushing.
+	$He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and look into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster($activeSlave)>> disconcerting, and $he looks down after a moment, blushing.
 <<elseif ($activeSlave.devotion > 20)>>
-	$He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and look into $his <<eyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster($activeSlave)>> worrying, and $he looks down after a moment, blushing nervously.
+	$He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and look into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster($activeSlave)>> worrying, and $he looks down after a moment, blushing nervously.
 <<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust >= -20)>>
-	$He visibly considers disobedience, but decides that complying with such an apparently harmless order is safe, for now. Once $he's close, you hold $his face in your palms and look into $his <<eyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster($activeSlave)>> worrying, and $he looks down after a moment, $his lower lip trembling with nervousness.
+	$He visibly considers disobedience, but decides that complying with such an apparently harmless order is safe, for now. Once $he's close, you hold $his face in your palms and look into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster($activeSlave)>> worrying, and $he looks down after a moment, $his lower lip trembling with nervousness.
 <<elseif ($activeSlave.trust < -20)>>
-	The command terrifies $him, but $he's more frightened still of the consequences of disobedience, and $he complies. Once $he's close, you hold $his face in your palms and look into $his <<eyeColor>> eyes. $He looks down fearfully, and begins to shake with terror, tears leaking silently down $his cheeks.
+	The command terrifies $him, but $he's more frightened still of the consequences of disobedience, and $he complies. Once $he's close, you hold $his face in your palms and look into $his <<= App.Desc.EyeColor>> eyes. $He looks down fearfully, and begins to shake with terror, tears leaking silently down $his cheeks.
 <<else>>
-	$He pauses, obviously considering whether to resist, but eventually decides to save $his strength to fight more onerous orders, and gives in. Once $he's close, you hold $his face in your palms and look into $his <<eyeColor>> eyes. $He stares back, but after a few moments $he loses the contest of wills and looks down.
+	$He pauses, obviously considering whether to resist, but eventually decides to save $his strength to fight more onerous orders, and gives in. Once $he's close, you hold $his face in your palms and look into $his <<= App.Desc.EyeColor>> eyes. $He stares back, but after a few moments $he loses the contest of wills and looks down.
 <</if>>
 
 You delicately lift $his head and touch your fingertips to $his chin, tenderly brushing along the line of $his mouth with your <<if $PC.title == 1>>manly<<else>>feminine<</if>> thumb.
@@ -71,17 +71,17 @@ Then, you gently tilt $his <<if $activeSlave.face > 95>>overwhelmingly stunning<
 <</if>> with your fingertips. You use your fingers and thumbs to slowly slide along $his mouth, $his chin, $his cheeks then around $his face. You use a deft touch to thoroughly explore the shape of $his <<if $activeSlave.face > 95>>gorgeous<<elseif $activeSlave.face > 10>>nice<<elseif $activeSlave.face >= -10>>cute<<elseif $activeSlave.face >= -40>>fair<<else>>prominent<</if>> cheekbones. Grazing $his temple and brushing $his forehead simultaneously, you smoothly motion along $his eyelids and nose and you tenderly stroke $his face with both hands as you take $his head lightly and trace around it, gently massaging as you go. You work your way down, slowly and gradually, along $his neck with one hand, then the other, briefly pausing before continuing your path down to $his shoulders and<<if ($activeSlave.fetish != "mindbroken")>> $he starts to gasp as<<else>> starts to shudder as<</if>> you slide your hands down $his side, across $his back and along $his belly taking every moment to savor the contours of $his body before going back up again to $his face.
 
 <<if ($activeSlave.fetish == "mindbroken")>>
-	$His posture doesn't change. $He initially only reacts slightly to your physical touch but then stops reacting completely. When you stop, $his <<eyeColor>> eyes track the movements of your hands briefly but then stare blankly ahead of $him, awaiting further use of $his body.
+	$His posture doesn't change. $He initially only reacts slightly to your physical touch but then stops reacting completely. When you stop, $his <<= App.Desc.EyeColor>> eyes track the movements of your hands briefly but then stare blankly ahead of $him, awaiting further use of $his body.
 <<elseif ($activeSlave.relationship == -2)>>
-	$His eyes gradually close and $he slowly leans $his head back, relaxing as $he feels your caress. $He gently gasps as $he feels your warm <<if $PC.title == 1>>manly<<else>>feminine<</if>> hand. When you finally stop gently caressing $him, $his eyes remain closed and $his mouth still in a rapturous shape for a moment before $he slowly opens $his eyes and smiles at you, $he has an eager look on $his face.<<if ($activeSlave.amp != 1)>> A hand reaches dumbly up to $his face mimicking your last movements.<</if>> <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate love with $his <<eyeColor>> eyes, since $he does not speak $language well enough to express $himself.<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>$He does $his best to communicate love with $his <<eyeColor>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he loves you.<<else>>"I love you, <<Master>>," $he <<say>>s dreamily.<</if>> $He looks as though $he wants much more than your mere caress.
+	$His eyes gradually close and $he slowly leans $his head back, relaxing as $he feels your caress. $He gently gasps as $he feels your warm <<if $PC.title == 1>>manly<<else>>feminine<</if>> hand. When you finally stop gently caressing $him, $his eyes remain closed and $his mouth still in a rapturous shape for a moment before $he slowly opens $his eyes and smiles at you, $he has an eager look on $his face.<<if ($activeSlave.amp != 1)>> A hand reaches dumbly up to $his face mimicking your last movements.<</if>> <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate love with $his <<= App.Desc.EyeColor>> eyes, since $he does not speak $language well enough to express $himself.<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>$He does $his best to communicate love with $his <<= App.Desc.EyeColor>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he loves you.<<else>>"I love you, <<Master>>," $he <<say>>s dreamily.<</if>> $He looks as though $he wants much more than your mere caress.
 <<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "dom") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
-	As you start to touch $his <<if $activeSlave.face > 95>>gorgeous<<elseif $activeSlave.face > 10>>lovely<<elseif $activeSlave.face >= -10>>pretty<<elseif $activeSlave.face >= -40>>homely<<else>>ugly<</if>> face, $he smiles at you and takes your hand in $hers, following its movements. $He tries hard to stop $himself from losing $himself in your masterful hands. $He takes $his tendency towards sexual dominance right up to the edge of insubordination, when $he starts to caress your face in turn. When you finally stop, $his eyes are closed and $he's smiling. <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate excitement with $his <<eyeColor>> eyes, since $he does not speak $language well enough to express $himself.<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>$He does $his best to communicate excitement with $his <<eyeColor>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he liked that.<<else>>"That wa<<s>> fun, <<Master>>," $he <<say>>s cheerfully.<</if>> $He looks at you, $his eyes almost begging you to give $him more than your mere caress.
+	As you start to touch $his <<if $activeSlave.face > 95>>gorgeous<<elseif $activeSlave.face > 10>>lovely<<elseif $activeSlave.face >= -10>>pretty<<elseif $activeSlave.face >= -40>>homely<<else>>ugly<</if>> face, $he smiles at you and takes your hand in $hers, following its movements. $He tries hard to stop $himself from losing $himself in your masterful hands. $He takes $his tendency towards sexual dominance right up to the edge of insubordination, when $he starts to caress your face in turn. When you finally stop, $his eyes are closed and $he's smiling. <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate excitement with $his <<= App.Desc.EyeColor>> eyes, since $he does not speak $language well enough to express $himself.<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>$He does $his best to communicate excitement with $his <<= App.Desc.EyeColor>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he liked that.<<else>>"That wa<<s>> fun, <<Master>>," $he <<say>>s cheerfully.<</if>> $He looks at you, $his eyes almost begging you to give $him more than your mere caress.
 <<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "cumslut") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
-	$He stiffens at your touch but slowly relaxes to your fingers on $his face. As you move your fingers along $his lips, $he reacts almost as though $he's receiving oral. $He starts to gently suck your fingers, moaning into your hand and pressing $himself lewdly against your <<if $PC.boobs == 1>>prominent breasts<<else>>manly chest<</if>>.<<if ($activeSlave.teeth == "pointy")>> $He's very careful to avoid spearing your tongue with $his sharp teeth.<</if>> $He achieves a weak orgasm before you stop caressing $him. <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate undiminished lust with $his <<eyeColor>> eyes, since $he does not speak $language well enough to express $himself.<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>$He does $his best to communicate undiminished lust with $his <<eyeColor>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he liked that.<<else>>"That wa<<s>> fun, <<Master>>," $he <<say>>s lustfully.<</if>> $He looks at you as if $he wants more than your hands touching $him.
+	$He stiffens at your touch but slowly relaxes to your fingers on $his face. As you move your fingers along $his lips, $he reacts almost as though $he's receiving oral. $He starts to gently suck your fingers, moaning into your hand and pressing $himself lewdly against your <<if $PC.boobs == 1>>prominent breasts<<else>>manly chest<</if>>.<<if ($activeSlave.teeth == "pointy")>> $He's very careful to avoid spearing your tongue with $his sharp teeth.<</if>> $He achieves a weak orgasm before you stop caressing $him. <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate undiminished lust with $his <<= App.Desc.EyeColor>> eyes, since $he does not speak $language well enough to express $himself.<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>$He does $his best to communicate undiminished lust with $his <<= App.Desc.EyeColor>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he liked that.<<else>>"That wa<<s>> fun, <<Master>>," $he <<say>>s lustfully.<</if>> $He looks at you as if $he wants more than your hands touching $him.
 <<elseif ($activeSlave.devotion > 50)>>
-	$He accepts your touch with devotion, leaning $his head back at your gentle caress along $his face. $He leans $his body forward, pressing $himself against you, and you feel the intense heat from $his body against your <<if $PC.boobs == 1>>soft breasts<<else>>manly chest<</if>>. $He gradually closes $his eyes and when you finally stop, <<if ($activeSlave.amp != 1)>>$he runs $his hand delightfully across $his face where you last touched $his<</if>>, a euphoric look on $his $activeSlave.skin face. <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate devotion with $his <<eyeColor>> eyes, since $he's not confident in $his ability to express it in $language.<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>$He does $his best to communicate devotion with $his <<eyeColor>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he loves you.<<else>>"I love you, <<Master>>," $he <<say>>s jubilantly.<</if>> $He looks at you longingly, almost as if $he's bursting to say that $he wants more than your mere caress.
+	$He accepts your touch with devotion, leaning $his head back at your gentle caress along $his face. $He leans $his body forward, pressing $himself against you, and you feel the intense heat from $his body against your <<if $PC.boobs == 1>>soft breasts<<else>>manly chest<</if>>. $He gradually closes $his eyes and when you finally stop, <<if ($activeSlave.amp != 1)>>$he runs $his hand delightfully across $his face where you last touched $his<</if>>, a euphoric look on $his $activeSlave.skin face. <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate devotion with $his <<= App.Desc.EyeColor>> eyes, since $he's not confident in $his ability to express it in $language.<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>$He does $his best to communicate devotion with $his <<= App.Desc.EyeColor>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he loves you.<<else>>"I love you, <<Master>>," $he <<say>>s jubilantly.<</if>> $He looks at you longingly, almost as if $he's bursting to say that $he wants more than your mere caress.
 <<elseif ($activeSlave.devotion > 20)>>
-	$He accepts your touch willingly. As you are so close to $him, you sense considerable turmoil in the <<if ($activeSlave.physicalAge > 30)>>$woman<<else>>$girl<</if>>; $he's doing $his duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your touch across $his face. When you finally move your hand away, $his <<eyeColor>> eyes gaze into yours searchingly, looking for answers that are not there. <<if (($activeSlave.amp == 1) && (!canTalk($activeSlave)))>>$His eyes beg for an answer: is that it?<<elseif !canTalk($activeSlave)>>$He signs hesitantly, asking if that's it.<<else>>$He asks hesitantly, "I-i<<s>> that it, <<Master>>?"<</if>>
+	$He accepts your touch willingly. As you are so close to $him, you sense considerable turmoil in the <<if ($activeSlave.physicalAge > 30)>>$woman<<else>>$girl<</if>>; $he's doing $his duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your touch across $his face. When you finally move your hand away, $his <<= App.Desc.EyeColor>> eyes gaze into yours searchingly, looking for answers that are not there. <<if (($activeSlave.amp == 1) && (!canTalk($activeSlave)))>>$His eyes beg for an answer: is that it?<<elseif !canTalk($activeSlave)>>$He signs hesitantly, asking if that's it.<<else>>$He asks hesitantly, "I-i<<s>> that it, <<Master>>?"<</if>>
 <<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust < -20)>>
 	$He shakes at your touch fearfully. As you move your hand along $his unresisting face, $his eagerness to avoid punishment leads $him to stiffen, $his nervousness is made apparent. You continue stroking $his cheek, enjoying $his fear, and the physical intimacy slowly does its work. $He starts to relax, $his resistance easing and $his eyes start to close. When finally move your hand away, $he looks at you for a long moment, $his eyes darting up at you, before visibly catching $himself with a reminder that $he's a slave and you're $his owner. <<if (($activeSlave.amp == 1) && (!canTalk($activeSlave)))>>$His eyes beg for an answer: is that it?<<elseif !canTalk($activeSlave)>>$He signs hesitantly, asking if that's it.<<else>>$He asks hesitantly, "I-i<<s>> that it, <<Master>>?"<</if>>
 <<elseif ($activeSlave.trust < -50)>>
diff --git a/src/player/actions/fEmbrace.tw b/src/player/actions/fEmbrace.tw
index 7216e303c8e0b05026d06298da8cf2c83c017f76..d5d5d37e70056fef426adec9400152fc4589efc4 100644
--- a/src/player/actions/fEmbrace.tw
+++ b/src/player/actions/fEmbrace.tw
@@ -14,31 +14,31 @@ You tell $activeSlave.slaveName to
 <<if ($activeSlave.fetish == "mindbroken") && ($activeSlave.relationship != -3)>>
 	$He complies automatically. $He remembers that when <<= WrittenMaster()>>'s commands are not obeyed, there is punishment.
 <<elseif ($activeSlave.relationship == -2)>>
-	$He excitedly complies, happy to be near the object of $his longing. Once $he's close, you take $his completely relaxed head in your hands and gaze deeply into $his <<eyeColor>> eyes. $He finds the intense look from the _womanP $he loves overwhelming, and $his eyes flick downward after a moment. $He blushes furiously.
+	$He excitedly complies, happy to be near the object of $his longing. Once $he's close, you take $his completely relaxed head in your hands and gaze deeply into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he loves overwhelming, and $his eyes flick downward after a moment. $He blushes furiously.
 <<elseif ($activeSlave.relationship == -3)>>
 	<<if $activeSlave.fetish == "mindbroken">>
-		$He complies mechanically. $He remembers that when <<= WrittenMaster()>>'s commands are not obeyed, there is punishment. Once $he's close, you hold $his face in your palms and look into $his blank <<eyeColor>> eyes. $He shows no reaction.
+		$He complies mechanically. $He remembers that when <<= WrittenMaster()>>'s commands are not obeyed, there is punishment. Once $he's close, you hold $his face in your palms and look into $his blank <<= App.Desc.EyeColor>> eyes. $He shows no reaction.
 	<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
-		$He lovingly complies, hurrying to come close to the _womanP who married $him. Once $he's close, you take your willing wife's head in your hands and gaze deeply into $his <<eyeColor>> eyes. $He finds the intense look from the _womanP $he's married to affirming, and looks down with a smile<<if canSee($activeSlave)>>, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>><</if>>.
+		$He lovingly complies, hurrying to come close to the _womanP who married $him. Once $he's close, you take your willing wife's head in your hands and gaze deeply into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's married to affirming, and looks down with a smile<<if canSee($activeSlave)>>, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>><</if>>.
 	<<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
-		$He complies. Once $he's close, you take your reluctant wife's head in your hands and gaze deeply into $his <<eyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to disturbing, and <<if canSee($activeSlave)>> breaks eye contact<<else>> turns $his face away<</if>>.
+		$He complies. Once $he's close, you take your reluctant wife's head in your hands and gaze deeply into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to disturbing, and <<if canSee($activeSlave)>> breaks eye contact<<else>> turns $his face away<</if>>.
 	<<elseif $activeSlave.devotion < -20>>
-		$He complies out of fear. Once $he's close, you take your unwilling wife's head in your hands and gaze deeply into $his teary <<eyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to terrifying, and <<if canSee($activeSlave)>> breaks eye contact<<else>> turns $his face away<</if>>.
+		$He complies out of fear. Once $he's close, you take your unwilling wife's head in your hands and gaze deeply into $his teary <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to terrifying, and <<if canSee($activeSlave)>> breaks eye contact<<else>> turns $his face away<</if>>.
 	<<else>>
-		$He complies obediently. Once $he's close, you take your willing wife's head in your hands and gaze deeply into $his <<eyeColor>> eyes. $He finds the intense look from the _womanP $he's married to reassuring, and looks down with a slight smile<<if canSee($activeSlave)>>, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>><</if>>.
+		$He complies obediently. Once $he's close, you take your willing wife's head in your hands and gaze deeply into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's married to reassuring, and looks down with a slight smile<<if canSee($activeSlave)>>, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>><</if>>.
 	<</if>>
 <<elseif ($activeSlave.devotion > 75)>>
-	$He elatedly complies, joyful at being near to you. Once $he's close, you take $his completely relaxed head in your hands and gaze deeply into $his <<eyeColor>> eyes. $He finds the intense look from $his beloved <<= WrittenMaster()>> disconcerting, and $his eyes flick downward after a moment. $He blushes furiously.
+	$He elatedly complies, joyful at being near to you. Once $he's close, you take $his completely relaxed head in your hands and gaze deeply into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from $his beloved <<= WrittenMaster()>> disconcerting, and $his eyes flick downward after a moment. $He blushes furiously.
 <<elseif ($activeSlave.devotion > 50)>>
-	$He dotingly complies, being near you filling $him with delight. Once $he's close, you take $his completely relaxed head in your hands and gaze deeply into $his <<eyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> disconcerting, and $he looks down after a moment, blushing.
+	$He dotingly complies, being near you filling $him with delight. Once $he's close, you take $his completely relaxed head in your hands and gaze deeply into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> disconcerting, and $he looks down after a moment, blushing.
 <<elseif ($activeSlave.devotion > 20)>>
-	$He joyfully complies, happy to be near you. Once $he's close, you you take $his willing head in your hands and gaze deeply into $his <<eyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, blushing nervously.
+	$He joyfully complies, happy to be near you. Once $he's close, you you take $his willing head in your hands and gaze deeply into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, blushing nervously.
 <<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust >= -20)>>
-	$He visibly considers disobedience, but decides that complying with such an apparently harmless order is safe, for now. Once $he's close, you take $his head in your hands and gaze deeply into $his <<eyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, $his lower lip trembling with nervousness.
+	$He visibly considers disobedience, but decides that complying with such an apparently harmless order is safe, for now. Once $he's close, you take $his head in your hands and gaze deeply into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, $his lower lip trembling with nervousness.
 <<elseif ($activeSlave.trust < -20)>>
-	The command terrifies $him, but $he's more frightened still of the consequences of disobedience, and $he complies. Once $he's close, you take $his trembling head in your hands and gaze deeply into $his <<eyeColor>> eyes for a moment. $He looks down fearfully, and begins to shake with terror, tears streaking down $his cheeks.
+	The command terrifies $him, but $he's more frightened still of the consequences of disobedience, and $he complies. Once $he's close, you take $his trembling head in your hands and gaze deeply into $his <<= App.Desc.EyeColor>> eyes for a moment. $He looks down fearfully, and begins to shake with terror, tears streaking down $his cheeks.
 <<else>>
-	$He pauses, obviously considering whether to resist, but eventually decides to save $his strength to fight more onerous orders, and gives in. Once $he's close, you take a moment to gaze deeply into $his <<eyeColor>> eyes. $He stares back, but after a few moments $he loses the contest of wills and looks down.
+	$He pauses, obviously considering whether to resist, but eventually decides to save $his strength to fight more onerous orders, and gives in. Once $he's close, you take a moment to gaze deeply into $his <<= App.Desc.EyeColor>> eyes. $He stares back, but after a few moments $he loses the contest of wills and looks down.
 <</if>>
 
 You walk around $him and put your hands around $his abdomen,<<if ($activeSlave.amp != 1)>> to gently pull $him close towards you<<else>> moving close towards $him on your desk<</if>> and then wrap your arms around $his shoulders.<<if ($activeSlave.amp != 1)>> When you press your hips against $hers,<<else>> You use your arms to prop $him up against you,<</if>> <<if ($activeSlave.trust > 20)>>letting $him lean while taking the weight of $his against you<<else>>$he tries to lean away from you, pushing against your arms<</if>>. You lovingly squeeze $him in your long, cradling embrace.
@@ -63,24 +63,24 @@ You walk around $him and put your hands around $his abdomen,<<if ($activeSlave.a
 <</if>>
 
 <<if ($activeSlave.fetish == "mindbroken")>>
-	$His posture doesn't change. $He initially only reacts slightly to your physical touch but eventually $he relaxes in the warmth of your embrace against $him. You know that this may only be a physiological reaction, nothing more. For a brief moment you think you detect a spark of life in $his dull eyes but just as quickly, it is gone. When you stop, $his <<eyeColor>> eyes track the movements of your hands briefly but then $he stares blankly ahead of $him, not understanding what is happening.
+	$His posture doesn't change. $He initially only reacts slightly to your physical touch but eventually $he relaxes in the warmth of your embrace against $him. You know that this may only be a physiological reaction, nothing more. For a brief moment you think you detect a spark of life in $his dull eyes but just as quickly, it is gone. When you stop, $his <<= App.Desc.EyeColor>> eyes track the movements of your hands briefly but then $he stares blankly ahead of $him, not understanding what is happening.
 <<elseif ($activeSlave.relationship == -2)>>
-	In the warmth of your embrace, $he turns towards you, $his passionate <<eyeColor>> eyes staring intently at your face. $He leans closer to you and kisses you as you hold $him. $His heart beats faster and then gradually slows as $he grows accustomed to your body against $hers. Eventually, $he relaxes totally and $his eyes gradually close, melting in your arms. When you finally stop and relax your embrace, $his eyes remain closed and $his mouth still in a rapturous shape for a moment before $he slowly opens $his eyes and smiles at you with a blissful look on $his face. <<if ($activeSlave.amp != 1)>> $His hand reaches to your arms and $he strokes them longingly.<</if>> <<if ($activeSlave.amp == 1) && !canTalk($activeSlave)>>$He slowly opens them and does $his best to communicate love with $his <<eyeColor>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he loves you.<<else>>"I love you, <<Master>>," $he <<say>>s dreamily.<</if>> $He looks at you, almost begging you with $his eyes that $he wants much more than a mere embrace.
+	In the warmth of your embrace, $he turns towards you, $his passionate <<= App.Desc.EyeColor>> eyes staring intently at your face. $He leans closer to you and kisses you as you hold $him. $His heart beats faster and then gradually slows as $he grows accustomed to your body against $hers. Eventually, $he relaxes totally and $his eyes gradually close, melting in your arms. When you finally stop and relax your embrace, $his eyes remain closed and $his mouth still in a rapturous shape for a moment before $he slowly opens $his eyes and smiles at you with a blissful look on $his face. <<if ($activeSlave.amp != 1)>> $His hand reaches to your arms and $he strokes them longingly.<</if>> <<if ($activeSlave.amp == 1) && !canTalk($activeSlave)>>$He slowly opens them and does $his best to communicate love with $his <<= App.Desc.EyeColor>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he loves you.<<else>>"I love you, <<Master>>," $he <<say>>s dreamily.<</if>> $He looks at you, almost begging you with $his eyes that $he wants much more than a mere embrace.
 <<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "dom") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
 	In your soft, warm embrace, $he tries hard to stop $himself from losing $himself in your arms.
 	<<if ($activeSlave.amp != 1)>> $He starts to embrace you in $his arms as well. When you gently squeeze $him in your arms, $he breathes more heavily and starts to lovingly squeeze you as well, $his tendency towards sexual dominance encouraging $him to compete with you in embraces against each other.
 	<<else>> When you gently squeeze $him in your arms, $he breathes more heavily before relaxing against you.
 	<</if>>
 	When you finally stop and relax your embrace, $his eyes are closed and $he's smiling blissfully.
-	<<if ($activeSlave.amp == 1) && !canTalk($activeSlave)>>$He slowly opens them and does $his best to communicate excitement with $his <<eyeColor>> eyes.
+	<<if ($activeSlave.amp == 1) && !canTalk($activeSlave)>>$He slowly opens them and does $his best to communicate excitement with $his <<= App.Desc.EyeColor>> eyes.
 	<<elseif !canTalk($activeSlave)>>$He signs that $he liked that.
 	<<else>>"That wa<<s>> fun, <<Master>>," $he <<say>>s cheerfully.
 	<</if>>
 	$He eagerly looks at you, $his eyes almost seem to say that $he wants you to give $his <<Master>> more than a mere hug.
 <<elseif ($activeSlave.devotion > 50)>>
-	$He sighs devotedly in your arms and slowly relaxes. $He turns towards you, $his doting <<eyeColor>> eyes staring intently at your face. You feel $his heart beating faster against your chest as you softly squeeze your arms tighter. $His hands reach to your arms and $he strokes them longingly as you squeeze. $He gradually closes $his eyes as $he leans $his body against yours, melting in your warm embrace, and you feel the intense heat from $his body against your <<if $PC.boobs == 1>>soft breasts<<else>>manly chest<</if>>. When you finally stop, <<if ($activeSlave.amp != 1)>>$he reaches to your face with $his hand and gently strokes your cheek<<else>>$he turns to you<</if>>, a euphoric look on $his $activeSlave.skin face. <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate devotion with $his <<eyeColor>> eyes, since $he's not confident in $his ability to express it in $language.<<elseif ($activeSlave.amp == 1) && !canTalk($activeSlave)>>$He does $his best to communicate devotion with $his <<eyeColor>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he loves you.<<else>>"I love you, <<Master>>," $he <<say>>s elatedly.<</if>> $He looks at you longingly, almost as if $he's bursting to say that $he wants more than a mere embrace.
+	$He sighs devotedly in your arms and slowly relaxes. $He turns towards you, $his doting <<= App.Desc.EyeColor>> eyes staring intently at your face. You feel $his heart beating faster against your chest as you softly squeeze your arms tighter. $His hands reach to your arms and $he strokes them longingly as you squeeze. $He gradually closes $his eyes as $he leans $his body against yours, melting in your warm embrace, and you feel the intense heat from $his body against your <<if $PC.boobs == 1>>soft breasts<<else>>manly chest<</if>>. When you finally stop, <<if ($activeSlave.amp != 1)>>$he reaches to your face with $his hand and gently strokes your cheek<<else>>$he turns to you<</if>>, a euphoric look on $his $activeSlave.skin face. <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate devotion with $his <<= App.Desc.EyeColor>> eyes, since $he's not confident in $his ability to express it in $language.<<elseif ($activeSlave.amp == 1) && !canTalk($activeSlave)>>$He does $his best to communicate devotion with $his <<= App.Desc.EyeColor>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he loves you.<<else>>"I love you, <<Master>>," $he <<say>>s elatedly.<</if>> $He looks at you longingly, almost as if $he's bursting to say that $he wants more than a mere embrace.
 <<elseif ($activeSlave.devotion > 20)>>
-	$He willingly gives $himself up to your embracing arms. As you are so close to $him, you sense considerable uneasiness in the <<if ($activeSlave.physicalAge > 30)>>$woman<<else>>$girl<</if>>; $he's doing $his duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your soft embrace against $his body. $He gradually closes $his eyes in the feeling of your gentle arms. When you finally stop and relax your embrace, $his <<eyeColor>> eyes open to gaze puzzlingly at you. Even though $he has accepted life as a sex slave, $he looks as though $he is unsure of what to make of this non-sexual physical contact. <<if ($activeSlave.amp == 1) && !canTalk($activeSlave)>>$His eyes beg for an answer: is that it?<<elseif !canTalk($activeSlave)>>$He signs hesitantly, asking if that's it.<<else>>$He asks hesitantly, "I-i<<s>> that it, <<Master>>?"<</if>>
+	$He willingly gives $himself up to your embracing arms. As you are so close to $him, you sense considerable uneasiness in the <<if ($activeSlave.physicalAge > 30)>>$woman<<else>>$girl<</if>>; $he's doing $his duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your soft embrace against $his body. $He gradually closes $his eyes in the feeling of your gentle arms. When you finally stop and relax your embrace, $his <<= App.Desc.EyeColor>> eyes open to gaze puzzlingly at you. Even though $he has accepted life as a sex slave, $he looks as though $he is unsure of what to make of this non-sexual physical contact. <<if ($activeSlave.amp == 1) && !canTalk($activeSlave)>>$His eyes beg for an answer: is that it?<<elseif !canTalk($activeSlave)>>$He signs hesitantly, asking if that's it.<<else>>$He asks hesitantly, "I-i<<s>> that it, <<Master>>?"<</if>>
 <<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust < -20)>>
 	$He shakes at your touch fearfully. As you softly press $his trembling body against you, $his eagerness to avoid punishment leads $him to stiffen in your arms. While $he continues to shudder, you continue embracing $him, enjoying $his fear, and the physical intimacy slowly does its work. $He starts to relax, $his resistance easing and $his eyes start to close. When you relax your arms for a moment, $he opens $his eyes to look at you for a long moment, $his eyes darting up to your face, before visibly catching $himself with a reminder that $he's a slave and you're $his owner. <<if ($activeSlave.amp == 1) && !canTalk($activeSlave)>>$His eyes beg for an answer: is that it?<<elseif !canTalk($activeSlave)>>$He signs hesitantly, asking if that's it.<<else>>$He asks hesitantly, "I-i<<s>> that it, <<Master>>?"<</if>>
 <<elseif ($activeSlave.trust < -50)>>
diff --git a/src/player/actions/fondleBoobs.tw b/src/player/actions/fondleBoobs.tw
index e7b996c30234ac146eb6172691158bcc3d821f3f..b6b6afea21575667ba37d78d1e8b80e53730b74c 100644
--- a/src/player/actions/fondleBoobs.tw
+++ b/src/player/actions/fondleBoobs.tw
@@ -150,15 +150,15 @@ You call $him over so you can fondle $his
 	<</if>>
 	You both alternate between taking your mouth to $his<<if ($activeSlave.lactation > 0)>> milky<</if>> nipples and $hers to yours, gently nuzzling and nibbling while simultaneously fondling each other all the while. Both of you continue to passionately lick, nibble, stroke and fondle one other until tiredly, $he slows down. When you eventually stop, $he looks up at you happily.
 	<<if ($activeSlave.accent >= 3)>>
-		$He does $his best to communicate excitement with $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>face<</if>>, since $he does not speak $language well enough to express $himself.
+		$He does $his best to communicate excitement with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>face<</if>>, since $he does not speak $language well enough to express $himself.
 	<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
-		$He does $his best to communicate excitement with $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>face<</if>>.
+		$He does $his best to communicate excitement with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>face<</if>>.
 	<<elseif !canTalk($activeSlave)>>
 		$He signs that $he liked that.
 	<<else>>
 		"That wa<<s>> fun, <<Master>>," $he <<say>>s cheerfully.
 	<</if>>
-	$He looks at you with $his <<eyeColor>> eyes, smiling.
+	$He looks at you with $his <<= App.Desc.EyeColor>> eyes, smiling.
 <<elseif ($activeSlave.fetish == "submissive") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)>>
 	$He eagerly comes over to you, to stand between you and your desk. You lean over while $he submissively lies down upon it, face up, with $his breasts pointed to the air. You place your hands on $his
 	<<if ($activeSlave.boobs >= 20000)>>
@@ -199,9 +199,9 @@ You call $him over so you can fondle $his
 	<</if>>
 	$He moans passionately at the continued stimulation of $his breasts and nipples. When you finally stop, $he reaches up to your face with $his hand and lovingly strokes it, a blissful look on $his $activeSlave.skin face.
 	<<if ($activeSlave.accent >= 3)>>
-		$He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>face<</if>>, since $he's not confident in $his ability to express it in $language.
+		$He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>face<</if>>, since $he's not confident in $his ability to express it in $language.
 	<<elseif ($activeSlave.amp == 1) && !canTalk($activeSlave)>>
-		$He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>face<</if>>.
+		$He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>face<</if>>.
 	<<elseif !canTalk($activeSlave)>>
 		$He signs that $he loves you.
 	<<else>>
@@ -248,9 +248,9 @@ You call $him over so you can fondle $his
 	<</if>>
 	$He moans passionately at the continued punishment of $his breasts and nipples. Your rough play leaves red marks on $his breasts and nipples and $he becomes even more aroused. When you finally stop $he rubs the marks on $his breasts with $his hands, an ecstatic look on $his $activeSlave.skin face.
 	<<if ($activeSlave.accent >= 3)>>
-		$He does $his best to communicate pleasure with $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>face<</if>>, since $he's not confident in $his ability to express it in $language.
+		$He does $his best to communicate pleasure with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>face<</if>>, since $he's not confident in $his ability to express it in $language.
 	<<elseif ($activeSlave.amp == 1) && !canTalk($activeSlave)>>
-		$He does $his best to communicate $his pleasure with $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>face<</if>>.
+		$He does $his best to communicate $his pleasure with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>face<</if>>.
 	<<elseif !canTalk($activeSlave)>>
 		$He signs that $he loves it.
 	<<else>>
@@ -258,7 +258,7 @@ You call $him over so you can fondle $his
 	<</if>>
 	$He <<if canSee($activeSlave)>>looks<<else>>gazes<</if>> at you longingly, hungry for more.
 <<elseif ($activeSlave.devotion > 50)>>
-	$He devotedly comes over to you, to stand between you and your desk. $His doting <<eyeColor>> eyes looking in yours. You place your hands on $his
+	$He devotedly comes over to you, to stand between you and your desk. $His doting <<= App.Desc.EyeColor>> eyes looking in yours. You place your hands on $his
 	<<if ($activeSlave.boobs >= 20000)>>
 		colossal tits, before sinking your body into their immense softness,
 	<<elseif ($activeSlave.boobs >= 10000)>>
@@ -297,9 +297,9 @@ You call $him over so you can fondle $his
 	<</if>>
 	$He moans passionately at the continued stimulation of $his breasts and nipples. When you finally stop, $he reaches up to your face with $his hand and lovingly strokes it, a blissful look on $his $activeSlave.skin face.
 	<<if ($activeSlave.accent >= 3)>>
-		$He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>face<</if>>, since $he's not confident in $his ability to express it in $language.
+		$He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>face<</if>>, since $he's not confident in $his ability to express it in $language.
 	<<elseif ($activeSlave.amp == 1) && !canTalk($activeSlave)>>
-		$He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>face<</if>>.
+		$He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>face<</if>>.
 	<<elseif !canTalk($activeSlave)>>
 		$He signs that $he loves you.<<else>>"I love you, <<Master>>," $he <<say>>s euphorically.
 	<</if>>
@@ -342,7 +342,7 @@ You call $him over so you can fondle $his
 	<<else>>
 		Moving your head close to $his breasts, you nuzzle on a nipple slit with your lips and even lick it delicately with your tongue. Then you alternate, gently probing the depths of the other nipple. You dig deep into both $his breasts, teasing what was once the tips of $his<<if ($activeSlave.lactation > 0)>> milky<</if>> nipples with your fingers before vigorously fingering $his tits.
 	<</if>>
-	You sense considerable uneasiness in the <<if ($activeSlave.physicalAge > 30)>>$woman<<else>>$girl<</if>>; $he's doing $his duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your hands on $his breasts. $He gradually loses $himself in the feeling of your gentle hands. When you finally stop, $his <<if canSee($activeSlave)>><<eyeColor>> eyes gaze<<else>>face gazes<</if>> puzzlingly at you. Even though $he has accepted life as a sex slave, $he looks as though $he is unsure of what to make of this.
+	You sense considerable uneasiness in the <<if ($activeSlave.physicalAge > 30)>>$woman<<else>>$girl<</if>>; $he's doing $his duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your hands on $his breasts. $He gradually loses $himself in the feeling of your gentle hands. When you finally stop, $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes gaze<<else>>face gazes<</if>> puzzlingly at you. Even though $he has accepted life as a sex slave, $he looks as though $he is unsure of what to make of this.
 	<<if ($activeSlave.amp == 1) && !canTalk($activeSlave)>>
 		$His <<if canSee($activeSlave)>>eyes beg<<else>>expression begs<</if>> for an answer: is that it?
 	<<elseif !canTalk($activeSlave)>>
@@ -373,7 +373,7 @@ You call $him over so you can fondle $his
 	<<else>>
 		playing with $his<<if ($activeSlave.lactation > 0)>> milky<</if>> $activeSlave.nipples nipples so that they become sodden with fluid around your fingers. You plunge the depths of $his nipple cunts and vigorously work the unusual orifice. When you finally withdraw from $his nipples<<if ($activeSlave.lactation > 0)>>, a stream of pent-up milk flows out after you and<<else>>,<</if>> $he lets out a gasp.
 	<</if>>
-	$His body softens as <<if canSee($activeSlave)>>$his <<eyeColor>> eyes dart up to your face, before visibly catching $himself with a reminder<<else>>$he remembers<</if>> that $he's a slave and you're $his owner. When you finally stop, $he shivers but says nothing, uneasy at what you are going to do next.
+	$His body softens as <<if canSee($activeSlave)>>$his <<= App.Desc.EyeColor>> eyes dart up to your face, before visibly catching $himself with a reminder<<else>>$he remembers<</if>> that $he's a slave and you're $his owner. When you finally stop, $he shivers but says nothing, uneasy at what you are going to do next.
 <<elseif ($activeSlave.trust < -50)>>
 	$He is nearly frozen with fear, and does not resist as you start to massage $his
 	<<if ($activeSlave.boobs >= 20000)>>
diff --git a/src/player/actions/fondleButt.tw b/src/player/actions/fondleButt.tw
index b98c510223453fbe63e837e2da09b5fb37234b36..99ce965ea17789a2548422bf1c65ad5a14cf4405 100644
--- a/src/player/actions/fondleButt.tw
+++ b/src/player/actions/fondleButt.tw
@@ -142,7 +142,7 @@ as well as $his
 	<</if>>
 	buttocks a gentle smack. $He turns to face you, kissing you, but looking at you longingly as if $he wants more.
 	<<if ($activeSlave.amp == 1) && !canTalk($activeSlave)>>
-		$He does $his best to communicate love with $his <<eyeColor>> eyes.
+		$He does $his best to communicate love with $his <<= App.Desc.EyeColor>> eyes.
 	<<elseif !canTalk($activeSlave)>>
 		$He signs that $he loves you.
 	<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>> "I love you,
diff --git a/src/player/actions/fondleVagina.tw b/src/player/actions/fondleVagina.tw
index a7e1d14543dfcabac7a6675bf8c52b8e4e206ac9..d4ac299a2ddccd3c69f18eee5e4dc829d8ed7900 100644
--- a/src/player/actions/fondleVagina.tw
+++ b/src/player/actions/fondleVagina.tw
@@ -113,7 +113,7 @@ You call $him over so you can fondle $his
 		<</if>>
 		and rub it with your fingertips as your hand nears it. As $he becomes more aroused, $he grabs hold of your wrist lightly, moving $his hands along with the motion of your own. $His pussy juices run down $his leg as $he begins to moan audibly<<if ($activeSlave.amp != 1)>>, gently clamping your hand between $his thighs<</if>> as you continue to move your hand along $his pussy. $He moans loudly as $he shudders in orgasmic joy.
 		<<if (($activeSlave.amp == 1) && !canTalk($activeSlave))>>
-			$He does $his best to communicate love with $his <<eyeColor>> eyes.
+			$He does $his best to communicate love with $his <<= App.Desc.EyeColor>> eyes.
 		<<elseif !canTalk($activeSlave)>>
 			$He signs that $he loves you.
 		<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>> "I love you,
diff --git a/src/pregmod/fPat.tw b/src/pregmod/fPat.tw
index 49b762f52b48071cda14ffa2e56002e11caf5d97..d7eda20d5674a569b3490adfebf11a8cc1dd4aeb 100644
--- a/src/pregmod/fPat.tw
+++ b/src/pregmod/fPat.tw
@@ -31,39 +31,39 @@ You tell $activeSlave.slaveName to
 <<elseif ($activeSlave.relationship == -2)>>
 	$He eagerly complies, happy to be near the object of $his longing. Once $he's close, you hold $his face in your palms and gaze deeply
 	<<if canSee($activeSlave)>>
-		into $his <<eyeColor>> eyes. $He finds the intense look from the _womanP $he loves overwhelming, and $his eyes flick downward after a moment.
+		into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he loves overwhelming, and $his eyes flick downward after a moment.
 	<<else>>
 		upon $his face. $He finds the intense look from the _womanP $he loves overwhelming, and after a moment glances away.
 	<</if>>
 	$He blushes furiously.
 <<elseif $activeSlave.relationship == -3>>
 	<<if $activeSlave.fetish == "mindbroken">>
-		$He complies mechanically. $He remembers that when <<= WrittenMaster()>>'s commands are not obeyed, there is punishment. Once $he's close, you hold $his face in your palms and look into $his empty <<eyeColor>> eyes. $He shows no reaction
+		$He complies mechanically. $He remembers that when <<= WrittenMaster()>>'s commands are not obeyed, there is punishment. Once $he's close, you hold $his face in your palms and look into $his empty <<= App.Desc.EyeColor>> eyes. $He shows no reaction
 	<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
 		$He complies in a wifely fashion, moving $his body as $he approaches to best enflame your desire, eager to be close to the _womanP who married $him. Once $he's close, you hold $his face in your palms and gaze
 		<<if canSee($activeSlave)>>
-			deeply into $his <<eyeColor>> eyes. $He finds the intense look from the _womanP $he's married to affirming, and looks down with a smile, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>>.
+			deeply into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's married to affirming, and looks down with a smile, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>>.
 		<<else>>
 			upon $his face. $He finds the intense look from the _womanP $he's married to affirming, and looks down with a smile.
 		<</if>>
 	<<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
 		$He complies. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
 		<<if canSee($activeSlave)>>
-			into $his tearful <<eyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to disturbing, and breaks eye contact.
+			into $his tearful <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to disturbing, and breaks eye contact.
 		<<else>>
 			upon $his face. $He can feel the intense gaze of the _womanP $he's forcibly married to, and finds it disturbing. $He quickly turns $his face away.
 		<</if>>
 	<<elseif $activeSlave.devotion < -20>>
 		$He complies out of fear. Once $he's close, you hold $his quivering face in your palms and take a moment to gaze deeply
 		<<if canSee($activeSlave)>>
-			into $his teary <<eyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to terrifying, and quickly breaks eye contact.
+			into $his teary <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's forcibly married to terrifying, and quickly breaks eye contact.
 		<<else>>
 			upon $his tear-streaked face. $He can feel the intense look from the _womanP $he's forcibly married to, and it is horrifying, causing $him to turn $his face away after only a moment.
 		<</if>>
 	<<else>>
 		$He complies obediently. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
 		<<if canSee($activeSlave)>>
-			into $his <<eyeColor>> eyes. $He finds the intense look from the _womanP $he's married to reassuring, and looks down with a slight smile, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>>.
+			into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from the _womanP $he's married to reassuring, and looks down with a slight smile, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>>.
 		<<else>>
 			upon $his face. The intense look from the _womanP $he's married to is reassuring to $him, and $he looks down with a slight smile.
 		<</if>>
@@ -71,7 +71,7 @@ You tell $activeSlave.slaveName to
 <<elseif ($activeSlave.devotion > 75)>>
 	$He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
 	<<if canSee($activeSlave)>>
-		into $his <<eyeColor>> eyes. $He finds the intense look from $his beloved <<= WrittenMaster()>> disconcerting, and $his eyes flick downward after a moment.
+		into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense look from $his beloved <<= WrittenMaster()>> disconcerting, and $his eyes flick downward after a moment.
 	<<else>>
 		upon $his face. $He can feel the intense look from $his beloved <<Master>> and it is disconcerting, causing $him to glance away after only a moment, $his face flushed.
 	<</if>>
@@ -79,14 +79,14 @@ You tell $activeSlave.slaveName to
 <<elseif ($activeSlave.devotion > 50)>>
 	$He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
 	<<if canSee($activeSlave)>>
-		into $his <<eyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> disconcerting, and $he looks down after a moment, blushing.
+		into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> disconcerting, and $he looks down after a moment, blushing.
 	<<else>>
 		upon $his face. $He finds the intense attention from $his <<= WrittenMaster()>> disconcerting, and it causes $him to glance away after only a moment, blushing.
 		<</if>>
 <<elseif ($activeSlave.devotion > 20)>>
 	$He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
 	<<if canSee($activeSlave)>>
-		into $his <<eyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, blushing nervously.
+		into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, blushing nervously.
 	<<else>>
 		upon $his face. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, blushing nervously.
 		<</if>>
@@ -100,21 +100,21 @@ You tell $activeSlave.slaveName to
 <<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust >= -20)>>
 	$He visibly considers disobedience, but decides that complying with such an apparently harmless order is safe, for now. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
 	<<if canSee($activeSlave)>>
-		into $his <<eyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> troubling, and $he looks down after a moment, $his lower lip trembling with nervousness.
+		into $his <<= App.Desc.EyeColor>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> troubling, and $he looks down after a moment, $his lower lip trembling with nervousness.
 	<<else>>
 		upon $his face. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and turns away after a moment, $his lower lip trembling with nervousness.
 	<</if>>
 <<elseif ($activeSlave.trust < -20)>>
 	The command terrifies $him, but $he's more frightened still of the consequences of disobedience, and $he complies. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
 	<<if canSee($activeSlave)>>
-		into $his <<eyeColor>> eyes. After a mere instant of locked faces, $he looks down fearfully and begins to shake with terror, tears leaking silently down $his cheeks.
+		into $his <<= App.Desc.EyeColor>> eyes. After a mere instant of locked faces, $he looks down fearfully and begins to shake with terror, tears leaking silently down $his cheeks.
 	<<else>>
 		upon $his face. After a mere instant of locked faces, $he looks down fearfully and begins to shake with terror, tears leaking silently down $his cheeks.
 	<</if>>
 <<else>>
 	$He pauses, obviously considering whether to resist, but eventually decides to save $his strength to fight more onerous orders, and gives in. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
 	<<if canSee($activeSlave)>>
-		into $his <<eyeColor>> eyes. $He stares back, but after a few moments $he loses the contest of wills and looks down.
+		into $his <<= App.Desc.EyeColor>> eyes. $He stares back, but after a few moments $he loses the contest of wills and looks down.
 	<<else>>
 		upon $his face. $He faces you defiantly, but after a few moments $he loses the contest of wills and looks down.
 	<</if>>
@@ -200,7 +200,7 @@ You move your hand down to caress $his forehead, and then slide your hand along
 <<if ($activeSlave.fetish == "mindbroken")>>
 	When you stop,
 	<<if canSee($activeSlave)>>
-		$his <<eyeColor>> eyes track the movements of your hands briefly before returning to their usual stare,
+		$his <<= App.Desc.EyeColor>> eyes track the movements of your hands briefly before returning to their usual stare,
 	<<else>>
 		$he stands at attention before you,
 	<</if>>
@@ -208,9 +208,9 @@ You move your hand down to caress $his forehead, and then slide your hand along
 <<elseif ($activeSlave.relationship == -2)>>
 	When you finally stop petting $him, <<if canSee($activeSlave)>>$his eyes remain closed just for a second <</if>>and $his mouth stands open in slack-jawed joy, before $he slowly <<if canSee($activeSlave)>> opens $his eyes<<else>> turns $his gaze towards you<</if>> and smiles warmly at you. Pleasure lights up $his face<<if ($activeSlave.amp != 1)>> as $his hand traces the path yours took up to $his head and mimics your last movements<<else>> as $his gaze drifts off to the right in memory, tilting $his head from side to side in sympathetic memory of how it felt to have your hand on $his head<</if>>.
 	<<if ($activeSlave.accent >= 3)>>
-		$He does $his best to communicate love with $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
+		$He does $his best to communicate love with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
 	<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
-		$He does $his best to communicate love with $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>facial expressions<</if>>.
+		$He does $his best to communicate love with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>.
 	<<elseif !canTalk($activeSlave)>>
 		$He signs that $he loves you.
 	<<else>>
@@ -220,21 +220,21 @@ You move your hand down to caress $his forehead, and then slide your hand along
 <<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "dom") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && !$activeSlave.amp != 1>>
 	$He tries hard to stop from losing $himself in your incredibly skilled hands. $He takes $his tendency towards sexual dominance right up to the edge of insubordination, when $he starts to caress your face in turn. When you finally stop, $his eyes are closed and $he's smiling. When you are finally finished stroking your slave, they remove their hand from yours. Then you give them a playful flick on the nose, and the mischievous twinkle in your eye is only half playful, reminding $him of $his place in these walls.
 	<<if ($activeSlave.accent >= 3)>>
-		$He does $his best to communicate enjoyment with $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
+		$He does $his best to communicate enjoyment with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
 	<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
-		$He does $his best to communicate enjoyment with $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>facial expressions<</if>>.
+		$He does $his best to communicate enjoyment with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>.
 	<<elseif !canTalk($activeSlave)>>
 		$He signs that $he liked that and would love to pet you next time.
 	<<else>>
 		"That wa<<s>> ni<<c>>e, <<Master>>," $he <<say>>s cheerfully. "Maybe next time I can <<s>>troke you..."
 	<</if>>
-	$He looks at you, $his <<if canSee($activeSlave)>>lovely <<eyeColor>> eyes<<else>>face<</if>> practically begging you to let $him take this farther.
+	$He looks at you, $his <<if canSee($activeSlave)>>lovely <<= App.Desc.EyeColor>> eyes<<else>>face<</if>> practically begging you to let $him take this farther.
 <<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "submissive") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
 	As you stroke $his head, $he reacts almost as though you're stroking $his nether regions, and begins to moan and press $himself lewdly against your <<if $PC.boobs == 1>>prominent breasts<<else>>manly chest<</if>>. $He achieves a weak orgasm before you finally stop caressing $his head; $he is your pet, after all.
 	<<if ($activeSlave.accent >= 3)>>
-		$He does $his best to communicate undiminished lust with $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
+		$He does $his best to communicate undiminished lust with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
 	<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
-		$He does $his best to communicate undiminished lust with $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>facial expressions<</if>>.
+		$He does $his best to communicate undiminished lust with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>.
 	<<elseif !canTalk($activeSlave)>>
 		$He signs that $he liked that.
 	<<else>>
@@ -244,9 +244,9 @@ You move your hand down to caress $his forehead, and then slide your hand along
 <<elseif ($activeSlave.devotion > 50)>>
 	$He gradually closes $his eyes and when you finally stop, <<if ($activeSlave.amp != 1)>>$he runs $his hand delightedly across $his face; <</if>>a euphoric look quickly lighting up $his features.
 	<<if ($activeSlave.accent >= 3)>>
-		$He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>facial expressions<</if>>, since $he's not confident in $his ability to express it in $language.
+		$He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>, since $he's not confident in $his ability to express it in $language.
 	<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
-		$He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>facial expressions<</if>>.
+		$He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>facial expressions<</if>>.
 	<<elseif !canTalk($activeSlave)>>
 		$He signs that $he loves you.
 	<<else>>
@@ -254,7 +254,7 @@ You move your hand down to caress $his forehead, and then slide your hand along
 	<</if>>
 	$He <<if canSee($activeSlave)>>looks<<else>>gazes<</if>> at you longingly, almost as if $he's bursting to say that $he wants more than your mere caress.
 <<elseif ($activeSlave.devotion > 20)>>
-	When you finally move your hand away, <<if canSee($activeSlave)>>$his <<eyeColor>> eyes gaze into yours searchingly<<else>>$he gazes at you<</if>>, looking for answers that are not there.
+	When you finally move your hand away, <<if canSee($activeSlave)>>$his <<= App.Desc.EyeColor>> eyes gaze into yours searchingly<<else>>$he gazes at you<</if>>, looking for answers that are not there.
 	<<if ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
 		$His <<if canSee($activeSlave)>>eyes beg<<else>>expression begs<</if>> for an answer: is that it?
 	<<elseif !canTalk($activeSlave)>>
diff --git a/src/pregmod/hotswapprosthetics.tw b/src/pregmod/hotswapprosthetics.tw
index 9bdaf2764f084ce469976c53b19dd70db8288094..638b62ea01229c4b69f54f1847089f67e183cc25 100644
--- a/src/pregmod/hotswapprosthetics.tw
+++ b/src/pregmod/hotswapprosthetics.tw
@@ -38,7 +38,7 @@
 			<<include "Hotswap Prosthetics">>
 			<</replace>>
 		<</link>>
-	<<elseif def $activeLimbs && $activeLimbs.type == "simple" && $activeSlave.ID == $activeLimbs.ID>>
+	<<elseif (def $activeLimbs) && $activeLimbs.type == "simple" && $activeSlave.ID == $activeLimbs.ID>>
 		//Basic P-limbs being built
 	<<else>>
 		//Basic prostheses unavailable
@@ -59,7 +59,7 @@
 			<<include "Hotswap Prosthetics">>
 			<</replace>>
 		<</link>>
-	<<elseif def $activeLimbs && $activeLimbs.type == "sex" && $activeSlave.ID == $activeLimbs.ID>>
+	<<elseif (def $activeLimbs) && $activeLimbs.type == "sex" && $activeSlave.ID == $activeLimbs.ID>>
 		//Sex focused P-limbs being built
 	<<else>>
 		//Sex focused prostheses unavailable
@@ -80,7 +80,7 @@
 			<<include "Hotswap Prosthetics">>
 			<</replace>>
 		<</link>>
-	<<elseif def $activeLimbs && $activeLimbs.type == "beauty" && $activeSlave.ID == $activeLimbs.ID>>
+	<<elseif (def $activeLimbs) && $activeLimbs.type == "beauty" && $activeSlave.ID == $activeLimbs.ID>>
 		//Natural looking P-limbs being built
 	<<else>>
 		//Natural looking prostheses unavailable
@@ -101,7 +101,7 @@
 			<<include "Hotswap Prosthetics">>
 			<</replace>>
 		<</link>>
-	<<elseif def $activeLimbs && $activeLimbs.type == "combat" && $activeSlave.ID == $activeLimbs.ID>>
+	<<elseif (def $activeLimbs) && $activeLimbs.type == "combat" && $activeSlave.ID == $activeLimbs.ID>>
 		//Combat P-limbs being built
 	<<else>>
 		//Combat prostheses unavailable
@@ -122,7 +122,7 @@
 			<<include "Hotswap Prosthetics">>
 			<</replace>>
 		<</link>>
-	<<elseif def $activeLimbs && $activeLimbs.type == "cyber" && $activeSlave.ID == $activeLimbs.ID>>
+	<<elseif (def $activeLimbs) && $activeLimbs.type == "cyber" && $activeSlave.ID == $activeLimbs.ID>>
 		//Cybernetic P-limbs being built
 	<<else>>
 		//Cybernetic prostheses unavailable
diff --git a/src/pregmod/killedSlave.tw b/src/pregmod/killedSlave.tw
index 71174090cda915aa16331f451eaf9e78d93fc50d..62d0d155fec78005f172c21a22159e26ad4cd804 100644
--- a/src/pregmod/killedSlave.tw
+++ b/src/pregmod/killedSlave.tw
@@ -84,7 +84,7 @@ $activeSlave.slaveName gives an audible sigh of relief and begins to thank you p
 		<<else>>
 			<<if $activeSlave.relation != 0>>
 				<<set _ss = $slaveIndices[$activeSlave.relationTarget]>>
-				<<if def _ss && $slaves[_ss].fetish != "mindbroken">>
+				<<if (def _ss) && $slaves[_ss].fetish != "mindbroken">>
 					$slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you have killed $his $activeSlave.relation.
 					<<run clearSummaryCache($slaves[_ss])>>
 					<br><br>
@@ -95,7 +95,7 @@ $activeSlave.slaveName gives an audible sigh of relief and begins to thank you p
 		<</if>>
 		<<if $activeSlave.relationship > 0>>
 			<<set _ss = $slaveIndices[$activeSlave.relationshipTarget]>>
-			<<if def _ss && $slaves[_ss].fetish != "mindbroken">>
+			<<if (def _ss) && $slaves[_ss].fetish != "mindbroken">>
 				$slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you have killed $his best source of comfort and companionship in a life of bondage.
 				<<run clearSummaryCache($slaves[_ss])>>
 				<br><br>
@@ -116,7 +116,7 @@ $activeSlave.slaveName gives an audible sigh of relief and begins to thank you p
 		<</if>>
 		<<if $activeSlave.rivalry != 0>>
 			<<set _ss = $slaveIndices[$activeSlave.rivalryTarget]>>
-			<<if def _ss && $slaves[_ss].fetish != "mindbroken">>
+			<<if (def _ss) && $slaves[_ss].fetish != "mindbroken">>
 				$slaves[_ss].slaveName is @@.hotpink;pleased@@ that $he won't have to see $his rival any more.
 				<<run clearSummaryCache($slaves[_ss])>>
 				<br><br>
diff --git a/src/pregmod/rePregInventor.tw b/src/pregmod/rePregInventor.tw
index 1b153259db13fc7b20cbccfb4b5c643b917370ff..c990581a2c690a179c73f3a8c01bc3d6d6f54c79 100644
--- a/src/pregmod/rePregInventor.tw
+++ b/src/pregmod/rePregInventor.tw
@@ -124,7 +124,7 @@
 			<<if $activeSlave.origEye == "implant">>
 				$His pretty $activeSlave.eyeColor bionic eyes flash a shade cooler than normal and you can tell $he's struggling to accept your decision.
 			<<else>>
-				You can see tears brimming in $his <<eyeColor>> eyes.
+				You can see tears brimming in $his <<= App.Desc.EyeColor>> eyes.
 			<</if>>
 			You kiss $him on the head, make sweet love to $him to improve $his mood, then have $him escorted out of your office.
 			<<= VaginalVCheck()>>
diff --git a/src/pregmod/saPorn.tw b/src/pregmod/saPorn.tw
index de8f3f29c53061bc54e2862ad869724613df1123..3291423c4af2ea87dd580c36ed4db0bf07e4314e 100644
--- a/src/pregmod/saPorn.tw
+++ b/src/pregmod/saPorn.tw
@@ -44,12 +44,12 @@
 	<<if $cheatMode == 1>>Decay: _decayRate Viewership: _viewership Last week's fame: _oldFame<</if>>
 
 	<<if $slaves[$i].pornPrestige > 1>>
-		$He is widely regarded in $slaves[$i].pornFameType porn, but with so many watchers, turn over is high.
+		$He is widely regarded in $slaves[$i].porn.fameType porn, but with so many watchers, turn over is high.
 	<<elseif $slaves[$i].pornPrestige > 0>>
-		<<if $slaves[$i].pornFameType == "generic">>
+		<<if $slaves[$i].porn.fameType == "generic">>
 			$He has claimed a niche in slave porn, so there is a constant cycle of new arrivals and bored ex-watchers.
 		<<else>>
-			$He has claimed a niche for $himself in $slaves[$i].pornFameType porn, so there is a constant cycle of new arrivals and bored ex-watchers.
+			$He has claimed a niche for $himself in $slaves[$i].porn.fameType porn, so there is a constant cycle of new arrivals and bored ex-watchers.
 		<</if>>
 	<<else>>
 		$He is borderline unknown, so $he tends to hold onto what little watchers $he has.
@@ -100,932 +100,932 @@
 
 	/*Paraphilias have the highest take of viewers*/
 	<<if $slaves[$i].sexualFlaw == "neglectful">>
-		<<if $slaves[$i].pornFocus == "neglectful" || $slaves[$i].pornFameType == "orgasm denial">> /*perhaps split these? */
+		<<if $slaves[$i].porn.focus == "neglectful" || $slaves[$i].porn.fameType == "orgasm denial">> /*perhaps split these? */
 			<<set _adjustedViewership = _viewership*1.5>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeNeglectful>>
-		<<set $slaves[$i].pornTypeNeglectful += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarNeglectfuls-1))>>
-		<<set $slaves[$i].pornTypeNeglectful = Math.clamp($slaves[$i].pornTypeNeglectful, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.neglectful>>
+		<<set $slaves[$i].porn.fame.neglectful += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarNeglectfuls-1))>>
+		<<set $slaves[$i].porn.fame.neglectful = Math.clamp($slaves[$i].porn.fame.neglectful, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "neglectful" || $slaves[$i].pornFameType == "orgasm denial">>
+		<<if $slaves[$i].porn.focus == "neglectful" || $slaves[$i].porn.fameType == "orgasm denial">>
 			$His lack of interest in getting off $himself, even when at the verge of climax, makes $him a hit with viewers that enjoy orgasm denial.
-			<<if $slaves[$i].pornTypeNeglectful > _oldPorn>>
+			<<if $slaves[$i].porn.fame.neglectful > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeNeglectful < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.neglectful < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Neglectful: (_oldPorn) to ($slaves[$i].pornTypeNeglectful).<</if>>
-	<<elseif $slaves[$i].pornTypeNeglectful > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeNeglectful>><</if>>
-		<<set $slaves[$i].pornTypeNeglectful = Math.clamp($slaves[$i].pornTypeNeglectful-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Neglectful: (_oldPorn) to ($slaves[$i].pornTypeNeglectful).<</if>>
+		<<if $cheatMode == 1>>Neglectful: (_oldPorn) to ($slaves[$i].porn.fame.neglectful).<</if>>
+	<<elseif $slaves[$i].porn.fame.neglectful > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.neglectful>><</if>>
+		<<set $slaves[$i].porn.fame.neglectful = Math.clamp($slaves[$i].porn.fame.neglectful-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Neglectful: (_oldPorn) to ($slaves[$i].porn.fame.neglectful).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualFlaw == "cum addict">>
-		<<if $slaves[$i].pornFocus == "cum addict" || $slaves[$i].pornFameType == "cum addiction">>
+		<<if $slaves[$i].porn.focus == "cum addict" || $slaves[$i].porn.fameType == "cum addiction">>
 			<<set _adjustedViewership = _viewership*1.5>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeCumAddict>>
-		<<set $slaves[$i].pornTypeCumAddict += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarCumAddicts-1))>>
-		<<set $slaves[$i].pornTypeCumAddict = Math.clamp($slaves[$i].pornTypeCumAddict, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.cumAddict>>
+		<<set $slaves[$i].porn.fame.cumAddict += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarCumAddicts-1))>>
+		<<set $slaves[$i].porn.fame.cumAddict = Math.clamp($slaves[$i].porn.fame.cumAddict, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "cum addict" || $slaves[$i].pornFameType == "bukkake">>
+		<<if $slaves[$i].porn.focus == "cum addict" || $slaves[$i].porn.fameType == "bukkake">>
 			$His complete obsession with cum makes $him a hit with viewers that enjoy bukkake and cum drinking.
-			<<if $slaves[$i].pornTypeCumAddict > _oldPorn>>
+			<<if $slaves[$i].porn.fame.cumAddict > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeCumAddict < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.cumAddict < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Cum Addict: (_oldPorn) to ($slaves[$i].pornTypeCumAddict).<</if>>
-	<<elseif $slaves[$i].pornTypeCumAddict > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeCumAddict>><</if>>
-		<<set $slaves[$i].pornTypeCumAddict = Math.clamp($slaves[$i].pornTypeCumAddict-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Cum Addict: (_oldPorn) to ($slaves[$i].pornTypeCumAddict).<</if>>
+		<<if $cheatMode == 1>>Cum Addict: (_oldPorn) to ($slaves[$i].porn.fame.cumAddict).<</if>>
+	<<elseif $slaves[$i].porn.fame.cumAddict > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.cumAddict>><</if>>
+		<<set $slaves[$i].porn.fame.cumAddict = Math.clamp($slaves[$i].porn.fame.cumAddict-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Cum Addict: (_oldPorn) to ($slaves[$i].porn.fame.cumAddict).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualFlaw == "anal addict" && canDoAnal($slaves[$i])>>
-		<<if $slaves[$i].pornFocus == "anal addict" || $slaves[$i].pornFameType == "anal addiction">>
+		<<if $slaves[$i].porn.focus == "anal addict" || $slaves[$i].porn.fameType == "anal addiction">>
 			<<set _adjustedViewership = _viewership*1.5>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeAnalAddict>>
-		<<set $slaves[$i].pornTypeAnalAddict += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarAnalAddicts-1))>>
-		<<set $slaves[$i].pornTypeAnalAddict = Math.clamp($slaves[$i].pornTypeAnalAddict, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.analAddict>>
+		<<set $slaves[$i].porn.fame.analAddict += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarAnalAddicts-1))>>
+		<<set $slaves[$i].porn.fame.analAddict = Math.clamp($slaves[$i].porn.fame.analAddict, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].sexualFlaw == "anal addict" || $slaves[$i].pornFameType == "anal addiction">>
+		<<if $slaves[$i].sexualFlaw == "anal addict" || $slaves[$i].porn.fameType == "anal addiction">>
 			$His complete obsession with taking things up $his ass makes $him a hit with viewers that enjoy hardcore anal.
-			<<if $slaves[$i].pornTypeAnalAddict > _oldPorn>>
+			<<if $slaves[$i].porn.fame.analAddict > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeAnalAddict < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.analAddict < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Anal Addict: (_oldPorn) to ($slaves[$i].pornTypeAnalAddict).<</if>>
-	<<elseif $slaves[$i].pornTypeAnalAddict > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeAnalAddict>><</if>>
-		<<set $slaves[$i].pornTypeAnalAddict = Math.clamp($slaves[$i].pornTypeAnalAddict-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Anal Addict: (_oldPorn) to ($slaves[$i].pornTypeAnalAddict).<</if>>
+		<<if $cheatMode == 1>>Anal Addict: (_oldPorn) to ($slaves[$i].porn.fame.analAddict).<</if>>
+	<<elseif $slaves[$i].porn.fame.analAddict > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.analAddict>><</if>>
+		<<set $slaves[$i].porn.fame.analAddict = Math.clamp($slaves[$i].porn.fame.analAddict-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Anal Addict: (_oldPorn) to ($slaves[$i].porn.fame.analAddict).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualFlaw == "attention whore">>
-		<<if $slaves[$i].pornFocus == "attention whore" || $slaves[$i].pornFameType == "exhibition">>
+		<<if $slaves[$i].porn.focus == "attention whore" || $slaves[$i].porn.fameType == "exhibition">>
 			<<set _adjustedViewership = _viewership*1.5>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeAttentionWhore>>
-		<<set $slaves[$i].pornTypeAttentionWhore += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarAttentionWhores-1))>>
-		<<set $slaves[$i].pornTypeAttentionWhore = Math.clamp($slaves[$i].pornTypeAttentionWhore, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.attentionWhore>>
+		<<set $slaves[$i].porn.fame.attentionWhore += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarAttentionWhores-1))>>
+		<<set $slaves[$i].porn.fame.attentionWhore = Math.clamp($slaves[$i].porn.fame.attentionWhore, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "attention whore" || $slaves[$i].pornFameType == "exhibition">>
+		<<if $slaves[$i].porn.focus == "attention whore" || $slaves[$i].porn.fameType == "exhibition">>
 			$His complete obsession with being the center of attention makes $him a hit with viewers that savor $his frequent exhibitionism.
-			<<if $slaves[$i].pornTypeAttentionWhore > _oldPorn>>
+			<<if $slaves[$i].porn.fame.attentionWhore > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeAttentionWhore < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.attentionWhore < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Attention Whore: (_oldPorn) to ($slaves[$i].pornTypeAttentionWhore).<</if>>
-	<<elseif $slaves[$i].pornTypeAttentionWhore > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeAttentionWhore>><</if>>
-		<<set $slaves[$i].pornTypeAttentionWhore = Math.clamp($slaves[$i].pornTypeAttentionWhore-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Attention Whore: (_oldPorn) to ($slaves[$i].pornTypeAttentionWhore).<</if>>
+		<<if $cheatMode == 1>>Attention Whore: (_oldPorn) to ($slaves[$i].porn.fame.attentionWhore).<</if>>
+	<<elseif $slaves[$i].porn.fame.attentionWhore > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.attentionWhore>><</if>>
+		<<set $slaves[$i].porn.fame.attentionWhore = Math.clamp($slaves[$i].porn.fame.attentionWhore-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Attention Whore: (_oldPorn) to ($slaves[$i].porn.fame.attentionWhore).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualFlaw == "breast growth">>
-		<<if $slaves[$i].pornFocus == "breast growth" || $slaves[$i].pornFameType == "breast expansion">>
+		<<if $slaves[$i].porn.focus == "breast growth" || $slaves[$i].porn.fameType == "breast expansion">>
 			<<set _adjustedViewership = _viewership*1.5>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeBreastGrowth>>
-		<<set $slaves[$i].pornTypeBreastGrowth += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarBreastGrowths-1))>>
-		<<set $slaves[$i].pornTypeBreastGrowth = Math.clamp($slaves[$i].pornTypeBreastGrowth, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.breastGrowth>>
+		<<set $slaves[$i].porn.fame.breastGrowth += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarBreastGrowths-1))>>
+		<<set $slaves[$i].porn.fame.breastGrowth = Math.clamp($slaves[$i].porn.fame.breastGrowth, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "breast growth" || $slaves[$i].pornFameType == "breast expansion">>
+		<<if $slaves[$i].porn.focus == "breast growth" || $slaves[$i].porn.fameType == "breast expansion">>
 			$His complete obsession with the ever increasing size of $his tits makes $him a hit with viewers that enjoy enormous knockers and breast expansion.
-			<<if $slaves[$i].pornTypeBreastGrowth > _oldPorn>>
+			<<if $slaves[$i].porn.fame.breastGrowth > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeBreastGrowth < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.breastGrowth < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Breast Growth: (_oldPorn) to ($slaves[$i].pornTypeBreastGrowth).<</if>>
-	<<elseif $slaves[$i].pornTypeBreastGrowth > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeBreastGrowth>><</if>>
-		<<set $slaves[$i].pornTypeBreastGrowth = Math.clamp($slaves[$i].pornTypeBreastGrowth-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Breast Growth: (_oldPorn) to ($slaves[$i].pornTypeBreastGrowth).<</if>>
+		<<if $cheatMode == 1>>Breast Growth: (_oldPorn) to ($slaves[$i].porn.fame.breastGrowth).<</if>>
+	<<elseif $slaves[$i].porn.fame.breastGrowth > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.breastGrowth>><</if>>
+		<<set $slaves[$i].porn.fame.breastGrowth = Math.clamp($slaves[$i].porn.fame.breastGrowth-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Breast Growth: (_oldPorn) to ($slaves[$i].porn.fame.breastGrowth).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualFlaw == "abusive">>
-		<<if $slaves[$i].pornFocus == "abusive" || $slaves[$i].pornFameType == "abuse">>
+		<<if $slaves[$i].porn.focus == "abusive" || $slaves[$i].porn.fameType == "abuse">>
 			<<set _adjustedViewership = _viewership*1.5>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeAbusive>>
-		<<set $slaves[$i].pornTypeAbusive += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarAbusives-1))>>
-		<<set $slaves[$i].pornTypeAbusive = Math.clamp($slaves[$i].pornTypeAbusive, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.abusive>>
+		<<set $slaves[$i].porn.fame.abusive += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarAbusives-1))>>
+		<<set $slaves[$i].porn.fame.abusive = Math.clamp($slaves[$i].porn.fame.abusive, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "abusive" || $slaves[$i].pornFameType == "abuse">>
+		<<if $slaves[$i].porn.focus == "abusive" || $slaves[$i].porn.fameType == "abuse">>
 			$His wanton enjoyment of pleasure through force amuses viewers that enjoy rape and abuse.
-			<<if $slaves[$i].pornTypeAbusive > _oldPorn>>
+			<<if $slaves[$i].porn.fame.abusive > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeAbusive < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.abusive < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Abusive: (_oldPorn) to ($slaves[$i].pornTypeAbusive).<</if>>
-	<<elseif $slaves[$i].pornTypeAbusive > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeAbusive>><</if>>
-		<<set $slaves[$i].pornTypeAbusive = Math.clamp($slaves[$i].pornTypeAbusive-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Abusive: (_oldPorn) to ($slaves[$i].pornTypeAbusive).<</if>>
+		<<if $cheatMode == 1>>Abusive: (_oldPorn) to ($slaves[$i].porn.fame.abusive).<</if>>
+	<<elseif $slaves[$i].porn.fame.abusive > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.abusive>><</if>>
+		<<set $slaves[$i].porn.fame.abusive = Math.clamp($slaves[$i].porn.fame.abusive-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Abusive: (_oldPorn) to ($slaves[$i].porn.fame.abusive).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualFlaw == "malicious">>
-		<<if $slaves[$i].pornFocus == "malicious" || $slaves[$i].pornFameType == "sexual torture">>
+		<<if $slaves[$i].porn.focus == "malicious" || $slaves[$i].porn.fameType == "sexual torture">>
 			<<set _adjustedViewership = _viewership*1.5>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeMalicious>>
-		<<set $slaves[$i].pornTypeMalicious += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarMalicious-1))>>
-		<<set $slaves[$i].pornTypeMalicious = Math.clamp($slaves[$i].pornTypeMalicious, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.malicious>>
+		<<set $slaves[$i].porn.fame.malicious += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarMalicious-1))>>
+		<<set $slaves[$i].porn.fame.malicious = Math.clamp($slaves[$i].porn.fame.malicious, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "malicious" || $slaves[$i].pornFameType == "sexual torture">>
+		<<if $slaves[$i].porn.focus == "malicious" || $slaves[$i].porn.fameType == "sexual torture">>
 			$His sexual appetite of others' suffering makes $him a hit with viewers that enjoy sadism and violence.
-			<<if $slaves[$i].pornTypeMalicious > _oldPorn>>
+			<<if $slaves[$i].porn.fame.malicious > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeMalicious < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.malicious < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Malicious: (_oldPorn) to ($slaves[$i].pornTypeMalicious).<</if>>
-	<<elseif $slaves[$i].pornTypeMalicious > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeMalicious>><</if>>
-		<<set $slaves[$i].pornTypeMalicious = Math.clamp($slaves[$i].pornTypeMalicious-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Malicious: (_oldPorn) to ($slaves[$i].pornTypeMalicious).<</if>>
+		<<if $cheatMode == 1>>Malicious: (_oldPorn) to ($slaves[$i].porn.fame.malicious).<</if>>
+	<<elseif $slaves[$i].porn.fame.malicious > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.malicious>><</if>>
+		<<set $slaves[$i].porn.fame.malicious = Math.clamp($slaves[$i].porn.fame.malicious-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Malicious: (_oldPorn) to ($slaves[$i].porn.fame.malicious).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualFlaw == "self hating">>
-		<<if $slaves[$i].pornFocus == "self hating" || $slaves[$i].pornFameType == "self hating">>
+		<<if $slaves[$i].porn.focus == "self hating" || $slaves[$i].porn.fameType == "self hating">>
 			<<set _adjustedViewership = _viewership*1.5>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeSelfHating>>
-		<<set $slaves[$i].pornTypeSelfHating += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarSelfHatings-1))>>
-		<<set $slaves[$i].pornTypeSelfHating = Math.clamp($slaves[$i].pornTypeSelfHating, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.selfHating>>
+		<<set $slaves[$i].porn.fame.selfHating += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarSelfHatings-1))>>
+		<<set $slaves[$i].porn.fame.selfHating = Math.clamp($slaves[$i].porn.fame.selfHating, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "self hating" || $slaves[$i].pornFameType == "self hating">>
+		<<if $slaves[$i].porn.focus == "self hating" || $slaves[$i].porn.fameType == "self hating">>
 			$His complete disregard for $his own wellbeing makes $him a hit with viewers that enjoy watching $him suffer.
-			<<if $slaves[$i].pornTypeSelfHating > _oldPorn>>
+			<<if $slaves[$i].porn.fame.selfHating > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeSelfHating < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.selfHating < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Self Hating: (_oldPorn) to ($slaves[$i].pornTypeSelfHating).<</if>>
-	<<elseif $slaves[$i].pornTypeSelfHating > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeSelfHating>><</if>>
-		<<set $slaves[$i].pornTypeSelfHating = Math.clamp($slaves[$i].pornTypeSelfHating-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Self Hating: (_oldPorn) to ($slaves[$i].pornTypeSelfHating).<</if>>
+		<<if $cheatMode == 1>>Self Hating: (_oldPorn) to ($slaves[$i].porn.fame.selfHating).<</if>>
+	<<elseif $slaves[$i].porn.fame.selfHating > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.selfHating>><</if>>
+		<<set $slaves[$i].porn.fame.selfHating = Math.clamp($slaves[$i].porn.fame.selfHating-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Self Hating: (_oldPorn) to ($slaves[$i].porn.fame.selfHating).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualFlaw == "breeder">>
-		<<if $slaves[$i].pornFocus == "breeder" || $slaves[$i].pornFameType == "breeder">>
+		<<if $slaves[$i].porn.focus == "breeder" || $slaves[$i].porn.fameType == "breeder">>
 			<<set _adjustedViewership = _viewership*1.5>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeBreeder>>
-		<<set $slaves[$i].pornTypeBreeder += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarBreeders-1))>>
-		<<set $slaves[$i].pornTypeBreeder = Math.clamp($slaves[$i].pornTypeBreeder, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.breeder>>
+		<<set $slaves[$i].porn.fame.breeder += _adjustedViewership+($slaves[$i].fetishStrength*2)-((_decayRate/10)*($pornStarBreeders-1))>>
+		<<set $slaves[$i].porn.fame.breeder = Math.clamp($slaves[$i].porn.fame.breeder, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "breeder" || $slaves[$i].pornFameType == "breeder">>
+		<<if $slaves[$i].porn.focus == "breeder" || $slaves[$i].porn.fameType == "breeder">>
 			$His complete obsession with getting and staying pregnant makes $him a hit with viewers with all manner of pregnancy fetish, but particularly resonates with those as focused on it as $he is.
-			<<if $slaves[$i].pornTypeBreeder > _oldPorn>>
+			<<if $slaves[$i].porn.fame.breeder > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeBreeder < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.breeder < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Breeder: (_oldPorn) to ($slaves[$i].pornTypeBreeder).<</if>>
-	<<elseif $slaves[$i].pornTypeBreeder > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeBreeder>><</if>>
-		<<set $slaves[$i].pornTypeBreeder = Math.clamp($slaves[$i].pornTypeBreeder-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Breeder: (_oldPorn) to ($slaves[$i].pornTypeBreeder).<</if>>
+		<<if $cheatMode == 1>>Breeder: (_oldPorn) to ($slaves[$i].porn.fame.breeder).<</if>>
+	<<elseif $slaves[$i].porn.fame.breeder > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.breeder>><</if>>
+		<<set $slaves[$i].porn.fame.breeder = Math.clamp($slaves[$i].porn.fame.breeder-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Breeder: (_oldPorn) to ($slaves[$i].porn.fame.breeder).<</if>>
 	<</if>>
 
 	/*fetish*/
 	<<if $slaves[$i].fetish == "submissive">>
-		<<if $slaves[$i].pornFocus == "submissive" || $slaves[$i].pornFameType == "submissive">>
+		<<if $slaves[$i].porn.focus == "submissive" || $slaves[$i].porn.fameType == "submissive">>
 			<<set _adjustedViewership = _viewership*2.0>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeSub>>
-		<<set $slaves[$i].pornTypeSub += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarSubs-1))>>
-		<<set $slaves[$i].pornTypeSub = Math.clamp($slaves[$i].pornTypeSub, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.sub>>
+		<<set $slaves[$i].porn.fame.sub += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarSubs-1))>>
+		<<set $slaves[$i].porn.fame.sub = Math.clamp($slaves[$i].porn.fame.sub, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "submissive" || $slaves[$i].pornFameType == "submissive">>
+		<<if $slaves[$i].porn.focus == "submissive" || $slaves[$i].porn.fameType == "submissive">>
 			With $his submissive streak, $he has a clear advantage when it comes to fetish smut.
-			<<if $slaves[$i].pornTypeSub > _oldPorn>>
+			<<if $slaves[$i].porn.fame.sub > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeSub < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.sub < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Submissive: (_oldPorn) to ($slaves[$i].pornTypeSub).<</if>>
-	<<elseif $slaves[$i].pornTypeSub > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeSub>><</if>>
-		<<set $slaves[$i].pornTypeSub = Math.clamp($slaves[$i].pornTypeSub-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Submissive: (_oldPorn) to ($slaves[$i].pornTypeSub).<</if>>
+		<<if $cheatMode == 1>>Submissive: (_oldPorn) to ($slaves[$i].porn.fame.sub).<</if>>
+	<<elseif $slaves[$i].porn.fame.sub > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.sub>><</if>>
+		<<set $slaves[$i].porn.fame.sub = Math.clamp($slaves[$i].porn.fame.sub-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Submissive: (_oldPorn) to ($slaves[$i].porn.fame.sub).<</if>>
 	<</if>>
 	<<if $slaves[$i].fetish == "cumslut">>
-		<<if $slaves[$i].pornFocus == "cumslut" || $slaves[$i].pornFameType == "cum">>
+		<<if $slaves[$i].porn.focus == "cumslut" || $slaves[$i].porn.fameType == "cum">>
 			<<set _adjustedViewership = _viewership*2.0>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeCumSlut>>
-		<<set $slaves[$i].pornTypeCumSlut += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarCumSluts-1))>>
-		<<set $slaves[$i].pornTypeCumSlut = Math.clamp($slaves[$i].pornTypeCumSlut, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.cumSlut>>
+		<<set $slaves[$i].porn.fame.cumSlut += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarCumSluts-1))>>
+		<<set $slaves[$i].porn.fame.cumSlut = Math.clamp($slaves[$i].porn.fame.cumSlut, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "cumslut" || $slaves[$i].pornFameType == "cum">>
+		<<if $slaves[$i].porn.focus == "cumslut" || $slaves[$i].porn.fameType == "cum">>
 			With $his taste for cum, $he has a clear advantage when it comes to ejaculate-based smut.
-			<<if $slaves[$i].pornTypeCumSlut > _oldPorn>>
+			<<if $slaves[$i].porn.fame.cumSlut > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeCumSlut < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.cumSlut < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Cumslut: (_oldPorn) to ($slaves[$i].pornTypeCumSlut).<</if>>
-	<<elseif $slaves[$i].pornTypeCumSlut > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeCumSlut>><</if>>
-		<<set $slaves[$i].pornTypeCumSlut = Math.clamp($slaves[$i].pornTypeCumSlut-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Cumslut: (_oldPorn) to ($slaves[$i].pornTypeCumSlut).<</if>>
+		<<if $cheatMode == 1>>Cumslut: (_oldPorn) to ($slaves[$i].porn.fame.cumSlut).<</if>>
+	<<elseif $slaves[$i].porn.fame.cumSlut > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.cumSlut>><</if>>
+		<<set $slaves[$i].porn.fame.cumSlut = Math.clamp($slaves[$i].porn.fame.cumSlut-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Cumslut: (_oldPorn) to ($slaves[$i].porn.fame.cumSlut).<</if>>
 	<</if>>
 	<<if $slaves[$i].fetish == "buttslut">>
-		<<if $slaves[$i].pornFocus == "buttslut" || $slaves[$i].pornFameType == "buttslut">>
+		<<if $slaves[$i].porn.focus == "buttslut" || $slaves[$i].porn.fameType == "buttslut">>
 			<<set _adjustedViewership = _viewership*2.0>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeAnal>>
-		<<set $slaves[$i].pornTypeAnal += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarAnals-1))>>
-		<<set $slaves[$i].pornTypeAnal = Math.clamp($slaves[$i].pornTypeAnal, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.anal>>
+		<<set $slaves[$i].porn.fame.anal += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarAnals-1))>>
+		<<set $slaves[$i].porn.fame.anal = Math.clamp($slaves[$i].porn.fame.anal, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "buttslut" || $slaves[$i].pornFameType == "buttslut">>
+		<<if $slaves[$i].porn.focus == "buttslut" || $slaves[$i].porn.fameType == "buttslut">>
 			With $his fetish for asses, $he finds in the company of viewers that love rear ends.
-			<<if $slaves[$i].pornTypeAnal > _oldPorn>>
+			<<if $slaves[$i].porn.fame.anal > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeAnal < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.anal < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Buttslut: (_oldPorn) to ($slaves[$i].pornTypeAnal).<</if>>
-	<<elseif $slaves[$i].pornTypeAnal > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeAnal>><</if>>
-		<<set $slaves[$i].pornTypeAnal = Math.clamp($slaves[$i].pornTypeAnal-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>(_oldPorn) to ($slaves[$i].pornTypeAnal).<</if>>
+		<<if $cheatMode == 1>>Buttslut: (_oldPorn) to ($slaves[$i].porn.fame.anal).<</if>>
+	<<elseif $slaves[$i].porn.fame.anal > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.anal>><</if>>
+		<<set $slaves[$i].porn.fame.anal = Math.clamp($slaves[$i].porn.fame.anal-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>(_oldPorn) to ($slaves[$i].porn.fame.anal).<</if>>
 	<</if>>
 	<<if $slaves[$i].fetish == "humiliation">>
-		<<if $slaves[$i].pornFocus == "humiliation" || $slaves[$i].pornFameType == "humiliating">>
+		<<if $slaves[$i].porn.focus == "humiliation" || $slaves[$i].porn.fameType == "humiliating">>
 			<<set _adjustedViewership = _viewership*2.0>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeHumiliation>>
-		<<set $slaves[$i].pornTypeHumiliation += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarHumiliations-1))>>
-		<<set $slaves[$i].pornTypeHumiliation = Math.clamp($slaves[$i].pornTypeHumiliation, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.humiliation>>
+		<<set $slaves[$i].porn.fame.humiliation += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarHumiliations-1))>>
+		<<set $slaves[$i].porn.fame.humiliation = Math.clamp($slaves[$i].porn.fame.humiliation, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "humiliation" || $slaves[$i].pornFameType == "humiliating">>
+		<<if $slaves[$i].porn.focus == "humiliation" || $slaves[$i].porn.fameType == "humiliating">>
 			With $his fetish for humiliation, $he has a clear advantage when it comes to demeaning smut.
-			<<if $slaves[$i].pornTypeHumiliation > _oldPorn>>
+			<<if $slaves[$i].porn.fame.humiliation > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeHumiliation < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.humiliation < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Humiliation: (_oldPorn) to ($slaves[$i].pornTypeHumiliation).<</if>>
-	<<elseif $slaves[$i].pornTypeHumiliation > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeHumiliation>><</if>>
-		<<set $slaves[$i].pornTypeHumiliation = Math.clamp($slaves[$i].pornTypeHumiliation-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Humiliation: (_oldPorn) to ($slaves[$i].pornTypeHumiliation).<</if>>
+		<<if $cheatMode == 1>>Humiliation: (_oldPorn) to ($slaves[$i].porn.fame.humiliation).<</if>>
+	<<elseif $slaves[$i].porn.fame.humiliation > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.humiliation>><</if>>
+		<<set $slaves[$i].porn.fame.humiliation = Math.clamp($slaves[$i].porn.fame.humiliation-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Humiliation: (_oldPorn) to ($slaves[$i].porn.fame.humiliation).<</if>>
 	<</if>>
 	<<if $slaves[$i].fetish == "boobs">>
-		<<if $slaves[$i].pornFocus == "boobs" || $slaves[$i].pornFameType == "breast">>
+		<<if $slaves[$i].porn.focus == "boobs" || $slaves[$i].porn.fameType == "breast">>
 			<<set _adjustedViewership = _viewership*2.0>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeBoobs>>
-		<<set $slaves[$i].pornTypeBoobs += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarBoobs-1))>>
-		<<set $slaves[$i].pornTypeBoobs = Math.clamp($slaves[$i].pornTypeBoobs, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.boobs>>
+		<<set $slaves[$i].porn.fame.boobs += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarBoobs-1))>>
+		<<set $slaves[$i].porn.fame.boobs = Math.clamp($slaves[$i].porn.fame.boobs, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "boobs" || $slaves[$i].pornFameType == "breast">>
+		<<if $slaves[$i].porn.focus == "boobs" || $slaves[$i].porn.fameType == "breast">>
 			With $his fetish for tits, $he has a clear advantage when it comes to breast focused smut.
-			<<if $slaves[$i].pornTypeBoobs > _oldPorn>>
+			<<if $slaves[$i].porn.fame.boobs > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeBoobs < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.boobs < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Boobs: (_oldPorn) to ($slaves[$i].pornTypeBoobs).<</if>>
-	<<elseif $slaves[$i].pornTypeBoobs > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeBoobs>><</if>>
-		<<set $slaves[$i].pornTypeBoobs = Math.clamp($slaves[$i].pornTypeBoobs-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Boobs: (_oldPorn) to ($slaves[$i].pornTypeBoobs).<</if>>
+		<<if $cheatMode == 1>>Boobs: (_oldPorn) to ($slaves[$i].porn.fame.boobs).<</if>>
+	<<elseif $slaves[$i].porn.fame.boobs > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.boobs>><</if>>
+		<<set $slaves[$i].porn.fame.boobs = Math.clamp($slaves[$i].porn.fame.boobs-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Boobs: (_oldPorn) to ($slaves[$i].porn.fame.boobs).<</if>>
 	<</if>>
 	<<if $slaves[$i].fetish == "dom">>
-		<<if $slaves[$i].pornFocus == "dom" || $slaves[$i].pornFameType == "dominant">>
+		<<if $slaves[$i].porn.focus == "dom" || $slaves[$i].porn.fameType == "dominant">>
 			<<set _adjustedViewership = _viewership*2.0>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeDom>>
-		<<set $slaves[$i].pornTypeDom += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarDoms-1))>>
-		<<set $slaves[$i].pornTypeDom = Math.clamp($slaves[$i].pornTypeDom, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.dom>>
+		<<set $slaves[$i].porn.fame.dom += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarDoms-1))>>
+		<<set $slaves[$i].porn.fame.dom = Math.clamp($slaves[$i].porn.fame.dom, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "dom" || $slaves[$i].pornFameType == "dominant">>
+		<<if $slaves[$i].porn.focus == "dom" || $slaves[$i].porn.fameType == "dominant">>
 			With $his dominant streak, $he has a clear advantage when it comes to fetish smut.
-			<<if $slaves[$i].pornTypeDom > _oldPorn>>
+			<<if $slaves[$i].porn.fame.dom > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeDom < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.dom < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Dom: (_oldPorn) to ($slaves[$i].pornTypeDom).<</if>>
-	<<elseif $slaves[$i].pornTypeDom > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeDom>><</if>>
-		<<set $slaves[$i].pornTypeDom = Math.clamp($slaves[$i].pornTypeDom-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Dom: (_oldPorn) to ($slaves[$i].pornTypeDom).<</if>>
+		<<if $cheatMode == 1>>Dom: (_oldPorn) to ($slaves[$i].porn.fame.dom).<</if>>
+	<<elseif $slaves[$i].porn.fame.dom > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.dom>><</if>>
+		<<set $slaves[$i].porn.fame.dom = Math.clamp($slaves[$i].porn.fame.dom-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Dom: (_oldPorn) to ($slaves[$i].porn.fame.dom).<</if>>
 	<</if>>
 	<<if $slaves[$i].fetish == "sadist">>
-		<<if $slaves[$i].pornFocus == "sadist" || $slaves[$i].pornFameType == "sadistic">>
+		<<if $slaves[$i].porn.focus == "sadist" || $slaves[$i].porn.fameType == "sadistic">>
 			<<set _adjustedViewership = _viewership*2.0>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeSadist>>
-		<<set $slaves[$i].pornTypeSadist += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarSadists-1))>>
-		<<set $slaves[$i].pornTypeSadist = Math.clamp($slaves[$i].pornTypeSadist, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.sadist>>
+		<<set $slaves[$i].porn.fame.sadist += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarSadists-1))>>
+		<<set $slaves[$i].porn.fame.sadist = Math.clamp($slaves[$i].porn.fame.sadist, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "sadist" || $slaves[$i].pornFameType == "sadistic">>
+		<<if $slaves[$i].porn.focus == "sadist" || $slaves[$i].porn.fameType == "sadistic">>
 			With $his sadistic streak, $he has a clear advantage when it comes to fetish smut.
-			<<if $slaves[$i].pornTypeSadist > _oldPorn>>
+			<<if $slaves[$i].porn.fame.sadist > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeSadist < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.sadist < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Sadist: (_oldPorn) to ($slaves[$i].pornTypeSadist).<</if>>
-	<<elseif $slaves[$i].pornTypeSadist > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeSadist>><</if>>
-		<<set $slaves[$i].pornTypeSadist = Math.clamp($slaves[$i].pornTypeSadist-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Sadist: (_oldPorn) to ($slaves[$i].pornTypeSadist).<</if>>
+		<<if $cheatMode == 1>>Sadist: (_oldPorn) to ($slaves[$i].porn.fame.sadist).<</if>>
+	<<elseif $slaves[$i].porn.fame.sadist > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.sadist>><</if>>
+		<<set $slaves[$i].porn.fame.sadist = Math.clamp($slaves[$i].porn.fame.sadist-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Sadist: (_oldPorn) to ($slaves[$i].porn.fame.sadist).<</if>>
 	<</if>>
 	<<if $slaves[$i].fetish == "masochist">>
-		<<if $slaves[$i].pornFocus == "masochist" || $slaves[$i].pornFameType == "masochistic">>
+		<<if $slaves[$i].porn.focus == "masochist" || $slaves[$i].porn.fameType == "masochistic">>
 			<<set _adjustedViewership = _viewership*2.0>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeMasochist>>
-		<<set $slaves[$i].pornTypeMasochist += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarMasochists-1))>>
-		<<set $slaves[$i].pornTypeMasochist = Math.clamp($slaves[$i].pornTypeMasochist, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.masochist>>
+		<<set $slaves[$i].porn.fame.masochist += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarMasochists-1))>>
+		<<set $slaves[$i].porn.fame.masochist = Math.clamp($slaves[$i].porn.fame.masochist, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "masochist" || $slaves[$i].pornFameType == "masochistic">>
+		<<if $slaves[$i].porn.focus == "masochist" || $slaves[$i].porn.fameType == "masochistic">>
 			With $his masochistic streak, $he has a clear advantage when it comes to fetish smut.
-			<<if $slaves[$i].pornTypeMasochist > _oldPorn>>
+			<<if $slaves[$i].porn.fame.masochist > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeMasochist < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.masochist < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Masochist: (_oldPorn) to ($slaves[$i].pornTypeMasochist).<</if>>
-	<<elseif $slaves[$i].pornTypeMasochist > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeMasochist>><</if>>
-		<<set $slaves[$i].pornTypeMasochist = Math.clamp($slaves[$i].pornTypeMasochist-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Masochist: (_oldPorn) to ($slaves[$i].pornTypeMasochist).<</if>>
+		<<if $cheatMode == 1>>Masochist: (_oldPorn) to ($slaves[$i].porn.fame.masochist).<</if>>
+	<<elseif $slaves[$i].porn.fame.masochist > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.masochist>><</if>>
+		<<set $slaves[$i].porn.fame.masochist = Math.clamp($slaves[$i].porn.fame.masochist-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Masochist: (_oldPorn) to ($slaves[$i].porn.fame.masochist).<</if>>
 	<</if>>
 	<<if $slaves[$i].fetish == "pregnancy">>
-		<<if $slaves[$i].pornFocus == "pregnancy" || $slaves[$i].pornFameType == "pregnancy fetish">>
+		<<if $slaves[$i].porn.focus == "pregnancy" || $slaves[$i].porn.fameType == "pregnancy fetish">>
 			<<set _adjustedViewership = _viewership*2.0>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypePregnancy>>
-		<<set $slaves[$i].pornTypePregnancy += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarPregnancySluts-1))>>
-		<<set $slaves[$i].pornTypePregnancy = Math.clamp($slaves[$i].pornTypePregnancy, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.pregnancy>>
+		<<set $slaves[$i].porn.fame.pregnancy += (_adjustedViewership/_viewerSoaking)+($slaves[$i].fetishStrength)-((_decayRate/10)*($pornStarPregnancySluts-1))>>
+		<<set $slaves[$i].porn.fame.pregnancy = Math.clamp($slaves[$i].porn.fame.pregnancy, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "pregnancy" || $slaves[$i].pornFameType == "pregnancy fetish">>
+		<<if $slaves[$i].porn.focus == "pregnancy" || $slaves[$i].porn.fameType == "pregnancy fetish">>
 			With $his fetish for all things pregnancy, $he has a clear advantage when it comes to fetish smut.
-			<<if $slaves[$i].pornTypePregnancy > _oldPorn>>
+			<<if $slaves[$i].porn.fame.pregnancy > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypePregnancy < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.pregnancy < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Pregnancy: (_oldPorn) to ($slaves[$i].pornTypePregnancy).<</if>>
-	<<elseif $slaves[$i].pornTypePregnancy > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypePregnancy>><</if>>
-		<<set $slaves[$i].pornTypePregnancy = Math.clamp($slaves[$i].pornTypePregnancy-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Pregnancy: (_oldPorn) to ($slaves[$i].pornTypePregnancy).<</if>>
+		<<if $cheatMode == 1>>Pregnancy: (_oldPorn) to ($slaves[$i].porn.fame.pregnancy).<</if>>
+	<<elseif $slaves[$i].porn.fame.pregnancy > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.pregnancy>><</if>>
+		<<set $slaves[$i].porn.fame.pregnancy = Math.clamp($slaves[$i].porn.fame.pregnancy-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Pregnancy: (_oldPorn) to ($slaves[$i].porn.fame.pregnancy).<</if>>
 	<</if>>
 
 	/*General*/
 
 	<<if $slaves[$i].fuckdoll > 0>>
-		<<if $slaves[$i].pornFocus == "fuckdoll" || $slaves[$i].pornFameType == "fuckdoll">>
+		<<if $slaves[$i].porn.focus == "fuckdoll" || $slaves[$i].porn.fameType == "fuckdoll">>
 			<<set _adjustedViewership = _viewership*4>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeFuckdoll>>
-		<<set $slaves[$i].pornTypeFuckdoll += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarFuckdolls-1))>>
-		<<set $slaves[$i].pornTypeFuckdoll = Math.clamp($slaves[$i].pornTypeFuckdoll, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.fuckdoll>>
+		<<set $slaves[$i].porn.fame.fuckdoll += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarFuckdolls-1))>>
+		<<set $slaves[$i].porn.fame.fuckdoll = Math.clamp($slaves[$i].porn.fame.fuckdoll, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "fuckdoll" || $slaves[$i].pornFameType == "fuckdoll">>
+		<<if $slaves[$i].porn.focus == "fuckdoll" || $slaves[$i].porn.fameType == "fuckdoll">>
 			$His latex encased body attracts a variety of viewers with tastes ranging from bondage to dolls.
-			<<if $slaves[$i].pornTypeFuckdoll > _oldPorn>>
+			<<if $slaves[$i].porn.fame.fuckdoll > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeFuckdoll < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.fuckdoll < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Fuckdoll: (_oldPorn) to ($slaves[$i].pornTypeFuckdoll).<</if>>
-	<<elseif $slaves[$i].pornTypeFuckdoll > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeFuckdoll>><</if>>
-		<<set $slaves[$i].pornTypeFuckdoll = Math.clamp($slaves[$i].pornTypeFuckdoll-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Fuckdoll: (_oldPorn) to ($slaves[$i].pornTypeFuckdoll).<</if>>
+		<<if $cheatMode == 1>>Fuckdoll: (_oldPorn) to ($slaves[$i].porn.fame.fuckdoll).<</if>>
+	<<elseif $slaves[$i].porn.fame.fuckdoll > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.fuckdoll>><</if>>
+		<<set $slaves[$i].porn.fame.fuckdoll = Math.clamp($slaves[$i].porn.fame.fuckdoll-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Fuckdoll: (_oldPorn) to ($slaves[$i].porn.fame.fuckdoll).<</if>>
 	<</if>>
 	<<if ($slaves[$i].devotion < -20) && ($slaves[$i].analCount + $slaves[$i].vaginalCount > 0)>>
-		<<if $slaves[$i].pornFocus == "rape" || $slaves[$i].pornFameType == "rape">>
+		<<if $slaves[$i].porn.focus == "rape" || $slaves[$i].porn.fameType == "rape">>
 			<<set _adjustedViewership = _viewership*4>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeRape>>
-		<<set $slaves[$i].pornTypeRape += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarRapees-1))>>
-		<<set $slaves[$i].pornTypeRape = Math.clamp($slaves[$i].pornTypeRape, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.rape>>
+		<<set $slaves[$i].porn.fame.rape += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarRapees-1))>>
+		<<set $slaves[$i].porn.fame.rape = Math.clamp($slaves[$i].porn.fame.rape, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "rape" || $slaves[$i].pornFameType == "rape">>
+		<<if $slaves[$i].porn.focus == "rape" || $slaves[$i].porn.fameType == "rape">>
 			$He is too unbroken for consensual sex, but $his viewers wouldn't want it any other way.
-			<<if $slaves[$i].pornTypeRape > _oldPorn>>
+			<<if $slaves[$i].porn.fame.rape > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeRape < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.rape < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Rape: (_oldPorn) to ($slaves[$i].pornTypeRape).<</if>>
-	<<elseif $slaves[$i].pornTypeRape > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeRape>><</if>>
-		<<set $slaves[$i].pornTypeRape = Math.clamp($slaves[$i].pornTypeRape-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Rape: (_oldPorn) to ($slaves[$i].pornTypeRape).<</if>>
+		<<if $cheatMode == 1>>Rape: (_oldPorn) to ($slaves[$i].porn.fame.rape).<</if>>
+	<<elseif $slaves[$i].porn.fame.rape > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.rape>><</if>>
+		<<set $slaves[$i].porn.fame.rape = Math.clamp($slaves[$i].porn.fame.rape-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Rape: (_oldPorn) to ($slaves[$i].porn.fame.rape).<</if>>
 	<</if>>
 	<<if $slaves[$i].bellyPreg > 500>>
-		<<if $slaves[$i].pornFocus == "preggo" || $slaves[$i].pornFameType == "preggo">>
+		<<if $slaves[$i].porn.focus == "preggo" || $slaves[$i].porn.fameType == "preggo">>
 			<<set _adjustedViewership = _viewership*4>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypePreggo>>
-		<<set $slaves[$i].pornTypePreggo += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarPreggos-1))>>
-		<<set $slaves[$i].pornTypePreggo = Math.clamp($slaves[$i].pornTypePreggo, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.preggo>>
+		<<set $slaves[$i].porn.fame.preggo += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarPreggos-1))>>
+		<<set $slaves[$i].porn.fame.preggo = Math.clamp($slaves[$i].porn.fame.preggo, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "preggo" || $slaves[$i].pornFameType == "preggo">>
+		<<if $slaves[$i].porn.focus == "preggo" || $slaves[$i].porn.fameType == "preggo">>
 			$His gravid swell may be a turn off to some, but the maiesiophiliacs love it.
-			<<if $slaves[$i].pornTypePreggo > _oldPorn>>
+			<<if $slaves[$i].porn.fame.preggo > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypePreggo < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.preggo < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Preggo: (_oldPorn) to ($slaves[$i].pornTypePreggo).<</if>>
-	<<elseif $slaves[$i].pornTypePreggo > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypePreggo>><</if>>
-		<<set $slaves[$i].pornTypePreggo = Math.clamp($slaves[$i].pornTypePreggo-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Preggo: (_oldPorn) to ($slaves[$i].pornTypePreggo).<</if>>
+		<<if $cheatMode == 1>>Preggo: (_oldPorn) to ($slaves[$i].porn.fame.preggo).<</if>>
+	<<elseif $slaves[$i].porn.fame.preggo > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.preggo>><</if>>
+		<<set $slaves[$i].porn.fame.preggo = Math.clamp($slaves[$i].porn.fame.preggo-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Preggo: (_oldPorn) to ($slaves[$i].porn.fame.preggo).<</if>>
 	<</if>>
 	<<if $slaves[$i].weight > 95>>
-		<<if $slaves[$i].pornFocus == "BBW" || $slaves[$i].pornFameType == "BBW">>
+		<<if $slaves[$i].porn.focus == "BBW" || $slaves[$i].porn.fameType == "BBW">>
 			<<set _adjustedViewership = _viewership*4>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeBBW>>
-		<<set $slaves[$i].pornTypeBBW += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarBBWs-1))>>
-		<<set $slaves[$i].pornTypeBBW = Math.clamp($slaves[$i].pornTypeBBW, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.BBW>>
+		<<set $slaves[$i].porn.fame.BBW += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarBBWs-1))>>
+		<<set $slaves[$i].porn.fame.BBW = Math.clamp($slaves[$i].porn.fame.BBW, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "BBW" || $slaves[$i].pornFameType == "BBW">>
+		<<if $slaves[$i].porn.focus == "BBW" || $slaves[$i].porn.fameType == "BBW">>
 			$His weight gives $him a heavy allure to the chubby chasers and BBW lovers out there.
-			<<if $slaves[$i].pornTypeBBW > _oldPorn>>
+			<<if $slaves[$i].porn.fame.BBW > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeBBW < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.BBW < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>BBW: (_oldPorn) to ($slaves[$i].pornTypeBBW).<</if>>
-	<<elseif $slaves[$i].pornTypeBBW > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeBBW>><</if>>
-		<<set $slaves[$i].pornTypeBBW = Math.clamp($slaves[$i].pornTypeBBW-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>BBW: (_oldPorn) to ($slaves[$i].pornTypeBBW).<</if>>
+		<<if $cheatMode == 1>>BBW: (_oldPorn) to ($slaves[$i].porn.fame.BBW).<</if>>
+	<<elseif $slaves[$i].porn.fame.BBW > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.BBW>><</if>>
+		<<set $slaves[$i].porn.fame.BBW = Math.clamp($slaves[$i].porn.fame.BBW-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>BBW: (_oldPorn) to ($slaves[$i].porn.fame.BBW).<</if>>
 	<</if>>
 	<<if $slaves[$i].visualAge <= 12>>
-		<<if $slaves[$i].pornFocus == "loli" || $slaves[$i].pornFameType == "underage">>
+		<<if $slaves[$i].porn.focus == "loli" || $slaves[$i].porn.fameType == "underage">>
 			<<set _adjustedViewership = _viewership*4>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeLoli>>
-		<<set $slaves[$i].pornTypeLoli += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarLolis-1))>>
-		<<set $slaves[$i].pornTypeLoli = Math.clamp($slaves[$i].pornTypeLoli, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.loli>>
+		<<set $slaves[$i].porn.fame.loli += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarLolis-1))>>
+		<<set $slaves[$i].porn.fame.loli = Math.clamp($slaves[$i].porn.fame.loli, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "loli" || $slaves[$i].pornFameType == "underage">>
+		<<if $slaves[$i].porn.focus == "loli" || $slaves[$i].porn.fameType == "underage">>
 			$His young age gives $him a dangerous edge and a number of careful viewers.
-			<<if $slaves[$i].pornTypeLoli > _oldPorn>>
+			<<if $slaves[$i].porn.fame.loli > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeLoli < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.loli < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Loli: (_oldPorn) to ($slaves[$i].pornTypeLoli).<</if>>
-	<<elseif $slaves[$i].pornTypeLoli > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeLoli>><</if>>
-		<<set $slaves[$i].pornTypeLoli = Math.clamp($slaves[$i].pornTypeLoli-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Loli: (_oldPorn) to ($slaves[$i].pornTypeLoli).<</if>>
+		<<if $cheatMode == 1>>Loli: (_oldPorn) to ($slaves[$i].porn.fame.loli).<</if>>
+	<<elseif $slaves[$i].porn.fame.loli > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.loli>><</if>>
+		<<set $slaves[$i].porn.fame.loli = Math.clamp($slaves[$i].porn.fame.loli-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Loli: (_oldPorn) to ($slaves[$i].porn.fame.loli).<</if>>
 	<</if>>
 	<<if ($slaves[$i].weight > 30 && $slaves[$i].diet == "fattening") || ($slaves[$i].inflation > 0 && $slaves[$i].inflationType == "food")>>
-		<<if $slaves[$i].pornFocus == "gainer" || $slaves[$i].pornFameType == "weight gain">>
+		<<if $slaves[$i].porn.focus == "gainer" || $slaves[$i].porn.fameType == "weight gain">>
 			<<set _adjustedViewership = _viewership*4>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeGainer>>
-		<<set $slaves[$i].pornTypeGainer += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarGainers-1))>>
-		<<set $slaves[$i].pornTypeGainer = Math.clamp($slaves[$i].pornTypeGainer, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.gainer>>
+		<<set $slaves[$i].porn.fame.gainer += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarGainers-1))>>
+		<<set $slaves[$i].porn.fame.gainer = Math.clamp($slaves[$i].porn.fame.gainer, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "gainer" || $slaves[$i].pornFameType == "weight gain">>
+		<<if $slaves[$i].porn.focus == "gainer" || $slaves[$i].porn.fameType == "weight gain">>
 			$His expanding waistline attracts those who enjoy seeing a $girl pack on the pounds while stuffing $his face.
-			<<if $slaves[$i].pornTypeGainer > _oldPorn>>
+			<<if $slaves[$i].porn.fame.gainer > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeGainer < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.gainer < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Gainer: (_oldPorn) to ($slaves[$i].pornTypeGainer).<</if>>
-	<<elseif $slaves[$i].pornTypeGainer > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeGainer>><</if>>
-		<<set $slaves[$i].pornTypeGainer = Math.clamp($slaves[$i].pornTypeGainer-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Gainer: (_oldPorn) to ($slaves[$i].pornTypeGainer).<</if>>
+		<<if $cheatMode == 1>>Gainer: (_oldPorn) to ($slaves[$i].porn.fame.gainer).<</if>>
+	<<elseif $slaves[$i].porn.fame.gainer > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.gainer>><</if>>
+		<<set $slaves[$i].porn.fame.gainer = Math.clamp($slaves[$i].porn.fame.gainer-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Gainer: (_oldPorn) to ($slaves[$i].porn.fame.gainer).<</if>>
 	<</if>>
 	<<if canPenetrate($slaves[$i]) && $slaves[$i].dick > 3>>
-		<<if $slaves[$i].pornFocus == "stud" || $slaves[$i].pornFameType == "big dick">>
+		<<if $slaves[$i].porn.focus == "stud" || $slaves[$i].porn.fameType == "big dick">>
 			<<set _adjustedViewership = _viewership*4>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeStud>>
-		<<set $slaves[$i].pornTypeStud += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarStuds-1))>>
-		<<set $slaves[$i].pornTypeStud = Math.clamp($slaves[$i].pornTypeStud, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.stud>>
+		<<set $slaves[$i].porn.fame.stud += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarStuds-1))>>
+		<<set $slaves[$i].porn.fame.stud = Math.clamp($slaves[$i].porn.fame.stud, 0, 150000)>>
 		<<set _viewerSoaking++>>
 
-		<<if $slaves[$i].pornFocus == "stud" || $slaves[$i].pornFameType == "big dick">>
+		<<if $slaves[$i].porn.focus == "stud" || $slaves[$i].porn.fameType == "big dick">>
 			$His powerful erection excites those who see it, especially when it is put to good use.
-			<<if $slaves[$i].pornTypeStud > _oldPorn>>
+			<<if $slaves[$i].porn.fame.stud > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeStud < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.stud < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Big Dick: (_oldPorn) to ($slaves[$i].pornTypeStud).<</if>>
-	<<elseif $slaves[$i].pornTypeStud > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeStud>><</if>>
-		<<set $slaves[$i].pornTypeStud = Math.clamp($slaves[$i].pornTypeStud-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Big Dick: (_oldPorn) to ($slaves[$i].pornTypeStud).<</if>>
+		<<if $cheatMode == 1>>Big Dick: (_oldPorn) to ($slaves[$i].porn.fame.stud).<</if>>
+	<<elseif $slaves[$i].porn.fame.stud > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.stud>><</if>>
+		<<set $slaves[$i].porn.fame.stud = Math.clamp($slaves[$i].porn.fame.stud-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Big Dick: (_oldPorn) to ($slaves[$i].porn.fame.stud).<</if>>
 	<</if>>
-	<<if $slaves[$i].pornFocus == "porn" || $slaves[$i].pornFameType === "generic">>
+	<<if $slaves[$i].porn.focus == "porn" || $slaves[$i].porn.fameType === "generic">>
 		<<set _adjustedViewership = _viewership*5>>
 	<<else>>
 		<<set _adjustedViewership = _viewership>>
 	<</if>>
-	<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeGeneral>><</if>>
-	<<set $slaves[$i].pornTypeGeneral += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStars-1))>>
-	<<set $slaves[$i].pornTypeGeneral = Math.clamp($slaves[$i].pornTypeGeneral, 0, 150000)>>
-	<<if $cheatMode == 1>>General: (_oldPorn) to ($slaves[$i].pornTypeGeneral).<</if>>
+	<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.general>><</if>>
+	<<set $slaves[$i].porn.fame.general += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStars-1))>>
+	<<set $slaves[$i].porn.fame.general = Math.clamp($slaves[$i].porn.fame.general, 0, 150000)>>
+	<<if $cheatMode == 1>>General: (_oldPorn) to ($slaves[$i].porn.fame.general).<</if>>
 
 	/*Quirks are low and unlikely, requiring focus to push into the limelight*/
 	<<if $slaves[$i].sexualQuirk == "gagfuck queen">>
-		<<if $slaves[$i].pornFocus == "gagfuck queen" || $slaves[$i].pornFameType == "deepthroat">>
+		<<if $slaves[$i].porn.focus == "gagfuck queen" || $slaves[$i].porn.fameType == "deepthroat">>
 			<<set _adjustedViewership = _viewership*6>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeDeepThroat>>
-		<<set $slaves[$i].pornTypeDeepThroat += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarDeepThroats-1))>>
-		<<set $slaves[$i].pornTypeDeepThroat = Math.clamp($slaves[$i].pornTypeDeepThroat, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.deepThroat>>
+		<<set $slaves[$i].porn.fame.deepThroat += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarDeepThroats-1))>>
+		<<set $slaves[$i].porn.fame.deepThroat = Math.clamp($slaves[$i].porn.fame.deepThroat, 0, 150000)>>
 
-		<<if $slaves[$i].pornFocus == "gagfuck queen" || $slaves[$i].pornFameType == "deepthroat">>
+		<<if $slaves[$i].porn.focus == "gagfuck queen" || $slaves[$i].porn.fameType == "deepthroat">>
 			$He impresses with just how much dick can slip down $his throat.
-			<<if $slaves[$i].pornTypeDeepThroat > _oldPorn>>
+			<<if $slaves[$i].porn.fame.deepThroat > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeDeepThroat < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.deepThroat < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Gagfuck Queen: (_oldPorn) to ($slaves[$i].pornTypeDeepThroat).<</if>>
-	<<elseif $slaves[$i].pornTypeDeepThroat > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeDeepThroat>><</if>>
-		<<set $slaves[$i].pornTypeDeepThroat = Math.clamp($slaves[$i].pornTypeDeepThroat-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Gagfuck Queen: (_oldPorn) to ($slaves[$i].pornTypeDeepThroat).<</if>>
+		<<if $cheatMode == 1>>Gagfuck Queen: (_oldPorn) to ($slaves[$i].porn.fame.deepThroat).<</if>>
+	<<elseif $slaves[$i].porn.fame.deepThroat > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.deepThroat>><</if>>
+		<<set $slaves[$i].porn.fame.deepThroat = Math.clamp($slaves[$i].porn.fame.deepThroat-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Gagfuck Queen: (_oldPorn) to ($slaves[$i].porn.fame.deepThroat).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualQuirk == "strugglefuck queen" && (canDoVaginal($slaves[$i]) || canDoAnal($slaves[$i]))>>
-		<<if $slaves[$i].pornFocus == "strugglefuck queen" || $slaves[$i].pornFameType == "unwilling">>
+		<<if $slaves[$i].porn.focus == "strugglefuck queen" || $slaves[$i].porn.fameType == "unwilling">>
 			<<set _adjustedViewership = _viewership*6>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeStruggleFuck>>
-		<<set $slaves[$i].pornTypeStruggleFuck += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarStruggleFucks-1))>>
-		<<set $slaves[$i].pornTypeStruggleFuck = Math.clamp($slaves[$i].pornTypeStruggleFuck, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.struggleFuck>>
+		<<set $slaves[$i].porn.fame.struggleFuck += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarStruggleFucks-1))>>
+		<<set $slaves[$i].porn.fame.struggleFuck = Math.clamp($slaves[$i].porn.fame.struggleFuck, 0, 150000)>>
 
-		<<if $slaves[$i].pornFocus == "strugglefuck queen" || $slaves[$i].pornFameType == "unwilling">>
+		<<if $slaves[$i].porn.focus == "strugglefuck queen" || $slaves[$i].porn.fameType == "unwilling">>
 			$He impresses with $his ability to put up just the right amount of fight during sex.
-			<<if $slaves[$i].pornTypeStruggleFuck > _oldPorn>>
+			<<if $slaves[$i].porn.fame.struggleFuck > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeStruggleFuck < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.struggleFuck < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Strugglefuck Queen: (_oldPorn) to ($slaves[$i].pornTypeStruggleFuck).<</if>>
-	<<elseif $slaves[$i].pornTypeStruggleFuck > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeStruggleFuck>><</if>>
-		<<set $slaves[$i].pornTypeStruggleFuck = Math.clamp($slaves[$i].pornTypeStruggleFuck-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Strugglefuck Queen: (_oldPorn) to ($slaves[$i].pornTypeStruggleFuck).<</if>>
+		<<if $cheatMode == 1>>Strugglefuck Queen: (_oldPorn) to ($slaves[$i].porn.fame.struggleFuck).<</if>>
+	<<elseif $slaves[$i].porn.fame.struggleFuck > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.struggleFuck>><</if>>
+		<<set $slaves[$i].porn.fame.struggleFuck = Math.clamp($slaves[$i].porn.fame.struggleFuck-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Strugglefuck Queen: (_oldPorn) to ($slaves[$i].porn.fame.struggleFuck).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualQuirk == "painal queen" && canDoAnal($slaves[$i])>>
-		<<if $slaves[$i].pornFocus == "painal queen" || $slaves[$i].pornFameType == "hardcore anal">>
+		<<if $slaves[$i].porn.focus == "painal queen" || $slaves[$i].porn.fameType == "hardcore anal">>
 			<<set _adjustedViewership = _viewership*6>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypePainal>>
-		<<set $slaves[$i].pornTypePainal += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarPainals-1))>>
-		<<set $slaves[$i].pornTypePainal = Math.clamp($slaves[$i].pornTypePainal, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.painal>>
+		<<set $slaves[$i].porn.fame.painal += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarPainals-1))>>
+		<<set $slaves[$i].porn.fame.painal = Math.clamp($slaves[$i].porn.fame.painal, 0, 150000)>>
 
-		<<if $slaves[$i].pornFocus == "painal queen" || $slaves[$i].pornFameType == "hardcore anal">>
+		<<if $slaves[$i].porn.focus == "painal queen" || $slaves[$i].porn.fameType == "hardcore anal">>
 			$He impresses with $his ability to push $his anus to its limit.
-			<<if $slaves[$i].pornTypePainal > _oldPorn>>
+			<<if $slaves[$i].porn.fame.painal > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypePainal < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.painal < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Painal Queen: (_oldPorn) to ($slaves[$i].pornTypePainal).<</if>>
-	<<elseif $slaves[$i].pornTypePainal > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypePainal>><</if>>
-		<<set $slaves[$i].pornTypePainal = Math.clamp($slaves[$i].pornTypePainal-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Strugglefuck Queen: (_oldPorn) to ($slaves[$i].pornTypePainal).<</if>>
+		<<if $cheatMode == 1>>Painal Queen: (_oldPorn) to ($slaves[$i].porn.fame.painal).<</if>>
+	<<elseif $slaves[$i].porn.fame.painal > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.painal>><</if>>
+		<<set $slaves[$i].porn.fame.painal = Math.clamp($slaves[$i].porn.fame.painal-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Strugglefuck Queen: (_oldPorn) to ($slaves[$i].porn.fame.painal).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualQuirk == "tease">>
-		<<if $slaves[$i].pornFocus == "tease" || $slaves[$i].pornFameType == "softcore">>
+		<<if $slaves[$i].porn.focus == "tease" || $slaves[$i].porn.fameType == "softcore">>
 			<<set _adjustedViewership = _viewership*6>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeTease>>
-		<<set $slaves[$i].pornTypeTease += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarTeases-1))>>
-		<<set $slaves[$i].pornTypeTease = Math.clamp($slaves[$i].pornTypeTease, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.tease>>
+		<<set $slaves[$i].porn.fame.tease += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarTeases-1))>>
+		<<set $slaves[$i].porn.fame.tease = Math.clamp($slaves[$i].porn.fame.tease, 0, 150000)>>
 
-		<<if $slaves[$i].pornFocus == "tease" || $slaves[$i].pornFameType == "softcore">>
+		<<if $slaves[$i].porn.focus == "tease" || $slaves[$i].porn.fameType == "softcore">>
 			$He tantalizes viewers with $his suggestive moves.
-			<<if $slaves[$i].pornTypeTease > _oldPorn>>
+			<<if $slaves[$i].porn.fame.tease > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeTease < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.tease < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Tease: (_oldPorn) to ($slaves[$i].pornTypeTease).<</if>>
-	<<elseif $slaves[$i].pornTypeTease > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeTease>><</if>>
-		<<set $slaves[$i].pornTypeTease = Math.clamp($slaves[$i].pornTypeTease-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Tease: (_oldPorn) to ($slaves[$i].pornTypeTease).<</if>>
+		<<if $cheatMode == 1>>Tease: (_oldPorn) to ($slaves[$i].porn.fame.tease).<</if>>
+	<<elseif $slaves[$i].porn.fame.tease > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.tease>><</if>>
+		<<set $slaves[$i].porn.fame.tease = Math.clamp($slaves[$i].porn.fame.tease-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Tease: (_oldPorn) to ($slaves[$i].porn.fame.tease).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualQuirk == "romantic">>
-		<<if $slaves[$i].pornFocus == "romantic" || $slaves[$i].pornFameType == "romantic">>
+		<<if $slaves[$i].porn.focus == "romantic" || $slaves[$i].porn.fameType == "romantic">>
 			<<set _adjustedViewership = _viewership*6>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeRomantic>>
-		<<set $slaves[$i].pornTypeRomantic += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarRomantics-1))>>
-		<<set $slaves[$i].pornTypeRomantic = Math.clamp($slaves[$i].pornTypeRomantic, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.romantic>>
+		<<set $slaves[$i].porn.fame.romantic += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarRomantics-1))>>
+		<<set $slaves[$i].porn.fame.romantic = Math.clamp($slaves[$i].porn.fame.romantic, 0, 150000)>>
 
-		<<if $slaves[$i].pornFocus == "romantic" || $slaves[$i].pornFameType == "romantic">>
+		<<if $slaves[$i].porn.focus == "romantic" || $slaves[$i].porn.fameType == "romantic">>
 			$He draws viewers in with $his genuine pleasure.
-			<<if $slaves[$i].pornTypeRomantic > _oldPorn>>
+			<<if $slaves[$i].porn.fame.romantic > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeRomantic < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.romantic < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Romantic: (_oldPorn) to ($slaves[$i].pornTypeRomantic).<</if>>
-	<<elseif $slaves[$i].pornTypeRomantic > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeRomantic>><</if>>
-		<<set $slaves[$i].pornTypeRomantic = Math.clamp($slaves[$i].pornTypeRomantic-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Romantic: (_oldPorn) to ($slaves[$i].pornTypeRomantic).<</if>>
+		<<if $cheatMode == 1>>Romantic: (_oldPorn) to ($slaves[$i].porn.fame.romantic).<</if>>
+	<<elseif $slaves[$i].porn.fame.romantic > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.romantic>><</if>>
+		<<set $slaves[$i].porn.fame.romantic = Math.clamp($slaves[$i].porn.fame.romantic-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Romantic: (_oldPorn) to ($slaves[$i].porn.fame.romantic).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualQuirk == "perverted">>
-		<<if $slaves[$i].pornFocus == "perverted" || $slaves[$i].pornFameType == "really perverted">>
+		<<if $slaves[$i].porn.focus == "perverted" || $slaves[$i].porn.fameType == "really perverted">>
 			<<set _adjustedViewership = _viewership*6>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypePervert>>
-		<<set $slaves[$i].pornTypePervert += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarPerverts-1))>>
-		<<set $slaves[$i].pornTypePervert = Math.clamp($slaves[$i].pornTypePervert, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.pervert>>
+		<<set $slaves[$i].porn.fame.pervert += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarPerverts-1))>>
+		<<set $slaves[$i].porn.fame.pervert = Math.clamp($slaves[$i].porn.fame.pervert, 0, 150000)>>
 
-		<<if $slaves[$i].pornFocus == "perverted" || $slaves[$i].pornFameType == "really perverted">>
+		<<if $slaves[$i].porn.focus == "perverted" || $slaves[$i].porn.fameType == "really perverted">>
 			$His perverted tastes shock and allure viewers in ways they didn't even realize.
-			<<if $slaves[$i].pornTypePervert > _oldPorn>>
+			<<if $slaves[$i].porn.fame.pervert > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypePervert < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.pervert < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Perverted: (_oldPorn) to ($slaves[$i].pornTypePervert).<</if>>
-	<<elseif $slaves[$i].pornTypePervert > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypePervert>><</if>>
-		<<set $slaves[$i].pornTypePervert = Math.clamp($slaves[$i].pornTypePervert-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Perverted: (_oldPorn) to ($slaves[$i].pornTypePervert).<</if>>
+		<<if $cheatMode == 1>>Perverted: (_oldPorn) to ($slaves[$i].porn.fame.pervert).<</if>>
+	<<elseif $slaves[$i].porn.fame.pervert > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.pervert>><</if>>
+		<<set $slaves[$i].porn.fame.pervert = Math.clamp($slaves[$i].porn.fame.pervert-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Perverted: (_oldPorn) to ($slaves[$i].porn.fame.pervert).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualQuirk == "caring">>
-		<<if $slaves[$i].pornFocus == "caring" || $slaves[$i].pornFameType == "voyeur">>
+		<<if $slaves[$i].porn.focus == "caring" || $slaves[$i].porn.fameType == "voyeur">>
 			<<set _adjustedViewership = _viewership*6>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeCaring>>
-		<<set $slaves[$i].pornTypeCaring += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarCarings-1))>>
-		<<set $slaves[$i].pornTypeCaring = Math.clamp($slaves[$i].pornTypeCaring, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.caring>>
+		<<set $slaves[$i].porn.fame.caring += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarCarings-1))>>
+		<<set $slaves[$i].porn.fame.caring = Math.clamp($slaves[$i].porn.fame.caring, 0, 150000)>>
 
-		<<if $slaves[$i].pornFocus == "caring" || $slaves[$i].pornFameType == "voyeur">>
+		<<if $slaves[$i].porn.focus == "caring" || $slaves[$i].porn.fameType == "voyeur">>
 			$His sincere devotion to $his partner's pleasure draws in viewers with an interest in watching couples fuck.
-			<<if $slaves[$i].pornTypeCaring > _oldPorn>>
+			<<if $slaves[$i].porn.fame.caring > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeCaring < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.caring < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Caring: (_oldPorn) to ($slaves[$i].pornTypeCaring).<</if>>
-	<<elseif $slaves[$i].pornTypeCaring > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeCaring>><</if>>
-		<<set $slaves[$i].pornTypeCaring = Math.clamp($slaves[$i].pornTypeCaring-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Caring: (_oldPorn) to ($slaves[$i].pornTypeCaring).<</if>>
+		<<if $cheatMode == 1>>Caring: (_oldPorn) to ($slaves[$i].porn.fame.caring).<</if>>
+	<<elseif $slaves[$i].porn.fame.caring > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.caring>><</if>>
+		<<set $slaves[$i].porn.fame.caring = Math.clamp($slaves[$i].porn.fame.caring-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Caring: (_oldPorn) to ($slaves[$i].porn.fame.caring).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualQuirk == "unflinching">>
-		<<if $slaves[$i].pornFocus == "unflinching" || $slaves[$i].pornFameType == "unspeakable">>
+		<<if $slaves[$i].porn.focus == "unflinching" || $slaves[$i].porn.fameType == "unspeakable">>
 			<<set _adjustedViewership = _viewership*6>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeUnflinching>>
-		<<set $slaves[$i].pornTypeUnflinching += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarUnflinchings-1))>>
-		<<set $slaves[$i].pornTypeUnflinching = Math.clamp($slaves[$i].pornTypeUnflinching, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.unflinching>>
+		<<set $slaves[$i].porn.fame.unflinching += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarUnflinchings-1))>>
+		<<set $slaves[$i].porn.fame.unflinching = Math.clamp($slaves[$i].porn.fame.unflinching, 0, 150000)>>
 
-		<<if $slaves[$i].pornFocus == "unflinching" || $slaves[$i].pornFameType == "unspeakable">>
+		<<if $slaves[$i].porn.focus == "unflinching" || $slaves[$i].porn.fameType == "unspeakable">>
 			$His willingness to do anything catches the attention of those who enjoy acts that should never be mentioned to others.
-			<<if $slaves[$i].pornTypeUnflinching > _oldPorn>>
+			<<if $slaves[$i].porn.fame.unflinching > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeUnflinching < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.unflinching < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Unflinching: (_oldPorn) to ($slaves[$i].pornTypeUnflinching).<</if>>
-	<<elseif $slaves[$i].pornTypeUnflinching > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeUnflinching>><</if>>
-		<<set $slaves[$i].pornTypeUnflinching = Math.clamp($slaves[$i].pornTypeUnflinching-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Unflinching: (_oldPorn) to ($slaves[$i].pornTypeUnflinching).<</if>>
+		<<if $cheatMode == 1>>Unflinching: (_oldPorn) to ($slaves[$i].porn.fame.unflinching).<</if>>
+	<<elseif $slaves[$i].porn.fame.unflinching > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.unflinching>><</if>>
+		<<set $slaves[$i].porn.fame.unflinching = Math.clamp($slaves[$i].porn.fame.unflinching-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Unflinching: (_oldPorn) to ($slaves[$i].porn.fame.unflinching).<</if>>
 	<</if>>
 	<<if $slaves[$i].sexualQuirk == "size queen">>
-		<<if $slaves[$i].pornFocus == "size queen" || $slaves[$i].pornFameType == "huge insertion">>
+		<<if $slaves[$i].porn.focus == "size queen" || $slaves[$i].porn.fameType == "huge insertion">>
 			<<set _adjustedViewership = _viewership*6>>
-		<<elseif $slaves[$i].pornFocus != "none">>
+		<<elseif $slaves[$i].porn.focus != "none">>
 			<<set _adjustedViewership = _viewership*.5>>
 		<</if>>
-		<<set _oldPorn = $slaves[$i].pornTypeSizeQueen>>
-		<<set $slaves[$i].pornTypeSizeQueen += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarSizeQueens-1))>>
-		<<set $slaves[$i].pornTypeSizeQueen = Math.clamp($slaves[$i].pornTypeSizeQueen, 0, 150000)>>
+		<<set _oldPorn = $slaves[$i].porn.fame.sizeQueen>>
+		<<set $slaves[$i].porn.fame.sizeQueen += (_adjustedViewership/_viewerSoaking)-((_decayRate/10)*($pornStarSizeQueens-1))>>
+		<<set $slaves[$i].porn.fame.sizeQueen = Math.clamp($slaves[$i].porn.fame.sizeQueen, 0, 150000)>>
 
-		<<if $slaves[$i].pornFocus == "size queen" || $slaves[$i].pornFameType == "huge insertion">>
+		<<if $slaves[$i].porn.focus == "size queen" || $slaves[$i].porn.fameType == "huge insertion">>
 			$His intent on taking the largest things possible into $his holes draws in viewers with an interest for huge insertions.
-			<<if $slaves[$i].pornTypeSizeQueen > _oldPorn>>
+			<<if $slaves[$i].porn.fame.sizeQueen > _oldPorn>>
 				Viewership @@.green;increased@@ this week.
-			<<elseif $slaves[$i].pornTypeSizeQueen < _oldPorn>>
+			<<elseif $slaves[$i].porn.fame.sizeQueen < _oldPorn>>
 				Viewership @@.red;declined@@ this week.
 			<<else>>
 				Viewership @@.yellow;was stable@@ this week.
 			<</if>>
 		<</if>>
-		<<if $cheatMode == 1>>Size Queen: (_oldPorn) to ($slaves[$i].pornTypeSizeQueen).<</if>>
-	<<elseif $slaves[$i].pornTypeSizeQueen > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeSizeQueen>><</if>>
-		<<set $slaves[$i].pornTypeSizeQueen = Math.clamp($slaves[$i].pornTypeSizeQueen-(_decayRate*2), 0, 150000)>>
-		<<if $cheatMode == 1>>Size Queen: (_oldPorn) to ($slaves[$i].pornTypeSizeQueen).<</if>>
+		<<if $cheatMode == 1>>Size Queen: (_oldPorn) to ($slaves[$i].porn.fame.sizeQueen).<</if>>
+	<<elseif $slaves[$i].porn.fame.sizeQueen > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.sizeQueen>><</if>>
+		<<set $slaves[$i].porn.fame.sizeQueen = Math.clamp($slaves[$i].porn.fame.sizeQueen-(_decayRate*2), 0, 150000)>>
+		<<if $cheatMode == 1>>Size Queen: (_oldPorn) to ($slaves[$i].porn.fame.sizeQueen).<</if>>
 	<</if>>
 
-	<<set $slaves[$i].pornFame = $slaves[$i].pornTypeGeneral + $slaves[$i].pornTypeFuckdoll + $slaves[$i].pornTypeRape + $slaves[$i].pornTypePreggo + $slaves[$i].pornTypeBBW + $slaves[$i].pornTypeGainer + $slaves[$i].pornTypeStud + $slaves[$i].pornTypeLoli + $slaves[$i].pornTypeDeepThroat + $slaves[$i].pornTypeStruggleFuck + $slaves[$i].pornTypePainal + $slaves[$i].pornTypeTease + $slaves[$i].pornTypeRomantic + $slaves[$i].pornTypePervert + $slaves[$i].pornTypeCaring + $slaves[$i].pornTypeUnflinching + $slaves[$i].pornTypeSizeQueen + $slaves[$i].pornTypeNeglectful + $slaves[$i].pornTypeCumAddict + $slaves[$i].pornTypeAnalAddict + $slaves[$i].pornTypeAttentionWhore + $slaves[$i].pornTypeBreastGrowth + $slaves[$i].pornTypeAbusive + $slaves[$i].pornTypeMalicious + $slaves[$i].pornTypeSelfHating + $slaves[$i].pornTypeBreeder + $slaves[$i].pornTypeSub + $slaves[$i].pornTypeCumSlut + $slaves[$i].pornTypeAnal + $slaves[$i].pornTypeHumiliation + $slaves[$i].pornTypeBoobs + $slaves[$i].pornTypeDom + $slaves[$i].pornTypeSadist + $slaves[$i].pornTypeMasochist + $slaves[$i].pornTypePregnancy>>
+	<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.general + $slaves[$i].porn.fame.fuckdoll + $slaves[$i].porn.fame.rape + $slaves[$i].porn.fame.preggo + $slaves[$i].porn.fame.BBW + $slaves[$i].porn.fame.gainer + $slaves[$i].porn.fame.stud + $slaves[$i].porn.fame.loli + $slaves[$i].porn.fame.deepThroat + $slaves[$i].porn.fame.struggleFuck + $slaves[$i].porn.fame.painal + $slaves[$i].porn.fame.tease + $slaves[$i].porn.fame.romantic + $slaves[$i].porn.fame.pervert + $slaves[$i].porn.fame.caring + $slaves[$i].porn.fame.unflinching + $slaves[$i].porn.fame.sizeQueen + $slaves[$i].porn.fame.neglectful + $slaves[$i].porn.fame.cumAddict + $slaves[$i].porn.fame.analAddict + $slaves[$i].porn.fame.attentionWhore + $slaves[$i].porn.fame.breastGrowth + $slaves[$i].porn.fame.abusive + $slaves[$i].porn.fame.malicious + $slaves[$i].porn.fame.selfHating + $slaves[$i].porn.fame.breeder + $slaves[$i].porn.fame.sub + $slaves[$i].porn.fame.cumSlut + $slaves[$i].porn.fame.anal + $slaves[$i].porn.fame.humiliation + $slaves[$i].porn.fame.boobs + $slaves[$i].porn.fame.dom + $slaves[$i].porn.fame.sadist + $slaves[$i].porn.fame.masochist + $slaves[$i].porn.fame.pregnancy>>
 	<<set $slaves[$i].pornFame = Math.trunc($slaves[$i].pornFame)>>
 
 	<<if _oldFame > $slaves[$i].pornFame>>
@@ -1054,49 +1054,49 @@
 
 	<<if $slaves[$i].pornPrestige == 0 && $slaves[$i].pornFame >= 10000>>
 		<<set _pornFameGrabBag = []>>
-		<<if $slaves[$i].pornTypeGeneral >= 10000>><<set _pornFameGrabBag.push("generic")>><</if>>
-		<<if $slaves[$i].pornTypeFuckdoll >= 10000>><<set _pornFameGrabBag.push("fuckdoll")>><</if>>
-		<<if $slaves[$i].pornTypeRape >= 10000>><<set _pornFameGrabBag.push("rape")>><</if>>
-		<<if $slaves[$i].pornTypePreggo >= 10000>><<set _pornFameGrabBag.push("preggo")>><</if>>
-		<<if $slaves[$i].pornTypeBBW >= 10000>><<set _pornFameGrabBag.push("BBW")>><</if>>
-		<<if $slaves[$i].pornTypeGainer >= 10000>><<set _pornFameGrabBag.push("weight gain")>><</if>>
-		<<if $slaves[$i].pornTypeStud >= 10000>><<set _pornFameGrabBag.push("big dick")>><</if>>
-		<<if $slaves[$i].pornTypeLoli >= 10000>><<set _pornFameGrabBag.push("underage")>><</if>>
-		<<if $slaves[$i].pornTypeDeepThroat >= 10000>><<set _pornFameGrabBag.push("deepthroat")>><</if>>
-		<<if $slaves[$i].pornTypeStruggleFuck >= 10000>><<set _pornFameGrabBag.push("unwilling")>><</if>>
-		<<if $slaves[$i].pornTypePainal >= 10000>><<set _pornFameGrabBag.push("hardcore anal")>><</if>>
-		<<if $slaves[$i].pornTypeTease >= 10000>><<set _pornFameGrabBag.push("softcore")>><</if>>
-		<<if $slaves[$i].pornTypeRomantic >= 10000>><<set _pornFameGrabBag.push("romantic")>><</if>>
-		<<if $slaves[$i].pornTypePervert >= 10000>><<set _pornFameGrabBag.push("really perverted")>><</if>>
-		<<if $slaves[$i].pornTypeCaring >= 10000>><<set _pornFameGrabBag.push("voyeur")>><</if>>
-		<<if $slaves[$i].pornTypeUnflinching >= 10000>><<set _pornFameGrabBag.push("unspeakable")>><</if>>
-		<<if $slaves[$i].pornTypeSizeQueen >= 10000>><<set _pornFameGrabBag.push("huge insertion")>><</if>>
-		<<if $slaves[$i].pornTypeNeglectful >= 10000>><<set _pornFameGrabBag.push("orgasm denial")>><</if>>
-		<<if $slaves[$i].pornTypeCumAddict >= 10000>><<set _pornFameGrabBag.push("cum addiction")>><</if>>
-		<<if $slaves[$i].pornTypeAnalAddict >= 10000>><<set _pornFameGrabBag.push("anal addiction")>><</if>>
-		<<if $slaves[$i].pornTypeAttentionWhore >= 10000>><<set _pornFameGrabBag.push("exhibition")>><</if>>
-		<<if $slaves[$i].pornTypeBreastGrowth >= 10000>><<set _pornFameGrabBag.push("breast expansion")>><</if>>
-		<<if $slaves[$i].pornTypeAbusive >= 10000>><<set _pornFameGrabBag.push("abuse")>><</if>>
-		<<if $slaves[$i].pornTypeMalicious >= 10000>><<set _pornFameGrabBag.push("sexual torture")>><</if>>
-		<<if $slaves[$i].pornTypeSelfHating >= 10000>><<set _pornFameGrabBag.push("self hating")>><</if>>
-		<<if $slaves[$i].pornTypeBreeder >= 10000>><<set _pornFameGrabBag.push("breeder")>><</if>>
-		<<if $slaves[$i].pornTypeSub >= 10000>><<set _pornFameGrabBag.push("submissive")>><</if>>
-		<<if $slaves[$i].pornTypeCumSlut >= 10000>><<set _pornFameGrabBag.push("cum")>><</if>>
-		<<if $slaves[$i].pornTypeAnal >= 10000>><<set _pornFameGrabBag.push("buttslut")>><</if>>
-		<<if $slaves[$i].pornTypeHumiliation >= 10000>><<set _pornFameGrabBag.push("humiliating")>><</if>>
-		<<if $slaves[$i].pornTypeBoobs >= 10000>><<set _pornFameGrabBag.push("breast")>><</if>>
-		<<if $slaves[$i].pornTypeDom >= 10000>><<set _pornFameGrabBag.push("dominant")>><</if>>
-		<<if $slaves[$i].pornTypeSadist >= 10000>><<set _pornFameGrabBag.push("sadistic")>><</if>>
-		<<if $slaves[$i].pornTypeMasochist >= 10000>><<set _pornFameGrabBag.push("masochistic")>><</if>>
-		<<if $slaves[$i].pornTypePregnancy >= 10000>><<set _pornFameGrabBag.push("pregnancy fetish")>><</if>>
+		<<if $slaves[$i].porn.fame.general >= 10000>><<set _pornFameGrabBag.push("generic")>><</if>>
+		<<if $slaves[$i].porn.fame.fuckdoll >= 10000>><<set _pornFameGrabBag.push("fuckdoll")>><</if>>
+		<<if $slaves[$i].porn.fame.rape >= 10000>><<set _pornFameGrabBag.push("rape")>><</if>>
+		<<if $slaves[$i].porn.fame.preggo >= 10000>><<set _pornFameGrabBag.push("preggo")>><</if>>
+		<<if $slaves[$i].porn.fame.BBW >= 10000>><<set _pornFameGrabBag.push("BBW")>><</if>>
+		<<if $slaves[$i].porn.fame.gainer >= 10000>><<set _pornFameGrabBag.push("weight gain")>><</if>>
+		<<if $slaves[$i].porn.fame.stud >= 10000>><<set _pornFameGrabBag.push("big dick")>><</if>>
+		<<if $slaves[$i].porn.fame.loli >= 10000>><<set _pornFameGrabBag.push("underage")>><</if>>
+		<<if $slaves[$i].porn.fame.deepThroat >= 10000>><<set _pornFameGrabBag.push("deepthroat")>><</if>>
+		<<if $slaves[$i].porn.fame.struggleFuck >= 10000>><<set _pornFameGrabBag.push("unwilling")>><</if>>
+		<<if $slaves[$i].porn.fame.painal >= 10000>><<set _pornFameGrabBag.push("hardcore anal")>><</if>>
+		<<if $slaves[$i].porn.fame.tease >= 10000>><<set _pornFameGrabBag.push("softcore")>><</if>>
+		<<if $slaves[$i].porn.fame.romantic >= 10000>><<set _pornFameGrabBag.push("romantic")>><</if>>
+		<<if $slaves[$i].porn.fame.pervert >= 10000>><<set _pornFameGrabBag.push("really perverted")>><</if>>
+		<<if $slaves[$i].porn.fame.caring >= 10000>><<set _pornFameGrabBag.push("voyeur")>><</if>>
+		<<if $slaves[$i].porn.fame.unflinching >= 10000>><<set _pornFameGrabBag.push("unspeakable")>><</if>>
+		<<if $slaves[$i].porn.fame.sizeQueen >= 10000>><<set _pornFameGrabBag.push("huge insertion")>><</if>>
+		<<if $slaves[$i].porn.fame.neglectful >= 10000>><<set _pornFameGrabBag.push("orgasm denial")>><</if>>
+		<<if $slaves[$i].porn.fame.cumAddict >= 10000>><<set _pornFameGrabBag.push("cum addiction")>><</if>>
+		<<if $slaves[$i].porn.fame.analAddict >= 10000>><<set _pornFameGrabBag.push("anal addiction")>><</if>>
+		<<if $slaves[$i].porn.fame.attentionWhore >= 10000>><<set _pornFameGrabBag.push("exhibition")>><</if>>
+		<<if $slaves[$i].porn.fame.breastGrowth >= 10000>><<set _pornFameGrabBag.push("breast expansion")>><</if>>
+		<<if $slaves[$i].porn.fame.abusive >= 10000>><<set _pornFameGrabBag.push("abuse")>><</if>>
+		<<if $slaves[$i].porn.fame.malicious >= 10000>><<set _pornFameGrabBag.push("sexual torture")>><</if>>
+		<<if $slaves[$i].porn.fame.selfHating >= 10000>><<set _pornFameGrabBag.push("self hating")>><</if>>
+		<<if $slaves[$i].porn.fame.breeder >= 10000>><<set _pornFameGrabBag.push("breeder")>><</if>>
+		<<if $slaves[$i].porn.fame.sub >= 10000>><<set _pornFameGrabBag.push("submissive")>><</if>>
+		<<if $slaves[$i].porn.fame.cumSlut >= 10000>><<set _pornFameGrabBag.push("cum")>><</if>>
+		<<if $slaves[$i].porn.fame.anal >= 10000>><<set _pornFameGrabBag.push("buttslut")>><</if>>
+		<<if $slaves[$i].porn.fame.humiliation >= 10000>><<set _pornFameGrabBag.push("humiliating")>><</if>>
+		<<if $slaves[$i].porn.fame.boobs >= 10000>><<set _pornFameGrabBag.push("breast")>><</if>>
+		<<if $slaves[$i].porn.fame.dom >= 10000>><<set _pornFameGrabBag.push("dominant")>><</if>>
+		<<if $slaves[$i].porn.fame.sadist >= 10000>><<set _pornFameGrabBag.push("sadistic")>><</if>>
+		<<if $slaves[$i].porn.fame.masochist >= 10000>><<set _pornFameGrabBag.push("masochistic")>><</if>>
+		<<if $slaves[$i].porn.fame.pregnancy >= 10000>><<set _pornFameGrabBag.push("pregnancy fetish")>><</if>>
 
 		<<if _pornFameGrabBag.length > 0>>
-			<<set $slaves[$i].pornFameType = _pornFameGrabBag.random()>>
+			<<set $slaves[$i].porn.fameType = _pornFameGrabBag.random()>>
 			<<set $slaves[$i].pornPrestige = 1>>
 
-			@@.green;$He has gained a following in $slaves[$i].pornFameType pornography!@@ Thousands have enjoyed
+			@@.green;$He has gained a following in $slaves[$i].porn.fameType pornography!@@ Thousands have enjoyed
 
-			<<switch $slaves[$i].pornFameType>>
+			<<switch $slaves[$i].porn.fameType>>
 			<<case "generic">>
 				<<set $slaves[$i].pornPrestigeDesc = "She has a following in slave pornography. Thousands have enjoyed the sight of her being used.">>
 				the sight of $him being used,
@@ -1218,370 +1218,370 @@
 	<<elseif $slaves[$i].pornPrestige == 1>>
 		<<set _failedStar = 0, _fameSwap = 0, _swapPoint = 1.2>>
 
-		<<switch $slaves[$i].pornFameType>>
+		<<switch $slaves[$i].porn.fameType>>
 		<<case "generic">>
-			<<if $slaves[$i].pornTypeGeneral >= 50000>>
+			<<if $slaves[$i].porn.fame.general >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sight of her being used.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $him being used, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeGeneral*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him being used, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.general*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeGeneral < 5000>>
+			<<elseif $slaves[$i].porn.fame.general < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "fuckdoll">>
-			<<if $slaves[$i].pornTypeFuckdoll >= 50000>>
+			<<if $slaves[$i].porn.fame.fuckdoll >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "It is well known from its career in slave pornography. Its many fans relish the sight of it being used.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $him being used, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeFuckdoll*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him being used, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.fuckdoll*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeFuckdoll < 5000>>
+			<<elseif $slaves[$i].porn.fame.fuckdoll < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "rape">>
-			<<if $slaves[$i].pornTypeRape >= 50000>>
+			<<if $slaves[$i].porn.fame.rape >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sight of her being raped.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $him being raped, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeRape*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him being raped, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.rape*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeRape < 5000>>
+			<<elseif $slaves[$i].porn.fame.rape < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "preggo">>
-			<<if $slaves[$i].pornTypePreggo >= 50000>>
+			<<if $slaves[$i].porn.fame.preggo >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sight of her swollen with child.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $him swollen with child, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypePreggo*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him swollen with child, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.preggo*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypePreggo < 5000>>
+			<<elseif $slaves[$i].porn.fame.preggo < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "BBW">>
-			<<if $slaves[$i].pornTypeBBW >= 50000>>
+			<<if $slaves[$i].porn.fame.BBW >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish her thick, soft body.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish $his thick and soft body, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeBBW*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his thick and soft body, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.BBW*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeBBW < 5000>>
+			<<elseif $slaves[$i].porn.fame.BBW < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "underage">>
-			<<if $slaves[$i].pornTypeLoli >= 50000>>
+			<<if $slaves[$i].porn.fame.loli >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish her immature body.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish $his immature body, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeLoli*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his immature body, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.loli*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeLoli < 5000>>
+			<<elseif $slaves[$i].porn.fame.loli < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "weight gain">>
-			<<if $slaves[$i].pornTypeGainer >= 50000>>
+			<<if $slaves[$i].porn.fame.gainer >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish how curvy she's gotten.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish how curvy <<print $he>>'s gotten, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeGainer*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish how curvy <<print $he>>'s gotten, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.gainer*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeGainer < 5000>>
+			<<elseif $slaves[$i].porn.fame.gainer < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "big dick">>
-			<<if $slaves[$i].pornTypeStud >= 50000>>
+			<<if $slaves[$i].porn.fame.stud >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sight of her heavy dick.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $his heavy dick, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeStud*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $his heavy dick, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.stud*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeStud < 5000>>
+			<<elseif $slaves[$i].porn.fame.stud < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "deepthroat">>
-			<<if $slaves[$i].pornTypeDeepThroat >= 50000>>
+			<<if $slaves[$i].porn.fame.deepThroat >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sounds she makes when being throatfucked.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sounds $he makes when being throatfucked, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeDeepThroat*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sounds $he makes when being throatfucked, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.deepThroat*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeDeepThroat < 5000>>
+			<<elseif $slaves[$i].porn.fame.deepThroat < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "unwilling">>
-			<<if $slaves[$i].pornTypeStruggleFuck >= 50000>>
+			<<if $slaves[$i].porn.fame.struggleFuck >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish how perfectly she struggles during sex.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish how perfectly $he struggles during sex, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeStruggleFuck*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish how perfectly $he struggles during sex, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.struggleFuck*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeStruggleFuck < 5000>>
+			<<elseif $slaves[$i].porn.fame.struggleFuck < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "hardcore anal">>
-			<<if $slaves[$i].pornTypePainal >= 50000>>
+			<<if $slaves[$i].porn.fame.painal >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish watching her asshole pushed to its limit.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish watching $his asshole pushed to its limit, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypePainal*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish watching $his asshole pushed to its limit, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.painal*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypePainal < 5000>>
+			<<elseif $slaves[$i].porn.fame.painal < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "softcore">>
-			<<if $slaves[$i].pornTypeTease >= 50000>>
+			<<if $slaves[$i].porn.fame.tease >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish her lewd striptease.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish $his lewd striptease, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeTease*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his lewd striptease, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.tease*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeTease < 5000>>
+			<<elseif $slaves[$i].porn.fame.tease < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "romantic">>
-			<<if $slaves[$i].pornTypeRomantic >= 50000>>
+			<<if $slaves[$i].porn.fame.romantic >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the deep bond she shares with her partners.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the deep bond $he shares with $his partners, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeRomantic*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the deep bond $he shares with $his partners, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.romantic*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeRomantic < 5000>>
+			<<elseif $slaves[$i].porn.fame.romantic < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "really perverted">>
-			<<if $slaves[$i].pornTypePervert >= 50000>>
+			<<if $slaves[$i].porn.fame.pervert >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the depths of her perversions.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the depths of $his perversions, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypePervert*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the depths of $his perversions, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.pervert*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypePervert < 5000>>
+			<<elseif $slaves[$i].porn.fame.pervert < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "voyeur">>
-			<<if $slaves[$i].pornTypeCaring >= 50000>>
+			<<if $slaves[$i].porn.fame.caring >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish her devotion to her partners' pleasure.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish $his devotion to $his partners' pleasure, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeCaring*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his devotion to $his partners' pleasure, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.caring*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeCaring < 5000>>
+			<<elseif $slaves[$i].porn.fame.caring < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "unspeakable">>
-			<<if $slaves[$i].pornTypeUnflinching >= 50000>>
+			<<if $slaves[$i].porn.fame.unflinching >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish her willingness to do anything and everything.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish $his willingness to do anything and everything, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeUnflinching*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his willingness to do anything and everything, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.unflinching*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeUnflinching < 5000>>
+			<<elseif $slaves[$i].porn.fame.unflinching < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "huge insertion">>
-			<<if $slaves[$i].pornTypeSizeQueen >= 50000>>
+			<<if $slaves[$i].porn.fame.sizeQueen >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sight of her holes filled to their limits.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $his holes filled to their limits, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeSizeQueen*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $his holes filled to their limits, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.sizeQueen*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeSizeQueen < 5000>>
+			<<elseif $slaves[$i].porn.fame.sizeQueen < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "orgasm denial">>
-			<<if $slaves[$i].pornTypeNeglectful >= 50000>>
+			<<if $slaves[$i].porn.fame.neglectful >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sight of her denying herself pleasure.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $him denying $himself pleasure, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeNeglectful*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him denying $himself pleasure, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.neglectful*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeNeglectful < 5000>>
+			<<elseif $slaves[$i].porn.fame.neglectful < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "cum addiction">>
-			<<if $slaves[$i].pornTypeCumAddict >= 50000>>
+			<<if $slaves[$i].porn.fame.cumAddict >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sight of her doing anything for cum.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $him doing anything for cum, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeCumAddict*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him doing anything for cum, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.cumAddict*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeCumAddict < 5000>>
+			<<elseif $slaves[$i].porn.fame.cumAddict < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "anal addiction">>
-			<<if $slaves[$i].pornTypeAnalAddict >= 50000>>
+			<<if $slaves[$i].porn.fame.analAddict >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sight of her doing anything for a dick up her ass.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $him doing anything for a dick up $his ass, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeAnalAddict*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him doing anything for a dick up $his ass, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.analAddict*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeAnalAddict < 5000>>
+			<<elseif $slaves[$i].porn.fame.analAddict < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "exhibition">>
-			<<if $slaves[$i].pornTypeAttentionWhore >= 50000>>
+			<<if $slaves[$i].porn.fame.attentionWhore >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sight of her doing anything for attention.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $him doing anything for attention, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeAttentionWhore*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him doing anything for attention, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.attentionWhore*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeAttentionWhore < 5000>>
+			<<elseif $slaves[$i].porn.fame.attentionWhore < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "breast expansion">>
-			<<if $slaves[$i].pornTypeBreastGrowth >= 50000>>
+			<<if $slaves[$i].porn.fame.breastGrowth >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sight of her expanding bust.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $his expanding bust, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeBreastGrowth*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $his expanding bust, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.breastGrowth*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeBreastGrowth < 5000>>
+			<<elseif $slaves[$i].porn.fame.breastGrowth < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "abuse">>
-			<<if $slaves[$i].pornTypeAbusive >= 50000>>
+			<<if $slaves[$i].porn.fame.abusive >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sight of her abusing others.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $him abusing others, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeAbusive*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him abusing others, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.abusive*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeAbusive < 5000>>
+			<<elseif $slaves[$i].porn.fame.abusive < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "sexual torture">>
-			<<if $slaves[$i].pornTypeMalicious >= 50000>>
+			<<if $slaves[$i].porn.fame.malicious >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sight of her getting off from the suffering she caused.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $him getting off from the suffering $he caused, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeMalicious*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him getting off from the suffering $he caused, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.malicious*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeMalicious < 5000>>
+			<<elseif $slaves[$i].porn.fame.malicious < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "self hating">>
-			<<if $slaves[$i].pornTypeSelfHating >= 50000>>
+			<<if $slaves[$i].porn.fame.selfHating >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish her suffering.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish $his suffering, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeSelfHating*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his suffering, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.selfHating*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeSelfHating < 5000>>
+			<<elseif $slaves[$i].porn.fame.selfHating < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "breeder">>
-			<<if $slaves[$i].pornTypeBreeder >= 50000>>
+			<<if $slaves[$i].porn.fame.breeder >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish her obsession with having children.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish $his obsession with having children, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeBreeder*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his obsession with having children, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.breeder*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeBreeder < 5000>>
+			<<elseif $slaves[$i].porn.fame.breeder < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "submissive">>
-			<<if $slaves[$i].pornTypeSub >= 50000>>
+			<<if $slaves[$i].porn.fame.sub >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish her submissiveness.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish $his submissiveness, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeSub*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his submissiveness, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.sub*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeSub < 5000>>
+			<<elseif $slaves[$i].porn.fame.sub < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "cum">>
-			<<if $slaves[$i].pornTypeCumSlut >= 50000>>
+			<<if $slaves[$i].porn.fame.cumSlut >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish her desire for cum.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish $his desire for cum, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeCumSlut*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his desire for cum, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.cumSlut*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeCumSlut < 5000>>
+			<<elseif $slaves[$i].porn.fame.cumSlut < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "buttslut">>
-			<<if $slaves[$i].pornTypeAnal >= 50000>>
+			<<if $slaves[$i].porn.fame.anal >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sight of her rear.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $his rear, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeAnal*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $his rear, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.anal*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeAnal < 5000>>
+			<<elseif $slaves[$i].porn.fame.anal < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "humiliating">>
-			<<if $slaves[$i].pornTypeHumiliation >= 50000>>
+			<<if $slaves[$i].porn.fame.humiliation >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish her frequent humiliation.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish $his frequent humiliation, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeHumiliation*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his frequent humiliation, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.humiliation*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeHumiliation < 5000>>
+			<<elseif $slaves[$i].porn.fame.humiliation < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "breast">>
-			<<if $slaves[$i].pornTypeBoobs >= 50000>>
+			<<if $slaves[$i].porn.fame.boobs >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish the sight of her breasts.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish the sight of $his breasts, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeBoobs*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $his breasts, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.boobs*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeBoobs < 5000>>
+			<<elseif $slaves[$i].porn.fame.boobs < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "dominant">>
-			<<if $slaves[$i].pornTypeDom >= 50000>>
+			<<if $slaves[$i].porn.fame.dom >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish her dominance.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish $his dominance, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeDom*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his dominance, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.dom*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeDom < 5000>>
+			<<elseif $slaves[$i].porn.fame.dom < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "sadistic">>
-			<<if $slaves[$i].pornTypeSadist >= 50000>>
+			<<if $slaves[$i].porn.fame.sadist >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish her sadism.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish $his sadism, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeSadist*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his sadism, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.sadist*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeSadist < 5000>>
+			<<elseif $slaves[$i].porn.fame.sadist < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "masochistic">>
-			<<if $slaves[$i].pornTypeMasochist >= 50000>>
+			<<if $slaves[$i].porn.fame.masochist >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish her masochism.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish $his masochism, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypeMasochist*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his masochism, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.masochist*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypeMasochist < 5000>>
+			<<elseif $slaves[$i].porn.fame.masochist < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "pregnancy fetish">>
-			<<if $slaves[$i].pornTypePregnancy >= 50000>>
+			<<if $slaves[$i].porn.fame.pregnancy >= 50000>>
 				<<set $slaves[$i].pornPrestige = 2>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is well known from her career in slave pornography. Her many fans relish her fondness for pregnancy.">>
-				@@.green;$He has gained a hold in $slaves[$i].pornFameType pornography!@@ $His many fans relish $his fondness for pregnancy, so it is now prestigious to own $him.
-			<<elseif _topFame.value >= $slaves[$i].pornTypePregnancy*_swapPoint>>
+				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his fondness for pregnancy, so it is now prestigious to own $him.
+			<<elseif _topFame.value >= $slaves[$i].porn.fame.pregnancy*_swapPoint>>
 				<<set _fameSwap = 1>>
-			<<elseif $slaves[$i].pornTypePregnancy < 5000>>
+			<<elseif $slaves[$i].porn.fame.pregnancy < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<default>>
 			@@.red;No porn fame detected, reseting to "none".@@
-			<<set $slaves[$i].pornPrestige = 0, $slaves[$i].pornPrestigeDesc = 0, $slaves[$i].pornFameType = "none">>
+			<<set $slaves[$i].pornPrestige = 0, $slaves[$i].pornPrestigeDesc = 0, $slaves[$i].porn.fameType = "none">>
 		<</switch>>
 
 		<<if _failedStar == 1>>
 			<<set $slaves[$i].pornPrestige = 0, $slaves[$i].pornPrestigeDesc = 0>>
-			@@.red;$His popularity in $slaves[$i].pornFameType pornography has faded.@@ $He is once again relatively unknown.
-			<<set $slaves[$i].pornFameType = "none">>
+			@@.red;$His popularity in $slaves[$i].porn.fameType pornography has faded.@@ $He is once again relatively unknown.
+			<<set $slaves[$i].porn.fameType = "none">>
 		<</if>>
 		<<if _fameSwap == 1>>
-			$His fame in $slaves[$i].pornFameType pornography has been overwhelmed by $his surging popularity in other aspects. @@.yellow;$He is now better known for $his _topFame.type porn.@@
-			<<set $slaves[$i].pornFameType = _topFame.type>>
+			$His fame in $slaves[$i].porn.fameType pornography has been overwhelmed by $his surging popularity in other aspects. @@.yellow;$He is now better known for $his _topFame.type porn.@@
+			<<set $slaves[$i].porn.fameType = _topFame.type>>
 			<<switch _topFame.type>>
 			<<case "generic">>
 				<<set $slaves[$i].pornPrestigeDesc = "She has a following in slave pornography. Thousands have enjoyed the sight of her being used.">>
@@ -1667,391 +1667,391 @@
 	<<elseif $slaves[$i].pornPrestige == 2>>
 		<<set _failedStar = 0>>
 
-		<<switch $slaves[$i].pornFameType>>
+		<<switch $slaves[$i].porn.fameType>>
 		<<case "generic">>
-			<<if $slaves[$i].pornTypeGeneral >= 150000 && $pornStarID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeGeneral = 250000, $pornStarID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeGeneral>>
+			<<if $slaves[$i].porn.fame.general >= 150000 && $pornStarID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.general = 250000, $pornStarID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.general>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her mid-coitus.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the sight of $him mid-coitus, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him mid-coitus, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her mid-coitus">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeGeneral < 40000>>
+			<<elseif $slaves[$i].porn.fame.general < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "fuckdoll">>
-			<<if $slaves[$i].pornTypeFuckdoll >= 150000 && $pornStarFuckdollID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeFuckdoll = 250000, $pornStarFuckdollID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeFuckdoll>>
+			<<if $slaves[$i].porn.fame.fuckdoll >= 150000 && $pornStarFuckdollID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.fuckdoll = 250000, $pornStarFuckdollID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.fuckdoll>>
 				<<set $slaves[$i].pornPrestigeDesc = "It is world famous for its career in slave pornography. Millions are intimately familiar with the sight of it being used.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the sight of $him being used, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him being used, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing it offering itself">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeFuckdoll < 40000>>
+			<<elseif $slaves[$i].porn.fame.fuckdoll < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "rape">>
-			<<if $slaves[$i].pornTypeRape >= 150000 && $pornStarRapeID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeRape = 250000, $pornStarRapeID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeRape>>
+			<<if $slaves[$i].porn.fame.rape >= 150000 && $pornStarRapeID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.rape = 250000, $pornStarRapeID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.rape>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her being raped.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the sight of $him being raped, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him being raped, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her rape">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeRape < 40000>>
+			<<elseif $slaves[$i].porn.fame.rape < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "preggo">>
-			<<if $slaves[$i].pornTypePreggo >= 150000 && $pornStarPreggoID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypePreggo = 250000, $pornStarPreggoID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypePreggo>>
+			<<if $slaves[$i].porn.fame.preggo >= 150000 && $pornStarPreggoID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.preggo = 250000, $pornStarPreggoID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.preggo>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her swollen with child.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the sight of $him swollen with child, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him swollen with child, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her cradling her middle">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypePreggo < 40000>>
+			<<elseif $slaves[$i].porn.fame.preggo < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "BBW">>
-			<<if $slaves[$i].pornTypeBBW >= 150000 && $pornStarBBWID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeBBW = 250000, $pornStarBBWID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeBBW>>
+			<<if $slaves[$i].porn.fame.BBW >= 150000 && $pornStarBBWID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.BBW = 250000, $pornStarBBWID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.BBW>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her thick, soft body.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his thick and soft body, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his thick and soft body, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her giving a bellyjob">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypePreggo < 40000>>
+			<<elseif $slaves[$i].porn.fame.preggo < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "underage">>
-			<<if $slaves[$i].pornTypeLoli >= 150000 && $pornStarLoliID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeLoli = 250000, $pornStarLoliID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeLoli>>
+			<<if $slaves[$i].porn.fame.loli >= 150000 && $pornStarLoliID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.loli = 250000, $pornStarLoliID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.loli>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her immature body.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his immature body, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his immature body, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her 'innocence'">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeLoli < 40000>>
+			<<elseif $slaves[$i].porn.fame.loli < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "weight gain">>
-			<<if $slaves[$i].pornTypeGainer >= 150000 && $pornStarGainerID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeGainer = 250000, $pornStarGainerID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeGainer>>
+			<<if $slaves[$i].porn.fame.gainer >= 150000 && $pornStarGainerID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.gainer = 250000, $pornStarGainerID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.gainer>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with how with how much weight she has gained.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with how much weight<<print $he>>'s put on, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with how much weight<<print $he>>'s put on, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her trying on her old clothes">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeGainer < 40000>>
+			<<elseif $slaves[$i].porn.fame.gainer < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "big dick">>
-			<<if $slaves[$i].pornTypeStud >= 150000 && $pornStarStudID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeStud = 250000, $pornStarStudID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeStud>>
+			<<if $slaves[$i].porn.fame.stud >= 150000 && $pornStarStudID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.stud = 250000, $pornStarStudID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.stud>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her erect dick.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the sight of $his erect dick, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $his erect dick, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her money shot">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeStud < 40000>>
+			<<elseif $slaves[$i].porn.fame.stud < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "deepthroat">>
-			<<if $slaves[$i].pornTypeDeepThroat >= 150000 && $pornStarDeepThroatID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeDeepThroat = 250000, $pornStarDeepThroatID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeDeepThroat>>
+			<<if $slaves[$i].porn.fame.deepThroat >= 150000 && $pornStarDeepThroatID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.deepThroat = 250000, $pornStarDeepThroatID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.deepThroat>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the sounds she makes when being throatfucked.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the sounds $he makes when being throatfucked, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sounds $he makes when being throatfucked, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her getting facefucked">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeDeepThroat < 40000>>
+			<<elseif $slaves[$i].porn.fame.deepThroat < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "unwilling">>
-			<<if $slaves[$i].pornTypeStruggleFuck >= 150000 && $pornStarStruggleFuckID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeStruggleFuck = 250000, $pornStarStruggleFuckID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeStruggleFuck>>
+			<<if $slaves[$i].porn.fame.struggleFuck >= 150000 && $pornStarStruggleFuckID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.struggleFuck = 250000, $pornStarStruggleFuckID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.struggleFuck>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with how perfectly she struggles during sex.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with how perfectly $he struggles during sex, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with how perfectly $he struggles during sex, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her struggling">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeStruggleFuck < 40000>>
+			<<elseif $slaves[$i].porn.fame.struggleFuck < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "hardcore anal">>
-			<<if $slaves[$i].pornTypePainal >= 150000 && $pornStarPainalID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypePainal = 250000, $pornStarPainalID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypePainal>>
+			<<if $slaves[$i].porn.fame.painal >= 150000 && $pornStarPainalID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.painal = 250000, $pornStarPainalID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.painal>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with seeing her asshole pushed to its limit.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with seeing $his asshole pushed to its limit, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with seeing $his asshole pushed to its limit, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her taking an enormous dick up her ass">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypePainal < 40000>>
+			<<elseif $slaves[$i].porn.fame.painal < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "softcore">>
-			<<if $slaves[$i].pornTypeTease >= 150000 && $pornStarTeaseID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeTease = 250000, $pornStarTeaseID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeTease>>
+			<<if $slaves[$i].porn.fame.tease >= 150000 && $pornStarTeaseID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.tease = 250000, $pornStarTeaseID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.tease>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her lewd striptease.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his lewd striptease, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his lewd striptease, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her stripping">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeTease < 40000>>
+			<<elseif $slaves[$i].porn.fame.tease < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "romantic">>
-			<<if $slaves[$i].pornTypeRomantic >= 150000 && $pornStarRomanticID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeRomantic = 250000, $pornStarRomanticID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeRomantic>>
+			<<if $slaves[$i].porn.fame.romantic >= 150000 && $pornStarRomanticID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.romantic = 250000, $pornStarRomanticID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.romantic>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the deep bond she shares with her partners.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the deep bond $he shares with her partners, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the deep bond $he shares with her partners, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her sharing an orgasm with her partner">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeRomantic < 40000>>
+			<<elseif $slaves[$i].porn.fame.romantic < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "really perverted">>
-			<<if $slaves[$i].pornTypePervert >= 150000 && $pornStarPervertID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypePervert = 250000, $pornStarPervertID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypePervert>>
+			<<if $slaves[$i].porn.fame.pervert >= 150000 && $pornStarPervertID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.pervert = 250000, $pornStarPervertID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.pervert>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the depths of her perversions.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the depths of $his perversions, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the depths of $his perversions, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her doing something perverted">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypePervert < 40000>>
+			<<elseif $slaves[$i].porn.fame.pervert < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "voyeur">>
-			<<if $slaves[$i].pornTypeCaring >= 150000 && $pornStarCaringID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeCaring = 250000, $pornStarCaringID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeCaring>>
+			<<if $slaves[$i].porn.fame.caring >= 150000 && $pornStarCaringID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.caring = 250000, $pornStarCaringID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.caring>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her devotion to her partners' pleasure.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his devotion to $his partners' pleasure, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his devotion to $his partners' pleasure, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her bringing her partner to orgasm">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeCaring < 40000>>
+			<<elseif $slaves[$i].porn.fame.caring < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "unspeakable">>
-			<<if $slaves[$i].pornTypeUnflinching >= 150000 && $pornStarUnflinchingID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeUnflinching = 250000, $pornStarUnflinchingID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeUnflinching>>
+			<<if $slaves[$i].porn.fame.unflinching >= 150000 && $pornStarUnflinchingID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.unflinching = 250000, $pornStarUnflinchingID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.unflinching>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her willingness to do things not repeated in polite company.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his willingness to do things not repeated in polite company, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his willingness to do things not repeated in polite company, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her doing something unmentionable">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeUnflinching < 40000>>
+			<<elseif $slaves[$i].porn.fame.unflinching < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "huge insertion">>
-			<<if $slaves[$i].pornTypeSizeQueen >= 150000 && $pornStarSizeQueenID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeSizeQueen = 250000, $pornStarSizeQueenID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeSizeQueen>>
+			<<if $slaves[$i].porn.fame.sizeQueen >= 150000 && $pornStarSizeQueenID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.sizeQueen = 250000, $pornStarSizeQueenID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.sizeQueen>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her holes filled to their limits.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the sight of $his holes filled to their limits, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $his holes filled to their limits, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her belly bulging from within">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeSizeQueen < 40000>>
+			<<elseif $slaves[$i].porn.fame.sizeQueen < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "orgasm denial">>
-			<<if $slaves[$i].pornTypeNeglectful >= 150000 && $pornStarNeglectfulID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeNeglectful = 250000, $pornStarNeglectfulID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeNeglectful>>
+			<<if $slaves[$i].porn.fame.neglectful >= 150000 && $pornStarNeglectfulID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.neglectful = 250000, $pornStarNeglectfulID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.neglectful>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her denying herself pleasure.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the sight of $him denying $himself pleasure, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him denying $himself pleasure, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her pleasing a line of partners without cumming once">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeNeglectful < 40000>>
+			<<elseif $slaves[$i].porn.fame.neglectful < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "cum addiction">>
-			<<if $slaves[$i].pornTypeCumAddict >= 150000 && $pornStarCumAddictID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeCumAddict = 250000, $pornStarCumAddictID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeCumAddict>>
+			<<if $slaves[$i].porn.fame.cumAddict >= 150000 && $pornStarCumAddictID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.cumAddict = 250000, $pornStarCumAddictID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.cumAddict>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her doing anything for cum.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the sight of $him doing anything for cum, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him doing anything for cum, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her bathing in a tub of cum">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeCumAddict < 40000>>
+			<<elseif $slaves[$i].porn.fame.cumAddict < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "anal addiction">>
-			<<if $slaves[$i].pornTypeAnalAddict >= 150000 && $pornStarAnalAddictID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeAnalAddict = 250000, $pornStarAnalAddictID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeAnalAddict>>
+			<<if $slaves[$i].porn.fame.analAddict >= 150000 && $pornStarAnalAddictID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.analAddict = 250000, $pornStarAnalAddictID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.analAddict>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her well-versed anus.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the sight of $him doing anything for a dick up $his ass, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him doing anything for a dick up $his ass, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her taking a series of huge cocks up her ass">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeAnalAddict < 40000>>
+			<<elseif $slaves[$i].porn.fame.analAddict < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "exhibition">>
-			<<if $slaves[$i].pornTypeAttentionWhore >= 150000 && $pornStarAttentionWhoreID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeAttentionWhore = 250000, $pornStarAttentionWhoreID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeAttentionWhore>>
+			<<if $slaves[$i].porn.fame.attentionWhore >= 150000 && $pornStarAttentionWhoreID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.attentionWhore = 250000, $pornStarAttentionWhoreID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.attentionWhore>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her doing anything for attention.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the sight of $him going to any length for attention, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him going to any length for attention, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her flashing strangers">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeAttentionWhore < 40000>>
+			<<elseif $slaves[$i].porn.fame.attentionWhore < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "breast expansion">>
-			<<if $slaves[$i].pornTypeBreastGrowth >= 150000 && $pornStarBreastGrowthID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeBreastGrowth = 250000, $pornStarBreastGrowthID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeBreastGrowth>>
+			<<if $slaves[$i].porn.fame.breastGrowth >= 150000 && $pornStarBreastGrowthID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.breastGrowth = 250000, $pornStarBreastGrowthID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.breastGrowth>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the history of her growing bust.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with history of $his growing bust, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with history of $his growing bust, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her having her tits measured">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeBreastGrowth < 40000>>
+			<<elseif $slaves[$i].porn.fame.breastGrowth < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "abuse">>
-			<<if $slaves[$i].pornTypeAbusive >= 150000 && $pornStarAbusiveID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeAbusive = 250000, $pornStarAbusiveID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeAbusive>>
+			<<if $slaves[$i].porn.fame.abusive >= 150000 && $pornStarAbusiveID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.abusive = 250000, $pornStarAbusiveID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.abusive>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her abusive tendencies.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his abusive tendencies, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his abusive tendencies, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " taking what she wants by force">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeAbusive < 40000>>
+			<<elseif $slaves[$i].porn.fame.abusive < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "sexual torture">>
-			<<if $slaves[$i].pornTypeMalicious >= 150000 && $pornStarMaliciousID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeMalicious = 250000, $pornStarMaliciousID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeMalicious>>
+			<<if $slaves[$i].porn.fame.malicious >= 150000 && $pornStarMaliciousID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.malicious = 250000, $pornStarMaliciousID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.malicious>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her hunger for making others suffer.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the sight of $him torturing others, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him torturing others, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her tormenting her prey">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeMalicious < 40000>>
+			<<elseif $slaves[$i].porn.fame.malicious < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "self hating">>
-			<<if $slaves[$i].pornTypeSelfHating >= 150000 && $pornStarSelfHatingID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeSelfHating = 250000, $pornStarSelfHatingID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeSelfHating>>
+			<<if $slaves[$i].porn.fame.selfHating >= 150000 && $pornStarSelfHatingID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.selfHating = 250000, $pornStarSelfHatingID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.selfHating>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her suffering.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the sight of $him suffering, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him suffering, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her orgasming from pain">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeSelfHating < 40000>>
+			<<elseif $slaves[$i].porn.fame.selfHating < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "breeder">>
-			<<if $slaves[$i].pornTypeBreeder >= 150000 && $pornStarBreederID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeBreeder = 250000, $pornStarBreederID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeBreeder>>
+			<<if $slaves[$i].porn.fame.breeder >= 150000 && $pornStarBreederID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.breeder = 250000, $pornStarBreederID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.breeder>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her obsession with being pregnant.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his obsession with having children, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his obsession with having children, so it is now extremely prestigious to own $him.
 				<<if $slaves[$i].births > 0>>
 					<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her having an orgasmic birth">>
 				<<else>>
 					<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her being bred">>
 				<</if>>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeBreeder < 40000>>
+			<<elseif $slaves[$i].porn.fame.breeder < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "submissive">>
-			<<if $slaves[$i].pornTypeSub >= 150000 && $pornStarSubID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeSub = 250000, $pornStarSubID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeSub>>
+			<<if $slaves[$i].porn.fame.sub >= 150000 && $pornStarSubID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.sub = 250000, $pornStarSubID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.sub>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her submissiveness.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his submissiveness, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his submissiveness, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her submission">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeSub < 40000>>
+			<<elseif $slaves[$i].porn.fame.sub < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "cum">>
-			<<if $slaves[$i].pornTypeCumSlut >= 150000 && $pornStarCumSlutID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeCumSlut = 250000, $pornStarCumSlutID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeCumSlut>>
+			<<if $slaves[$i].porn.fame.cumSlut >= 150000 && $pornStarCumSlutID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.cumSlut = 250000, $pornStarCumSlutID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.cumSlut>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her taste for cum.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his taste for cum, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his taste for cum, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her drinking a glass of cum">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeCumSlut < 40000>>
+			<<elseif $slaves[$i].porn.fame.cumSlut < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "buttslut">>
-			<<if $slaves[$i].pornTypeAnal >= 150000 && $pornStarAnalID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeAnal = 250000, $pornStarAnalID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeAnal>>
+			<<if $slaves[$i].porn.fame.anal >= 150000 && $pornStarAnalID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.anal = 250000, $pornStarAnalID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.anal>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her rear.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with the sight of $his rear, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $his rear, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her shaking her booty">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeAnal < 40000>>
+			<<elseif $slaves[$i].porn.fame.anal < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "humiliating">>
-			<<if $slaves[$i].pornTypeHumiliation >= 150000 && $pornStarHumiliationID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeHumiliation = 250000, $pornStarHumiliationID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeHumiliation>>
+			<<if $slaves[$i].porn.fame.humiliation >= 150000 && $pornStarHumiliationID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.humiliation = 250000, $pornStarHumiliationID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.humiliation>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her frequent humiliation.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his frequent humiliation, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his frequent humiliation, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her humiliated in public">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeHumiliation < 40000>>
+			<<elseif $slaves[$i].porn.fame.humiliation < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "breast">>
-			<<if $slaves[$i].pornTypeBoobs >= 150000 && $pornStarBoobsID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeBoobs = 250000, $pornStarBoobsID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeBoobs>>
+			<<if $slaves[$i].porn.fame.boobs >= 150000 && $pornStarBoobsID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.boobs = 250000, $pornStarBoobsID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.boobs>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her breasts.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his breasts, so it is now extremely prestigious to own $him, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his breasts, so it is now extremely prestigious to own $him, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her bare chest">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeBoobs < 40000>>
+			<<elseif $slaves[$i].porn.fame.boobs < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "dominant">>
-			<<if $slaves[$i].pornTypeDom >= 150000 && $pornStarDomID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeDom = 250000, $pornStarDomID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeDom>>
+			<<if $slaves[$i].porn.fame.dom >= 150000 && $pornStarDomID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.dom = 250000, $pornStarDomID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.dom>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her dominant streak.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his dominant streak, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his dominant streak, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her seated upon her obedient toy">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeDom < 40000>>
+			<<elseif $slaves[$i].porn.fame.dom < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "sadistic">>
-			<<if $slaves[$i].pornTypeSadist >= 150000 && $pornStarSadistID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeSadist = 250000, $pornStarSadistID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeSadist>>
+			<<if $slaves[$i].porn.fame.sadist >= 150000 && $pornStarSadistID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.sadist = 250000, $pornStarSadistID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.sadist>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her sadistic streak.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his sadistic streak, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his sadistic streak, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her whipping her lover">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeSadist < 40000>>
+			<<elseif $slaves[$i].porn.fame.sadist < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "masochistic">>
-			<<if $slaves[$i].pornTypeMasochist >= 150000 && $pornStarMasochistID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypeMasochist = 250000, $pornStarMasochistID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypeMasochist>>
+			<<if $slaves[$i].porn.fame.masochist >= 150000 && $pornStarMasochistID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.masochist = 250000, $pornStarMasochistID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.masochist>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her masochistic streak.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his masochistic streak, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his masochistic streak, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her being whipped">>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypeMasochist < 40000>>
+			<<elseif $slaves[$i].porn.fame.masochist < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "pregnancy fetish">>
-			<<if $slaves[$i].pornTypePregnancy >= 150000 && $pornStarPregnancyID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].pornTypePregnancy = 250000, $pornStarPregnancyID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].pornTypePregnancy>>
+			<<if $slaves[$i].porn.fame.pregnancy >= 150000 && $pornStarPregnancyID == 0>>
+				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.pregnancy = 250000, $pornStarPregnancyID = $slaves[$i].ID>>
+				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.pregnancy>>
 				<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her pregnancy kink.">>
-				@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his pregnancy kink, so it is now extremely prestigious to own $him.
+				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his pregnancy kink, so it is now extremely prestigious to own $him.
 				<<if $slaves[$i].ovaries == 1 || $slaves[$i].mpreg == 1>>
 					<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her getting knocked up">>
 				<<elseif $slaves[$i].dick > 0>>
@@ -2060,18 +2060,18 @@
 					<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her pretending to be pregnant">>
 				<</if>>
 				<<set $trinkets.push(_desc)>>
-			<<elseif $slaves[$i].pornTypePregnancy < 40000>>
+			<<elseif $slaves[$i].porn.fame.pregnancy < 40000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<default>>
 			@@.red;No porn fame detected, reseting to "none".@@
-			<<set $slaves[$i].pornPrestige = 0, $slaves[$i].pornPrestigeDesc = 0, $slaves[$i].pornFameType = "none">>
+			<<set $slaves[$i].pornPrestige = 0, $slaves[$i].pornPrestigeDesc = 0, $slaves[$i].porn.fameType = "none">>
 		<</switch>>
 
 		<<if _failedStar == 1>>
 			<<set $slaves[$i].pornPrestige = 1>>
-			@@.red;$His popularity in $slaves[$i].pornFameType pornography has dropped considerably,@@ though $he still retains a core fanbase.
-			<<switch $slaves[$i].pornFameType>>
+			@@.red;$His popularity in $slaves[$i].porn.fameType pornography has dropped considerably,@@ though $he still retains a core fanbase.
+			<<switch $slaves[$i].porn.fameType>>
 			<<case "generic">>
 				<<set $slaves[$i].pornPrestigeDesc = "She has a following in slave pornography. Thousands have enjoyed the sight of her being used.">>
 			<<case "fuckdoll">>
@@ -2161,415 +2161,415 @@
 		<<set _decayRate = 30>>
 	<</if>>
 
-	<<if $slaves[$i].pornTypeNeglectful > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeNeglectful>><</if>>
-		<<set $slaves[$i].pornTypeNeglectful = Math.clamp($slaves[$i].pornTypeNeglectful-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Neglectful: (_oldPorn) to ($slaves[$i].pornTypeNeglectful).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeCumAddict > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeCumAddict>><</if>>
-		<<set $slaves[$i].pornTypeCumAddict = Math.clamp($slaves[$i].pornTypeCumAddict-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Cum Addict: (_oldPorn) to ($slaves[$i].pornTypeCumAddict).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeAnalAddict > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeAnalAddict>><</if>>
-		<<set $slaves[$i].pornTypeAnalAddict = Math.clamp($slaves[$i].pornTypeAnalAddict-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Anal Addict: (_oldPorn) to ($slaves[$i].pornTypeAnalAddict).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeAttentionWhore > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeAttentionWhore>><</if>>
-		<<set $slaves[$i].pornTypeAttentionWhore = Math.clamp($slaves[$i].pornTypeAttentionWhore-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Attention Whore: (_oldPorn) to ($slaves[$i].pornTypeAttentionWhore).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeBreastGrowth > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeBreastGrowth>><</if>>
-		<<set $slaves[$i].pornTypeBreastGrowth = Math.clamp($slaves[$i].pornTypeBreastGrowth-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Breast Growth: (_oldPorn) to ($slaves[$i].pornTypeBreastGrowth).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeAbusive > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeAbusive>><</if>>
-		<<set $slaves[$i].pornTypeAbusive = Math.clamp($slaves[$i].pornTypeAbusive-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Abusive: (_oldPorn) to ($slaves[$i].pornTypeAbusive).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeMalicious > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeMalicious>><</if>>
-		<<set $slaves[$i].pornTypeMalicious = Math.clamp($slaves[$i].pornTypeMalicious-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Malicious: (_oldPorn) to ($slaves[$i].pornTypeMalicious).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeSelfHating > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeSelfHating>><</if>>
-		<<set $slaves[$i].pornTypeSelfHating = Math.clamp($slaves[$i].pornTypeSelfHating-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Self Hating: (_oldPorn) to ($slaves[$i].pornTypeSelfHating).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeBreeder > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeBreeder>><</if>>
-		<<set $slaves[$i].pornTypeBreeder = Math.clamp($slaves[$i].pornTypeBreeder-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Breeder: (_oldPorn) to ($slaves[$i].pornTypeBreeder).<</if>>
-	<</if>>
-
-	<<if $slaves[$i].pornTypeSub > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeSub>><</if>>
-		<<set $slaves[$i].pornTypeSub = Math.clamp($slaves[$i].pornTypeSub-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Submissive: (_oldPorn) to ($slaves[$i].pornTypeSub).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeCumSlut > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeCumSlut>><</if>>
-		<<set $slaves[$i].pornTypeCumSlut = Math.clamp($slaves[$i].pornTypeCumSlut-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Cumslut: (_oldPorn) to ($slaves[$i].pornTypeCumSlut).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeAnal > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeAnal>><</if>>
-		<<set $slaves[$i].pornTypeAnal = Math.clamp($slaves[$i].pornTypeAnal-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>(_oldPorn) to ($slaves[$i].pornTypeAnal).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeHumiliation > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeHumiliation>><</if>>
-		<<set $slaves[$i].pornTypeHumiliation = Math.clamp($slaves[$i].pornTypeHumiliation-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Humiliation: (_oldPorn) to ($slaves[$i].pornTypeHumiliation).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeBoobs > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeBoobs>><</if>>
-		<<set $slaves[$i].pornTypeBoobs = Math.clamp($slaves[$i].pornTypeBoobs-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Boobs: (_oldPorn) to ($slaves[$i].pornTypeBoobs).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeDom > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeDom>><</if>>
-		<<set $slaves[$i].pornTypeDom = Math.clamp($slaves[$i].pornTypeDom-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Dom: (_oldPorn) to ($slaves[$i].pornTypeDom).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeSadist > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeSadist>><</if>>
-		<<set $slaves[$i].pornTypeSadist = Math.clamp($slaves[$i].pornTypeSadist-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Sadist: (_oldPorn) to ($slaves[$i].pornTypeSadist).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeMasochist > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeMasochist>><</if>>
-		<<set $slaves[$i].pornTypeMasochist = Math.clamp($slaves[$i].pornTypeMasochist-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Masochist: (_oldPorn) to ($slaves[$i].pornTypeMasochist).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypePregnancy > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypePregnancy>><</if>>
-		<<set $slaves[$i].pornTypePregnancy = Math.clamp($slaves[$i].pornTypePregnancy-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Pregnancy: (_oldPorn) to ($slaves[$i].pornTypePregnancy).<</if>>
-	<</if>>
-
-	<<if $slaves[$i].pornTypeFuckdoll > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeFuckdoll>><</if>>
-		<<set $slaves[$i].pornTypeFuckdoll = Math.clamp($slaves[$i].pornTypeFuckdoll-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Fuckdoll: (_oldPorn) to ($slaves[$i].pornTypeFuckdoll).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeRape > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeRape>><</if>>
-		<<set $slaves[$i].pornTypeRape = Math.clamp($slaves[$i].pornTypeRape-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Rape: (_oldPorn) to ($slaves[$i].pornTypeRape).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypePreggo > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypePreggo>><</if>>
-		<<set $slaves[$i].pornTypePreggo = Math.clamp($slaves[$i].pornTypePreggo-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Preggo: (_oldPorn) to ($slaves[$i].pornTypePreggo).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeBBW > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeBBW>><</if>>
-		<<set $slaves[$i].pornTypeBBW = Math.clamp($slaves[$i].pornTypeBBW-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>BBW: (_oldPorn) to ($slaves[$i].pornTypeBBW).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeLoli > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeLoli>><</if>>
-		<<set $slaves[$i].pornTypeLoli = Math.clamp($slaves[$i].pornTypeLoli-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Loli: (_oldPorn) to ($slaves[$i].pornTypeLoli).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeGainer > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeGainer>><</if>>
-		<<set $slaves[$i].pornTypeGainer = Math.clamp($slaves[$i].pornTypeGainer-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Gainer: (_oldPorn) to ($slaves[$i].pornTypeGainer).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeStud > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeStud>><</if>>
-		<<set $slaves[$i].pornTypeStud = Math.clamp($slaves[$i].pornTypeStud-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Big Dick: (_oldPorn) to ($slaves[$i].pornTypeStud).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeGeneral > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeGeneral>><</if>>
-		<<set $slaves[$i].pornTypeGeneral = Math.clamp($slaves[$i].pornTypeGeneral-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>(_oldPorn) to ($slaves[$i].pornTypeGeneral).<</if>>
-	<</if>>
-
-	<<if $slaves[$i].pornTypeDeepThroat > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeDeepThroat>><</if>>
-		<<set $slaves[$i].pornTypeDeepThroat = Math.clamp($slaves[$i].pornTypeDeepThroat-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Gagfuck Queen: (_oldPorn) to ($slaves[$i].pornTypeDeepThroat).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeStruggleFuck > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeStruggleFuck>><</if>>
-		<<set $slaves[$i].pornTypeStruggleFuck = Math.clamp($slaves[$i].pornTypeStruggleFuck-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Strugglefuck Queen: (_oldPorn) to ($slaves[$i].pornTypeStruggleFuck).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypePainal > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypePainal>><</if>>
-		<<set $slaves[$i].pornTypePainal = Math.clamp($slaves[$i].pornTypePainal-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Strugglefuck Queen: (_oldPorn) to ($slaves[$i].pornTypePainal).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeTease > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeTease>><</if>>
-		<<set $slaves[$i].pornTypeTease = Math.clamp($slaves[$i].pornTypeTease-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Tease: (_oldPorn) to ($slaves[$i].pornTypeTease).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeRomantic > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeRomantic>><</if>>
-		<<set $slaves[$i].pornTypeRomantic = Math.clamp($slaves[$i].pornTypeRomantic-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Romantic: (_oldPorn) to ($slaves[$i].pornTypeRomantic).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypePervert > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypePervert>><</if>>
-		<<set $slaves[$i].pornTypePervert = Math.clamp($slaves[$i].pornTypePervert-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Perverted: (_oldPorn) to ($slaves[$i].pornTypePervert).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeCaring > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeCaring>><</if>>
-		<<set $slaves[$i].pornTypeCaring = Math.clamp($slaves[$i].pornTypeCaring-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Caring: (_oldPorn) to ($slaves[$i].pornTypeCaring).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeUnflinching > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeUnflinching>><</if>>
-		<<set $slaves[$i].pornTypeUnflinching = Math.clamp($slaves[$i].pornTypeUnflinching-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Unflinching: (_oldPorn) to ($slaves[$i].pornTypeUnflinching).<</if>>
-	<</if>>
-	<<if $slaves[$i].pornTypeSizeQueen > 0>>
-		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].pornTypeSizeQueen>><</if>>
-		<<set $slaves[$i].pornTypeSizeQueen = Math.clamp($slaves[$i].pornTypeSizeQueen-(_decayRate*2), 0, 100000)>>
-		<<if $cheatMode == 1>>Size Queen: (_oldPorn) to ($slaves[$i].pornTypeSizeQueen).<</if>>
-	<</if>>
-
-	<<set $slaves[$i].pornFame = $slaves[$i].pornTypeGeneral + $slaves[$i].pornTypeFuckdoll + $slaves[$i].pornTypeRape + $slaves[$i].pornTypePreggo + $slaves[$i].pornTypeBBW + $slaves[$i].pornTypeGainer + $slaves[$i].pornTypeStud + $slaves[$i].pornTypeLoli + $slaves[$i].pornTypeDeepThroat + $slaves[$i].pornTypeStruggleFuck + $slaves[$i].pornTypePainal + $slaves[$i].pornTypeTease + $slaves[$i].pornTypeRomantic + $slaves[$i].pornTypePervert + $slaves[$i].pornTypeCaring + $slaves[$i].pornTypeUnflinching + $slaves[$i].pornTypeSizeQueen + $slaves[$i].pornTypeNeglectful + $slaves[$i].pornTypeCumAddict + $slaves[$i].pornTypeAnalAddict + $slaves[$i].pornTypeAttentionWhore + $slaves[$i].pornTypeBreastGrowth + $slaves[$i].pornTypeAbusive + $slaves[$i].pornTypeMalicious + $slaves[$i].pornTypeSelfHating + $slaves[$i].pornTypeBreeder + $slaves[$i].pornTypeSub + $slaves[$i].pornTypeCumSlut + $slaves[$i].pornTypeAnal + $slaves[$i].pornTypeHumiliation + $slaves[$i].pornTypeBoobs + $slaves[$i].pornTypeDom + $slaves[$i].pornTypeSadist + $slaves[$i].pornTypeMasochist + $slaves[$i].pornTypePregnancy>>
+	<<if $slaves[$i].porn.fame.neglectful > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.neglectful>><</if>>
+		<<set $slaves[$i].porn.fame.neglectful = Math.clamp($slaves[$i].porn.fame.neglectful-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Neglectful: (_oldPorn) to ($slaves[$i].porn.fame.neglectful).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.cumAddict > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.cumAddict>><</if>>
+		<<set $slaves[$i].porn.fame.cumAddict = Math.clamp($slaves[$i].porn.fame.cumAddict-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Cum Addict: (_oldPorn) to ($slaves[$i].porn.fame.cumAddict).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.analAddict > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.analAddict>><</if>>
+		<<set $slaves[$i].porn.fame.analAddict = Math.clamp($slaves[$i].porn.fame.analAddict-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Anal Addict: (_oldPorn) to ($slaves[$i].porn.fame.analAddict).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.attentionWhore > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.attentionWhore>><</if>>
+		<<set $slaves[$i].porn.fame.attentionWhore = Math.clamp($slaves[$i].porn.fame.attentionWhore-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Attention Whore: (_oldPorn) to ($slaves[$i].porn.fame.attentionWhore).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.breastGrowth > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.breastGrowth>><</if>>
+		<<set $slaves[$i].porn.fame.breastGrowth = Math.clamp($slaves[$i].porn.fame.breastGrowth-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Breast Growth: (_oldPorn) to ($slaves[$i].porn.fame.breastGrowth).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.abusive > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.abusive>><</if>>
+		<<set $slaves[$i].porn.fame.abusive = Math.clamp($slaves[$i].porn.fame.abusive-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Abusive: (_oldPorn) to ($slaves[$i].porn.fame.abusive).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.malicious > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.malicious>><</if>>
+		<<set $slaves[$i].porn.fame.malicious = Math.clamp($slaves[$i].porn.fame.malicious-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Malicious: (_oldPorn) to ($slaves[$i].porn.fame.malicious).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.selfHating > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.selfHating>><</if>>
+		<<set $slaves[$i].porn.fame.selfHating = Math.clamp($slaves[$i].porn.fame.selfHating-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Self Hating: (_oldPorn) to ($slaves[$i].porn.fame.selfHating).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.breeder > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.breeder>><</if>>
+		<<set $slaves[$i].porn.fame.breeder = Math.clamp($slaves[$i].porn.fame.breeder-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Breeder: (_oldPorn) to ($slaves[$i].porn.fame.breeder).<</if>>
+	<</if>>
+
+	<<if $slaves[$i].porn.fame.sub > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.sub>><</if>>
+		<<set $slaves[$i].porn.fame.sub = Math.clamp($slaves[$i].porn.fame.sub-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Submissive: (_oldPorn) to ($slaves[$i].porn.fame.sub).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.cumSlut > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.cumSlut>><</if>>
+		<<set $slaves[$i].porn.fame.cumSlut = Math.clamp($slaves[$i].porn.fame.cumSlut-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Cumslut: (_oldPorn) to ($slaves[$i].porn.fame.cumSlut).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.anal > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.anal>><</if>>
+		<<set $slaves[$i].porn.fame.anal = Math.clamp($slaves[$i].porn.fame.anal-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>(_oldPorn) to ($slaves[$i].porn.fame.anal).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.humiliation > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.humiliation>><</if>>
+		<<set $slaves[$i].porn.fame.humiliation = Math.clamp($slaves[$i].porn.fame.humiliation-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Humiliation: (_oldPorn) to ($slaves[$i].porn.fame.humiliation).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.boobs > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.boobs>><</if>>
+		<<set $slaves[$i].porn.fame.boobs = Math.clamp($slaves[$i].porn.fame.boobs-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Boobs: (_oldPorn) to ($slaves[$i].porn.fame.boobs).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.dom > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.dom>><</if>>
+		<<set $slaves[$i].porn.fame.dom = Math.clamp($slaves[$i].porn.fame.dom-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Dom: (_oldPorn) to ($slaves[$i].porn.fame.dom).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.sadist > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.sadist>><</if>>
+		<<set $slaves[$i].porn.fame.sadist = Math.clamp($slaves[$i].porn.fame.sadist-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Sadist: (_oldPorn) to ($slaves[$i].porn.fame.sadist).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.masochist > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.masochist>><</if>>
+		<<set $slaves[$i].porn.fame.masochist = Math.clamp($slaves[$i].porn.fame.masochist-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Masochist: (_oldPorn) to ($slaves[$i].porn.fame.masochist).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.pregnancy > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.pregnancy>><</if>>
+		<<set $slaves[$i].porn.fame.pregnancy = Math.clamp($slaves[$i].porn.fame.pregnancy-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Pregnancy: (_oldPorn) to ($slaves[$i].porn.fame.pregnancy).<</if>>
+	<</if>>
+
+	<<if $slaves[$i].porn.fame.fuckdoll > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.fuckdoll>><</if>>
+		<<set $slaves[$i].porn.fame.fuckdoll = Math.clamp($slaves[$i].porn.fame.fuckdoll-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Fuckdoll: (_oldPorn) to ($slaves[$i].porn.fame.fuckdoll).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.rape > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.rape>><</if>>
+		<<set $slaves[$i].porn.fame.rape = Math.clamp($slaves[$i].porn.fame.rape-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Rape: (_oldPorn) to ($slaves[$i].porn.fame.rape).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.preggo > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.preggo>><</if>>
+		<<set $slaves[$i].porn.fame.preggo = Math.clamp($slaves[$i].porn.fame.preggo-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Preggo: (_oldPorn) to ($slaves[$i].porn.fame.preggo).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.BBW > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.BBW>><</if>>
+		<<set $slaves[$i].porn.fame.BBW = Math.clamp($slaves[$i].porn.fame.BBW-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>BBW: (_oldPorn) to ($slaves[$i].porn.fame.BBW).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.loli > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.loli>><</if>>
+		<<set $slaves[$i].porn.fame.loli = Math.clamp($slaves[$i].porn.fame.loli-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Loli: (_oldPorn) to ($slaves[$i].porn.fame.loli).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.gainer > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.gainer>><</if>>
+		<<set $slaves[$i].porn.fame.gainer = Math.clamp($slaves[$i].porn.fame.gainer-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Gainer: (_oldPorn) to ($slaves[$i].porn.fame.gainer).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.stud > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.stud>><</if>>
+		<<set $slaves[$i].porn.fame.stud = Math.clamp($slaves[$i].porn.fame.stud-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Big Dick: (_oldPorn) to ($slaves[$i].porn.fame.stud).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.general > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.general>><</if>>
+		<<set $slaves[$i].porn.fame.general = Math.clamp($slaves[$i].porn.fame.general-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>(_oldPorn) to ($slaves[$i].porn.fame.general).<</if>>
+	<</if>>
+
+	<<if $slaves[$i].porn.fame.deepThroat > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.deepThroat>><</if>>
+		<<set $slaves[$i].porn.fame.deepThroat = Math.clamp($slaves[$i].porn.fame.deepThroat-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Gagfuck Queen: (_oldPorn) to ($slaves[$i].porn.fame.deepThroat).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.struggleFuck > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.struggleFuck>><</if>>
+		<<set $slaves[$i].porn.fame.struggleFuck = Math.clamp($slaves[$i].porn.fame.struggleFuck-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Strugglefuck Queen: (_oldPorn) to ($slaves[$i].porn.fame.struggleFuck).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.painal > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.painal>><</if>>
+		<<set $slaves[$i].porn.fame.painal = Math.clamp($slaves[$i].porn.fame.painal-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Strugglefuck Queen: (_oldPorn) to ($slaves[$i].porn.fame.painal).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.tease > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.tease>><</if>>
+		<<set $slaves[$i].porn.fame.tease = Math.clamp($slaves[$i].porn.fame.tease-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Tease: (_oldPorn) to ($slaves[$i].porn.fame.tease).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.romantic > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.romantic>><</if>>
+		<<set $slaves[$i].porn.fame.romantic = Math.clamp($slaves[$i].porn.fame.romantic-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Romantic: (_oldPorn) to ($slaves[$i].porn.fame.romantic).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.pervert > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.pervert>><</if>>
+		<<set $slaves[$i].porn.fame.pervert = Math.clamp($slaves[$i].porn.fame.pervert-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Perverted: (_oldPorn) to ($slaves[$i].porn.fame.pervert).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.caring > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.caring>><</if>>
+		<<set $slaves[$i].porn.fame.caring = Math.clamp($slaves[$i].porn.fame.caring-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Caring: (_oldPorn) to ($slaves[$i].porn.fame.caring).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.unflinching > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.unflinching>><</if>>
+		<<set $slaves[$i].porn.fame.unflinching = Math.clamp($slaves[$i].porn.fame.unflinching-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Unflinching: (_oldPorn) to ($slaves[$i].porn.fame.unflinching).<</if>>
+	<</if>>
+	<<if $slaves[$i].porn.fame.sizeQueen > 0>>
+		<<if $cheatMode == 1>><<set _oldPorn = $slaves[$i].porn.fame.sizeQueen>><</if>>
+		<<set $slaves[$i].porn.fame.sizeQueen = Math.clamp($slaves[$i].porn.fame.sizeQueen-(_decayRate*2), 0, 100000)>>
+		<<if $cheatMode == 1>>Size Queen: (_oldPorn) to ($slaves[$i].porn.fame.sizeQueen).<</if>>
+	<</if>>
+
+	<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.general + $slaves[$i].porn.fame.fuckdoll + $slaves[$i].porn.fame.rape + $slaves[$i].porn.fame.preggo + $slaves[$i].porn.fame.BBW + $slaves[$i].porn.fame.gainer + $slaves[$i].porn.fame.stud + $slaves[$i].porn.fame.loli + $slaves[$i].porn.fame.deepThroat + $slaves[$i].porn.fame.struggleFuck + $slaves[$i].porn.fame.painal + $slaves[$i].porn.fame.tease + $slaves[$i].porn.fame.romantic + $slaves[$i].porn.fame.pervert + $slaves[$i].porn.fame.caring + $slaves[$i].porn.fame.unflinching + $slaves[$i].porn.fame.sizeQueen + $slaves[$i].porn.fame.neglectful + $slaves[$i].porn.fame.cumAddict + $slaves[$i].porn.fame.analAddict + $slaves[$i].porn.fame.attentionWhore + $slaves[$i].porn.fame.breastGrowth + $slaves[$i].porn.fame.abusive + $slaves[$i].porn.fame.malicious + $slaves[$i].porn.fame.selfHating + $slaves[$i].porn.fame.breeder + $slaves[$i].porn.fame.sub + $slaves[$i].porn.fame.cumSlut + $slaves[$i].porn.fame.anal + $slaves[$i].porn.fame.humiliation + $slaves[$i].porn.fame.boobs + $slaves[$i].porn.fame.dom + $slaves[$i].porn.fame.sadist + $slaves[$i].porn.fame.masochist + $slaves[$i].porn.fame.pregnancy>>
 	<<set $slaves[$i].pornFame = Math.trunc($slaves[$i].pornFame)>>
 
 	<<if $slaves[$i].pornPrestige > 0>>
 		<<set _failedStar = 0>>
 
-		<<switch $slaves[$i].pornFameType>>
+		<<switch $slaves[$i].porn.fameType>>
 		<<case "generic">>
-			<<if $slaves[$i].pornTypeGeneral < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.general < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeGeneral < 5000>>
+			<<elseif $slaves[$i].porn.fame.general < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "fuckdoll">>
-			<<if $slaves[$i].pornTypeFuckdoll < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.fuckdoll < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeFuckdoll < 5000>>
+			<<elseif $slaves[$i].porn.fame.fuckdoll < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "rape">>
-			<<if $slaves[$i].pornTypeRape < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.rape < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeRape < 5000>>
+			<<elseif $slaves[$i].porn.fame.rape < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "preggo">>
-			<<if $slaves[$i].pornTypePreggo < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.preggo < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypePreggo < 5000>>
+			<<elseif $slaves[$i].porn.fame.preggo < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "BBW">>
-			<<if $slaves[$i].pornTypePreggo < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.preggo < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypePreggo < 5000>>
+			<<elseif $slaves[$i].porn.fame.preggo < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "underage">>
-			<<if $slaves[$i].pornTypeLoli < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.loli < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeLoli < 5000>>
+			<<elseif $slaves[$i].porn.fame.loli < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "weight gain">>
-			<<if $slaves[$i].pornTypeGainer < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.gainer < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeGainer < 5000>>
+			<<elseif $slaves[$i].porn.fame.gainer < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "big dick">>
-			<<if $slaves[$i].pornTypeStud < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.stud < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeStud < 5000>>
+			<<elseif $slaves[$i].porn.fame.stud < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "deepthroat">>
-			<<if $slaves[$i].pornTypeDeepThroat < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.deepThroat < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeDeepThroat < 5000>>
+			<<elseif $slaves[$i].porn.fame.deepThroat < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "unwilling">>
-			<<if $slaves[$i].pornTypeStruggleFuck < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.struggleFuck < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeStruggleFuck < 5000>>
+			<<elseif $slaves[$i].porn.fame.struggleFuck < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "hardcore anal">>
-			<<if $slaves[$i].pornTypePainal < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.painal < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypePainal < 5000>>
+			<<elseif $slaves[$i].porn.fame.painal < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "softcore">>
-			<<if $slaves[$i].pornTypeTease < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.tease < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeTease < 5000>>
+			<<elseif $slaves[$i].porn.fame.tease < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "romantic">>
-			<<if $slaves[$i].pornTypeRomantic < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.romantic < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeRomantic < 5000>>
+			<<elseif $slaves[$i].porn.fame.romantic < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "really perverted">>
-			<<if $slaves[$i].pornTypePervert < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.pervert < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypePervert < 5000>>
+			<<elseif $slaves[$i].porn.fame.pervert < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "voyeur">>
-			<<if $slaves[$i].pornTypeCaring < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.caring < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeCaring < 5000>>
+			<<elseif $slaves[$i].porn.fame.caring < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "unspeakable">>
-			<<if $slaves[$i].pornTypeUnflinching < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.unflinching < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeUnflinching < 5000>>
+			<<elseif $slaves[$i].porn.fame.unflinching < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "huge insertion">>
-			<<if $slaves[$i].pornTypeSizeQueen < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.sizeQueen < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeSizeQueen < 5000>>
+			<<elseif $slaves[$i].porn.fame.sizeQueen < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "orgasm denial">>
-			<<if $slaves[$i].pornTypeNeglectful < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.neglectful < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeNeglectful < 5000>>
+			<<elseif $slaves[$i].porn.fame.neglectful < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "cum addiction">>
-			<<if $slaves[$i].pornTypeCumAddict < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.cumAddict < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeCumAddict < 5000>>
+			<<elseif $slaves[$i].porn.fame.cumAddict < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "anal addiction">>
-			<<if $slaves[$i].pornTypeAnalAddict < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.analAddict < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeAnalAddict < 5000>>
+			<<elseif $slaves[$i].porn.fame.analAddict < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "exhibition">>
-			<<if $slaves[$i].pornTypeAttentionWhore < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.attentionWhore < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeAttentionWhore < 5000>>
+			<<elseif $slaves[$i].porn.fame.attentionWhore < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "breast expansion">>
-			<<if $slaves[$i].pornTypeBreastGrowth < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.breastGrowth < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeBreastGrowth < 5000>>
+			<<elseif $slaves[$i].porn.fame.breastGrowth < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "abuse">>
-			<<if $slaves[$i].pornTypeAbusive < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.abusive < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeAbusive < 5000>>
+			<<elseif $slaves[$i].porn.fame.abusive < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "sexual torture">>
-			<<if $slaves[$i].pornTypeMalicious < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.malicious < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeMalicious < 5000>>
+			<<elseif $slaves[$i].porn.fame.malicious < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "self hating">>
-			<<if $slaves[$i].pornTypeSelfHating < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.selfHating < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeSelfHating < 5000>>
+			<<elseif $slaves[$i].porn.fame.selfHating < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "breeder">>
-			<<if $slaves[$i].pornTypeBreeder < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.breeder < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeBreeder < 5000>>
+			<<elseif $slaves[$i].porn.fame.breeder < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "submissive">>
-			<<if $slaves[$i].pornTypeSub < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.sub < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeSub < 5000>>
+			<<elseif $slaves[$i].porn.fame.sub < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "cum">>
-			<<if $slaves[$i].pornTypeCumSlut < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.cumSlut < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeCumSlut < 5000>>
+			<<elseif $slaves[$i].porn.fame.cumSlut < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "buttslut">>
-			<<if $slaves[$i].pornTypeAnal < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.anal < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeAnal < 5000>>
+			<<elseif $slaves[$i].porn.fame.anal < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "humiliating">>
-			<<if $slaves[$i].pornTypeHumiliation < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.humiliation < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeHumiliation < 5000>>
+			<<elseif $slaves[$i].porn.fame.humiliation < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "breast">>
-			<<if $slaves[$i].pornTypeBoobs < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.boobs < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeBoobs < 5000>>
+			<<elseif $slaves[$i].porn.fame.boobs < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "dominant">>
-			<<if $slaves[$i].pornTypeDom < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.dom < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeDom < 5000>>
+			<<elseif $slaves[$i].porn.fame.dom < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "sadistic">>
-			<<if $slaves[$i].pornTypeSadist < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.sadist < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeSadist < 5000>>
+			<<elseif $slaves[$i].porn.fame.sadist < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "masochistic">>
-			<<if $slaves[$i].pornTypeMasochist < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.masochist < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypeMasochist < 5000>>
+			<<elseif $slaves[$i].porn.fame.masochist < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "pregnancy fetish">>
-			<<if $slaves[$i].pornTypePregnancy < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.pregnancy < 40000 && $slaves[$i].pornPrestige == 2>>
 				<<set _failedStar = 2>>
-			<<elseif $slaves[$i].pornTypePregnancy < 5000>>
+			<<elseif $slaves[$i].porn.fame.pregnancy < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<default>>
 			@@.red;No porn fame detected, reseting to "none".@@
-			<<set $slaves[$i].pornPrestige = 0, $slaves[$i].pornPrestigeDesc = 0, $slaves[$i].pornFameType = "none">>
+			<<set $slaves[$i].pornPrestige = 0, $slaves[$i].pornPrestigeDesc = 0, $slaves[$i].porn.fameType = "none">>
 		<</switch>>
 
 		<<if _failedStar == 1>>
 			<<set $slaves[$i].pornPrestige = 0, $slaves[$i].pornPrestigeDesc = 0>>
-			With no new $slaves[$i].pornFameType content coming out, @@.red;$his popularity has faded away.@@
-			<<set $slaves[$i].pornFameType = "none">>
+			With no new $slaves[$i].porn.fameType content coming out, @@.red;$his popularity has faded away.@@
+			<<set $slaves[$i].porn.fameType = "none">>
 		<<elseif _failedStar == 2>>
 			<<set $slaves[$i].pornPrestige = 1>>
-			With the lack of any new content, @@.red;$his popularity in $slaves[$i].pornFameType pornography has dropped considerably,@@ though some viewers still cling to the hope that <<print $he>>'ll come back.
-			<<switch $slaves[$i].pornFameType>>
+			With the lack of any new content, @@.red;$his popularity in $slaves[$i].porn.fameType pornography has dropped considerably,@@ though some viewers still cling to the hope that <<print $he>>'ll come back.
+			<<switch $slaves[$i].porn.fameType>>
 			<<case "generic">>
 				<<set $slaves[$i].pornPrestigeDesc = "She has a following in slave pornography. Thousands have enjoyed the sight of her being used.">>
 			<<case "fuckdoll">>
@@ -2644,4 +2644,4 @@
 		<</if>>
 	<</if>>
 
-<</if>>
\ No newline at end of file
+<</if>>
diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw
index d396524a58ad51221474b634587bd7d1d087ef30..76f8142e4ef631d9e3e4b8a5b27f50c14c2d04b7 100644
--- a/src/pregmod/widgets/bodyswapWidgets.tw
+++ b/src/pregmod/widgets/bodyswapWidgets.tw
@@ -11,43 +11,9 @@
 <<set $args[0].pornFame = $args[1].pornFame>>
 <<set $args[0].pornPrestige = $args[1].pornPrestige>>
 <<set $args[0].pornPrestigeDesc = $args[1].pornPrestigeDesc>>
-<<set $args[0].pornFameType = $args[1].pornFameType>>
-<<set $args[0].pornFocus = "none">>
-<<set $args[0].pornTypeGeneral = $args[1].pornTypeGeneral>>
-<<set $args[0].pornTypeFuckdoll = $args[1].pornTypeFuckdoll>>
-<<set $args[0].pornTypeRape = $args[1].pornTypeRape>>
-<<set $args[0].pornTypePreggo = $args[1].pornTypePreggo>>
-<<set $args[0].pornTypeBBW = $args[1].pornTypeBBW>>
-<<set $args[0].pornTypeGainer = $args[1].pornTypeGainer>>
-<<set $args[0].pornTypeStud = $args[1].pornTypeStud>>
-<<set $args[0].pornTypeLoli = $args[1].pornTypeLoli>>
-<<set $args[0].pornTypeDeepThroat = $args[1].pornTypeDeepThroat>>
-<<set $args[0].pornTypeStruggleFuck = $args[1].pornTypeStruggleFuck>>
-<<set $args[0].pornTypePainal = $args[1].pornTypePainal>>
-<<set $args[0].pornTypeTease = $args[1].pornTypeTease>>
-<<set $args[0].pornTypeRomantic = $args[1].pornTypeRomantic>>
-<<set $args[0].pornTypePervert = $args[1].pornTypePervert>>
-<<set $args[0].pornTypeCaring = $args[1].pornTypeCaring>>
-<<set $args[0].pornTypeUnflinching = $args[1].pornTypeUnflinching>>
-<<set $args[0].pornTypeSizeQueen = $args[1].pornTypeSizeQueen>>
-<<set $args[0].pornTypeNeglectful = $args[1].pornTypeNeglectful>>
-<<set $args[0].pornTypeCumAddict = $args[1].pornTypeCumAddict>>
-<<set $args[0].pornTypeAnalAddict = $args[1].pornTypeAnalAddict>>
-<<set $args[0].pornTypeAttentionWhore = $args[1].pornTypeAttentionWhore>>
-<<set $args[0].pornTypeBreastGrowth = $args[1].pornTypeBreastGrowth>>
-<<set $args[0].pornTypeAbusive = $args[1].pornTypeAbusive>>
-<<set $args[0].pornTypeMalicious = $args[1].pornTypeMalicious>>
-<<set $args[0].pornTypeSelfHating = $args[1].pornTypeSelfHating>>
-<<set $args[0].pornTypeBreeder = $args[1].pornTypeBreeder>>
-<<set $args[0].pornTypeSub = $args[1].pornTypeSub>>
-<<set $args[0].pornTypeCumSlut = $args[1].pornTypeCumSlut>>
-<<set $args[0].pornTypeAnal = $args[1].pornTypeAnal>>
-<<set $args[0].pornTypeHumiliation = $args[1].pornTypeHumiliation>>
-<<set $args[0].pornTypeBoobs = $args[1].pornTypeBoobs>>
-<<set $args[0].pornTypeDom = $args[1].pornTypeDom>>
-<<set $args[0].pornTypeSadist = $args[1].pornTypeSadist>>
-<<set $args[0].pornTypeMasochist = $args[1].pornTypeMasochist>>
-<<set $args[0].pornTypePregnancy = $args[1].pornTypePregnancy>>
+<<set $args[0].porn.fameType = $args[1].porn.fameType>>
+<<set $args[0].porn.focus = "none">>
+<<set $args[0].porn = $args[1].porn>>
 <<set $args[0].prestigeDesc = $args[1].prestigeDesc>>
 <<set $args[0].physicalAge = $args[1].physicalAge>>
 <<set $args[0].visualAge = $args[1].visualAge>>
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index a46c7bad5039d5eee694eea07a3a77960933d473..833ba600628c0d37a43b7172172f32e0339f329e 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -910,7 +910,7 @@ All in all,
 	<<if $arcologies[0].FSRestart != "unset" && $slaves[$i].breedingMark == 1 && $propOutcome == 1 && $slaves[$i].pregSource == -1>>
 		<<set _lostBabies = 1>>
 		$His child<<if _curBabies > 1>>ren<</if>> are collected by the Societal Elite to be raised into upstanding members of the new society.
-	<<elseif $Cash4Babies == 1 && $slaves[_b].pregSource == -9>>
+	<<elseif $Cash4Babies == 1 && $slaves[$i].pregSource == -9>>
 		<<set _lostBabies = 1, _babyCost = random(1000,2500)>>
 		$His <<if _curBabies > 1>>babies were<<else>>baby was<</if>> purchased by the Futanari Sisters for @@.yellowgreen;<<print cashFormat(_curBabies*(_babyCost))>>.@@
 		<<run cashX((_curBabies*(_babyCost)), "babyTransfer")>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 78a049d3f9c79b6334efd87c88425ce80d865289..c2c8ca1991d7d1757c49086cb9eebdab8abf9b2e 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -49,11 +49,11 @@
 	<<unset $badNames>>
 <</if>>
 
-<<if def $origin || def $origins>>
+<<if (def $origin) || def $origins>>
 	<<unset $origin, $origins>>
 <</if>>
 
-<<if def $hare1 || def $hareSpeed1>>
+<<if (def $hare1) || def $hareSpeed1>>
 	<<unset $hare1, $hare2, $hare3, $hareSpeed, $hareSpeed1, $hareSpeed2, $hareSpeed3, $origin1, $origin2, $origin3, $LurcherSpeed>>
 <</if>>
 
@@ -152,16 +152,16 @@
 <<if def $place>>
 	<<unset $place>>
 <</if>>
-<<if def $assayedSlave || def $assayedSlaveAvailable || def $assayType>>
+<<if (def $assayedSlave) || (def $assayedSlaveAvailable) || def $assayType>>
 	<<unset $assayedSlave, $assayedSlaveAvailable, $assayType>>
 <</if>>
-<<if def $RERepressedAnalVirginSub || def $REBoobCollisionSub || def $REIfYouEnjoyItSub || def $RESadisticDescriptionSub || def $REShowerForceSub>>
+<<if (def $RERepressedAnalVirginSub) || (def $REBoobCollisionSub) || (def $REIfYouEnjoyItSub) || (def $RESadisticDescriptionSub) || def $REShowerForceSub>>
 	<<unset $RERepressedAnalVirginSub, $REBoobCollisionSub, $REIfYouEnjoyItSub, $RESadisticDescriptionSub, $REShowerForceSub>>
 <</if>>
-<<if def $unmodded || def $modded || def $XX || def $XY || def $old || def $young || def $pregYes || def $pregNo || def $implanted || def $slimPass || def $slim || def $stacked>>
+<<if (def $unmodded) || (def $modded) || (def $XX) || (def $XY) || (def $old) || (def $young) || (def $pregYes) || (def $pregNo) || (def $implanted) || (def $slimPass) || (def $slim) || def $stacked>>
 	<<unset $unmodded, $modded, $XX, $XY, $old, $young, $pregYes, $pregNo, $implanted, $slimPass, $slim, $stacked>>
 <</if>>
-<<if def $recruiterMother || def $recruiterSister>>
+<<if (def $recruiterMother) || def $recruiterSister>>
 	<<unset $recruiterMother, $recruiterSister>>
 <</if>>
 <<if def $relations>>
@@ -176,19 +176,19 @@
 <<if def $piercingLocation>>
 	<<unset $piercingLocation>>
 <</if>>
-<<if def $target1 || def $target2 || def $target3>>
+<<if (def $target1) || (def $target2) || def $target3>>
 	<<unset $target1, $target2, $target3>>
 <</if>>
-<<if def $targetEscape1 || def $targetEscape2 || def $targetEscape3>>
+<<if (def $targetEscape1) || (def $targetEscape2) || def $targetEscape3>>
 	<<unset $targetEscape1, $targetEscape2, $targetEscape3>>
 <</if>>
-<<if def $oralCount || def $vaginalCount || def $analCount>>
+<<if (def $oralCount) || (def $vaginalCount) || def $analCount>>
 	<<unset $oralCount, $vaginalCount, $analCount>>
 <</if>>
-<<if def $fighterOne || def $fighterTwo>>
+<<if (def $fighterOne) || def $fighterTwo>>
 	<<unset $fighterOne, $fighterTwo>>
 <</if>>
-<<if def $fighterOneDeadliness || def $fighterTwoDeadliness>>
+<<if (def $fighterOneDeadliness) || def $fighterTwoDeadliness>>
 	<<unset $fighterOneDeadliness, $fighterTwoDeadliness>>
 <</if>>
 <<if def $adopted>>
@@ -197,13 +197,13 @@
 <<if def $fetishChangeChance>>
 	<<unset $fetishChangeChance>>
 <</if>>
-<<if def $titles || def $schoolsPresent || def $schoolsPerfected || def $schoolTitle>>
+<<if (def $titles) || (def $schoolsPresent) || (def $schoolsPerfected) || def $schoolTitle>>
 	<<unset $titles, $schoolsPresent, $schoolsPerfected, $schoolTitle>>
 <</if>>
 <<if def $appraiserGender>>
 	<<unset $appraiserGender>>
 <</if>>
-<<if def $assetDirection || def $assetAffected>>
+<<if (def $assetDirection) || def $assetAffected>>
 	<<unset $assetDirection, $assetAffected>>
 <</if>>
 <<if def $rents>>
@@ -1360,7 +1360,7 @@
 	<<set $arcologies[0].leaderID = 0>>
 <</if>>
 
-<<if def $FSSupremacist && $FSSupremacist != "unset">>
+<<if (def $FSSupremacist) && $FSSupremacist != "unset">>
 	<<set $arcologies[0].FSSupremacist = $FSSupremacist>>
 	<<set $arcologies[0].FSSupremacistRace = $FSSupremacistRace>>
 	<<unset $FSSupremacist>>
@@ -1368,7 +1368,7 @@
 <<elseif ndef $arcologies[0].FSSupremacist>>
 	<<set $arcologies[0].FSSupremacist = "unset">>
 <</if>>
-<<if def $FSSupremacistLawME && $FSSupremacistLawME != 0>>
+<<if (def $FSSupremacistLawME) && $FSSupremacistLawME != 0>>
 	<<set $arcologies[0].FSSupremacistLawME = $FSSupremacistLawME>>
 	<<unset $FSSupremacistLawME>>
 <<elseif ndef $arcologies[0].FSSupremacistLawME>>
@@ -1384,7 +1384,7 @@
 	<<set $arcologies[0].FSSupremacistRace = "mixed race">>
 <</if>>
 
-<<if def $FSSubjugationist && $FSSubjugationist != "unset">>
+<<if (def $FSSubjugationist) && $FSSubjugationist != "unset">>
 	<<set $arcologies[0].FSSubjugationist = $FSSubjugationist>>
 	<<set $arcologies[0].FSSubjugationistRace = $FSSubjugationistRace>>
 	<<unset $FSSubjugationist>>
@@ -1392,7 +1392,7 @@
 <<elseif ndef $arcologies[0].FSSubjugationist>>
 	<<set $arcologies[0].FSSubjugationist = "unset">>
 <</if>>
-<<if def $FSSubjugationistLawME && $FSSubjugationistLawME != 0>>
+<<if (def $FSSubjugationistLawME) && $FSSubjugationistLawME != 0>>
 	<<set $arcologies[0].FSSubjugationistLawME = $FSSubjugationistLawME>>
 	<<unset $FSSubjugationistLawME>>
 <<elseif ndef $arcologies[0].FSSubjugationistLawME>>
@@ -1408,42 +1408,42 @@
 	<<set $arcologies[0].FSSubjugationistRace = "mixed race">>
 <</if>>
 
-<<if def $FSDegradationist && $FSDegradationist != "unset">>
+<<if (def $FSDegradationist) && $FSDegradationist != "unset">>
 	<<set $arcologies[0].FSDegradationist = $FSDegradationist>>
 	<<unset $FSDegradationist>>
 <<elseif ndef $arcologies[0].FSDegradationist>>
 	<<set $arcologies[0].FSDegradationist = "unset">>
 <</if>>
 
-<<if def $FSDegradationistLaw && $FSDegradationistLaw != 0>>
+<<if (def $FSDegradationistLaw) && $FSDegradationistLaw != 0>>
 	<<set $arcologies[0].FSDegradationistLaw = $FSDegradationistLaw>>
 	<<unset $FSDegradationistLaw>>
 <<elseif ndef $arcologies[0].FSDegradationistLaw>>
 	<<set $arcologies[0].FSDegradationistLaw = 0>>
 <</if>>
 
-<<if def $FSPaternalist && $FSPaternalist != "unset">>
+<<if (def $FSPaternalist) && $FSPaternalist != "unset">>
 	<<set $arcologies[0].FSPaternalist = $FSPaternalist>>
 	<<unset $FSPaternalist>>
 <<elseif ndef $arcologies[0].FSPaternalist>>
 	<<set $arcologies[0].FSPaternalist = "unset">>
 <</if>>
 
-<<if def $FSPaternalistLaw && $FSPaternalistLaw != 0>>
+<<if (def $FSPaternalistLaw) && $FSPaternalistLaw != 0>>
 	<<set $arcologies[0].FSPaternalistLaw = $FSPaternalistLaw>>
 	<<unset $FSPaternalistLaw>>
 <<elseif ndef $arcologies[0].FSPaternalistLaw>>
 	<<set $arcologies[0].FSPaternalistLaw = 0>>
 <</if>>
 
-<<if def $FSGenderFundamentalist && $FSGenderFundamentalist != "unset">>
+<<if (def $FSGenderFundamentalist) && $FSGenderFundamentalist != "unset">>
 	<<set $arcologies[0].FSGenderFundamentalist = $FSGenderFundamentalist>>
 	<<unset $FSGenderFundamentalist>>
 <<elseif ndef $arcologies[0].FSGenderFundamentalist>>
 	<<set $arcologies[0].FSGenderFundamentalist = "unset">>
 <</if>>
 
-<<if def $FSGenderFundamentalistSMR && $FSGenderFundamentalistSMR != 0>>
+<<if (def $FSGenderFundamentalistSMR) && $FSGenderFundamentalistSMR != 0>>
 	<<set $arcologies[0].FSGenderFundamentalistSMR = $FSGenderFundamentalistSMR>>
 	<<unset $FSGenderFundamentalistSMR>>
 <<elseif ndef $arcologies[0].FSGenderFundamentalistSMR>>
@@ -1453,7 +1453,7 @@
 	<<run delete $arcologies[0].FSGenderFundamentalistLaw>>
 <</if>>
 
-<<if def $FSGenderRadicalist && $FSGenderRadicalist != "unset">>
+<<if (def $FSGenderRadicalist) && $FSGenderRadicalist != "unset">>
 	<<set $arcologies[0].FSGenderRadicalist = $FSGenderRadicalist>>
 	<<unset $FSGenderRadicalist>>
 <<elseif ndef $arcologies[0].FSGenderRadicalist>>
@@ -1475,42 +1475,42 @@
 	<<run delete $arcologies[0].FSGenderRadicalistSMR>>
 <</if>>
 
-<<if def $FSBodyPurist && $FSBodyPurist != "unset">>
+<<if (def $FSBodyPurist) && $FSBodyPurist != "unset">>
 	<<set $arcologies[0].FSBodyPurist = $FSBodyPurist>>
 	<<unset $FSBodyPurist>>
 <<elseif ndef $arcologies[0].FSBodyPurist>>
 	<<set $arcologies[0].FSBodyPurist = "unset">>
 <</if>>
 
-<<if def $FSBodyPuristLaw && $FSBodyPuristLaw != 0>>
+<<if (def $FSBodyPuristLaw) && $FSBodyPuristLaw != 0>>
 	<<set $arcologies[0].FSBodyPuristLaw = $FSBodyPuristLaw>>
 	<<unset $FSBodyPuristLaw>>
 <<elseif ndef $arcologies[0].FSBodyPuristLaw>>
 	<<set $arcologies[0].FSBodyPuristLaw = 0>>
 <</if>>
 
-<<if def $FSPhysicalIdealist && $FSPhysicalIdealist != "unset">>
+<<if (def $FSPhysicalIdealist) && $FSPhysicalIdealist != "unset">>
 	<<set $arcologies[0].FSPhysicalIdealist = $FSPhysicalIdealist>>
 	<<unset $FSPhysicalIdealist>>
 <<elseif ndef $arcologies[0].FSPhysicalIdealist>>
 	<<set $arcologies[0].FSPhysicalIdealist = "unset">>
 <</if>>
 
-<<if def $FSPhysicalIdealistSMR && $FSPhysicalIdealistSMR != 0>>
+<<if (def $FSPhysicalIdealistSMR) && $FSPhysicalIdealistSMR != 0>>
 	<<set $arcologies[0].FSPhysicalIdealistSMR = $FSPhysicalIdealistSMR>>
 	<<unset $FSPhysicalIdealistSMR>>
 <<elseif ndef $arcologies[0].FSPhysicalIdealistSMR>>
 	<<set $arcologies[0].FSPhysicalIdealistSMR = 0>>
 <</if>>
 
-<<if def $FSTransformationFetishist && $FSTransformationFetishist != "unset">>
+<<if (def $FSTransformationFetishist) && $FSTransformationFetishist != "unset">>
 	<<set $arcologies[0].FSTransformationFetishist = $FSTransformationFetishist>>
 	<<unset $FSTransformationFetishist>>
 <<elseif ndef $arcologies[0].FSTransformationFetishist>>
 	<<set $arcologies[0].FSTransformationFetishist = "unset">>
 <</if>>
 
-<<if def $FSTransformationFetishistSMR && $FSTransformationFetishistSMR != 0>>
+<<if (def $FSTransformationFetishistSMR) && $FSTransformationFetishistSMR != 0>>
 	<<set $arcologies[0].FSTransformationFetishistSMR = $FSTransformationFetishistSMR>>
 	<<unset $FSTransformationFetishistSMR>>
 <<elseif ndef $arcologies[0].FSTransformationFetishistSMR>>
@@ -1520,14 +1520,14 @@
 	<<run delete $arcologies[0].FSTransformationFetishistLaw>>
 <</if>>
 
-<<if def $FSAssetExpansionist && $FSAssetExpansionist != "unset">>
+<<if (def $FSAssetExpansionist) && $FSAssetExpansionist != "unset">>
 	<<set $arcologies[0].FSAssetExpansionist = $FSAssetExpansionist>>
 	<<unset $FSAssetExpansionist>>
 <<elseif ndef $arcologies[0].FSAssetExpansionist>>
 	<<set $arcologies[0].FSAssetExpansionist = "unset">>
 <</if>>
 
-<<if def $FSAssetExpansionistSMR && $FSAssetExpansionistSMR != 0>>
+<<if (def $FSAssetExpansionistSMR) && $FSAssetExpansionistSMR != 0>>
 	<<set $arcologies[0].FSAssetExpansionistSMR = $FSAssetExpansionistSMR>>
 	<<unset $FSAssetExpansionistSMR>>
 <<elseif ndef $arcologies[0].FSAssetExpansionistSMR>>
@@ -1537,98 +1537,98 @@
 	<<run delete $arcologies[0].FSAssetExpansionistLaw>>
 <</if>>
 
-<<if def $FSSlimnessEnthusiast && $FSSlimnessEnthusiast != "unset">>
+<<if (def $FSSlimnessEnthusiast) && $FSSlimnessEnthusiast != "unset">>
 	<<set $arcologies[0].FSSlimnessEnthusiast = $FSSlimnessEnthusiast>>
 	<<unset $FSSlimnessEnthusiast>>
 <<elseif ndef $arcologies[0].FSSlimnessEnthusiast>>
 	<<set $arcologies[0].FSSlimnessEnthusiast = "unset">>
 <</if>>
 
-<<if def $FSSlimnessEnthusiastSMR && $FSSlimnessEnthusiastSMR != 0>>
+<<if (def $FSSlimnessEnthusiastSMR) && $FSSlimnessEnthusiastSMR != 0>>
 	<<set $arcologies[0].FSSlimnessEnthusiastSMR = $FSSlimnessEnthusiastSMR>>
 	<<unset $FSSlimnessEnthusiastSMR>>
 <<elseif ndef $arcologies[0].FSSlimnessEnthusiastSMR>>
 	<<set $arcologies[0].FSSlimnessEnthusiastSMR = 0>>
 <</if>>
 
-<<if def $FSMaturityPreferentialist && $FSMaturityPreferentialist != "unset">>
+<<if (def $FSMaturityPreferentialist) && $FSMaturityPreferentialist != "unset">>
 	<<set $arcologies[0].FSMaturityPreferentialist = $FSMaturityPreferentialist>>
 	<<unset $FSMaturityPreferentialist>>
 <<elseif ndef $arcologies[0].FSMaturityPreferentialist>>
 	<<set $arcologies[0].FSMaturityPreferentialist = "unset">>
 <</if>>
 
-<<if def $FSMaturityPreferentialistLaw && $FSMaturityPreferentialistLaw != 0>>
+<<if (def $FSMaturityPreferentialistLaw) && $FSMaturityPreferentialistLaw != 0>>
 	<<set $arcologies[0].FSMaturityPreferentialistLaw = $FSMaturityPreferentialistLaw>>
 	<<unset $FSMaturityPreferentialistLaw>>
 <<elseif ndef $arcologies[0].FSMaturityPreferentialistLaw>>
 	<<set $arcologies[0].FSMaturityPreferentialistLaw = 0>>
 <</if>>
 
-<<if def $FSYouthPreferentialist && $FSYouthPreferentialist != "unset">>
+<<if (def $FSYouthPreferentialist) && $FSYouthPreferentialist != "unset">>
 	<<set $arcologies[0].FSYouthPreferentialist = $FSYouthPreferentialist>>
 	<<unset $FSYouthPreferentialist>>
 <<elseif ndef $arcologies[0].FSYouthPreferentialist>>
 	<<set $arcologies[0].FSYouthPreferentialist = "unset">>
 <</if>>
 
-<<if def $FSYouthPreferentialistLaw && $FSYouthPreferentialistLaw != 0>>
+<<if (def $FSYouthPreferentialistLaw) && $FSYouthPreferentialistLaw != 0>>
 	<<set $arcologies[0].FSYouthPreferentialistLaw = $FSYouthPreferentialistLaw>>
 	<<unset $FSYouthPreferentialistLaw>>
 <<elseif ndef $arcologies[0].FSYouthPreferentialistLaw>>
 	<<set $arcologies[0].FSYouthPreferentialistLaw = 0>>
 <</if>>
 
-<<if def $FSPastoralist && $FSPastoralist != "unset">>
+<<if (def $FSPastoralist) && $FSPastoralist != "unset">>
 	<<set $arcologies[0].FSPastoralist = $FSPastoralist>>
 	<<unset $FSPastoralist>>
 <<elseif ndef $arcologies[0].FSPastoralist>>
 	<<set $arcologies[0].FSPastoralist = "unset">>
 <</if>>
 
-<<if def $FSPastoralistLaw && $FSPastoralistLaw != 0>>
+<<if (def $FSPastoralistLaw) && $FSPastoralistLaw != 0>>
 	<<set $arcologies[0].FSPastoralistLaw = $FSPastoralistLaw>>
 	<<unset $FSPastoralistLaw>>
 <<elseif ndef $arcologies[0].FSPastoralistLaw>>
 	<<set $arcologies[0].FSPastoralistLaw = 0>>
 <</if>>
 
-<<if def $FSChattelReligionist && $FSChattelReligionist != "unset">>
+<<if (def $FSChattelReligionist) && $FSChattelReligionist != "unset">>
 	<<set $arcologies[0].FSChattelReligionist = $FSChattelReligionist>>
 	<<unset $FSChattelReligionist>>
 <<elseif ndef $arcologies[0].FSChattelReligionist>>
 	<<set $arcologies[0].FSChattelReligionist = "unset">>
 <</if>>
 
-<<if def $FSChattelReligionistLaw && $FSChattelReligionistLaw != 0>>
+<<if (def $FSChattelReligionistLaw) && $FSChattelReligionistLaw != 0>>
 	<<set $arcologies[0].FSChattelReligionistLaw = $FSChattelReligionistLaw>>
 	<<unset $FSChattelReligionistLaw>>
 <<elseif ndef $arcologies[0].FSChattelReligionistLaw>>
 	<<set $arcologies[0].FSChattelReligionistLaw = 0>>
 <</if>>
 
-<<if def $FSRomanRevivalist && $FSRomanRevivalist != "unset">>
+<<if (def $FSRomanRevivalist) && $FSRomanRevivalist != "unset">>
 	<<set $arcologies[0].FSRomanRevivalist = $FSRomanRevivalist>>
 	<<unset $FSRomanRevivalist>>
 <<elseif ndef $arcologies[0].FSRomanRevivalist>>
 	<<set $arcologies[0].FSRomanRevivalist = "unset">>
 <</if>>
 
-<<if def $FSRomanRevivalistLaw && $FSRomanRevivalistLaw != 0>>
+<<if (def $FSRomanRevivalistLaw) && $FSRomanRevivalistLaw != 0>>
 	<<set $arcologies[0].FSRomanRevivalistLaw = $FSRomanRevivalistLaw>>
 	<<unset $FSRomanRevivalistLaw>>
 <<elseif ndef $arcologies[0].FSRomanRevivalistLaw>>
 	<<set $arcologies[0].FSRomanRevivalistLaw = 0>>
 <</if>>
 
-<<if def $FSEgyptianRevivalist && $FSEgyptianRevivalist != "unset">>
+<<if (def $FSEgyptianRevivalist) && $FSEgyptianRevivalist != "unset">>
 	<<set $arcologies[0].FSEgyptianRevivalist = $FSEgyptianRevivalist>>
 	<<unset $FSEgyptianRevivalist>>
 <<elseif ndef $arcologies[0].FSEgyptianRevivalist>>
 	<<set $arcologies[0].FSEgyptianRevivalist = "unset">>
 <</if>>
 
-<<if def $FSEgyptianRevivalistLaw && $FSEgyptianRevivalistLaw != 0>>
+<<if (def $FSEgyptianRevivalistLaw) && $FSEgyptianRevivalistLaw != 0>>
 	<<set $arcologies[0].FSEgyptianRevivalistLaw = $FSEgyptianRevivalistLaw>>
 	<<unset $FSEgyptianRevivalistLaw>>
 <<elseif ndef $arcologies[0].FSEgyptianRevivalistLaw>>
@@ -1642,42 +1642,42 @@
 	<<set $arcologies[0].FSEgyptianRevivalistInterest = 0>>
 <</if>>
 
-<<if def $FSEdoRevivalist && $FSEdoRevivalist != "unset">>
+<<if (def $FSEdoRevivalist) && $FSEdoRevivalist != "unset">>
 	<<set $arcologies[0].FSEdoRevivalist = $FSEdoRevivalist>>
 	<<unset $FSEdoRevivalist>>
 <<elseif ndef $arcologies[0].FSEdoRevivalist>>
 	<<set $arcologies[0].FSEdoRevivalist = "unset">>
 <</if>>
 
-<<if def $FSEdoRevivalistLaw && $FSEdoRevivalistLaw != 0>>
+<<if (def $FSEdoRevivalistLaw) && $FSEdoRevivalistLaw != 0>>
 	<<set $arcologies[0].FSEdoRevivalistLaw = $FSEdoRevivalistLaw>>
 	<<unset $FSEdoRevivalistLaw>>
 <<elseif ndef $arcologies[0].FSEdoRevivalistLaw>>
 	<<set $arcologies[0].FSEdoRevivalistLaw = 0>>
 <</if>>
 
-<<if def $FSArabianRevivalist && $FSArabianRevivalist != "unset">>
+<<if (def $FSArabianRevivalist) && $FSArabianRevivalist != "unset">>
 	<<set $arcologies[0].FSArabianRevivalist = $FSArabianRevivalist>>
 	<<unset $FSArabianRevivalist>>
 <<elseif ndef $arcologies[0].FSArabianRevivalist>>
 	<<set $arcologies[0].FSArabianRevivalist = "unset">>
 <</if>>
 
-<<if def $FSArabianRevivalistLaw && $FSArabianRevivalistLaw != 0>>
+<<if (def $FSArabianRevivalistLaw) && $FSArabianRevivalistLaw != 0>>
 	<<set $arcologies[0].FSArabianRevivalistLaw = $FSArabianRevivalistLaw>>
 	<<unset $FSArabianRevivalistLaw>>
 <<elseif ndef $arcologies[0].FSArabianRevivalistLaw>>
 	<<set $arcologies[0].FSArabianRevivalistLaw = 0>>
 <</if>>
 
-<<if def $FSChineseRevivalist && $FSChineseRevivalist != "unset">>
+<<if (def $FSChineseRevivalist) && $FSChineseRevivalist != "unset">>
 	<<set $arcologies[0].FSChineseRevivalist = $FSChineseRevivalist>>
 	<<unset $FSChineseRevivalist>>
 <<elseif ndef $arcologies[0].FSChineseRevivalist>>
 	<<set $arcologies[0].FSChineseRevivalist = "unset">>
 <</if>>
 
-<<if def $FSChineseRevivalistLaw && $FSChineseRevivalistLaw != 0>>
+<<if (def $FSChineseRevivalistLaw) && $FSChineseRevivalistLaw != 0>>
 	<<set $arcologies[0].FSChineseRevivalistLaw = $FSChineseRevivalistLaw>>
 	<<unset $FSChineseRevivalistLaw>>
 <<elseif ndef $arcologies[0].FSChineseRevivalistLaw>>
@@ -2524,10 +2524,10 @@ Setting missing global variables:
 	<<set $NPCSlaves = $ASlaves,
 	$ASlaves += $menials + $fuckdolls + $menialBioreactors>>
 <</if>>
-<<if def $ACitizenLimit || def $ASlaveLimit>>
+<<if (def $ACitizenLimit) || def $ASlaveLimit>>
 	<<unset $ACitizenLimit, $ASlaveLimit>>
 <</if>>
-<<if def $welfare || def $slaveDemandU || def $slaveDemandT|| def $slaveProductivity || def $enslaveChance || def $slaveExpiration>>
+<<if (def $welfare) || (def $slaveDemandU) || def $slaveDemandT|| (def $slaveProductivity) || (def $enslaveChance) || def $slaveExpiration>>
 	<<unset $welfare, $slaveDemandU, $slaveDemandT, $slaveProductivity, $enslaveChance, $slaveExpiration>>
 <</if>>
 
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index 9bc6c000a7ab9ac78361938bda3d5e79e50e2443..7bfe1e20f93d243d6c44fc42e0f264972a8c9b88 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -95,7 +95,7 @@
 <<set $desc = SlaveTitle($activeSlave)>>
 <<run Enunciate($activeSlave)>>
 <<setLocalPronouns $activeSlave>>
-<<if def $slaves[$j] && $slaves[$j] != 0>>
+<<if (def $slaves[$j]) && $slaves[$j] != 0>>
 	<<setLocalPronouns $slaves[$j] 2>>
 <</if>>
 <<setPlayerPronouns>>
@@ -379,7 +379,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 <br><<link "It can wait until after some lovemaking with the Concubine">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	When you enter your suite, the dim light reveals $activeSlave.slaveName waiting with $his beautiful body laid across the bed. When $he <<if canSee($activeSlave)>>sees<<else>>figures out<</if>> the kind of lovemaking you're in the mood for, $he spreads $his arms for you, smiling gently. $He kisses you lovingly, <<if !canTalk($activeSlave)>>taking your hand in $hers and drawing a heart on your palm with one finger.<<else>><<say>>ing, "<<Master>>, I love you."<</if>> <<if ($PC.vagina == 1)>>$He lies on $his side and raises one leg for you so you can straddle the other, sliding up to press your pussy against $his submissive groin. You grind against $him; the stimulation is so strong that $he writhes into the sheets, panting and whining.<<if $PC.dick == 1>> Your stiff dick, unused for once, slides deliciously between your warm bodies.<</if>><<else>><<if ($activeSlave.vagina > 0)>>$His pussy is warm and very wet, making penetration easy; $he gasps and arches $his back, clasping you between $his legs as $his <<eyeColor>> eyes look deep into yours.<<elseif ($activeSlave.anus > 0)>>$His butt is relaxed and welcoming, and $he holds $his legs back to take missionary anal loving as $his <<eyeColor>> eyes look deep into yours.<<else>>$He holds $his thighs together for frottage so $he can love you without losing $his virginity.<</if>><</if>> You both know each other quite well, and maintain the gentle communion for a long time. When $he senses your climax building, $he lets $himself climb to orgasm with you, holding <<if ($PC.dick == 0)>>your hips in $his hands<<else>>you in $his arms<</if>>. $He quickly cleans you with $his mouth and heads to the shower. When $he gets out you're back at work, but $he comes out to @@.hotpink;plant another kiss on you.@@
+	When you enter your suite, the dim light reveals $activeSlave.slaveName waiting with $his beautiful body laid across the bed. When $he <<if canSee($activeSlave)>>sees<<else>>figures out<</if>> the kind of lovemaking you're in the mood for, $he spreads $his arms for you, smiling gently. $He kisses you lovingly, <<if !canTalk($activeSlave)>>taking your hand in $hers and drawing a heart on your palm with one finger.<<else>><<say>>ing, "<<Master>>, I love you."<</if>> <<if ($PC.vagina == 1)>>$He lies on $his side and raises one leg for you so you can straddle the other, sliding up to press your pussy against $his submissive groin. You grind against $him; the stimulation is so strong that $he writhes into the sheets, panting and whining.<<if $PC.dick == 1>> Your stiff dick, unused for once, slides deliciously between your warm bodies.<</if>><<else>><<if ($activeSlave.vagina > 0)>>$His pussy is warm and very wet, making penetration easy; $he gasps and arches $his back, clasping you between $his legs as $his <<= App.Desc.EyeColor>> eyes look deep into yours.<<elseif ($activeSlave.anus > 0)>>$His butt is relaxed and welcoming, and $he holds $his legs back to take missionary anal loving as $his <<= App.Desc.EyeColor>> eyes look deep into yours.<<else>>$He holds $his thighs together for frottage so $he can love you without losing $his virginity.<</if>><</if>> You both know each other quite well, and maintain the gentle communion for a long time. When $he senses your climax building, $he lets $himself climb to orgasm with you, holding <<if ($PC.dick == 0)>>your hips in $his hands<<else>>you in $his arms<</if>>. $He quickly cleans you with $his mouth and heads to the shower. When $he gets out you're back at work, but $he comes out to @@.hotpink;plant another kiss on you.@@
 	<<set $activeSlave.devotion += 10>>
 	<<set $activeSlave.oralCount += 1>>
 	<<set $oralTotal += 1>>
@@ -487,7 +487,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 <<link "Trust $him to tell them">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	You tell $him that you're sure $he'll let them know, since $he understands the situation and knows them all well. $His <<if $activeSlave.visualAge > 35>>mature<<elseif $activeSlave.face > 40>>lovely<<else>>attentive<</if>> face flicks <<if $activeSlave.height >= 185>>over<<else>>up<</if>> to look at you, @@.hotpink;$his <<eyeColor>> eyes glittering at the compliment.@@ "Thank you, <<Master>>," $he murmurs. There's another flash on the horizon, followed by a series of smaller flashes and a low, slowly growing glow as secondaries go off and start a fire. $activeSlave.slaveName seems affected, a certain amount of moisture gathering in $his eyes, but $he turns away to return to $his duties when it becomes clear that you intend to keep watching for a while, and aren't going to have sex with $him right this minute. $He does $his best to communicate the new reality to those of your slaves who are obedient enough to understand the truth: though they are slaves, @@.mediumaquamarine;there is safety to be found in slavery.@@
+	You tell $him that you're sure $he'll let them know, since $he understands the situation and knows them all well. $His <<if $activeSlave.visualAge > 35>>mature<<elseif $activeSlave.face > 40>>lovely<<else>>attentive<</if>> face flicks <<if $activeSlave.height >= 185>>over<<else>>up<</if>> to look at you, @@.hotpink;$his <<= App.Desc.EyeColor>> eyes glittering at the compliment.@@ "Thank you, <<Master>>," $he murmurs. There's another flash on the horizon, followed by a series of smaller flashes and a low, slowly growing glow as secondaries go off and start a fire. $activeSlave.slaveName seems affected, a certain amount of moisture gathering in $his eyes, but $he turns away to return to $his duties when it becomes clear that you intend to keep watching for a while, and aren't going to have sex with $him right this minute. $He does $his best to communicate the new reality to those of your slaves who are obedient enough to understand the truth: though they are slaves, @@.mediumaquamarine;there is safety to be found in slavery.@@
 	<<for $i = 0; $i < _SL; $i++>>
 		<<if $slaves[$i].devotion > 20>>
 			<<set $slaves[$i].trust += 1>>
diff --git a/src/uncategorized/PETS.tw b/src/uncategorized/PETS.tw
index 84330ebad7f264b2245867830159e49a045fbe6a..d847f8e32682abf8877b2ef627538e707e5d9fee 100644
--- a/src/uncategorized/PETS.tw
+++ b/src/uncategorized/PETS.tw
@@ -303,7 +303,10 @@ You decide to knit up care's raveled sleave with a break in the spa. You have yo
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	When $activeSlave.slaveName finishes using $subSlave.slaveName's mouth, $subSlave.slaveName crawls out from under _his2 desk and stumbles back towards _his2 seat. _He2 stops short when _he2 realizes you're sitting in it. All the other students do their absolute best to be perfectly studious as $subSlave.slaveName gets back to _his2 knees, for you this time. After class is over, you tell _him2 that since _he2 can't have been paying particularly good attention, _he2'll have to take @@.green;remedial classes@@ after everyone else is done. $activeSlave.slaveName gives $subSlave.slaveName a very thorough grope at 'remedial classes,' making sure to pinch $his student's nipples.
-	<<set $subSlave.oralCount += 1, $oralTotal += 1, $subSlave.intelligenceImplant += 0.5>>
+	<<set $subSlave.oralCount += 1, $oralTotal += 1>>
+	<<if $subSlave.intelligenceImplant < 29.5>>
+		<<set $subSlave.intelligenceImplant += 0.5>>
+	<</if>>
 	<<set $slaves[$slaveIndices[$subSlave.ID]] = $subSlave>>
 	<</replace>>
 <</link>>
@@ -370,7 +373,7 @@ You decide to knit up care's raveled sleave with a break in the spa. You have yo
 <br><<link "Leave the matter between the Attendant and the slave $he's helping">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	You let $activeSlave.slaveName deal with $subSlave.slaveName's troubles; after a short time $he sends $subSlave.slaveName off to shower, and submerges, swimming over to you under the water. $He pokes out of the water, comically letting a huge mouthful of the warm, healthy mineral water run out of $his mouth in a stream before giggling at $himself and smiling at you. "<<Master>>, would you like me to tell you about $subSlave.slaveName?" $he asks. You shake your head, and tell $him no, you trust $him to do $his best to heal anything that ails $his charges. $He looks at you with huge <<eyeColor>> eyes for a long moment before throwing $his <<if ($activeSlave.weight > 10)>>plush<<else>>taut<</if>> body into your arms. $He looks up at you and asks incredulously, "<<Master>>, you trust me?" You nod. $He looks shocked but kisses you and drops back down under the water. You feel the lovely sensation of $his <<if ($activeSlave.lips > 70)>>massive<<elseif ($activeSlave.lips > 40)>>pillowlike<<else>>nice<</if>> lips <<if ($PC.vagina == 1)>>nibbling their way up towards your clit<<else>>forming a seal around your dickhead<</if>>, and although $he has to come up periodically for air, $he gives you quite a @@.hotpink;loving@@ blowjob.
+	You let $activeSlave.slaveName deal with $subSlave.slaveName's troubles; after a short time $he sends $subSlave.slaveName off to shower, and submerges, swimming over to you under the water. $He pokes out of the water, comically letting a huge mouthful of the warm, healthy mineral water run out of $his mouth in a stream before giggling at $himself and smiling at you. "<<Master>>, would you like me to tell you about $subSlave.slaveName?" $he asks. You shake your head, and tell $him no, you trust $him to do $his best to heal anything that ails $his charges. $He looks at you with huge <<= App.Desc.EyeColor>> eyes for a long moment before throwing $his <<if ($activeSlave.weight > 10)>>plush<<else>>taut<</if>> body into your arms. $He looks up at you and asks incredulously, "<<Master>>, you trust me?" You nod. $He looks shocked but kisses you and drops back down under the water. You feel the lovely sensation of $his <<if ($activeSlave.lips > 70)>>massive<<elseif ($activeSlave.lips > 40)>>pillowlike<<else>>nice<</if>> lips <<if ($PC.vagina == 1)>>nibbling their way up towards your clit<<else>>forming a seal around your dickhead<</if>>, and although $he has to come up periodically for air, $he gives you quite a @@.hotpink;loving@@ blowjob.
 	<<set $activeSlave.devotion += 10>>
 	<</replace>>
 <</link>>
diff --git a/src/uncategorized/RECI.tw b/src/uncategorized/RECI.tw
index 9c3dbbeda74ccec0fd2dcbbf98bf1d4d02460283..e13c3b862a998747d142ce0c4178924a7cbf27ed 100644
--- a/src/uncategorized/RECI.tw
+++ b/src/uncategorized/RECI.tw
@@ -153,7 +153,7 @@ $His $activeSlave.skin face displays nothing but honest gratitude and devotion.
 	$his pathetically limp dick is practically dripping precum
 <<elseif ($activeSlave.clit > 0)>>$his big clit is visibly erect<<else>>a sheen is visible on $his pussylips<</if>>, $his nipples are <<if $activeSlave.nipples != "fuckable">>stiff<<else>>swollen tight<</if>>, and $he's starting to breathe a little hard.
 
-When you finish and send the slave you were boning on their way with a light slap on the rump, you seat yourself to inspect $activeSlave.slaveName. As you do, <<if ($PC.dick == 0)>>your rather realistically modeled phallus dangles between your legs<<else>>your half-hard but still quite imposing cock hangs between your legs<</if>>, still slick from fucking the previous inspectee. $activeSlave.slaveName's <<if canSee($activeSlave)>><<eyeColor>><<else>>blank<</if>> eyes focus on it with painful intensity,
+When you finish and send the slave you were boning on their way with a light slap on the rump, you seat yourself to inspect $activeSlave.slaveName. As you do, <<if ($PC.dick == 0)>>your rather realistically modeled phallus dangles between your legs<<else>>your half-hard but still quite imposing cock hangs between your legs<</if>>, still slick from fucking the previous inspectee. $activeSlave.slaveName's <<if canSee($activeSlave)>><<= App.Desc.EyeColor>><<else>>blank<</if>> eyes focus on it with painful intensity,
 <<if ($activeSlave.chastityPenis == 1)>>
 	and the $desc's chastity cage begins to bother $him even more.
 <<elseif ($activeSlave.dick > 0) && canAchieveErection($activeSlave)>>
@@ -207,7 +207,7 @@ $He arches $his back and bats $his eyes at you. "A lot."
 	poor flaccid member, which $he uses a thumb and forefinger to pull upright.
 <<elseif ($activeSlave.labia > 0)>>pussy, whose lips are so generous that $he uses both hands to peel them apart.<<elseif ($activeSlave.vagina > 1)>>nice big cunt, which $he spreads shamelessly for you.<<else>>tight pussy.<</if>>
 <br><br>
-You often pepper slaves with questions during this inspection; it helps you gauge their mental state, and it's just as important to verbally inspect slaves' minds as it is to visually inspect their parts. You remember with sudden clarity what $activeSlave.slaveName was like when you acquired $him. $He seemed older then.<<if $activeSlave.faceImplant > 0>> $His face has been improved since then, of course, making $him a good deal prettier.<</if>><<if $activeSlave.ageImplant > 0>> The age lift $he received has certainly hidden some of the most evident signs of $his years.<</if>> Decent care, diet, and exercise have done wonders. But more than all of that trivial physical stuff, the sexual hunger visible in $his <<eyeColor>> eyes makes $him look like a teenager. You ask $him if $he remembers what $he was like when you enslaved $him. $He hesitates, wondering how to answer, but decides that honesty is the best policy and <<say>>s, "I remember it every day, <<Master>>. I'm grateful. I didn't think of my<<s>>elf a<<s>> too pretty, then." $He giggles. "Becoming a fuck<<s>>lave really improved my <<s>>elf e<<s>>teem.
+You often pepper slaves with questions during this inspection; it helps you gauge their mental state, and it's just as important to verbally inspect slaves' minds as it is to visually inspect their parts. You remember with sudden clarity what $activeSlave.slaveName was like when you acquired $him. $He seemed older then.<<if $activeSlave.faceImplant > 0>> $His face has been improved since then, of course, making $him a good deal prettier.<</if>><<if $activeSlave.ageImplant > 0>> The age lift $he received has certainly hidden some of the most evident signs of $his years.<</if>> Decent care, diet, and exercise have done wonders. But more than all of that trivial physical stuff, the sexual hunger visible in $his <<= App.Desc.EyeColor>> eyes makes $him look like a teenager. You ask $him if $he remembers what $he was like when you enslaved $him. $He hesitates, wondering how to answer, but decides that honesty is the best policy and <<say>>s, "I remember it every day, <<Master>>. I'm grateful. I didn't think of my<<s>>elf a<<s>> too pretty, then." $He giggles. "Becoming a fuck<<s>>lave really improved my <<s>>elf e<<s>>teem.
 <<if ($activeSlave.energy > 95)>>
 	I can't imagine going back to having a<<s>> little <<s>>e<<x>> a<<s>> I u<<s>>ed to have. It would be awful.
 <<elseif ($activeSlave.fetish == "cumslut") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)>>
@@ -269,7 +269,7 @@ I try to be a good <<s>>lave girl for you, <<Master>>. Can I — can I be a good
 
 <<EventNameLink>> comes in for an inspection. You have a relaxed day scheduled, so you take the time to do an unusually thorough job. On a whim, you pull up $his complete file, flipping the virtual pages out across your desk. The induction pictures are particularly striking. $He doesn't look much like that, anymore, and that's a good thing. $He was not a pretty girl when you got here, though $he's pretty enough now. With a desk control gesture you flip a full frontal shot of $him on the day of $his enslavement up onto a wallscreen.
 <br><br>
-$His <<eyeColor>> eyes track your sudden motion, of course, and $he follows it to the screen. Suddenly, the $desc is eye to eye with a life-size picture of who $he used to be, just a few <<if $showInches == 2>>feet<<else>>meters<</if>> away. $He gasps with recognition, and then $his face clouds inscrutably. $He takes a couple of hesitant steps forward, and then reaches out to touch the cheek of the $girl in the picture. As $his fingertips brush the smooth surface of the wallscreen, $his other hand ghosts along $his own face. $His expression is not sad, so it's surprising when a single tear rolls down $his cheek. You order $him to tell you how the picture makes $him feel.
+$His <<= App.Desc.EyeColor>> eyes track your sudden motion, of course, and $he follows it to the screen. Suddenly, the $desc is eye to eye with a life-size picture of who $he used to be, just a few <<if $showInches == 2>>feet<<else>>meters<</if>> away. $He gasps with recognition, and then $his face clouds inscrutably. $He takes a couple of hesitant steps forward, and then reaches out to touch the cheek of the $girl in the picture. As $his fingertips brush the smooth surface of the wallscreen, $his other hand ghosts along $his own face. $His expression is not sad, so it's surprising when a single tear rolls down $his cheek. You order $him to tell you how the picture makes $him feel.
 <br><br>
 $He looks pensive, and goes through two false starts before $he clears $his throat, wrenches $his gaze away from $his picture, and <<say>>s introspectively, "<<Master>>, it'<<s>> <<s>>trange. We — we don't have picture<<s>> of our<<s>>elve<<s>>, from before we were en<<s>>laved. I didn't really reali<<z>>e how much I'd changed. <<S>>ome day<<s>> being a <<s>>lave i<<s>> hard. But <<s>>eeing that picture, it make<<s>> me feel better about it. You — you're really <<if $PC.title == 1>>hand<<s>>ome<<else>>pretty<</if>>, <<Master>>. I bet you alway<<s>> were." $He inclines $his head towards the homely $girl on the screen. "It'<<s>> hard to be ugly, <<Master>>. Really hard. I feel <<s>>orry for that $girl, and I'm glad I don't look like $him anymore." $He laughs suddenly, a little self-consciously. "The cra<<z>>y thing i<<s>>, if you'd told that $girl that
 <<if $activeSlave.assignment == "whore">>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index ee9f97899e57c634e16f76ac3e149e541620ccc9..4a38d5ae893df28a6182e588f07a16f0eb8a3d94 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -361,7 +361,7 @@ With $his back arched and $his thighs together $his <<if $activeSlave.butt > 5>>
 
 <<case "sore shoulders">>
 
-<<EventNameLink>> comes before you for a routine inspection. The <<if $activeSlave.muscles > 95>>heavily muscled<<elseif $activeSlave.muscles > 30>>ripped<<else>>toned<</if>><<if $activeSlave.preg > $activeSlave.pregData.normalBirth/1.33>> and heavily pregnant<<elseif $activeSlave.preg > $activeSlave.pregData.normalBirth/2>>pregnant<</if>> $desc is looking good, but as $he raises $his arms over $his head to spin $his nude torso under your gaze, $he winces slightly. <<if canSee($activeSlave)>>$His <<eyeColor>> eyes flick up to see if you noticed, and $his face falls a little when $he sees that you did. You raise one eyebrow, and the obedient slave explains $himself<<elseif canHear($activeSlave)>>$His ears perk up to hear if you noticed. You clear your throat, startling $him and making $him explain $himself<<else>>$He tries to affect a stoic expression, but when you tentatively touch one of $his shoulders, $he grimaces slightly and quickly opts to explain $himself<</if>>.
+<<EventNameLink>> comes before you for a routine inspection. The <<if $activeSlave.muscles > 95>>heavily muscled<<elseif $activeSlave.muscles > 30>>ripped<<else>>toned<</if>><<if $activeSlave.preg > $activeSlave.pregData.normalBirth/1.33>> and heavily pregnant<<elseif $activeSlave.preg > $activeSlave.pregData.normalBirth/2>>pregnant<</if>> $desc is looking good, but as $he raises $his arms over $his head to spin $his nude torso under your gaze, $he winces slightly. <<if canSee($activeSlave)>>$His <<= App.Desc.EyeColor>> eyes flick up to see if you noticed, and $his face falls a little when $he sees that you did. You raise one eyebrow, and the obedient slave explains $himself<<elseif canHear($activeSlave)>>$His ears perk up to hear if you noticed. You clear your throat, startling $him and making $him explain $himself<<else>>$He tries to affect a stoic expression, but when you tentatively touch one of $his shoulders, $he grimaces slightly and quickly opts to explain $himself<</if>>.
 <<if !canTalk($activeSlave)>>
 	$He uses gestures to beg your pardon, and explains that yesterday was arm day for $him, and $he went out a little hard. $His shoulders are a little sore, but $he gestures that $he's all right.
 <<else>>
@@ -449,7 +449,7 @@ $He's lying on $his back with $his arms outstretched, $his <<if ($activeSlave.bo
 <<default>>
 	nipples look pleasantly soft and warm in the sun.
 <</switch>>
-As you consider $his radiant body, $he senses your presence, either realizing you're there through $his closed eyes or coming out of a light sleep at your proximity. $He opens $his <<eyeColor>> eyes a slit and stretches deliciously, arching $his back luxuriantly, and murmurs, "Hi <<Master>>."
+As you consider $his radiant body, $he senses your presence, either realizing you're there through $his closed eyes or coming out of a light sleep at your proximity. $He opens $his <<= App.Desc.EyeColor>> eyes a slit and stretches deliciously, arching $his back luxuriantly, and murmurs, "Hi <<Master>>."
 
 <<case "devoted nympho">>
 
@@ -585,7 +585,7 @@ provides just enough stimulation that $he climaxes. $His hands ball into fists a
 	<</if>>
 	of girlcum out onto $his legs and the floor.
 <</if>>
-$He stands up straight, but this brings $his <<if canSee($activeSlave)>><<eyeColor>> eyes up to gaze straight into yours<<else>>face to face with you<</if>>, and the mixed release, humiliation, and naughtiness of having climaxed prematurely right in front of $his <<= WrittenMaster()>> produces an aftershock, adding to the mess on the floor.
+$He stands up straight, but this brings $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes up to gaze straight into yours<<else>>face to face with you<</if>>, and the mixed release, humiliation, and naughtiness of having climaxed prematurely right in front of $his <<= WrittenMaster()>> produces an aftershock, adding to the mess on the floor.
 
 <<case "devoted exhibition">>
 
@@ -657,7 +657,7 @@ Slaves with powerful sex drives like $hers often find it necessary to masturbate
 
 <<case "terrified inspection">>
 
-<<EventNameLink>> appears in the door of your office for a scheduled inspection. $He hesitates in the doorway, <<if canSee($activeSlave)>>staring fixedly downward with huge <<eyeColor>> eyes<<else>>$his face towards the floor<</if>>, before stumbling forward to stand in front of your desk. $His chest is rising and falling with panicked hyperventilation. The poor
+<<EventNameLink>> appears in the door of your office for a scheduled inspection. $He hesitates in the doorway, <<if canSee($activeSlave)>>staring fixedly downward with huge <<= App.Desc.EyeColor>> eyes<<else>>$his face towards the floor<</if>>, before stumbling forward to stand in front of your desk. $His chest is rising and falling with panicked hyperventilation. The poor
 $desc
 is terrified of you for some reason.
 <br><br>
@@ -1246,7 +1246,7 @@ Your order $him to turn around and present $his anus for inspection. $He doesn't
 
 In the morning the penthouse is a busy bustle of female energy. Slaves get up promptly, eat, shower, dress themselves, and head out to work. They chatter if able and allowed, and draw a good deal of strength from each other. As you pass by the kitchen, you are narrowly avoided by a rush of girls heading to the showers. They're almost bouncing, feeding off each others' youthful energy. At the back of the pack is <<EventNameLink>>. $He looks as young as any of them, but after they're out, $he leans against the door frame for a moment and exhales slowly.
 <br><br>
-$His <<eyeColor>> eyed gaze catches yours for a moment, and you are reminded that $he isn't as young as they are, not at all. $His face might look youthful, but $his eyes don't. <<if canSee($activeSlave)>>$He sees your consideration, and<<else>>You make yourself known, and $he<</if>> murmurs, "<<S>>orry, <<Master>>. Ju<<s>>t a little <<s>>low thi<<s>> morning."
+$His <<= App.Desc.EyeColor>> eyed gaze catches yours for a moment, and you are reminded that $he isn't as young as they are, not at all. $His face might look youthful, but $his eyes don't. <<if canSee($activeSlave)>>$He sees your consideration, and<<else>>You make yourself known, and $he<</if>> murmurs, "<<S>>orry, <<Master>>. Ju<<s>>t a little <<s>>low thi<<s>> morning."
 $He hurries after $his sisters, $his
 <<if $activeSlave.butt > 12>>
 	massive
@@ -1307,7 +1307,7 @@ Though it's late, $he's surprised to find the lights in the master suite off. Yo
 <<else>>
 	sits on
 <</if>>
-the edge of the bed, preparing to climb quietly in. $He clearly thinks you're asleep, and is doing $his best not to wake you. The dim, blue-toned light of your bedroom at night washes out $his $activeSlave.skin skin and robs $his <<eyeColor>> eyes of their color, but it highlights
+the edge of the bed, preparing to climb quietly in. $He clearly thinks you're asleep, and is doing $his best not to wake you. The dim, blue-toned light of your bedroom at night washes out $his $activeSlave.skin skin and robs $his <<= App.Desc.EyeColor>> eyes of their color, but it highlights
 <<if ($activeSlave.belly >= 100000)>>
 	$his _belly dome of a stomach,
 	<<if $activeSlave.bellyPreg >= 3000>>
@@ -1650,7 +1650,7 @@ $He hasn't been with you long; it's been a mere <<print $week-$activeSlave.weekA
 
 <<case "cage relief">>
 
-You come face to face with <<EventNameLink>> in a hallway of your penthouse, entirely by happenstance. <<if canSee($activeSlave)>>$His <<eyeColor>> eyes lock with yours, and $he stares at you dumbly for a long moment<<else>>Once $he regains $his footing after bumping into you, $he gazes towards you dumbly for a long moment<</if>>. Then $he squares $his <<if $activeSlave.shoulders > 0>>broad<<elseif $activeSlave.shoulders < 0>>pretty<<else>>feminine<</if>> shoulders and bites $his lower lip, obviously doing $his best to think quickly. Right when you're about to reprimand $him for not greeting you properly, $he surprises you by throwing $himself abjectly on the ground in front of you<<if $activeSlave.belly >= 10000>>, $his rear forced into the air by $his _belly <<if $activeSlave.bellyPreg >= 3000>>pregnant<<else>>distended<</if>> belly<</if>>.
+You come face to face with <<EventNameLink>> in a hallway of your penthouse, entirely by happenstance. <<if canSee($activeSlave)>>$His <<= App.Desc.EyeColor>> eyes lock with yours, and $he stares at you dumbly for a long moment<<else>>Once $he regains $his footing after bumping into you, $he gazes towards you dumbly for a long moment<</if>>. Then $he squares $his <<if $activeSlave.shoulders > 0>>broad<<elseif $activeSlave.shoulders < 0>>pretty<<else>>feminine<</if>> shoulders and bites $his lower lip, obviously doing $his best to think quickly. Right when you're about to reprimand $him for not greeting you properly, $he surprises you by throwing $himself abjectly on the ground in front of you<<if $activeSlave.belly >= 10000>>, $his rear forced into the air by $his _belly <<if $activeSlave.bellyPreg >= 3000>>pregnant<<else>>distended<</if>> belly<</if>>.
 <br><br>
 <<if !canTalk($activeSlave)>>
 	$He uses gestures to apologize for $his rudeness, and then gets to $his knees so $he can use $his hands to gesture more clearly. $His hands are shaky as $he begs, making two false starts before unmistakably gesturing to ask you to cut $his balls off. Once $he <<if canSee($activeSlave)>>sees<<else>>figures<</if>> that you understand, $he begins to cry openly. $He gestures that $he can barely get off wearing $his chastity cage, that it hurts when $he does, and that $he's constantly oppressed by the need for release. $He thinks that it would be easier to be soft all the time, so $he could climax without discomfort. $He begs hard, and promises to be a good little bitch.
@@ -2013,7 +2013,7 @@ At your <<if canSee($activeSlave)>>nod<<else>>acknowledgment<</if>>, $he
 <<if ($activeSlave.fetish == "submissive") && ($activeSlave.fetishKnown == 1)>>
 	gives a submissive shudder, and turns to show you $his bare back.
 	"<<Master>>, may I have a cor<<s>>et pier<<c>>ing? I would love to feel more, um, bound. Tied up. Plea<<s>>e?"
-	$He awaits your answer coquettishly, <<if canSee($activeSlave)>>$his <<eyeColor>> eyes huge<<else>>a look of begging on $his face<</if>>.
+	$He awaits your answer coquettishly, <<if canSee($activeSlave)>>$his <<= App.Desc.EyeColor>> eyes huge<<else>>a look of begging on $his face<</if>>.
 <<elseif ($activeSlave.fetish == "cumslut") && ($activeSlave.fetishKnown == 1)>>
 	blows you a wet kiss.
 	"<<Master>>, may I have a tongue pier<<c>>ing? It would take my dick <<s>>ucking to the next level. Plea<<s>>e?"
@@ -2289,7 +2289,7 @@ You complete the final rep of your first workout of the day, rack the bar, and j
 	<</if>>
 <</if>>
 <br><br>
-$His <<eyeColor>> eyes track up your torso comically until $he's looking into your eyes. $He stares dumbly at you for a moment before realizing what $he's doing and blushing with embarrassment. $He's reasonably well broken, but is still coming to terms with $his sexual place as a $desc.
+$His <<= App.Desc.EyeColor>> eyes track up your torso comically until $he's looking into your eyes. $He stares dumbly at you for a moment before realizing what $he's doing and blushing with embarrassment. $He's reasonably well broken, but is still coming to terms with $his sexual place as a $desc.
 In particular, $he hasn't gotten used to the effects of $his training, the slave food, and the atmosphere in the penthouse, all of which are serving to fuel an acceleration of $his sex drive.
 <<if !canTalk($activeSlave)>>
 	$He uses shaky hands to ask you to fuck $him,
@@ -2300,7 +2300,7 @@ and turns to flee.
 
 <<case "dickgirl PC">>
 
-Having just enjoyed one of your slaves, you take a quick post-coital rinse in one of the showers scattered around the arcology for the purpose. Thus refreshed, you step out and come face to face with <<EventNameLink>>, who is going about $his assigned business. $His <<eyeColor>> eyes lock with yours for a surprised moment, and then flick down submissively.
+Having just enjoyed one of your slaves, you take a quick post-coital rinse in one of the showers scattered around the arcology for the purpose. Thus refreshed, you step out and come face to face with <<EventNameLink>>, who is going about $his assigned business. $His <<= App.Desc.EyeColor>> eyes lock with yours for a surprised moment, and then flick down submissively.
 <br><br>
 As $his gaze travels down your body towards the floor,
 <<if $activeSlave.attrXY <= 35>>
@@ -2559,7 +2559,7 @@ To go by $his behavior, the likelihood that $he's actually eager to <<if $PC.dic
 
 <<EventNameLink>> is standing before you for an inspection. The obedient
 $desc
-has run through the prescribed motions of a normal inspection, and you've reached the part of the routine where you usually ask the slave a few questions, give $him a few orders, or fuck $him. $His <<if canSee($activeSlave)>><<eyeColor>> eyes are watching you closely<<else>>face is centered on you<</if>>, and $he's <<if canHear($activeSlave)>>listening carefully<<else>>waiting patiently<</if>> for direction. This is probably due to linguistic anxiety: $he can understand the most straightforward commands, but giving $him orders is often an exercise in <<if canSee($activeSlave)>>pointing and gesturing, or when that fails, simply<<else>>frustration, ending with you simply<</if>> pushing and pulling $his usually-compliant body into the proper place.
+has run through the prescribed motions of a normal inspection, and you've reached the part of the routine where you usually ask the slave a few questions, give $him a few orders, or fuck $him. $His <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes are watching you closely<<else>>face is centered on you<</if>>, and $he's <<if canHear($activeSlave)>>listening carefully<<else>>waiting patiently<</if>> for direction. This is probably due to linguistic anxiety: $he can understand the most straightforward commands, but giving $him orders is often an exercise in <<if canSee($activeSlave)>>pointing and gesturing, or when that fails, simply<<else>>frustration, ending with you simply<</if>> pushing and pulling $his usually-compliant body into the proper place.
 
 <<case "kitchen molestation">>
 
@@ -2656,7 +2656,7 @@ $He's chosen to do it in a dark corner and looks like $he's hurrying; $he clearl
 
 It's a sunny morning, with rare mild weather, and you're stuck at your desk, as usual. After the typical rush of slaves clears the kitchen after the breakfast hour, you see one peel off to stand out on a balcony for a moment with the light on $his face. You pay little attention to such a trifle, but then notice that it's <<EventNameLink>>.
 <br><br>
-You head out and find that $he's looking up at the sun with $his <<eyeColor>> eyes closed, letting the warmth and light envelop $his
+You head out and find that $he's looking up at the sun with $his <<= App.Desc.EyeColor>> eyes closed, letting the warmth and light envelop $his
 <<if ($activeSlave.face > 95)>>
 	incredible
 <<elseif ($activeSlave.face > 40)>>
@@ -2915,7 +2915,7 @@ $He comes to a stop right beside your elbow, waiting for further direction, just
 	<</if>>
 	showing unmistakably how badly $he needs release.
 <<else>>
-	$He keeps $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>face<</if>> slightly downcast, $his back arched, $his chest pressed outward, and $his bottom stuck out a bit. $He's the perfect picture of an obedient little sex slave<<if $activeSlave.height > 185>> (though, of course, $he's anything but physically small)<</if>>.
+	$He keeps $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>face<</if>> slightly downcast, $his back arched, $his chest pressed outward, and $his bottom stuck out a bit. $He's the perfect picture of an obedient little sex slave<<if $activeSlave.height > 185>> (though, of course, $he's anything but physically small)<</if>>.
 <</if>>
 
 <<case "tittymonster inspection">>
@@ -3479,7 +3479,7 @@ $His
 	<</if>>
 	malnourished.
 <</if>>
-$His $activeSlave.faceShape face is clearly conflicted, and <<if canSee($activeSlave)>>$his <<eyeColor>> eyes shift<<else>>$he glances about<</if>> with nervous energy. $He is clearly unsure whether $he should say what $he came here to say.
+$His $activeSlave.faceShape face is clearly conflicted, and <<if canSee($activeSlave)>>$his <<= App.Desc.EyeColor>> eyes shift<<else>>$he glances about<</if>> with nervous energy. $He is clearly unsure whether $he should say what $he came here to say.
 <br><br>
 When you finally ask $him what $he wants, $he hesitates for a moment and then suddenly seems to gain $his courage<<if $activeSlave.accent > 1>>, speaking in an atrociously thick accent<<elseif $activeSlave.accent > 0>>, speaking in a cute little accent<</if>>.
 "Plea<<s>>e, <<Master>> I'm <<s>>o hungry! It <<s>>eem<<s>> like all I get to eat i<<s>> cum. It'<<s>> di<<s>>gu<<s>>ting! Plea<<s>>e! I have to eat <<s>>o much of it. Can I be allowed to eat regular food again? Plea<<s>>e, <<Master>>, I'm <<s>>o hungry. I need real food!"
@@ -3718,7 +3718,7 @@ The slutty $desc wants it badly.
 
 You happen to come across <<EventNameLink>> during one of $his rest periods. $He's lying on a couch in the slave areas, <<if canSee($activeSlave)>>staring at the ceiling above $him<<else>>leaning back<</if>> with a dreamy expression on $his face. $He's <<if $activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation">>touching $himself idly.<<else>>not allowed to touch $himself, but $he's extremely aroused.<</if>> Whatever's on $his mind, it's so absorbing that $he doesn't realize you're there until you're standing over $him.
 <br><br>
-"<<S>>orry, <<Master>>," $he <<say>>s apologetically, <<if $activeSlave.belly >= 10000>>struggling<<else>>scrambling<</if>> to $his feet. "I didn't noti<<c>>e you there." <<if canSee($activeSlave)>>Seeing your questioning look<<elseif canHear($activeSlave)>>Hearing your lack of response<<else>>Sensing a request to continue<</if>>, $he explains $himself further. "I was ju<<s>>t thinking about, um, my favorite pla<<c>>e. I can almo<<s>>t get off ju<<s>>t by thinking about it." There's a wild, perverted gleam <<if canSee($activeSlave)>>in $his <<eyeColor>> eyes<<else>>on $his face<</if>>. $He's a confirmed sadist, so whatever $his favorite mental masturbation is probably quite strong.
+"<<S>>orry, <<Master>>," $he <<say>>s apologetically, <<if $activeSlave.belly >= 10000>>struggling<<else>>scrambling<</if>> to $his feet. "I didn't noti<<c>>e you there." <<if canSee($activeSlave)>>Seeing your questioning look<<elseif canHear($activeSlave)>>Hearing your lack of response<<else>>Sensing a request to continue<</if>>, $he explains $himself further. "I was ju<<s>>t thinking about, um, my favorite pla<<c>>e. I can almo<<s>>t get off ju<<s>>t by thinking about it." There's a wild, perverted gleam <<if canSee($activeSlave)>>in $his <<= App.Desc.EyeColor>> eyes<<else>>on $his face<</if>>. $He's a confirmed sadist, so whatever $his favorite mental masturbation is probably quite strong.
 
 <<case "ass fitting">>
 
@@ -4140,7 +4140,7 @@ in front of you, awaiting further direction.
 	<</if>>
 	showing unmistakably how badly $he needs release.
 <<else>>
-	$He keeps $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>face<</if>> slightly downcast, $his hands lightly smoothing the folds from $his tight skirt while $his breasts visibly rise and fall under $his even tighter blouse<<if $activeSlave.belly >= 5000>>. Between the two, there is little $he can do to cover $his exposed <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>middle<</if>><</if>>. $He's the perfect picture of an attentive little old world girlfriend<<if $activeSlave.height > 185>> (though, of course, $he's anything but physically small)<</if>>.
+	$He keeps $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>face<</if>> slightly downcast, $his hands lightly smoothing the folds from $his tight skirt while $his breasts visibly rise and fall under $his even tighter blouse<<if $activeSlave.belly >= 5000>>. Between the two, there is little $he can do to cover $his exposed <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>middle<</if>><</if>>. $He's the perfect picture of an attentive little old world girlfriend<<if $activeSlave.height > 185>> (though, of course, $he's anything but physically small)<</if>>.
 <</if>>
 
 <<case "devoted shortstack">>
@@ -4171,7 +4171,7 @@ in front of you, awaiting further direction.
 <<else>>
 	$loli
 <</if>>
-is looking good despite $his diminutive height. When $he raises $his arms above $his head to submit to an inspection under your gaze, the top of $his $activeSlave.hColor-haired head doesn't even reach your chest. Despite the discrepancy between your height and $hers, you notice an unmistakable flush of embarrassment tinging $his cheeks. <<if canSee($activeSlave)>>$His <<eyeColor>> eyes flick up to gaze at you, but $he must crane $his head upwards as well to meet your gaze<<elseif canHear($activeSlave)>>$His ears perk up to hear at the sound of some minute noise you made, before $he cranes $his head upwards so that $his sightless eyes may meet your gaze<<else>>$He knows from training and experience how tall you are, and uses this knowledge to crane $his head exactly so that your gaze meets $his face directly<</if>>.
+is looking good despite $his diminutive height. When $he raises $his arms above $his head to submit to an inspection under your gaze, the top of $his $activeSlave.hColor-haired head doesn't even reach your chest. Despite the discrepancy between your height and $hers, you notice an unmistakable flush of embarrassment tinging $his cheeks. <<if canSee($activeSlave)>>$His <<= App.Desc.EyeColor>> eyes flick up to gaze at you, but $he must crane $his head upwards as well to meet your gaze<<elseif canHear($activeSlave)>>$His ears perk up to hear at the sound of some minute noise you made, before $he cranes $his head upwards so that $his sightless eyes may meet your gaze<<else>>$He knows from training and experience how tall you are, and uses this knowledge to crane $his head exactly so that your gaze meets $his face directly<</if>>.
 <<if !canTalk($activeSlave)>>
 	$He uses gestures to beg your pardon, even as $he continues to blush rosily, and explains that $he doesn't understand why you keep $him in your penthouse, when there are such tall, beautiful slaves in abundance in your arcology. $He pauses, shuffling about a little shamefacedly before signing that $he thinks their bodies could be more fit to pleasure you.
 <<else>>
@@ -4255,7 +4255,7 @@ face that the gag is a distressing addition to $his life. When you don't immedia
 <<else>>
 	fatigue after $his long day.
 <</if>>
-From $his new position beneath you, $he must crane $his neck so $his <<if canSee($activeSlave)>><<eyeColor>> eyes<<else>>sightless eyes<</if>> may meet yours. With $his mouth gagged, $he is almost the perfect image of a submissive slave.
+From $his new position beneath you, $he must crane $his neck so $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes<<else>>sightless eyes<</if>> may meet yours. With $his mouth gagged, $he is almost the perfect image of a submissive slave.
 
 <<case "back stretch">>
 
@@ -4793,7 +4793,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 <br><<link "Embrace $him">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	You gently grab $his face and stare deeply into $his <<eyeColor>> eyes. <<if canSee($activeSlave)>>They are full of life as opposed to their usual dullness<<else>>They are as dull as always, but that isn't $his fault. $His facial expressions at the act tell you all you need to know<</if>>. You pull your wife into a tight embrace — $him coming back to you is more than enough of a gift; $he needn't do anything more for now. You pull the covers over the both of you and begin to doze off, smiling at the warmth cuddling ever closer to you.
+	You gently grab $his face and stare deeply into $his <<= App.Desc.EyeColor>> eyes. <<if canSee($activeSlave)>>They are full of life as opposed to their usual dullness<<else>>They are as dull as always, but that isn't $his fault. $His facial expressions at the act tell you all you need to know<</if>>. You pull your wife into a tight embrace — $him coming back to you is more than enough of a gift; $he needn't do anything more for now. You pull the covers over the both of you and begin to doze off, smiling at the warmth cuddling ever closer to you.
 	$He is @@.green;no longer mindbroken@@ and thanks to your care deeply and sincerely @@.hotpink;loves@@ and @@.mediumaquamarine;trusts@@ you.
 	<<set $activeSlave.devotion = 100, $activeSlave.oldDevotion = 100, $activeSlave.trust = 100, $activeSlave.oldTrust = 100, $activeSlave.sexualQuirk = "romantic", $activeSlave.fetish = "none", $activeSlave.fetishKnown = 1>>
 	<<set $activeSlave.intelligence = $genePool[_ress].intelligence>>
@@ -5966,7 +5966,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 	<<else>>
 		kid
 	<</if>>
-	cuddled up beside you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> lowers the temperature in the room and directs another slave to quietly put a couple of warm blankets over you and $activeSlave.slaveName. When you finally wake, several hours later, the effect is magical. You're ensconced in a little island of warmth and comfort, a tiny universe of relaxation populated only by yourself and your slave. $He woke before you did, but remained still to avoid disturbing you. <<if canSee($activeSlave)>>From the lazy, contented look in $his <<eyeColor>> eyes as $he meets your waking gaze, $he did not mind waiting. @@.hotpink;$He was already looking at your face when you opened your eyes.@@<<else>>From the serene expression on $his face as $he meets your waking gaze, $he did not mind waiting. @@.hotpink;$He was already looking at your face, lost in the soothing sounds of your breathing, when you opened your eyes.@@<</if>>
+	cuddled up beside you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> lowers the temperature in the room and directs another slave to quietly put a couple of warm blankets over you and $activeSlave.slaveName. When you finally wake, several hours later, the effect is magical. You're ensconced in a little island of warmth and comfort, a tiny universe of relaxation populated only by yourself and your slave. $He woke before you did, but remained still to avoid disturbing you. <<if canSee($activeSlave)>>From the lazy, contented look in $his <<= App.Desc.EyeColor>> eyes as $he meets your waking gaze, $he did not mind waiting. @@.hotpink;$He was already looking at your face when you opened your eyes.@@<<else>>From the serene expression on $his face as $he meets your waking gaze, $he did not mind waiting. @@.hotpink;$He was already looking at your face, lost in the soothing sounds of your breathing, when you opened your eyes.@@<</if>>
 	<br><br>
 	Since you're awake, $he rolls onto $his face and then further, to place $his back and <<if $activeSlave.butt > 5>>massive ass<<elseif $activeSlave.butt > 2>>healthy rear<<else>>butt<</if>> against you, making sure to drag $his $activeSlave.nipples nipples against you the whole way. You accept the invitation and spoon $him, <<if $activeSlave.height >= 185>>your bodies lining up well, since $he's as tall as you are<<elseif $activeSlave.height >= 160>>$his body fitting neatly within the embrace of your larger frame<<else>>$his small body fitting entirely within your embrace<</if>>. $His <<if $activeSlave.muscles > 30>>muscles<<else>>softness<</if>> and warmth awaken your desire, and $he feels <<if $PC.dick == 1>>your stiffening cock beginning to press against <<if $activeSlave.amp == 1>>$his perineum. $He shifts to slide $himself along its shaft<<if $PC.vagina == 1>> and down to where your pussy begins<</if>><<else>>the place between $his thighs. $He shifts to let your dick slide between them, and reaches down to massage its head<</if>><<else>>heat building against $his butt. <<if $activeSlave.amp == 1>>$He does $his best to grind against you, since $he can't caress you without hands<<else>>$He snakes a hand behind $himself to caress your womanhood, and begins to gently masturbate with the other<</if>><</if>>.
 	<<if $PC.dick == 1>>
@@ -6501,7 +6501,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 	<<else>>
 		going limp and slumping down onto
 	<</if>>
-	the sheets beneath $him. When you climax soon after, $he expects you to get off $him so $he can clean up, but instead, the <<if $PC.dick == 1>>cock up $his butt returns to rock hardness<<if $PC.vagina == 1>> as you use a little manual stimulation of your own cunt to get your cock stiff again<</if>> and<<else>>strap-on up $his butt<</if>> goes back to pumping in and out of $him. $He slides a hand under $himself to <<if $activeSlave.vagina == -1>>jerk off<<else>>rub $himself<</if>> this time. When you finally finish, a long time later, the exhausted slave is lying on a bed wet with lube, <<if ($PC.dick == 1) || ($activeSlave.dick > 0)>> ejaculate,<</if>><<if ($PC.dick == 0) || ($activeSlave.vagina > -1)>> girlcum,<</if>> drool, and sweat. $He doesn't care, and you let $him curl up in $his sex-soaked nest. As you leave, you think $he's asleep already, but <<if !canSee($activeSlave)>>as you go<<else>>$his <<eyeColor>> eyes open a slit as you go and<</if>> $he murmurs, @@.hotpink;Thank<<s>>,@@ <<Master>>."
+	the sheets beneath $him. When you climax soon after, $he expects you to get off $him so $he can clean up, but instead, the <<if $PC.dick == 1>>cock up $his butt returns to rock hardness<<if $PC.vagina == 1>> as you use a little manual stimulation of your own cunt to get your cock stiff again<</if>> and<<else>>strap-on up $his butt<</if>> goes back to pumping in and out of $him. $He slides a hand under $himself to <<if $activeSlave.vagina == -1>>jerk off<<else>>rub $himself<</if>> this time. When you finally finish, a long time later, the exhausted slave is lying on a bed wet with lube, <<if ($PC.dick == 1) || ($activeSlave.dick > 0)>> ejaculate,<</if>><<if ($PC.dick == 0) || ($activeSlave.vagina > -1)>> girlcum,<</if>> drool, and sweat. $He doesn't care, and you let $him curl up in $his sex-soaked nest. As you leave, you think $he's asleep already, but <<if !canSee($activeSlave)>>as you go<<else>>$his <<= App.Desc.EyeColor>> eyes open a slit as you go and<</if>> $he murmurs, @@.hotpink;Thank<<s>>,@@ <<Master>>."
 	<<set $activeSlave.devotion += 5>>
 	<<= AnalVCheck(5)>>
 	<</replace>>
@@ -9271,7 +9271,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 <<link "Cheer $him up">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	You close in on $him, and $he starts to present $himself with the force of long habit. However, you take $him by the hand and draw $him in close, running your fingertips along $his cheekbone, looking into $his <<eyeColor>> eyes. <<if canSee($activeSlave)>>$He only holds your gaze for a brief moment before blushing and looking down again,<<else>>Once $he feels your hand stop, $he quickly glances down while<</if>> muttering another apology. You raise $his chin again with a gentle hand and give $him a deep kiss. After a moment $he hugs you with almost painful
+	You close in on $him, and $he starts to present $himself with the force of long habit. However, you take $him by the hand and draw $him in close, running your fingertips along $his cheekbone, looking into $his <<= App.Desc.EyeColor>> eyes. <<if canSee($activeSlave)>>$He only holds your gaze for a brief moment before blushing and looking down again,<<else>>Once $he feels your hand stop, $he quickly glances down while<</if>> muttering another apology. You raise $his chin again with a gentle hand and give $him a deep kiss. After a moment $he hugs you with almost painful
 	<<if $activeSlave.belly >= 100000>>
 		fierceness, a feat given the size of $his _belly <<if $activeSlave.bellyPreg >= 3000>>gravid <</if>>belly, where
 	<<elseif $activeSlave.belly >= 5000>>
@@ -9895,7 +9895,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 <<link "Join $him in the shower">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	You step into the running water and help $him to $his feet with exaggerated gallantry. $He seems surprised <<if canSee($activeSlave)>>and stares at<<else>>faces<</if>> you through the steam for a moment before looking away with a blush. Before long you have $his back against the shower wall, $his titanic udders<<if $activeSlave.belly >= 5000>> and _belly <<if $activeSlave.bellyPreg >= 3000>>pregnant <</if>> belly<</if>> offering an amusing challenge as they slide soapily between you as you fuck. $He comes in no time at all, and a brief massage of $his huge soapy nipples produces a whimpering aftershock orgasm. <<if canSee($activeSlave)>>$His <<eyeColor>> eyes stare straight into yours<<else>>You stare into $his <<eyeColor>> eyes<</if>> as $he writhes with overstimulation, @@.mediumaquamarine;$his trust in your stewardship of $his pleasure total.@@
+	You step into the running water and help $him to $his feet with exaggerated gallantry. $He seems surprised <<if canSee($activeSlave)>>and stares at<<else>>faces<</if>> you through the steam for a moment before looking away with a blush. Before long you have $his back against the shower wall, $his titanic udders<<if $activeSlave.belly >= 5000>> and _belly <<if $activeSlave.bellyPreg >= 3000>>pregnant <</if>> belly<</if>> offering an amusing challenge as they slide soapily between you as you fuck. $He comes in no time at all, and a brief massage of $his huge soapy nipples produces a whimpering aftershock orgasm. <<if canSee($activeSlave)>>$His <<= App.Desc.EyeColor>> eyes stare straight into yours<<else>>You stare into $his <<= App.Desc.EyeColor>> eyes<</if>> as $he writhes with overstimulation, @@.mediumaquamarine;$his trust in your stewardship of $his pleasure total.@@
 	<<if canDoVaginal($activeSlave)>><<= VaginalVCheck()>><<elseif canDoAnal($activeSlave)>><<= AnalVCheck()>><</if>>
 	<<set $activeSlave.devotion += 4>>
 	<</replace>>
@@ -10248,7 +10248,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 	$he says fervently, and gestures at the tablet.
 		"I've noti<<c>>ed a couple of the girl<<s>> working better together re<<c>>ently, <<s>>o I'm making <<s>>ome minor adju<<s>>tment<<s>> to give them more <<sh>>ift<<s>> together."
 	<br><br>
-	You're sure $he'll do $his best, and you tell $him so. $He thanks you again, and you both go back to your work. Though your Head Girl continues manipulating $his tablet diligently, $he can't seem to stop $himself from @@.hotpink;stealing the occasional glance at you.@@ $His <<eyeColor>> eyes, dark in the dimness of the office, seem to have an unaccountable sheen.
+	You're sure $he'll do $his best, and you tell $him so. $He thanks you again, and you both go back to your work. Though your Head Girl continues manipulating $his tablet diligently, $he can't seem to stop $himself from @@.hotpink;stealing the occasional glance at you.@@ $His <<= App.Desc.EyeColor>> eyes, dark in the dimness of the office, seem to have an unaccountable sheen.
 	<<if $assistant != 0>>
 	<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>>'s $assistantAppearance avatar appears on your desktop, glowing brightly, and ruins the moment. "$activeSlave.slaveName loooves $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Maaaster<<else>>Miiistress<</if>>," $he taunts,
 	<<switch $assistantAppearance>>
@@ -10587,7 +10587,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 <br><<link "Work on broadening $his sexual horizons">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	$He seems a little too focused on $his hot cunt. You order $him to get up on your desk, and $he obeys eagerly, $his <<if canSee($activeSlave)>><<eyeColor>> eyes shining<<else>>facial expression filled<</if>> with lust. <<if canSee($activeSlave)>>They focus<<else>>$He focuses<</if>> on <<if $PC.dick == 1>>your cock as you bring it to bear<<if $PC.vagina == 1>>, not to mention the pussy at its base<</if>><<else>>your strap-on as you step into it<</if>>, and $he's about to express $his gratitude when you push the slave, who is sitting on the edge of your desk with $his legs spread to provide you access to $his pussy, over onto $his back. $He barely has time to reorient $himself when $he feels <<if $activeSlave.anus > 2>>a sudden fullness in $his loose ass<<elseif $activeSlave.anus == 2>>a presence inside $his experienced ass<<else>>something starting to push its way up $his poor little bottom<</if>>.
+	$He seems a little too focused on $his hot cunt. You order $him to get up on your desk, and $he obeys eagerly, $his <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes shining<<else>>facial expression filled<</if>> with lust. <<if canSee($activeSlave)>>They focus<<else>>$He focuses<</if>> on <<if $PC.dick == 1>>your cock as you bring it to bear<<if $PC.vagina == 1>>, not to mention the pussy at its base<</if>><<else>>your strap-on as you step into it<</if>>, and $he's about to express $his gratitude when you push the slave, who is sitting on the edge of your desk with $his legs spread to provide you access to $his pussy, over onto $his back. $He barely has time to reorient $himself when $he feels <<if $activeSlave.anus > 2>>a sudden fullness in $his loose ass<<elseif $activeSlave.anus == 2>>a presence inside $his experienced ass<<else>>something starting to push its way up $his poor little bottom<</if>>.
 	<br><br>
 	$He cannot hide $his disappointment, but has the presence of mind not to protest as you assfuck $him hard enough that $his <<if $activeSlave.boobs > 2000>>ridiculous tits almost hit $him in the face with each stroke<<elseif $activeSlave.boobs > 800>>big boobs bounce all over the place<<else>>boobs bounce<</if>><<if $activeSlave.belly >= 10000>> and taut belly is forced back<</if>>. $His orgasm sneaks up on $him, and comes by surprise, forcing a squeal out of $him as $his sphincter tightens down involuntarily. $He gets up gingerly, clearly feeling sore,
 	<<if (random(0,1) == 1)>>
@@ -10939,7 +10939,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 	<<else>>
 		$He <<say>>s, a little tearfully, "<<Master>>, thi<<s>> guy wanted to u<<s>>e my butt in public. <<S>>o of cour<<s>>e I let him, and he made me <<s>>it in hi<<s>> lap to do it, and held my leg<<s>> back <<s>>o everyone could <<s>>ee! And then another guy thought it wa<<s>> hot and waited, and then fucked me in my a<<ss>> too. Another girl finally noti<<c>>ed and re<<s>>cued me after four cock<<s>>, <<Master>>. I'm really <<s>>ore."
 	<</if>>
-	$He <<if canSee($activeSlave)>>looks up at you with big <<eyeColor>> eyes<<else>>gazes at you<</if>> for a long moment, a final tear leaking down $his $activeSlave.skin cheek, before $he suddenly
+	$He <<if canSee($activeSlave)>>looks up at you with big <<= App.Desc.EyeColor>> eyes<<else>>gazes at you<</if>> for a long moment, a final tear leaking down $his $activeSlave.skin cheek, before $he suddenly
 	<<if !canTalk($activeSlave)>>
 		shakes with mute laughter.
 	<<else>>
@@ -11819,7 +11819,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 <br><<link "Drive up $his anal count">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	You make a ceremony of querying $assistantName, aloud for everyone to hear, into $activeSlave.slaveName's sexual history. $He soon realizes this is a sort of recitation of $his service for the benefit of the other slaves, and $he stands a little straighter. $His <<if canSee($activeSlave)>><<eyeColor>> eyes glitter<<else>>face beams<</if>> with @@.mediumaquamarine;pride@@ as $assistantName finishes, "...and $his anus has been penetrated $activeSlave.analCount times." You announce that $activeSlave.analCount isn't nearly enough, detail a slave to fetch you a comfortable chair, seat yourself, and draw the compliant $activeSlave.slaveName's head down towards your <<if $PC.dick == 0>>pussy<<else>>cock<</if>>. $He gets eagerly to work, surrounded by a circle of slaves staring at the show. You select a favored girl and tell $him to get to work driving that anal count up. $activeSlave.slaveName keeps <<if $PC.dick == 0>>eating you out<<else>>sucking your dick<</if>> as the chosen girl pulls $activeSlave.slaveName's hips up a little and
+	You make a ceremony of querying $assistantName, aloud for everyone to hear, into $activeSlave.slaveName's sexual history. $He soon realizes this is a sort of recitation of $his service for the benefit of the other slaves, and $he stands a little straighter. $His <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes glitter<<else>>face beams<</if>> with @@.mediumaquamarine;pride@@ as $assistantName finishes, "...and $his anus has been penetrated $activeSlave.analCount times." You announce that $activeSlave.analCount isn't nearly enough, detail a slave to fetch you a comfortable chair, seat yourself, and draw the compliant $activeSlave.slaveName's head down towards your <<if $PC.dick == 0>>pussy<<else>>cock<</if>>. $He gets eagerly to work, surrounded by a circle of slaves staring at the show. You select a favored girl and tell $him to get to work driving that anal count up. $activeSlave.slaveName keeps <<if $PC.dick == 0>>eating you out<<else>>sucking your dick<</if>> as the chosen girl pulls $activeSlave.slaveName's hips up a little and
 	<<if $activeSlave.butt > 18>>
 		struggles into $his immense butt.
 	<<elseif $activeSlave.butt > 10>>
@@ -16403,7 +16403,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 <<link "Make love to $him">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	You crane your neck down and kiss $him on the lips. $He awakens slowly, gently, $his <<eyeColor>> eyes fluttering open, looking black in the nighttime gloom. $He smiles into your mouth, and you feel $his pulse quicken through the extensive contact down your bodies. You interlace your fingers between $hers and turn, pressing $him back down into the soft sheets. $He opens $himself for you, spreading $his legs wide and embracing you with them, making sure to run $his heels up the backs of your calves in a way that sends a shiver up your spine. Feeling this through your kissing mouths, $he smiles into you, a pleased expression $he maintains as you
+	You crane your neck down and kiss $him on the lips. $He awakens slowly, gently, $his <<= App.Desc.EyeColor>> eyes fluttering open, looking black in the nighttime gloom. $He smiles into your mouth, and you feel $his pulse quicken through the extensive contact down your bodies. You interlace your fingers between $hers and turn, pressing $him back down into the soft sheets. $He opens $himself for you, spreading $his legs wide and embracing you with them, making sure to run $his heels up the backs of your calves in a way that sends a shiver up your spine. Feeling this through your kissing mouths, $he smiles into you, a pleased expression $he maintains as you
 	<<if $activeSlave.belly >= 300000 && $PC.belly >= 5000>>
 		struggle to find a position to handle both your pregnancy and $his <<if $activeSlave.bellyPreg >= 3000>>_belly gravid middle<<else>>_belly belly<</if>> and
 	<<elseif $activeSlave.belly >= 300000>>
@@ -16886,7 +16886,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 <br><<link "Double penetrate $his mouth for insolence">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	You step forward and caress the slave's throat, telling $him to suck like a good little $desc. You make no threat, but give $him the order in a voice of brass. $He knows what you can do to $him, and scrabbles forward to obey, @@.gold;terribly frightened.@@ $His fear is justified. You announce that $he's avoided serious punishment, but $he still needs correction for $him hesitation and insolence. $He can't beg or even moan, since $he's being facefucked by the feeder dildo by now, but $his <<eyeColor>> eyes widen in terror. $He <<if canSee($activeSlave)>>can't watch you, since $he can't turn $his head,<<else>>can't see what you are doing,<</if>> so $he has almost no time to prepare when you haul $him head most of the way off the feeder and shove <<if $PC.dick == 1>>your own phallus<<else>>a strap-on<</if>> into $his mouth, too. $He gags instantly, almost vomiting, but forces $himself to relax as you begin to thrust into $his throat, alternately with the feeder. The liquid food provides plenty of lubrication, and a lot of liquid for $him to gag on, and before long $he's a degraded, humiliating mess. $He often clamps $his eyes shut as $he desperately concentrates on breathing, squeezing the tears out to run down $his $activeSlave.skin cheeks.
+	You step forward and caress the slave's throat, telling $him to suck like a good little $desc. You make no threat, but give $him the order in a voice of brass. $He knows what you can do to $him, and scrabbles forward to obey, @@.gold;terribly frightened.@@ $His fear is justified. You announce that $he's avoided serious punishment, but $he still needs correction for $him hesitation and insolence. $He can't beg or even moan, since $he's being facefucked by the feeder dildo by now, but $his <<= App.Desc.EyeColor>> eyes widen in terror. $He <<if canSee($activeSlave)>>can't watch you, since $he can't turn $his head,<<else>>can't see what you are doing,<</if>> so $he has almost no time to prepare when you haul $him head most of the way off the feeder and shove <<if $PC.dick == 1>>your own phallus<<else>>a strap-on<</if>> into $his mouth, too. $He gags instantly, almost vomiting, but forces $himself to relax as you begin to thrust into $his throat, alternately with the feeder. The liquid food provides plenty of lubrication, and a lot of liquid for $him to gag on, and before long $he's a degraded, humiliating mess. $He often clamps $his eyes shut as $he desperately concentrates on breathing, squeezing the tears out to run down $his $activeSlave.skin cheeks.
 	<<if ($suppository != 0) && ($activeSlave.drugs != "none")>>You leave the poor slave to take $his drugs up the ass, since the kitchen administers those by phallus, too. Fortunately for $him, $he doesn't object to that.<</if>>
 	<<set $activeSlave.trust -= 4, $activeSlave.oralCount++, $oralTotal++>>
 	<</replace>>
@@ -16895,7 +16895,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 <br><<link "Force-feed $him with your own cock">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	You step forward and pull $him away from the feeder, telling $him that since $he doesn't like the cockfeeder $he can suck yours like a good little $desc. You make no threat, but order $him in a steely voice to suck you off until $he's earned a meal of your cum. $He knows what you can do to $him, and hurries forward to obey. $He rushes to open your clothes and get to work, but pauses when <<if canSee($activeSlave)>>$his <<eyeColor>> eyes take in your massive testicles.<<else>>$his groping hand feels your massive testicles.<</if>> Realizing just how big $his meal will be, $he's obviously @@.gold;frightened.@@ You grab $his head, breaking $him out of $his shocked stillness, and explain that you can't let $him starve. If $he won't eat out of the feeder, you'll just have to feed $him some other way. With that, you ram your cock forward and start fucking $his <<if $activeSlave.face > 95>>heartbreakingly beautiful<<elseif $activeSlave.face > 10>>pretty<<else>>homely<</if>> face. After a few minutes of gagging oral, you start to approach your climax. Your thorough facefucking leaves $him unable to beg or even moan, but $his eyes widen in terror when $he realizes you're about to cum. You don't give $him any time to prepare, instead hilting yourself immediately, and letting $his throat's desperate attempts to swallow bring you over the edge. You begin your long release of pent-up jizz, spraying deciliter after deciliter of cum down $his throat and into $his stomach. By the time you've finished, you can tell $he's struggling for air and in pain from the massive quantity of thick fluid in $his stomach. You give $him a helpful hint before releasing $him, "if you take it all the way in your throat, you don't even have to taste what it's feeding you." You pull out of $his mouth and let $him go. $He gasps for air and almost immediately vomits some of your cum all over $himself, turning $him into a degraded, humiliating mess. $He lays on the floor and desperately concentrates on breathing, squeezing the tears out of $his eyes to run down $his $activeSlave.skin cheeks.
+	You step forward and pull $him away from the feeder, telling $him that since $he doesn't like the cockfeeder $he can suck yours like a good little $desc. You make no threat, but order $him in a steely voice to suck you off until $he's earned a meal of your cum. $He knows what you can do to $him, and hurries forward to obey. $He rushes to open your clothes and get to work, but pauses when <<if canSee($activeSlave)>>$his <<= App.Desc.EyeColor>> eyes take in your massive testicles.<<else>>$his groping hand feels your massive testicles.<</if>> Realizing just how big $his meal will be, $he's obviously @@.gold;frightened.@@ You grab $his head, breaking $him out of $his shocked stillness, and explain that you can't let $him starve. If $he won't eat out of the feeder, you'll just have to feed $him some other way. With that, you ram your cock forward and start fucking $his <<if $activeSlave.face > 95>>heartbreakingly beautiful<<elseif $activeSlave.face > 10>>pretty<<else>>homely<</if>> face. After a few minutes of gagging oral, you start to approach your climax. Your thorough facefucking leaves $him unable to beg or even moan, but $his eyes widen in terror when $he realizes you're about to cum. You don't give $him any time to prepare, instead hilting yourself immediately, and letting $his throat's desperate attempts to swallow bring you over the edge. You begin your long release of pent-up jizz, spraying deciliter after deciliter of cum down $his throat and into $his stomach. By the time you've finished, you can tell $he's struggling for air and in pain from the massive quantity of thick fluid in $his stomach. You give $him a helpful hint before releasing $him, "if you take it all the way in your throat, you don't even have to taste what it's feeding you." You pull out of $his mouth and let $him go. $He gasps for air and almost immediately vomits some of your cum all over $himself, turning $him into a degraded, humiliating mess. $He lays on the floor and desperately concentrates on breathing, squeezing the tears out of $his eyes to run down $his $activeSlave.skin cheeks.
 	<<if ($suppository != 0) && ($activeSlave.drugs != "none")>>You leave the poor slave to take $his drugs up the ass, since the kitchen administers those by phallus, too. Fortunately for $him, $he doesn't object to that.<</if>>
 	<<set $activeSlave.trust -= 2, $activeSlave.oralCount++, $oralTotal++>>
 	<</replace>>
@@ -17051,7 +17051,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 	<<else>>
 		Knowing that $he'll need to get dressed before the next part of $his day, you help $him to <<if $activeSlave.livingRules == "luxurious">>$his room<<else>>the part of the common area with where clothes are kept<</if>>. $He lets you do most of the work, letting $himself be guided without a word. When you set $him on $his bed,
 	<</if>>
-	there's a little unaccountable moisture in $his <<eyeColor>> eyes @@.mediumaquamarine;for some reason.@@ $He gives you a kiss and thanks you prettily.
+	there's a little unaccountable moisture in $his <<= App.Desc.EyeColor>> eyes @@.mediumaquamarine;for some reason.@@ $He gives you a kiss and thanks you prettily.
 	<<set $activeSlave.trust += 4>>
 	<</replace>>
 <</link>>
@@ -17877,7 +17877,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 <<link "Fuck $him">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-		You announce that you're going to fuck $his <<if $activeSlave.anus == 0>>virgin <</if>>asspussy. To your complete lack of surprise, $he can't hide $his horror at the prospect of <<if $PC.dick == 1>>having a cock inside $his<<else>>being fucked with a strap-on<</if>>, and $his <<if canSee($activeSlave)>>wide, <<eyeColor>> eyes track<<else>>terrified face follows<</if>> your movements closely as you stand up and <<if $PC.dick == 1>>reveal the formidable member<<else>>don the strap-on<</if>> you're about to breed $him with. You order $him to kneel on the couch, which $he does, @@.gold;cringing in fear of being buttfucked, but knowing disobedience will be worse;@@ and then you order $him to reach down and spread $his butt for you, as wide as it'll go. $He complies,
+		You announce that you're going to fuck $his <<if $activeSlave.anus == 0>>virgin <</if>>asspussy. To your complete lack of surprise, $he can't hide $his horror at the prospect of <<if $PC.dick == 1>>having a cock inside $his<<else>>being fucked with a strap-on<</if>>, and $his <<if canSee($activeSlave)>>wide, <<= App.Desc.EyeColor>> eyes track<<else>>terrified face follows<</if>> your movements closely as you stand up and <<if $PC.dick == 1>>reveal the formidable member<<else>>don the strap-on<</if>> you're about to breed $him with. You order $him to kneel on the couch, which $he does, @@.gold;cringing in fear of being buttfucked, but knowing disobedience will be worse;@@ and then you order $him to reach down and spread $his butt for you, as wide as it'll go. $He complies,
 		<<if $activeSlave.butt > 12>>
 			grabbing as much flesh as $he can of each monstrous buttock and heaving them as far apart as $he can manage in an attempt
 		<<elseif $activeSlave.butt > 6>>
@@ -18079,7 +18079,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 		<<else>>
 			closer than ever.
 		<</if>>
-		You take your other hand and place a firm but loving grip under $his chin, lifting $his <<eyeColor>>-eyed gaze to meet yours before kissing $him again. All the while, you
+		You take your other hand and place a firm but loving grip under $his chin, lifting $his <<= App.Desc.EyeColor>>-eyed gaze to meet yours before kissing $him again. All the while, you
 		<<if $PC.dick == 1>>
 			fuck $him powerfully, withdrawing your dick almost all the way and then hilting yourself in $his soaked slit.
 			<<= VaginalVCheck()>>
@@ -18527,7 +18527,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 		<<if $activeSlave.height < 170>>
 			The short $desc has to go up on tiptoe to reach.
 		<</if>>
-		"@@.hotpink;I really do love you,@@ <<Master>>," $he <<say>>s, <<if canSee($activeSlave)>><<eyeColor>> eyes shining<<else>>face filled with joy<</if>>.
+		"@@.hotpink;I really do love you,@@ <<Master>>," $he <<say>>s, <<if canSee($activeSlave)>><<= App.Desc.EyeColor>> eyes shining<<else>>face filled with joy<</if>>.
 		<<set $activeSlave.devotion += 5>>
 	<</replace>>
 <</link>>
@@ -18796,7 +18796,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 		<<else>>
 			disappointingly thin
 		<</if>>
-		lips before starting to suck dick. Dissatisfied with $his reluctance, you order $him to open $his eyes and look up at you; $he obeys, the <<eyeColor>> orbs glittering with a little moisture as $he concentrates on breathing past your penis. You ask if your cock <<if canTaste($activeSlave)>>tastes<<else>>feels<</if>> any different than usual. "Mmm hmm, M'," $he mumbles, producing a nice humming sensation against your cock. You tell $him that $he's <<if canTaste($activeSlave)>>tasting<<else>>feeling<</if>> another slave's <<if $activeSlave.vagina > -1>>pussy<<else>>ass<</if>>. $He gags, but only slightly, and controls $himself immediately. Your dick is desensitized from vigorous use, and $he has to suck it a long time before you cup the back of $his head, ram yourself all the way in, and blow your load straight down $his gullet. You tell $him $he's a good $desc. "Thank you, <<Master>>," $he <<say>>s @@.hotpink;submissively,@@ going back to $his polishing.
+		lips before starting to suck dick. Dissatisfied with $his reluctance, you order $him to open $his eyes and look up at you; $he obeys, the <<= App.Desc.EyeColor>> orbs glittering with a little moisture as $he concentrates on breathing past your penis. You ask if your cock <<if canTaste($activeSlave)>>tastes<<else>>feels<</if>> any different than usual. "Mmm hmm, M'," $he mumbles, producing a nice humming sensation against your cock. You tell $him that $he's <<if canTaste($activeSlave)>>tasting<<else>>feeling<</if>> another slave's <<if $activeSlave.vagina > -1>>pussy<<else>>ass<</if>>. $He gags, but only slightly, and controls $himself immediately. Your dick is desensitized from vigorous use, and $he has to suck it a long time before you cup the back of $his head, ram yourself all the way in, and blow your load straight down $his gullet. You tell $him $he's a good $desc. "Thank you, <<Master>>," $he <<say>>s @@.hotpink;submissively,@@ going back to $his polishing.
 		<<set $activeSlave.oralCount++, $oralTotal++>>
 		<<set $activeSlave.devotion += 5>>
 	<</replace>>
@@ -19273,7 +19273,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 <<link "Gently acclimate $him to the age difference with some lovemaking">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	As you cross the breadth of your office to reach $activeSlave.slaveName, $he presents $himself for your sexual usage out of habit. However, you take $him by surprise by drawing $him into you arms, running the tips of your fingers through $his $activeSlave.hColor hair, and looking into $his <<eyeColor>> eyes. <<if canSee($activeSlave)>>$He meets your gaze for a brief moment before blushing girlishly, as if forgetting how many years your senior $he is<<else>>$He seems to feel the intensity of your gaze despite $his sightless eyes and blushes girlishly, as if forgetting how many years your senior $he is<</if>>. In lieu of words, you lift $his chin with a single beckoning finger and steal $his breath from $his lips with a firm kiss. Once $he's recovered $his wits $he clings to you with almost animalistic attachment. After a few moments $he moves to get down on $his knees, clearly defaulting to $his role as a sex slave in response to your unexpected intimacy. Instead, you
+	As you cross the breadth of your office to reach $activeSlave.slaveName, $he presents $himself for your sexual usage out of habit. However, you take $him by surprise by drawing $him into you arms, running the tips of your fingers through $his $activeSlave.hColor hair, and looking into $his <<= App.Desc.EyeColor>> eyes. <<if canSee($activeSlave)>>$He meets your gaze for a brief moment before blushing girlishly, as if forgetting how many years your senior $he is<<else>>$He seems to feel the intensity of your gaze despite $his sightless eyes and blushes girlishly, as if forgetting how many years your senior $he is<</if>>. In lieu of words, you lift $his chin with a single beckoning finger and steal $his breath from $his lips with a firm kiss. Once $he's recovered $his wits $he clings to you with almost animalistic attachment. After a few moments $he moves to get down on $his knees, clearly defaulting to $his role as a sex slave in response to your unexpected intimacy. Instead, you
 	<<if $activeSlave.belly >= 300000>>
 		help $him to $his feet and guide $him to bed, aiding the <<if $activeSlave.bellyPreg >= 3000>>child-laden<<else>>tremendously swollen<</if>> older $woman onto the sheets before gently mounting $him.
 	<<else>>
@@ -19397,7 +19397,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 <<link "Gently acclimate $him to the age difference with some lovemaking">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	As you cross the breadth of your office to reach $activeSlave.slaveName, $he presents $himself for your sexual usage out of habit. However, you take $him by surprise by drawing $him into you arms, running the tips of your fingers through $his $activeSlave.hColor hair, and looking into $his <<eyeColor>> eyes. <<if canSee($activeSlave)>>$He meets your gaze for a brief moment before blushing girlishly, as if forgetting how many years $his senior you are<<else>>$He seems to feel the intensity of your gaze despite $his sightless eyes and blushes girlishly, as if forgetting how many years $his senior you are<</if>>. In lieu of words, you lift $his chin with a single beckoning finger and steal $his breath from $his lips with a firm kiss. Once $he's recovered $his wits $he clings to you with almost animalistic attachment. After a few moments $he moves to get down on $his knees, clearly defaulting to $his role as a sex slave in response to your unexpected intimacy.
+	As you cross the breadth of your office to reach $activeSlave.slaveName, $he presents $himself for your sexual usage out of habit. However, you take $him by surprise by drawing $him into you arms, running the tips of your fingers through $his $activeSlave.hColor hair, and looking into $his <<= App.Desc.EyeColor>> eyes. <<if canSee($activeSlave)>>$He meets your gaze for a brief moment before blushing girlishly, as if forgetting how many years $his senior you are<<else>>$He seems to feel the intensity of your gaze despite $his sightless eyes and blushes girlishly, as if forgetting how many years $his senior you are<</if>>. In lieu of words, you lift $his chin with a single beckoning finger and steal $his breath from $his lips with a firm kiss. Once $he's recovered $his wits $he clings to you with almost animalistic attachment. After a few moments $he moves to get down on $his knees, clearly defaulting to $his role as a sex slave in response to your unexpected intimacy.
 	Instead, you
 	<<if $activeSlave.belly >= 300000>>
 		help $him to $his feet and guide $him to bed, aiding the
@@ -20401,7 +20401,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 	<<default>>
 		You grab each of $his nipples in a merciless grip and pinch them with abandon, adding a cruel twist as soon as you've got them held tightly enough.
 	<</switch>>
-	$His <<eyeColor>> eyes fly open and $he
+	$His <<= App.Desc.EyeColor>> eyes fly open and $he
 	<<if $activeSlave.voice == 1>>
 		bellows with pain, $his deep voice very loud.
 	<<elseif $activeSlave.voice == 2>>
@@ -20554,7 +20554,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 	<<default>>
 		$activeSlave.clothes
 	<</switch>>
-	You tell $him that you like how $he looks, and that $he's pretty. $He wasn't expecting such a blunt compliment, and <<if canSee($activeSlave)>>$his <<eyeColor>> eyes flick down to<<else>>$he faces<</if>> the ground for a moment as $he blushes. "T-thank you, <<Master>>," $he stutters.
+	You tell $him that you like how $he looks, and that $he's pretty. $He wasn't expecting such a blunt compliment, and <<if canSee($activeSlave)>>$his <<= App.Desc.EyeColor>> eyes flick down to<<else>>$he faces<</if>> the ground for a moment as $he blushes. "T-thank you, <<Master>>," $he stutters.
 	<br><br>
 	You add that $he looks so good that $he had better take $his nice clean
 	<<switch $activeSlave.clothes>>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 52ea3bf6092fb1f62e5334dfe11a5d7306bd4dbf..7b3008518b3e25b9a4016530206759fee63b5701 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -601,7 +601,7 @@ You look in on your slaves as a group of them heads for bed. $subSlave.slaveName
 <<else>>
 	skinny
 <</if>>
-waist to cup _his2 <<if $subSlave.dick > 0>>cock<<elseif $subSlave.vagina == -1>>asshole<<else>>pussy<</if>> possessively with one hand. $subSlave.slaveName closes _his2 <<eyeColor $subSlave>> eyes.
+waist to cup _his2 <<if $subSlave.dick > 0>>cock<<elseif $subSlave.vagina == -1>>asshole<<else>>pussy<</if>> possessively with one hand. $subSlave.slaveName closes _his2 <<= App.Desc.EyeColor $subSlave>> eyes.
 <br><br>
 $activeSlave.slaveName chuckles into $subSlave.slaveName's ear, crooning,
 <<if $subSlave.bellyPreg >= 120000>>
@@ -651,7 +651,7 @@ $subSlave.slaveName keeps _his2 eyes clamped shut and _his2 hands down at _his2
 <<set _belly = bellyAdjective($subSlave)>>
 As you pass the showers, you hear what sounds like a muffled altercation over the noise of the showers running. You look in to see $subSlave.slaveName's $subSlave.skin body facing you, pressed hard up against the glass wall of one of the showers. _His2 <<if $subSlave.face > 95>>gorgeous<<elseif $subSlave.face > 40>>beautiful<<elseif $subSlave.face > 10>>pretty<<elseif $subSlave.face >= -10>>attractive<<else>>homely<</if>> face<<if $subSlave.belly >= 5000>> and <<if $subSlave.bellyPreg >= 5000>>pregnant<<else>>_belly<</if>> belly are<<else>> is<</if>> smashed against the glass, <<if $subSlave.belly >= 5000>>_his2 face <</if>>contorted in pain and fear. The apparent mystery is solved when you notice that there are four legs visible: there's a pair of <<if ($activeSlave.muscles > 95)>>ripped<<elseif ($activeSlave.muscles > 30)>>muscular<<elseif ($activeSlave.muscles > 5)>>toned<<else>>soft<</if>> $activeSlave.skin calves behind $subSlave.slaveName's. <<EventNameLink>>'s face appears at $subSlave.slaveName's ear, and though you can't hear exactly what $he says, it's something along the lines of "Take it, you whiny little bitch." $He's clearly got <<if canPenetrate($activeSlave)>>$his cock<<else>>a couple of fingers<</if>> up $subSlave.slaveName's asshole.
 <br><br>
-Both slaves notice you at the same time. $subSlave.slaveName's <<if canSee($subSlave)>><<eyeColor $subSlave>> eyes widen<<else>>face lights up<</if>>, but _his2 momentary look of hope is snuffed out when _he2 remembers who you are. $activeSlave.slaveName, on the other hand, looks a little doubtful. The rules allow $him to fuck your other slaves, but $he isn't quite sure what the right thing to do is, since $he isn't the most dominant force in the showers any more.
+Both slaves notice you at the same time. $subSlave.slaveName's <<if canSee($subSlave)>><<= App.Desc.EyeColor $subSlave>> eyes widen<<else>>face lights up<</if>>, but _his2 momentary look of hope is snuffed out when _he2 remembers who you are. $activeSlave.slaveName, on the other hand, looks a little doubtful. The rules allow $him to fuck your other slaves, but $he isn't quite sure what the right thing to do is, since $he isn't the most dominant force in the showers any more.
 
 <<case "repressed anal virgin">>
 
@@ -1544,7 +1544,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
 	<<replace "#result">>
 	You ask $activeSlave.slaveName what $he said in a neutral tone. $He gives you a quick glance, not sure whether to be aroused or afraid, but takes a breath to steady $himself and begins. For _his2 part, $subSlave.slaveName vainly tries to stop crying in front of you. When $activeSlave.slaveName reaches "<<HeP>>'<<s>> going to hold you down and <<sh>>ove <<hisP>> <<if $PC.dick == 1>>huge cockhead<<else>>bigge<<s>>t <<s>>trap-on<</if>> right up again<<s>>t thi<<s>> tight little hole," you hold up a hand to get $him to pause. $He does, and you suddenly shove $subSlave.slaveName towards the couch. _He2 crashes face-down into the cushions, already sobbing in terror. You place a hand on _his2 $activeSlave.skin back to hold _him2 down and then use the other to apply some lube to your <<if $PC.dick == 1>>penis<<else>>strap-on<</if>> before pressing it against the quivering slave's virgin anus. _He2 shakes with anguish, causing <<if $PC.dick == 1>>your cock to rub deliciously<<else>>the strap-on to slide amusingly<</if>> up and down _his2 asscrack. You make a come-on gesture to $activeSlave.slaveName, and $he continues, "You're going to do your be<<s>>t to relax like a good little _girl2."
 	$subSlave.slaveName desperately takes in a huge breath. $activeSlave.slaveName, who has gotten the idea (and to go by $his furious masturbation, clearly likes it), gasps out, "But it'<<s>> going to be <<s>>o big! It'<<s>> going to burn!" Here you begin to apply inexorable pressure. $subSlave.slaveName manages one more deep breath, but it becomes a squeal of anguish and _he2 tries frantically to burrow into the couch, away from the penetrating <<if $PC.dick == 1>>cock<<else>>strap-on<</if>>. "You're going to panic, and <<s>>truggle, and <<heP>>'<<s>> going to hold you down and rape your butt while you <<s>>cream and cry..."
-	$activeSlave.slaveName trails off as $he shakes with orgasm; $he doesn't say any more, but the @@.hotpink;wild satisfaction@@ <<if canSee($activeSlave)>>in $his <<eyeColor>> eyes<<else>>on $his face<</if>> says it for $him. $subSlave.slaveName, meanwhile, is a mess, but hurries @@.gold;fearfully@@ to obey your instructions to go clean _himself2, and hides _his2 @@.mediumorchid;hatred@@ as _he2 gingerly applies an enema to _his2 @@.lime;loosened butt.@@
+	$activeSlave.slaveName trails off as $he shakes with orgasm; $he doesn't say any more, but the @@.hotpink;wild satisfaction@@ <<if canSee($activeSlave)>>in $his <<= App.Desc.EyeColor>> eyes<<else>>on $his face<</if>> says it for $him. $subSlave.slaveName, meanwhile, is a mess, but hurries @@.gold;fearfully@@ to obey your instructions to go clean _himself2, and hides _his2 @@.mediumorchid;hatred@@ as _he2 gingerly applies an enema to _his2 @@.lime;loosened butt.@@
 	<<set $activeSlave.devotion += 5>>
 	<<set $subSlave.trust -= 10, $subSlave.devotion -= 5, $subSlave.analCount++, $subSlave.anus = 1>>
 	<<set $analTotal++>>
diff --git a/src/uncategorized/addCustomDescriptors.tw b/src/uncategorized/addCustomDescriptors.tw
index 5fc9cc3a0aeae86df5a6425d955e8e8846ee3559..dc4c5aafa9bde41e19d9652580f6b46bfcdd0352 100644
--- a/src/uncategorized/addCustomDescriptors.tw
+++ b/src/uncategorized/addCustomDescriptors.tw
@@ -41,7 +41,7 @@ You may enter custom descriptors for your slave's hair color, hair style, tattoo
 	<</if>>
 	</span>
 <<else>>
-	//You must break $his will further before $he will refer to you by a new title.<<if SlaveStatsChecker.checkForLisp($activeSlave)>><<if def $activeSlave.customTitleLisp && $activeSlave.customTitleLisp != "">> For now, $he intends to keep calling you "<<print $activeSlave.customTitleLisp>>".<</if>><<else>><<if def $activeSlave.customTitle && $activeSlave.customTitle != "">> For now, $he intends to keep calling you "<<print $activeSlave.customTitle>>".<</if>><</if>>//
+	//You must break $his will further before $he will refer to you by a new title.<<if SlaveStatsChecker.checkForLisp($activeSlave)>><<if (def $activeSlave.customTitleLisp) && $activeSlave.customTitleLisp != "">> For now, $he intends to keep calling you "<<print $activeSlave.customTitleLisp>>".<</if>><<else>><<if (def $activeSlave.customTitle) && $activeSlave.customTitle != "">> For now, $he intends to keep calling you "<<print $activeSlave.customTitle>>".<</if>><</if>>//
 <</if>>
 
 <br><br>
@@ -169,4 +169,4 @@ jQuery(function() {
 		<<textbox "$activeSlave.customHairVector" "" "Add custom descriptors">>
 	<</if>>
 	<<link "Reset" "Add custom descriptors">><<set $activeSlave.customHairVector = 0>><</link>>
-<</if>>
\ No newline at end of file
+<</if>>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 00e663d8038207b1f80e1f67c3db7c9d6c2c5cf5..542e2e44aaa3e90abb3d407c009531a623bcc64c 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -1281,7 +1281,7 @@ earning you @@.yellowgreen;<<print cashFormat(_menialEarnings + _bioreactorEarni
 		<</if>>
 	<</if>>
 
-	<<if def $arcologies[0].embargoTarget && $arcologies[0].embargoTarget != -1>>
+	<<if (def $arcologies[0].embargoTarget) && $arcologies[0].embargoTarget != -1>>
 		The local economy is hurt by the double edged sword of your economic warfare.
 		<<set _AWeekGrowth -= $arcologies[0].embargo*2>>
 	<</if>>
diff --git a/src/uncategorized/freeRangeDairyAssignmentScene.tw b/src/uncategorized/freeRangeDairyAssignmentScene.tw
index 30678a8c4ace4b11ea817531be21c2ad896d5b69..63d11ca6efdaa21b3cfc7c71058936474079c056 100644
--- a/src/uncategorized/freeRangeDairyAssignmentScene.tw
+++ b/src/uncategorized/freeRangeDairyAssignmentScene.tw
@@ -113,7 +113,7 @@ Eventually, $activeSlave.slaveName arrives at $his designated milking stall.
 <<else>>
 	<<if ($activeSlave.relation != 0)>>
 		<<set _assayedSlave = getSlave($activeSlave.relationTarget)>>
-		<<if def _assayedSlave && _assayedSlave.assignment == "work in the dairy">>
+		<<if (def _assayedSlave) && _assayedSlave.assignment == "work in the dairy">>
 			<<set _assayedSlaveAvailable = 1>>
 			<<set _assayType = $activeSlave.relation>>
 		<</if>>
@@ -121,7 +121,7 @@ Eventually, $activeSlave.slaveName arrives at $his designated milking stall.
 <</if>> /*closes extended family mode */
 <<if _assayedSlaveAvailable == 0 && $activeSlave.relationship > 0>>
 	<<set _assayedSlave = getSlave($activeSlave.relationshipTarget)>>
-	<<if def _assayedSlave && _assayedSlave.assignment == "work in the dairy">>
+	<<if (def _assayedSlave) && _assayedSlave.assignment == "work in the dairy">>
 		<<set _assayedSlaveAvailable = 1>>
 		<<switch $activeSlave.relationship>>
 		<<case 1>>
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index 1f4601ebf2824a386c4d1161719fef9c9fd6935d..8656331dda80cba0f3b3316dd65a27cb3709887f 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -168,7 +168,9 @@ The crowd of nude slaves led up to the lawn and chained to rings along one edge
 	<<set _trapped.push("housewives")>>
 	<<if $seePreg != 0>>
 		<<set _trapped.push("maternity")>>
-		<<set _trapped.push("seizedMission")>>
+		<<if $continent == "Africa">>
+			<<set _trapped.push("seizedMission")>>
+		<</if>>
 	<</if>>
 	<<set _trapped.push("volleyballTeam")>>
 <</if>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index b8bad58b19e7778f30e9cccb281c6234bc5b54ae..9e6e99ab43084caba467c8fe271296c9dcfaba6d 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -541,7 +541,7 @@ is
 
 <<if $activeSlave.fuckdoll == 0>> /* NORMAL NON-FUCKDOLL MENTAL REPORT */
 
-	<<eyeDescription>>
+	<<= App.Desc.Eyes($activeSlave)>>
 
 	<<if $activeSlave.fetish == "mindbroken">>
 		However, @@.coral;$his mind is fundamentally broken;@@ everything $he experiences will quickly be forgotten.
@@ -1161,7 +1161,7 @@ is
 				$He is in an @@.lightgreen;incestuous relationship with $his father, <<= SlaveFullName(_lover)>>.@@
 			<<elseif _lover.mother == $activeSlave.ID || _lover.father == $activeSlave.ID>>
 				$He is in an @@.lightgreen;incestuous relationship with $his daughter, <<= SlaveFullName(_lover)>>.@@
-			<<elseif def $showDistantRelatives && $showDistantRelatives == 1>>
+			<<elseif (def $showDistantRelatives) && $showDistantRelatives == 1>>
 				<<if isAunt($activeSlave, _lover)>>
 					$He is in an @@.lightgreen;incestuous relationship with $his aunt, <<= SlaveFullName(_lover)>>.@@
 				<<elseif isAunt(_lover, $activeSlave)>>
@@ -1195,7 +1195,7 @@ is
 			<<elseif $PC.title == 0>>
 				$He is in an @@.lightgreen;incestuous relationship with $his daughter, you.@@
 			<</if>>
-		<<elseif def $showDistantRelatives && $showDistantRelatives == 1>>
+		<<elseif (def $showDistantRelatives) && $showDistantRelatives == 1>>
 			<<if isAunt($activeSlave, $PC)>>
 				<<if $PC.title == 1>>
 					$He is in an @@.lightgreen;incestuous relationship with $his uncle, you.@@
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index 568387e5dd8f2e78ce4a0ecd140442f02344a6bd..8a44a769948b53540f29139ae1aed3b82d148a35 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -178,7 +178,7 @@ __''MAIN MENU''__&nbsp;&nbsp;&nbsp;&nbsp;//[[Summary Options]]//
 		<button class="tablinks" onclick="opentab(event, 'all')" id="tab all">
 			All
 			<<if _penthouseSlaves > 0>>
-				<<if $Headgirl != 0>>
+				<<if $HeadGirl != 0>>
 					<<set _penthouseSlaves++>>
 				<</if>>
 				<<if $Recruiter != 0>>
diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw
index 41fac2215a717ff916549b01b16e07827355662d..35bc6665e950c07193b9f519d4a0a67dd82ba607 100644
--- a/src/uncategorized/neighborsDevelopment.tw
+++ b/src/uncategorized/neighborsDevelopment.tw
@@ -55,7 +55,7 @@
 	<<setLocalPronouns $leaders[_k]>>
 	is being run by your agent @@.deeppink;<<= SlaveFullName($leaders[_k])>>@@.
 	<<set _agentIndex = $slaveIndices[$leaders[_k].ID]>>
-	<<if def _agentIndex && $slaves[_agentIndex].assignment != "be your agent">>
+	<<if (def _agentIndex) && $slaves[_agentIndex].assignment != "be your agent">>
 		@@.red;BUG: $slaves[_agentIndex].slaveName also was <<print $slaves[_agentIndex].assignment>>!@@
 		<<= assignJob($slaves[_agentIndex], "be your agent")>>
 	<</if>>
@@ -84,7 +84,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(_prosperity)>><<if $sh
 		<<set $arcologies[$i].PCminority = 0>>
 	<</if>>
 	@@.yellow;After a brief power struggle, it undergoes a change of government.@@
-	<<if def _agentIndex && _agentIndex != -1>>
+	<<if (def _agentIndex) && _agentIndex != -1>>
 		<<setLocalPronouns $slaves[_agentIndex]>>
 		@@.deeppink;$slaves[_agentIndex].slaveName@@ manages to escape with the help of a few loyal citizens and returns to you @@.gold;fearing your displeasure at $his failure.@@
 		<<set $slaves[_agentIndex].trust -= 40>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index d03f730accdf303047527ae01b7532970c05313d..8e9ce1b7e5523fabdbf43b88cb9adefd846e650e 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -193,41 +193,41 @@
 		<<set $averageTrust += $slaves[_i].trust*0.5, $averageDevotion += $slaves[_i].devotion*0.5, _slavesContributing += 0.5>>
 	<</if>>
 	<<if $studio == 1>>
-		<<if $slaves[_i].pornTypeGeneral > 0>><<set $pornStars++>><</if>>
-		<<if $slaves[_i].pornTypeFuckdoll > 0>><<set $pornStarFuckdolls++>><</if>>
-		<<if $slaves[_i].pornTypeRape > 0>><<set $pornStarRapees++>><</if>>
-		<<if $slaves[_i].pornTypePreggo > 0>><<set $pornStarPreggos++>><</if>>
-		<<if $slaves[_i].pornTypeBBW > 0>><<set $pornStarBBWs++>><</if>>
-		<<if $slaves[_i].pornTypeGainer > 0>><<set $pornStarGainers++>><</if>>
-		<<if $slaves[_i].pornTypeStud > 0>><<set $pornStarStuds++>><</if>>
-		<<if $slaves[_i].pornTypeLoli > 0>><<set $pornStarLolis++>><</if>>
-		<<if $slaves[_i].pornTypeDeepThroat > 0>><<set $pornStarDeepThroats++>><</if>>
-		<<if $slaves[_i].pornTypeStruggleFuck > 0>><<set $pornStarStruggleFucks++>><</if>>
-		<<if $slaves[_i].pornTypePainal > 0>><<set $pornStarPainals++>><</if>>
-		<<if $slaves[_i].pornTypeTease > 0>><<set $pornStarTeases++>><</if>>
-		<<if $slaves[_i].pornTypeRomantic > 0>><<set $pornStarRomantics++>><</if>>
-		<<if $slaves[_i].pornTypePervert > 0>><<set $pornStarPerverts++>><</if>>
-		<<if $slaves[_i].pornTypeCaring > 0>><<set $pornStarCarings++>><</if>>
-		<<if $slaves[_i].pornTypeUnflinching > 0>><<set $pornStarUnflinchings++>><</if>>
-		<<if $slaves[_i].pornTypeSizeQueen > 0>><<set $pornStarSizeQueens++>><</if>>
-		<<if $slaves[_i].pornTypeNeglectful > 0>><<set $pornStarNeglectfuls++>><</if>>
-		<<if $slaves[_i].pornTypeCumAddict > 0>><<set $pornStarCumAddicts++>><</if>>
-		<<if $slaves[_i].pornTypeAnalAddict > 0>><<set $pornStarAnalAddicts++>><</if>>
-		<<if $slaves[_i].pornTypeAttentionWhore > 0>><<set $pornStarAttentionWhores++>><</if>>
-		<<if $slaves[_i].pornTypeBreastGrowth > 0>><<set $pornStarBreastGrowths++>><</if>>
-		<<if $slaves[_i].pornTypeAbusive > 0>><<set $pornStarAbusives++>><</if>>
-		<<if $slaves[_i].pornTypeMalicious > 0>><<set $pornStarMalicious++>><</if>>
-		<<if $slaves[_i].pornTypeSelfHating > 0>><<set $pornStarSelfHatings++>><</if>>
-		<<if $slaves[_i].pornTypeBreeder > 0>><<set $pornStarBreeders++>><</if>>
-		<<if $slaves[_i].pornTypeSub > 0>><<set $pornStarSubs++>><</if>>
-		<<if $slaves[_i].pornTypeCumSlut > 0>><<set $pornStarCumSluts++>><</if>>
-		<<if $slaves[_i].pornTypeAnal > 0>><<set $pornStarAnals++>><</if>>
-		<<if $slaves[_i].pornTypeHumiliation > 0>><<set $pornStarHumiliations++>><</if>>
-		<<if $slaves[_i].pornTypeBoobs > 0>><<set $pornStarBoobs++>><</if>>
-		<<if $slaves[_i].pornTypeDom > 0>><<set $pornStarDoms++>><</if>>
-		<<if $slaves[_i].pornTypeSadist > 0>><<set $pornStarSadists++>><</if>>
-		<<if $slaves[_i].pornTypeMasochist > 0>><<set $pornStarMasochists++>><</if>>
-		<<if $slaves[_i].pornTypePregnancy > 0>><<set $pornStarPregnancySluts++>><</if>>
+		<<if $slaves[_i].porn.fame.general > 0>><<set $pornStars++>><</if>>
+		<<if $slaves[_i].porn.fame.fuckdoll > 0>><<set $pornStarFuckdolls++>><</if>>
+		<<if $slaves[_i].porn.fame.rape > 0>><<set $pornStarRapees++>><</if>>
+		<<if $slaves[_i].porn.fame.preggo > 0>><<set $pornStarPreggos++>><</if>>
+		<<if $slaves[_i].porn.fame.BBW > 0>><<set $pornStarBBWs++>><</if>>
+		<<if $slaves[_i].porn.fame.gainer > 0>><<set $pornStarGainers++>><</if>>
+		<<if $slaves[_i].porn.fame.stud > 0>><<set $pornStarStuds++>><</if>>
+		<<if $slaves[_i].porn.fame.loli > 0>><<set $pornStarLolis++>><</if>>
+		<<if $slaves[_i].porn.fame.deepThroat > 0>><<set $pornStarDeepThroats++>><</if>>
+		<<if $slaves[_i].porn.fame.struggleFuck > 0>><<set $pornStarStruggleFucks++>><</if>>
+		<<if $slaves[_i].porn.fame.painal > 0>><<set $pornStarPainals++>><</if>>
+		<<if $slaves[_i].porn.fame.tease > 0>><<set $pornStarTeases++>><</if>>
+		<<if $slaves[_i].porn.fame.romantic > 0>><<set $pornStarRomantics++>><</if>>
+		<<if $slaves[_i].porn.fame.pervert > 0>><<set $pornStarPerverts++>><</if>>
+		<<if $slaves[_i].porn.fame.caring > 0>><<set $pornStarCarings++>><</if>>
+		<<if $slaves[_i].porn.fame.unflinching > 0>><<set $pornStarUnflinchings++>><</if>>
+		<<if $slaves[_i].porn.fame.sizeQueen > 0>><<set $pornStarSizeQueens++>><</if>>
+		<<if $slaves[_i].porn.fame.neglectful > 0>><<set $pornStarNeglectfuls++>><</if>>
+		<<if $slaves[_i].porn.fame.cumAddict > 0>><<set $pornStarCumAddicts++>><</if>>
+		<<if $slaves[_i].porn.fame.analAddict > 0>><<set $pornStarAnalAddicts++>><</if>>
+		<<if $slaves[_i].porn.fame.attentionWhore > 0>><<set $pornStarAttentionWhores++>><</if>>
+		<<if $slaves[_i].porn.fame.breastGrowth > 0>><<set $pornStarBreastGrowths++>><</if>>
+		<<if $slaves[_i].porn.fame.abusive > 0>><<set $pornStarAbusives++>><</if>>
+		<<if $slaves[_i].porn.fame.malicious > 0>><<set $pornStarMalicious++>><</if>>
+		<<if $slaves[_i].porn.fame.selfHating > 0>><<set $pornStarSelfHatings++>><</if>>
+		<<if $slaves[_i].porn.fame.breeder > 0>><<set $pornStarBreeders++>><</if>>
+		<<if $slaves[_i].porn.fame.sub > 0>><<set $pornStarSubs++>><</if>>
+		<<if $slaves[_i].porn.fame.cumSlut > 0>><<set $pornStarCumSluts++>><</if>>
+		<<if $slaves[_i].porn.fame.anal > 0>><<set $pornStarAnals++>><</if>>
+		<<if $slaves[_i].porn.fame.humiliation > 0>><<set $pornStarHumiliations++>><</if>>
+		<<if $slaves[_i].porn.fame.boobs > 0>><<set $pornStarBoobs++>><</if>>
+		<<if $slaves[_i].porn.fame.dom > 0>><<set $pornStarDoms++>><</if>>
+		<<if $slaves[_i].porn.fame.sadist > 0>><<set $pornStarSadists++>><</if>>
+		<<if $slaves[_i].porn.fame.masochist > 0>><<set $pornStarMasochists++>><</if>>
+		<<if $slaves[_i].porn.fame.pregnancy > 0>><<set $pornStarPregnancySluts++>><</if>>
 	<</if>>
 	<<if $slaves[_i].choosesOwnAssignment > 0>>
 		<<= assignJob($slaves[_i], "choose her own job")>>
diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw
index 777073ae9399abf2af8f987dd9af021861eb19d1..3f7e51e249961e9fa59166ca2a34a71639029879 100644
--- a/src/uncategorized/nonRandomEvent.tw
+++ b/src/uncategorized/nonRandomEvent.tw
@@ -75,7 +75,7 @@
 		<<set $badB = 1>>
 		<<goto "Nonrandom Event">>
 	<</if>>
-<<elseif _effectiveWeek == 54 && def $peacekeepers && $peacekeepers.attitude >= 0>>
+<<elseif _effectiveWeek == 54 && (def $peacekeepers) && $peacekeepers.attitude >= 0>>
 	<<goto "P peacekeepers deficit">>
 <<elseif (_effectiveWeek == 56)>>
 	<<set $collaboration = 0>>
@@ -133,9 +133,9 @@
 	<<goto "Assistant Events">>
 <<elseif (_effectiveWeek > 70) && ($corpIncorporated > 0) && ($rivalOwnerEnslaved > 0) && ($mercenaries >= 3) && ($mercenariesHelpCorp == 0) && ($corpDivExtra > 0)>>
 	<<goto "P Mercs Help Corp">>
-<<elseif _effectiveWeek > 75 && def $peacekeepers && $peacekeepers.strength < 50 && $rivalOwner == 0 && $peacekeepersFate != 1>>
+<<elseif _effectiveWeek > 75 && (def $peacekeepers) && $peacekeepers.strength < 50 && $rivalOwner == 0 && $peacekeepersFate != 1>>
 	<<goto "P peacekeepers independence">>
-<<elseif def $peacekeepers && $peacekeepers.strength >= 50 && $peacekeepers.influenceAnnounced == 0>>
+<<elseif (def $peacekeepers) && $peacekeepers.strength >= 50 && $peacekeepers.influenceAnnounced == 0>>
 	<<goto "P peacekeepers influence">>
 <<elseif ($cash > 120000) && ($rep > 4000) && ($corpAnnounced == 0)>>
 	<<goto "P Corp Announcement">>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index 1084a4c697b90396d86a55b31d3b8faa663ffa78..138df6085a12126684873597cbf538e448979246 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -350,7 +350,7 @@ Assignment performance vignettes on the end week report are
 <br>
 
 <<if $familyTesting == 1>>
-	<<if def $showDistantRelatives && $showDistantRelatives == 1>>
+	<<if (def $showDistantRelatives) && $showDistantRelatives == 1>>
 		Distant relatives such as aunts, nieces and cousins ''are'' shown
 		[[Hide distant relatives|Options][$showDistantRelatives = 0]]
 	<<else>>
diff --git a/src/uncategorized/reAnalPunishment.tw b/src/uncategorized/reAnalPunishment.tw
index 858a59e34c2d5ea98dc780695068410e775805ab..7abf2d5fb73ae4a3c04ea77cbe8e7e19816d53bc 100644
--- a/src/uncategorized/reAnalPunishment.tw
+++ b/src/uncategorized/reAnalPunishment.tw
@@ -29,7 +29,7 @@
 
 As you're making the rounds through your penthouse, you hear $HeadGirl.slaveName speaking in the tones _he2 uses to castigate misbehaving slaves in the next room. When you appear in the doorway, you have little chance to survey the situation before <<EventNameLink>>, apparently the miscreant, flings $himself at your feet. $He clings to one of your legs convulsively, choking on tears as $he stares up at you and tries to muster an explanation. After two false starts, $he manages to start begging. "Plea<<s>>e, <<Master>>," $he wails miserably. "Plea<<s>>e don't let _him2 rape my butt."
 <br><br>
-You shoot an amused glance at $HeadGirl.slaveName, who smiles back as _he2 explains the slave's minor sin and _his2 intention to sodomize the malefactor. _He2 does not bother to keep an edge of anticipation out of _his2 voice, and $activeSlave.slaveName cries harder and clings to you with renewed force as your Head Girl pronounces _his2 intention with cruel clarity.<<if $activeSlave.boobs > 4000>> The supplicant's breasts are so huge that $his embrace of your leg has completely surrounded it in deliciously heaving breastflesh.<<elseif $activeSlave.boobs > 1000>> The weight of the supplicant's breasts is quite noticeable as $his embrace of your leg presses them against it.<</if>> You look down at $activeSlave.slaveName. $He stares back with huge wet <<eyeColor>> eyes, doing $his best to implore you with $his gaze, and scooting $his rear in towards your foot in an unconscious effort to protect it from the promised assrape. $He's quite authentically terrified; $his whole body is shaking.
+You shoot an amused glance at $HeadGirl.slaveName, who smiles back as _he2 explains the slave's minor sin and _his2 intention to sodomize the malefactor. _He2 does not bother to keep an edge of anticipation out of _his2 voice, and $activeSlave.slaveName cries harder and clings to you with renewed force as your Head Girl pronounces _his2 intention with cruel clarity.<<if $activeSlave.boobs > 4000>> The supplicant's breasts are so huge that $his embrace of your leg has completely surrounded it in deliciously heaving breastflesh.<<elseif $activeSlave.boobs > 1000>> The weight of the supplicant's breasts is quite noticeable as $his embrace of your leg presses them against it.<</if>> You look down at $activeSlave.slaveName. $He stares back with huge wet <<= App.Desc.EyeColor>> eyes, doing $his best to implore you with $his gaze, and scooting $his rear in towards your foot in an unconscious effort to protect it from the promised assrape. $He's quite authentically terrified; $his whole body is shaking.
 <br><br>
 $HeadGirl.slaveName is very much acting within _his2 duties, and $activeSlave.slaveName has now misbehaved twice by trying to go over your Head Girl's head by appealing to you. $HeadGirl.slaveName is ready to carry out the sentence: <<if canPenetrate($HeadGirl) && ($HeadGirl.dick > 2)>>_his2 cock is fully erect, and _he2's keeping it hard with one hand. _He2 slaps its head against _his2 other palm<<elseif $HeadGirl.dick > 0>>since _his2 dick isn't an appropriate instrument for inflicting anal pain, _he2's got an elephantine dildo ready. _He2 slaps it against _his2 palm<<else>>_He2's got an elephantine dildo ready, and _he2 slaps it against _his2 palm<</if>>, forcing a frightened moan from $activeSlave.slaveName.
 
@@ -54,7 +54,7 @@ $HeadGirl.slaveName is very much acting within _his2 duties, and $activeSlave.sl
 	<br><br>
 	After enjoying the spectacle for a while, you judge that the slave's sphincter is loose enough and tell $HeadGirl.slaveName to flip the bitch over. @@.hotpink;_He2 obeys, chuckling,@@ sitting _himself2 down and hauling the reluctant slave onto _his2 lap by seizing a nipple and pulling it into position so the agonized slave is forced to follow. <<if canPenetrate($HeadGirl) && ($HeadGirl.dick > 2)>>$HeadGirl.slaveName reinserts _his2 dick, <<else>>$HeadGirl.slaveName maneuvers the dildo down over _his2 own crotch, approximating the position of a natural cock and using its base to stimulate _himself2. _He2 reinserts it,<</if>> intentionally missing twice to keep the experience unpleasant despite _his2 victim's well-fucked backdoor.
 	<br><br>
-	$activeSlave.slaveName, now facing upward rather than having $his face ground into the floor, notices for the first time that <<if $PC.dick == 1>>you've got your dick out and hard<<else>>you've donned one of your punishment-sized strap-ons<</if>>. $His <<eyeColor>> eyes @@.gold;fly open with horror@@ as you kneel down and smack its head against $his <<if $activeSlave.vagina > -1>>poor pussy<<else>>stretched taint<</if>>, but $he doesn't realize how comprehensively fucked $he is until you press it against the top of $his already-stretched anal sphincter. "Plea<<s>>e no, <<Master>>! It won't fit! Plea<<s>>e <<if $activeSlave.vagina > 0>>put it in my pu<<ss>>y<<else>>let me <<s>>uck it<</if>> in<<s>>tead," $he begs desperately. "I p-promi<<s>>e I'll be a g-good giiAAIIEEHH," $he howls. $He gasps for air, tears streaming down $his $activeSlave.skin cheeks, and then continues: "AAAH! FUCK! TAKE IT OUUUT! N-NOOO, PLEA<<S>>E DON'T THRU<<S>>T — AAAH! AAAH! AAAH!"
+	$activeSlave.slaveName, now facing upward rather than having $his face ground into the floor, notices for the first time that <<if $PC.dick == 1>>you've got your dick out and hard<<else>>you've donned one of your punishment-sized strap-ons<</if>>. $His <<= App.Desc.EyeColor>> eyes @@.gold;fly open with horror@@ as you kneel down and smack its head against $his <<if $activeSlave.vagina > -1>>poor pussy<<else>>stretched taint<</if>>, but $he doesn't realize how comprehensively fucked $he is until you press it against the top of $his already-stretched anal sphincter. "Plea<<s>>e no, <<Master>>! It won't fit! Plea<<s>>e <<if $activeSlave.vagina > 0>>put it in my pu<<ss>>y<<else>>let me <<s>>uck it<</if>> in<<s>>tead," $he begs desperately. "I p-promi<<s>>e I'll be a g-good giiAAIIEEHH," $he howls. $He gasps for air, tears streaming down $his $activeSlave.skin cheeks, and then continues: "AAAH! FUCK! TAKE IT OUUUT! N-NOOO, PLEA<<S>>E DON'T THRU<<S>>T — AAAH! AAAH! AAAH!"
 	<<set $activeSlave.trust -= 5, $activeSlave.analCount += 1>>
 	<<set $analTotal += 1>>
 	<<set $HeadGirl.devotion += 4, $HeadGirl.penetrativeCount += 1>>
diff --git a/src/uncategorized/reBusyMasterSuite.tw b/src/uncategorized/reBusyMasterSuite.tw
index b9e8e544dbe58af2d1c8c0297c2b075f6bdc3c31..9d1d60b400528085a7dc5fc481bc5c20d52541f9 100644
--- a/src/uncategorized/reBusyMasterSuite.tw
+++ b/src/uncategorized/reBusyMasterSuite.tw
@@ -199,7 +199,7 @@ who has paused $his thrusting to issue a peremptory order to the slaves to stay
 <br><<link "Slide in up at the head of the bed for some oral">>
 	<<replace "#result">>
 	<<setLocalPronouns _msIdx[0] 2>>
-	_msIdx[0].slaveName's <<eyeColor _msIdx[0]>> eyes widen when you push _him2 upright for a moment and slide in under _him2, but _he2 wraps _his2
+	_msIdx[0].slaveName's <<= App.Desc.EyeColor _msIdx[0]>> eyes widen when you push _him2 upright for a moment and slide in under _him2, but _he2 wraps _his2
 	<<if (_msIdx[0].lips > 95)>>
 		facepussy
 	<<elseif (_msIdx[0].lips > 70)>>
diff --git a/src/uncategorized/reHGReplacement.tw b/src/uncategorized/reHGReplacement.tw
index 0d49859533e73b2e2fc08efc898cb3725e07da9e..03d188ecea407d51ecdbf2dfa984ee0abda09e80 100644
--- a/src/uncategorized/reHGReplacement.tw
+++ b/src/uncategorized/reHGReplacement.tw
@@ -25,7 +25,7 @@
 <<set $activeSlave.clothes = _clothesTemp>>
 <<set $HeadGirl.clothes = _clothesTemp2>>
 
-There's a constant traffic of slaves in and out of your office as your chattel comes in and out for instructions, inspections, and sex. Your Head Girl $HeadGirl.slaveName is one of the most frequent visitors, since although you trust _him2, _he2's still a slave and has to check with you before acting on some matters.<<if $HeadGirl.relationship == -3>> (_He2's also your wife, making _his2 visits a pleasant diversion.)<<elseif $arcologies[0].FSEgyptianRevivalistLaw == 1>> (_He2's also your Consort, making _his2 visits a pleasant diversion.)<</if>> During one of _his2 visits, <<EventNameLink>> happens to come in for $his scheduled inspection. $He perches politely on the couch, waiting $his turn like a good $girl. $His <<eyeColor>> eyes are watchful, however, and $he seems to be paying very close attention to your conversation with your Head Girl.
+There's a constant traffic of slaves in and out of your office as your chattel comes in and out for instructions, inspections, and sex. Your Head Girl $HeadGirl.slaveName is one of the most frequent visitors, since although you trust _him2, _he2's still a slave and has to check with you before acting on some matters.<<if $HeadGirl.relationship == -3>> (_He2's also your wife, making _his2 visits a pleasant diversion.)<<elseif $arcologies[0].FSEgyptianRevivalistLaw == 1>> (_He2's also your Consort, making _his2 visits a pleasant diversion.)<</if>> During one of _his2 visits, <<EventNameLink>> happens to come in for $his scheduled inspection. $He perches politely on the couch, waiting $his turn like a good $girl. $His <<= App.Desc.EyeColor>> eyes are watchful, however, and $he seems to be paying very close attention to your conversation with your Head Girl.
 
 When $HeadGirl.slaveName leaves, $he clears $his throat nervously. $He gathers $his courage, and <<say>>s, "<<Master>>, I think I would make a better Head Girl than $him." $He takes a deep breath and plunges on. "I'm ju<<s>>t a<<s>> <<s>>mart a<<s>> <<he 2>> i<<s>>. And, <<Master>>, I'm <<s>>ure you've noti<<c>>ed <<he 2>> i<<s>>n't very good at teaching other girl<<s>> vaginal <<s>>kill<<s>>.
 <<if $HeadGirl.vagina > 0>>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index 1e1e7e9ca24b9963c1c54f67103bbbde435c6766..45fb2275f97ace4fc1cae5aa20d26df3ca10910c 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -397,43 +397,43 @@
 <<set $activeSlave.pornFeed = 0>>
 <<set $activeSlave.pornPrestige = 0>>
 <<set $activeSlave.pornPrestigeDesc = 0>>
-<<set $activeSlave.pornFameType = "none">>
-<<set $activeSlave.pornFocus = "none">>
-<<set $activeSlave.pornTypeGeneral = 0>>
-<<set $activeSlave.pornTypeFuckdoll = 0>>
-<<set $activeSlave.pornTypeRape = 0>>
-<<set $activeSlave.pornTypePreggo = 0>>
-<<set $activeSlave.pornTypeBBW = 0>>
-<<set $activeSlave.pornTypeGainer = 0>>
-<<set $activeSlave.pornTypeStud = 0>>
-<<set $activeSlave.pornTypeLoli = 0>>
-<<set $activeSlave.pornTypeDeepThroat = 0>>
-<<set $activeSlave.pornTypeStruggleFuck = 0>>
-<<set $activeSlave.pornTypePainal = 0>>
-<<set $activeSlave.pornTypeTease = 0>>
-<<set $activeSlave.pornTypeRomantic = 0>>
-<<set $activeSlave.pornTypePervert = 0>>
-<<set $activeSlave.pornTypeCaring = 0>>
-<<set $activeSlave.pornTypeUnflinching = 0>>
-<<set $activeSlave.pornTypeSizeQueen = 0>>
-<<set $activeSlave.pornTypeNeglectful = 0>>
-<<set $activeSlave.pornTypeCumAddict = 0>>
-<<set $activeSlave.pornTypeAnalAddict = 0>>
-<<set $activeSlave.pornTypeAttentionWhore = 0>>
-<<set $activeSlave.pornTypeBreastGrowth = 0>>
-<<set $activeSlave.pornTypeAbusive = 0>>
-<<set $activeSlave.pornTypeMalicious = 0>>
-<<set $activeSlave.pornTypeSelfHating = 0>>
-<<set $activeSlave.pornTypeBreeder = 0>>
-<<set $activeSlave.pornTypeSub = 0>>
-<<set $activeSlave.pornTypeCumSlut = 0>>
-<<set $activeSlave.pornTypeAnal = 0>>
-<<set $activeSlave.pornTypeHumiliation = 0>>
-<<set $activeSlave.pornTypeBoobs = 0>>
-<<set $activeSlave.pornTypeDom = 0>>
-<<set $activeSlave.pornTypeSadist = 0>>
-<<set $activeSlave.pornTypeMasochist = 0>>
-<<set $activeSlave.pornTypePregnancy = 0>>
+<<set $activeSlave.porn.fameType = "none">>
+<<set $activeSlave.porn.focus = "none">>
+<<set $activeSlave.porn.fame.general = 0>>
+<<set $activeSlave.porn.fame.fuckdoll = 0>>
+<<set $activeSlave.porn.fame.rape = 0>>
+<<set $activeSlave.porn.fame.preggo = 0>>
+<<set $activeSlave.porn.fame.BBW = 0>>
+<<set $activeSlave.porn.fame.gainer = 0>>
+<<set $activeSlave.porn.fame.stud = 0>>
+<<set $activeSlave.porn.fame.loli = 0>>
+<<set $activeSlave.porn.fame.deepThroat = 0>>
+<<set $activeSlave.porn.fame.struggleFuck = 0>>
+<<set $activeSlave.porn.fame.painal = 0>>
+<<set $activeSlave.porn.fame.tease = 0>>
+<<set $activeSlave.porn.fame.romantic = 0>>
+<<set $activeSlave.porn.fame.pervert = 0>>
+<<set $activeSlave.porn.fame.caring = 0>>
+<<set $activeSlave.porn.fame.unflinching = 0>>
+<<set $activeSlave.porn.fame.sizeQueen = 0>>
+<<set $activeSlave.porn.fame.neglectful = 0>>
+<<set $activeSlave.porn.fame.cumAddict = 0>>
+<<set $activeSlave.porn.fame.analAddict = 0>>
+<<set $activeSlave.porn.fame.attentionWhore = 0>>
+<<set $activeSlave.porn.fame.breastGrowth = 0>>
+<<set $activeSlave.porn.fame.abusive = 0>>
+<<set $activeSlave.porn.fame.malicious = 0>>
+<<set $activeSlave.porn.fame.selfHating = 0>>
+<<set $activeSlave.porn.fame.breeder = 0>>
+<<set $activeSlave.porn.fame.sub = 0>>
+<<set $activeSlave.porn.fame.cumSlut = 0>>
+<<set $activeSlave.porn.fame.anal = 0>>
+<<set $activeSlave.porn.fame.humiliation = 0>>
+<<set $activeSlave.porn.fame.boobs = 0>>
+<<set $activeSlave.porn.fame.dom = 0>>
+<<set $activeSlave.porn.fame.sadist = 0>>
+<<set $activeSlave.porn.fame.masochist = 0>>
+<<set $activeSlave.porn.fame.pregnancy = 0>>
 <<set $activeSlave.prestigeDesc = "">>
 <<set $activeSlave.rivalry = 0>>
 <<set $activeSlave.rivalryTarget = 0>>
@@ -1032,43 +1032,43 @@ You look up the _relationType. _He2 costs <<print cashFormat($slaveCost)>>, a ba
 <<set $activeSlave.pornFeed = 0>>
 <<set $activeSlave.pornPrestige = 0>>
 <<set $activeSlave.pornPrestigeDesc = 0>>
-<<set $activeSlave.pornFameType = "none">>
-<<set $activeSlave.pornFocus = "none">>
-<<set $activeSlave.pornTypeGeneral = 0>>
-<<set $activeSlave.pornTypeFuckdoll = 0>>
-<<set $activeSlave.pornTypeRape = 0>>
-<<set $activeSlave.pornTypePreggo = 0>>
-<<set $activeSlave.pornTypeBBW = 0>>
-<<set $activeSlave.pornTypeGainer = 0>>
-<<set $activeSlave.pornTypeStud = 0>>
-<<set $activeSlave.pornTypeLoli = 0>>
-<<set $activeSlave.pornTypeDeepThroat = 0>>
-<<set $activeSlave.pornTypeStruggleFuck = 0>>
-<<set $activeSlave.pornTypePainal = 0>>
-<<set $activeSlave.pornTypeTease = 0>>
-<<set $activeSlave.pornTypeRomantic = 0>>
-<<set $activeSlave.pornTypePervert = 0>>
-<<set $activeSlave.pornTypeCaring = 0>>
-<<set $activeSlave.pornTypeUnflinching = 0>>
-<<set $activeSlave.pornTypeSizeQueen = 0>>
-<<set $activeSlave.pornTypeNeglectful = 0>>
-<<set $activeSlave.pornTypeCumAddict = 0>>
-<<set $activeSlave.pornTypeAnalAddict = 0>>
-<<set $activeSlave.pornTypeAttentionWhore = 0>>
-<<set $activeSlave.pornTypeBreastGrowth = 0>>
-<<set $activeSlave.pornTypeAbusive = 0>>
-<<set $activeSlave.pornTypeMalicious = 0>>
-<<set $activeSlave.pornTypeSelfHating = 0>>
-<<set $activeSlave.pornTypeBreeder = 0>>
-<<set $activeSlave.pornTypeSub = 0>>
-<<set $activeSlave.pornTypeCumSlut = 0>>
-<<set $activeSlave.pornTypeAnal = 0>>
-<<set $activeSlave.pornTypeHumiliation = 0>>
-<<set $activeSlave.pornTypeBoobs = 0>>
-<<set $activeSlave.pornTypeDom = 0>>
-<<set $activeSlave.pornTypeSadist = 0>>
-<<set $activeSlave.pornTypeMasochist = 0>>
-<<set $activeSlave.pornTypePregnancy = 0>>
+<<set $activeSlave.porn.fameType = "none">>
+<<set $activeSlave.porn.focus = "none">>
+<<set $activeSlave.porn.fame.general = 0>>
+<<set $activeSlave.porn.fame.fuckdoll = 0>>
+<<set $activeSlave.porn.fame.rape = 0>>
+<<set $activeSlave.porn.fame.preggo = 0>>
+<<set $activeSlave.porn.fame.BBW = 0>>
+<<set $activeSlave.porn.fame.gainer = 0>>
+<<set $activeSlave.porn.fame.stud = 0>>
+<<set $activeSlave.porn.fame.loli = 0>>
+<<set $activeSlave.porn.fame.deepThroat = 0>>
+<<set $activeSlave.porn.fame.struggleFuck = 0>>
+<<set $activeSlave.porn.fame.painal = 0>>
+<<set $activeSlave.porn.fame.tease = 0>>
+<<set $activeSlave.porn.fame.romantic = 0>>
+<<set $activeSlave.porn.fame.pervert = 0>>
+<<set $activeSlave.porn.fame.caring = 0>>
+<<set $activeSlave.porn.fame.unflinching = 0>>
+<<set $activeSlave.porn.fame.sizeQueen = 0>>
+<<set $activeSlave.porn.fame.neglectful = 0>>
+<<set $activeSlave.porn.fame.cumAddict = 0>>
+<<set $activeSlave.porn.fame.analAddict = 0>>
+<<set $activeSlave.porn.fame.attentionWhore = 0>>
+<<set $activeSlave.porn.fame.breastGrowth = 0>>
+<<set $activeSlave.porn.fame.abusive = 0>>
+<<set $activeSlave.porn.fame.malicious = 0>>
+<<set $activeSlave.porn.fame.selfHating = 0>>
+<<set $activeSlave.porn.fame.breeder = 0>>
+<<set $activeSlave.porn.fame.sub = 0>>
+<<set $activeSlave.porn.fame.cumSlut = 0>>
+<<set $activeSlave.porn.fame.anal = 0>>
+<<set $activeSlave.porn.fame.humiliation = 0>>
+<<set $activeSlave.porn.fame.boobs = 0>>
+<<set $activeSlave.porn.fame.dom = 0>>
+<<set $activeSlave.porn.fame.sadist = 0>>
+<<set $activeSlave.porn.fame.masochist = 0>>
+<<set $activeSlave.porn.fame.pregnancy = 0>>
 <<set $activeSlave.prestigeDesc = "">>
 <<if ndef $activeSlave.geneMods>>
 	<<set $activeSlave.geneMods = {NCS: 0, rapidCellGrowth: 0}>>
diff --git a/src/uncategorized/saGuardsYou.tw b/src/uncategorized/saGuardsYou.tw
index 03995323f17e82667890480d9560749b637ef444..de9a7292dadd489ce8fc3319fb1b428001d23a0c 100644
--- a/src/uncategorized/saGuardsYou.tw
+++ b/src/uncategorized/saGuardsYou.tw
@@ -187,7 +187,7 @@ Being continually trusted with your life @@.hotpink;increases $his devotion to y
 		<<set _flawedTrainee = 0>>
 		<<if $slaves[$i].relationship > 1>>
 			<<set $subSlave = getSlave($slaves[$i].relationshipTarget)>>
-			<<if def $subSlave && $subSlave.combatSkill == 0 && bodyguardSuccessorEligible($subSlave)>>
+			<<if (def $subSlave) && $subSlave.combatSkill == 0 && bodyguardSuccessorEligible($subSlave)>>
 				$He does $his best to train $subSlave.slaveName whenever $he can, hoping that $his
 				<<if $slaves[$i].relationship > 4>>wife<<elseif $slaves[$i].relationship == 4>>lover<<elseif $slaves[$i].relationship == 3>>girlfriend<<else>>best friend<</if>>
 				can be made capable of stepping into $his place.
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index e609ec05ba5ec5c530046b4615877f3699d4dfe5..dd6f6dd685020d4fd0f8db11123a17f7039fc6e7 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -6394,7 +6394,7 @@
 /* There really is no good place for this since saRules is too early and saRivals/saRelationships is too late */
 <<if $slaves[$i].rivalry > 1 && $universalRulesConsent == 0>>
 	<<set _j = $slaveIndices[$slaves[$i].rivalryTarget]>>
-	<<if def _j && isSlaveAvailable($slaves[$i]) && isSlaveAvailable($slaves[_j])>> /* rape time */
+	<<if (def _j) && isSlaveAvailable($slaves[$i]) && isSlaveAvailable($slaves[_j])>> /* rape time */
 		<<set _fuckCount = random(1,(Math.ceil($slaves[$i].energy/10)+1))>>
 		<<set $slaves[$i].need -= _fuckCount*10>>
 		<<= SimpleSlaveSlaveFucking($slaves[_j], $slaves[$i], _fuckCount)>>
@@ -6402,7 +6402,7 @@
 <</if>>
 <<if $slaves[$i].relationship > 2>>
 	<<set _j = $slaveIndices[$slaves[$i].relationshipTarget]>>
-	<<if def _j && isSlaveAvailable($slaves[$i]) && isSlaveAvailable($slaves[_j])>> /* sexy time */
+	<<if (def _j) && isSlaveAvailable($slaves[$i]) && isSlaveAvailable($slaves[_j])>> /* sexy time */
 		<<if $slaves[$i].relationship == 5 && canPenetrate($slaves[$i])>>
 			<<if $slaves[_j].vagina == 0 && canDoVaginal($slaves[_j])>>
 				<<set $slaves[_j].vagina++, $slaves[_j].vaginalCount++, $vaginalTotal++>>
@@ -8151,7 +8151,7 @@
 
 /* saPorn */
 <<if $slaves[$i].pornPrestige == 3>>
-	$He is the whore people envision when they think of $slaves[$i].pornFameType porn. $His omnipresence on the internet @@.green;boosts $his owner's reputation.@@
+	$He is the whore people envision when they think of $slaves[$i].porn.fameType porn. $His omnipresence on the internet @@.green;boosts $his owner's reputation.@@
 	<<run repX((750*$slaves[$i].pornPrestige), "porn", $slaves[$i])>>
 	<<set _donations = Math.floor($slaves[$i].pornFame/(random(13,20)))+(random(-5000,5000))>>
 	<<if _donations > 0>>
diff --git a/src/uncategorized/saPleaseYou.tw b/src/uncategorized/saPleaseYou.tw
index 4cc928ffa73dda66d99651a71dc475c23d9228e3..54e041591a318e89f10133c3a2dd03302e7fafd3 100644
--- a/src/uncategorized/saPleaseYou.tw
+++ b/src/uncategorized/saPleaseYou.tw
@@ -1159,7 +1159,7 @@ serves you this week.
 		Keeping your own daughter as a personal fucktoy leaves quite a public impression.
 	<<elseif $slaves[$i].father > 0 && $slaves[$i].mother != $slaves[$i].father>>
 		<<set _spy = $slaveIndices[$slaves[$i].father]>>
-		<<if def _spy && ($slaves[_spy].assignment == "please you" || $slaves[_spy].assignment == "serve in the master suite" || $slaves[_spy].assignment == "be your Concubine")>>
+		<<if (def _spy) && ($slaves[_spy].assignment == "please you" || $slaves[_spy].assignment == "serve in the master suite" || $slaves[_spy].assignment == "be your Concubine")>>
 			Since you are also keeping $his father as a sexual servant, you often use them together, which leaves quite a public impression.
 		<</if>>
 	<</if>>
@@ -1168,7 +1168,7 @@ serves you this week.
 		Keeping your own daughter as a sexual servant leaves quite a public impression.
 	<<elseif $slaves[$i].mother > 0>>
 		<<set _spy = $slaveIndices[$slaves[$i].mother]>>
-		<<if def _spy && ($slaves[_spy].assignment == "please you" || $slaves[_spy].assignment == "serve in the master suite" || $slaves[_spy].assignment == "be your Concubine")>>
+		<<if (def _spy) && ($slaves[_spy].assignment == "please you" || $slaves[_spy].assignment == "serve in the master suite" || $slaves[_spy].assignment == "be your Concubine")>>
 			Since you are also keeping $his mother as a sexual servant, you often use them together, which leaves quite a public impression.
 		<</if>>
 	<</if>>
@@ -1210,7 +1210,7 @@ serves you this week.
 <<else>>
 	<<if ($slaves[$i].relation != 0)>>
 		<<set _spy = $slaveIndices[$slaves[$i].relationTarget]>>
-		<<if def _spy && ($slaves[_spy].assignment == "please you" || $slaves[_spy].assignment == "serve in the master suite" || $slaves[_spy].assignment == "be your Concubine")>>
+		<<if (def _spy) && ($slaves[_spy].assignment == "please you" || $slaves[_spy].assignment == "serve in the master suite" || $slaves[_spy].assignment == "be your Concubine")>>
 			Since you are also keeping $his $slaves[_spy].relation as a sexual servant, you often use them together, which leaves quite a public impression.
 		<</if>>
 	<</if>>
diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw
index cbbd3947f175172a9e3d329d7cbe010f67e236f1..2f864ee653c4a0846880d210a28146feab7315d1 100644
--- a/src/uncategorized/saRelationships.tw
+++ b/src/uncategorized/saRelationships.tw
@@ -1592,7 +1592,7 @@
 
 	<<if _SlaveI.rivalryTarget != _SlaveI.relationTarget>>
 		<<set _K = $slaveIndices[_SlaveI.relationTarget]>>
-		<<if def _K && _SlaveI.trust <= 95>>
+		<<if (def _K) && _SlaveI.trust <= 95>>
 			<<setLocalPronouns $slaves[_K] 2>>
 			_SlaveI.slaveName
 			<<if _SlaveI.trust < -20>>
diff --git a/src/uncategorized/saRivalries.tw b/src/uncategorized/saRivalries.tw
index 9f712cbb70c4569d4160f07b57571e816400d170..66ed851d903a86abc7f8b027d2e59cf2b3fa2f06 100644
--- a/src/uncategorized/saRivalries.tw
+++ b/src/uncategorized/saRivalries.tw
@@ -286,7 +286,7 @@
 
 <<if $slaves[$i].rivalry>>
 	<<set _j = $slaveIndices[$slaves[$i].rivalryTarget]>>
-	<<if def _j && ($slaves[$i].ID != $slaves[_j].rivalryTarget)>>
+	<<if (def _j) && ($slaves[$i].ID != $slaves[_j].rivalryTarget)>>
 		<<set $slaves[_j].rivalry = 0, $slaves[_j].rivalryTarget = 0>>
 		<<set $slaves[$i].rivalry = 0, $slaves[$i].rivalryTarget = 0>>
 	<</if>>
diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw
index de9dab8a4202e71ec78f1a2216d5c946808e74a7..2f63bfb005ebd0088f354bd8814311031b9745a5 100644
--- a/src/uncategorized/saServeThePublic.tw
+++ b/src/uncategorized/saServeThePublic.tw
@@ -514,7 +514,7 @@ $His appearance attracted $beauty members of the public (<<print Math.trunc($bea
 <<else>>
 	<<if $slaves[$i].relation != 0>>
 		<<set $j = $slaveIndices[$slaves[$i].relationTarget]>>
-		<<if def $j && $slaves[$j].assignment == $slaves[$i].assignment>>
+		<<if (def $j) && $slaves[$j].assignment == $slaves[$i].assignment>>
 			Since $his $slaves[$j].relation $slaves[$j].slaveName is a public slut too, $he earns extra attention.
 			<<if $arcologies[0].FSEgyptianRevivalist > 20>>
 				Citizens are very excited about being able to participate in incestuous sex like the ancient Egyptians.
@@ -526,7 +526,7 @@ $His appearance attracted $beauty members of the public (<<print Math.trunc($bea
 <</if>>
 <<if $slaves[$i].relationship > 0>>
 	<<set $j = $slaveIndices[$slaves[$i].relationshipTarget]>>
-	<<if def $j && $slaves[$j].assignment == $slaves[$i].assignment>>
+	<<if (def $j) && $slaves[$j].assignment == $slaves[$i].assignment>>
 		$His <<print relationshipTerm($slaves[$i])>> $slaves[$j].slaveName is also serving the public and they work well together.
 	<</if>>
 <<elseif $slaves[$i].relationship == -1>>
@@ -534,7 +534,7 @@ $His appearance attracted $beauty members of the public (<<print Math.trunc($bea
 <</if>>
 <<if $slaves[$i].rivalry != 0>>
 	<<set $j = $slaveIndices[$slaves[$i].rivalryTarget]>>
-	<<if def $j && $slaves[$j].assignment == $slaves[$i].assignment>>
+	<<if (def $j) && $slaves[$j].assignment == $slaves[$i].assignment>>
 		$He's a little less effective due to $his mutual dislike with $slaves[$j].slaveName.
 	<</if>>
 <</if>>
@@ -823,7 +823,7 @@ $His appearance attracted $beauty members of the public (<<print Math.trunc($bea
 <</if>>
 
 <<if $slaves[$i].pornPrestige > 2>>
-	Patrons line up for the chance to spend time with the face of $slaves[$i].pornFameType porn.
+	Patrons line up for the chance to spend time with the face of $slaves[$i].porn.fameType porn.
 <<elseif $slaves[$i].pornPrestige > 1>>
 	$He has a sizable fanbase, one that is eager to spend time with $him.
 <<elseif $slaves[$i].pornPrestige > 0>>
diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw
index 19ad644826b6c9b4e6221abb8fbe96bae72cc7e9..2f3e8f8cb4e2b18031917a318404faca68212648 100644
--- a/src/uncategorized/saWhore.tw
+++ b/src/uncategorized/saWhore.tw
@@ -537,7 +537,7 @@ $His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a d
 <<else>>
 	<<if $slaves[$i].relation != 0>>
 		<<set $j = $slaveIndices[$slaves[$i].relationTarget]>>
-		<<if def $j && $slaves[$j].assignment == $slaves[$i].assignment>>
+		<<if (def $j) && $slaves[$j].assignment == $slaves[$i].assignment>>
 			<<setLocalPronouns $slaves[$j] 2>>
 			Since $his $slaves[$j].relation $slaves[$j].slaveName is selling _himself2 too, $he earns extra ¤ by working with _him2.
 			<<if $arcologies[0].FSEgyptianRevivalist > 20>>
@@ -550,7 +550,7 @@ $His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a d
 <</if>> /*closes extended family mode */
 <<if $slaves[$i].relationship > 0>>
 	<<set $j = $slaveIndices[$slaves[$i].relationshipTarget]>>
-	<<if def $j && $slaves[$j].assignment == $slaves[$i].assignment>>
+	<<if (def $j) && $slaves[$j].assignment == $slaves[$i].assignment>>
 		$His <<print relationshipTerm($slaves[$i])>> $slaves[$j].slaveName is also whoring, so $he earns a bit more.
 	<</if>>
 <<elseif $slaves[$i].relationship == -1>>
@@ -558,7 +558,7 @@ $His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a d
 <</if>>
 <<if $slaves[$i].rivalry != 0>>
 	<<set $j = $slaveIndices[$slaves[$i].rivalryTarget]>>
-	<<if def $j && $slaves[$j].assignment == $slaves[$i].assignment>>
+	<<if (def $j) && $slaves[$j].assignment == $slaves[$i].assignment>>
 		$He earns a little less ¤ due to bickering with $slaves[$j].slaveName.
 	<</if>>
 <</if>>
@@ -839,7 +839,7 @@ $His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a d
 <</if>>
 
 <<if $slaves[$i].pornPrestige > 2>>
-	Customers line up for the chance to buy time with the face of $slaves[$i].pornFameType porn.
+	Customers line up for the chance to buy time with the face of $slaves[$i].porn.fameType porn.
 <<elseif $slaves[$i].pornPrestige > 1>>
 	$He has a sizable fanbase, one that is eager to buy time with $him.
 <<elseif $slaves[$i].pornPrestige > 0>>
diff --git a/src/uncategorized/seCustomSlaveDelivery.tw b/src/uncategorized/seCustomSlaveDelivery.tw
index 19eed2188e35846d76c6b9b9408984a3447619ca..3bb2b3d3f1b29a48fbc24b99880c36c2834d61ac 100644
--- a/src/uncategorized/seCustomSlaveDelivery.tw
+++ b/src/uncategorized/seCustomSlaveDelivery.tw
@@ -171,7 +171,7 @@
 <<if $customSlave.analVirgin == 0>>
 	<<set $activeSlave.anus = $customSlave.analVirgin>>
 <</if>>
-<<if def $customSlave.voice && $customSlave.voice != -1>>
+<<if (def $customSlave.voice) && $customSlave.voice != -1>>
 	<<set $activeSlave.voice = $customSlave.voice>>
 <<else>>
 	<<set $activeSlave.voice = random(0,3)>>
diff --git a/src/uncategorized/seExpiration.tw b/src/uncategorized/seExpiration.tw
index 0aa40044de1376b1a949e6f717f326854cd701cb..ef71a04792505f6aa29a2c9b3521e0dd8532d266 100644
--- a/src/uncategorized/seExpiration.tw
+++ b/src/uncategorized/seExpiration.tw
@@ -83,7 +83,7 @@ $activeSlave.slaveName's indentured servitude is ending this week, meaning that
 	<<if $cash > 1000>>
 		<<link "Enslave $him">>
 			<<replace "#result">>
-				$He's beside $himself with joy when you accept $his plea and enslave $him. $He's given you the finest proof of loyalty a slave possibly can, having tasted a moment of freedom under the law, and thrown it away with utter contempt. $His <<eyeColor>> eyes <<if canSee($activeSlave)>>watch you<<else>>are wide<</if>> with eager anticipation, radiating gladness that the prospect of separation from you has gone.
+				$He's beside $himself with joy when you accept $his plea and enslave $him. $He's given you the finest proof of loyalty a slave possibly can, having tasted a moment of freedom under the law, and thrown it away with utter contempt. $His <<= App.Desc.EyeColor>> eyes <<if canSee($activeSlave)>>watch you<<else>>are wide<</if>> with eager anticipation, radiating gladness that the prospect of separation from you has gone.
 				<<set $activeSlave.indenture = -1, $activeSlave.indentureRestrictions = 0>>
 				<<run cashX(-1000, "event", $activeSlave)>>
 				<<set $lowerClass -= 1>>
diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw
index 652f08c8c7ca191f7cc4e949615a6a8d1c130a0b..ae50d1cf02a6c9a14ebcfbc92a3f92e2d9088f38 100644
--- a/src/uncategorized/sellSlave.tw
+++ b/src/uncategorized/sellSlave.tw
@@ -501,11 +501,11 @@ A reputable slave appraiser arrives promptly to inspect $him and certify $his qu
 <</if>>
 
 <<if $activeSlave.pornPrestige == 3>>
-	$He's pretty popular in $activeSlave.pornFameType smut, isn't $he? Buyers will be lining up for $him.
+	$He's pretty popular in $activeSlave.porn.fameType smut, isn't $he? Buyers will be lining up for $him.
 <<elseif $activeSlave.pornPrestige == 2>>
-	$He's gained quite the following in $activeSlave.pornFameType smut. In fact, I've even seen some of $his smut; buyers will flock to $him.
+	$He's gained quite the following in $activeSlave.porn.fameType smut. In fact, I've even seen some of $his smut; buyers will flock to $him.
 <<elseif $activeSlave.pornPrestige == 1>>
-	$He's got a small fanbase in $activeSlave.pornFameType smut. Who knows? Maybe one of them will want $him all to themselves?
+	$He's got a small fanbase in $activeSlave.porn.fameType smut. Who knows? Maybe one of them will want $him all to themselves?
 <</if>>
 
 <<if $activeSlave.devotion > 95>>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index 4136ca54b71d3312cd9420ed44691535504230fd..874049b7645a8bfeb386fec2a869776f56ad36cd 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -449,7 +449,7 @@
 <</if>>
 */
 <<if $slaves[$i].fetish == "mindbroken" && $slaves[$i].relationship == -3>>
-	<<if def $slaves[$i].kindness && $slaves[$i].kindness > 0>>
+	<<if (def $slaves[$i].kindness) && $slaves[$i].kindness > 0>>
 		<<set $slaves[$i].kindness-->>
 	<</if>>
 <</if>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 3f1f8cf9edf5b622d6bc1a1c2d24fda64b3e45ab..cef0d6cf71040e37f16d1a3701af1c9f4da0d293 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1717,18 +1717,18 @@ Relationship rules: ''<span id="relationshipRules">$activeSlave.relationshipRule
 
 	<br><br>__Media__:<br>
 	<<if $activeSlave.pornPrestige == 3>>
-		//$He is so prestigious in the realm of $activeSlave.pornFameType porn that $his fame is self-sustaining.//
+		//$He is so prestigious in the realm of $activeSlave.porn.fameType porn that $his fame is self-sustaining.//
 	<<elseif $activeSlave.pornFeed == 0>>
 		The media hub is not releasing highlights of $his sex life. [[Release|Slave Interact][$activeSlave.pornFeed = 1]]
 	<<else>>
 		The media hub is releasing highlights of $his sex life <<if $activeSlave.pornFameSpending < 500>>to those who can find it<<elseif $activeSlave.pornFameSpending < 2500>>on several websites<<elseif $activeSlave.pornFameSpending > 5000>>through your old distributor<<else>>on many websites<</if>>.
 		<<if $activeSlave.pornFameSpending == 0>>
-			[[Halt|Slave Interact][$activeSlave.pornFeed = 0, $activeSlave.pornFocus = "none"]] |
+			[[Halt|Slave Interact][$activeSlave.pornFeed = 0, $activeSlave.porn.focus = "none"]] |
 			[[Publicize|Slave Interact][$activeSlave.pornFameSpending += 1000]]
 			//Will cost <<print cashFormat(1000)>> weekly.//
 		<<else>>
 			<<textbox "_newPornSpending" $activeSlave.pornFameSpending>> weekly is spent to publicize them. [[Save changes|Slave Interact][$activeSlave.pornFameSpending = Number(_newPornSpending) || 0]] |
-			[[Halt|Slave Interact][$activeSlave.pornFeed = 0, $activeSlave.pornFameSpending = 0, $activeSlave.pornFocus = "none", $PCSlutContacts = 1]] |
+			[[Halt|Slave Interact][$activeSlave.pornFeed = 0, $activeSlave.pornFameSpending = 0, $activeSlave.porn.focus = "none", $PCSlutContacts = 1]] |
 			<<if $activeSlave.pornFameSpending < 5000>>
 				[[Increase|Slave Interact][$activeSlave.pornFameSpending += 1000]] |
 			<</if>>
@@ -1756,100 +1756,100 @@ Relationship rules: ''<span id="relationshipRules">$activeSlave.relationshipRule
 				$He lacks the fame in porn needed to discern what $his feed is getting tagged as.
 			<<else>>
 				<<if $activeSlave.pornPrestige > 0>>
-					$He is known for $activeSlave.pornFameType porn<<if $activeSlave.pornPrestige > 1>> and viewers have grown to expect it from $him<</if>>.
+					$He is known for $activeSlave.porn.fameType porn<<if $activeSlave.pornPrestige > 1>> and viewers have grown to expect it from $him<</if>>.
 				<</if>>
-				<<if $activeSlave.pornFocus == "none">>
+				<<if $activeSlave.porn.focus == "none">>
 					You are allowing $his viewers to guide the direction of $his content.
 				<<else>>
-					You are focusing attention on the $activeSlave.pornFocus aspect of $his content.
+					You are focusing attention on the $activeSlave.porn.focus aspect of $his content.
 				<</if>>
 				<<switch $activeSlave.sexualFlaw>>
 				<<case "neglectful">>
-					[[Neglectful|Slave Interact][$activeSlave.pornFocus = "neglectful"]] |
+					[[Neglectful|Slave Interact][$activeSlave.porn.focus = "neglectful"]] |
 				<<case "cum addict">>
-					[[Cum addiction|Slave Interact][$activeSlave.pornFocus = "cum addict"]] |
+					[[Cum addiction|Slave Interact][$activeSlave.porn.focus = "cum addict"]] |
 				<<case "anal addict">>
-					[[Anal addiction|Slave Interact][$activeSlave.pornFocus = "anal addict"]] |
+					[[Anal addiction|Slave Interact][$activeSlave.porn.focus = "anal addict"]] |
 				<<case "attention whore">>
-					[[Attention whore|Slave Interact][$activeSlave.pornFocus = "attention whore"]] |
+					[[Attention whore|Slave Interact][$activeSlave.porn.focus = "attention whore"]] |
 				<<case "breast growth">>
-					[[Breast growth|Slave Interact][$activeSlave.pornFocus = "breast growth"]] |
+					[[Breast growth|Slave Interact][$activeSlave.porn.focus = "breast growth"]] |
 				<<case "abusive">>
-					[[Abusive|Slave Interact][$activeSlave.pornFocus = "abusive"]] |
+					[[Abusive|Slave Interact][$activeSlave.porn.focus = "abusive"]] |
 				<<case "malicious">>
-					[[Malicious|Slave Interact][$activeSlave.pornFocus = "malicious"]] |
+					[[Malicious|Slave Interact][$activeSlave.porn.focus = "malicious"]] |
 				<<case "self hating">>
-					[[Self hating|Slave Interact][$activeSlave.pornFocus = "self hating"]] |
+					[[Self hating|Slave Interact][$activeSlave.porn.focus = "self hating"]] |
 				<<case "breeder">>
-					[[Breeder|Slave Interact][$activeSlave.pornFocus = "breeder"]] |
+					[[Breeder|Slave Interact][$activeSlave.porn.focus = "breeder"]] |
 				<</switch>>
 
 				<<switch $activeSlave.fetish>>
 				<<case "submissive">>
-					[[Submissive|Slave Interact][$activeSlave.pornFocus = "submissive"]] |
+					[[Submissive|Slave Interact][$activeSlave.porn.focus = "submissive"]] |
 				<<case "cumslut">>
-					[[Cumslut|Slave Interact][$activeSlave.pornFocus = "cumslut"]] |
+					[[Cumslut|Slave Interact][$activeSlave.porn.focus = "cumslut"]] |
 				<<case "buttslut">>
-					[[Buttslut|Slave Interact][$activeSlave.pornFocus = "buttslut"]] |
+					[[Buttslut|Slave Interact][$activeSlave.porn.focus = "buttslut"]] |
 				<<case "humiliation">>
-					[[Humiliation|Slave Interact][$activeSlave.pornFocus = "humiliation"]] |
+					[[Humiliation|Slave Interact][$activeSlave.porn.focus = "humiliation"]] |
 				<<case "boobs">>
-					[[Boobs|Slave Interact][$activeSlave.pornFocus = "boobs"]] |
+					[[Boobs|Slave Interact][$activeSlave.porn.focus = "boobs"]] |
 				<<case "dom">>
-					[[Dominant|Slave Interact][$activeSlave.pornFocus = "dom"]] |
+					[[Dominant|Slave Interact][$activeSlave.porn.focus = "dom"]] |
 				<<case "sadist">>
-					[[Sadist|Slave Interact][$activeSlave.pornFocus = "sadist"]] |
+					[[Sadist|Slave Interact][$activeSlave.porn.focus = "sadist"]] |
 				<<case "masochist">>
-					[[Masochist|Slave Interact][$activeSlave.pornFocus = "masochist"]] |
+					[[Masochist|Slave Interact][$activeSlave.porn.focus = "masochist"]] |
 				<<case "pregnancy">>
-					[[Pregnancy|Slave Interact][$activeSlave.pornFocus = "pregnancy"]] |
+					[[Pregnancy|Slave Interact][$activeSlave.porn.focus = "pregnancy"]] |
 				<</switch>>
 
 				<<switch $activeSlave.sexualQuirk>>
 				<<case "gagfuck queen">>
-					[[Gagfuck queen|Slave Interact][$activeSlave.pornFocus = "gagfuck queen"]] |
+					[[Gagfuck queen|Slave Interact][$activeSlave.porn.focus = "gagfuck queen"]] |
 				<<case "strugglefuck queen">>
-					[[Strugglefuck queen|Slave Interact][$activeSlave.pornFocus = "strugglefuck queen"]] |
+					[[Strugglefuck queen|Slave Interact][$activeSlave.porn.focus = "strugglefuck queen"]] |
 				<<case "painal queen">>
-					[[Painal queen|Slave Interact][$activeSlave.pornFocus = "painal queen"]] |
+					[[Painal queen|Slave Interact][$activeSlave.porn.focus = "painal queen"]] |
 				<<case "tease">>
-					[[Tease|Slave Interact][$activeSlave.pornFocus = "tease"]] |
+					[[Tease|Slave Interact][$activeSlave.porn.focus = "tease"]] |
 				<<case "romantic">>
-					[[Romantic|Slave Interact][$activeSlave.pornFocus = "romantic"]] |
+					[[Romantic|Slave Interact][$activeSlave.porn.focus = "romantic"]] |
 				<<case "perverted">>
-					[[Perverted|Slave Interact][$activeSlave.pornFocus = "perverted"]] |
+					[[Perverted|Slave Interact][$activeSlave.porn.focus = "perverted"]] |
 				<<case "caring">>
-					[[Caring|Slave Interact][$activeSlave.pornFocus = "caring"]] |
+					[[Caring|Slave Interact][$activeSlave.porn.focus = "caring"]] |
 				<<case "unflinching">>
-					[[Unspeakable|Slave Interact][$activeSlave.pornFocus = "unspeakable"]] |
+					[[Unspeakable|Slave Interact][$activeSlave.porn.focus = "unspeakable"]] |
 				<<case "size queen">>
-					[[Size queen|Slave Interact][$activeSlave.pornFocus = "size queen"]] |
+					[[Size queen|Slave Interact][$activeSlave.porn.focus = "size queen"]] |
 				<</switch>>
 
 				<<if $activeSlave.fuckdoll > 0>>
-					[[Fuckdoll|Slave Interact][$activeSlave.pornFocus = "fuckdoll"]] |
+					[[Fuckdoll|Slave Interact][$activeSlave.porn.focus = "fuckdoll"]] |
 				<</if>>
 				<<if ($activeSlave.devotion < -20) && ($activeSlave.analCount + $activeSlave.vaginalCount > 0)>>
-					[[Rape|Slave Interact][$activeSlave.pornFocus = "rape"]] |
+					[[Rape|Slave Interact][$activeSlave.porn.focus = "rape"]] |
 				<</if>>
 				<<if $activeSlave.bellyPreg > 500>>
-					[[Preggo|Slave Interact][$activeSlave.pornFocus = "preggo"]] |
+					[[Preggo|Slave Interact][$activeSlave.porn.focus = "preggo"]] |
 				<</if>>
 				<<if $activeSlave.weight > 95>>
-					[[BBW|Slave Interact][$activeSlave.pornFocus = "BBW"]] |
+					[[BBW|Slave Interact][$activeSlave.porn.focus = "BBW"]] |
 				<</if>>
 				<<if $activeSlave.visualAge <= 12>>
-					[[Underage|Slave Interact][$activeSlave.pornFocus = "underage"]] |
+					[[Underage|Slave Interact][$activeSlave.porn.focus = "underage"]] |
 				<</if>>
 				<<if ($activeSlave.weight > 30 && $activeSlave.diet == "fattening") || ($activeSlave.inflation > 0 && $activeSlave.inflationType == "food")>>
-					[[Weight gain|Slave Interact][$activeSlave.pornFocus = "weight gain"]] |
+					[[Weight gain|Slave Interact][$activeSlave.porn.focus = "weight gain"]] |
 				<</if>>
 				<<if canPenetrate($activeSlave) && $activeSlave.dick > 3>>
-					[[Big dick|Slave Interact][$activeSlave.pornFocus = "well hung"]] |
+					[[Big dick|Slave Interact][$activeSlave.porn.focus = "well hung"]] |
 				<</if>>
 
-				[[Smut is smut|Slave Interact][$activeSlave.pornFocus = "porn"]] |
-				[[No focus|Slave Interact][$activeSlave.pornFocus = "none"]]
+				[[Smut is smut|Slave Interact][$activeSlave.porn.focus = "porn"]] |
+				[[No focus|Slave Interact][$activeSlave.porn.focus = "none"]]
 			<</if>>
 		<</if>>
 	<</if>>
diff --git a/src/uncategorized/slaveSold.tw b/src/uncategorized/slaveSold.tw
index 296de31fc13d8ad125609b72a4232fc22a872b16..bc1ecb2f7cefb5f611667c05a2f02ce49afaae66 100644
--- a/src/uncategorized/slaveSold.tw
+++ b/src/uncategorized/slaveSold.tw
@@ -141,7 +141,7 @@
 <<else>>
 	<<if $activeSlave.relation != 0>>
 		<<set _ss = $slaveIndices[$activeSlave.relationTarget]>>
-		<<if def _ss && $slaves[_ss].fetish != "mindbroken">>
+		<<if (def _ss) && $slaves[_ss].fetish != "mindbroken">>
 			<<setLocalPronouns $slaves[_ss] 2>>
 			$slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you are selling _his2 $activeSlave.relation.
 			<<run clearSummaryCache($slaves[_ss])>>
@@ -153,7 +153,7 @@
 <</if>>
 <<if $activeSlave.relationship > 0>>
 	<<set _ss = $slaveIndices[$activeSlave.relationshipTarget]>>
-	<<if def _ss && $slaves[_ss].fetish != "mindbroken">>
+	<<if (def _ss) && $slaves[_ss].fetish != "mindbroken">>
 		<<setLocalPronouns $slaves[_ss] 2>>
 		$slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you are selling _his2 best source of comfort and companionship in a life of bondage.
 		<<run clearSummaryCache($slaves[_ss])>>
@@ -175,7 +175,7 @@
 <</if>>
 <<if $activeSlave.rivalry != 0>>
 	<<set _ss = $slaveIndices[$activeSlave.rivalryTarget]>>
-	<<if def _ss && $slaves[_ss].fetish != "mindbroken">>
+	<<if (def _ss) && $slaves[_ss].fetish != "mindbroken">>
 		<<setLocalPronouns $slaves[_ss] 2>>
 		$slaves[_ss].slaveName is @@.hotpink;pleased@@ that _he2 won't have to see _his2 rival any more.
 		<<run clearSummaryCache($slaves[_ss])>>
@@ -1045,7 +1045,7 @@
 	<</for>>
 
 <<case "porn studio">>
-	$activeSlave.slaveName becomes a frequent sight in $activeSlave.pornFameType smut and attracts huge crowds with each public appearance. Your other aspiring porn stars @@.mediumaquamarine;try harder than ever@@ in the hopes of following in $his prestigious footsteps.
+	$activeSlave.slaveName becomes a frequent sight in $activeSlave.porn.fameType smut and attracts huge crowds with each public appearance. Your other aspiring porn stars @@.mediumaquamarine;try harder than ever@@ in the hopes of following in $his prestigious footsteps.
 	<<run clearSummaryCache()>>
 	<<for _ss = 0; _ss < $slaves.length; _ss++>>
 		<<if $slaves[_ss].pornPrestige > 0 && $slaves[_ss].pornPrestige < 3>>
diff --git a/src/uncategorized/slaveStats.tw b/src/uncategorized/slaveStats.tw
index 70ea971fc5a2c9974dae73783208934f0590a7bc..db0f71f63d8b9bf33ec90f63be63e0dcead69d06 100644
--- a/src/uncategorized/slaveStats.tw
+++ b/src/uncategorized/slaveStats.tw
@@ -26,43 +26,43 @@ slaveName: $activeSlave.slaveName	   /* TODO: figure out why this is being inden
 <br>pornFameSpending: $activeSlave.pornFameSpending
 <br>pornPrestige: $activeSlave.pornPrestige
 <br>pornPrestigeDesc: $activeSlave.pornPrestigeDesc
-<br>pornFameType: $activeSlave.pornFameType
-<br>pornFocus: $activeSlave.pornFocus
-<br>pornTypeGeneral: $activeSlave.pornTypeGeneral
-<br>pornTypeFuckdoll: $activeSlave.pornTypeFuckdoll
-<br>pornTypeRape: $activeSlave.pornTypeRape
-<br>pornTypePreggo: $activeSlave.pornTypePreggo
-<br>pornTypeBBW: $activeSlave.pornTypeBBW
-<br>pornTypeGainer: $activeSlave.pornTypeGainer
-<br>pornTypeStud: $activeSlave.pornTypeStud
-<br>pornTypeLoli: $activeSlave.pornTypeLoli
-<br>pornTypeDeepThroat: $activeSlave.pornTypeDeepThroat
-<br>pornTypeStruggleFuck: $activeSlave.pornTypeStruggleFuck
-<br>pornTypePainal: $activeSlave.pornTypePainal
-<br>pornTypeTease: $activeSlave.pornTypeTease
-<br>pornTypeRomantic: $activeSlave.pornTypeRomantic
-<br>pornTypePervert: $activeSlave.pornTypePervert
-<br>pornTypeCaring: $activeSlave.pornTypeCaring
-<br>pornTypeUnflinching: $activeSlave.pornTypeUnflinching
-<br>pornTypeSizeQueen: $activeSlave.pornTypeSizeQueen
-<br>pornTypeNeglectful: $activeSlave.pornTypeNeglectful
-<br>pornTypeCumAddict: $activeSlave.pornTypeCumAddict
-<br>pornTypeAnalAddict: $activeSlave.pornTypeAnalAddict
-<br>pornTypeAttentionWhore: $activeSlave.pornTypeAttentionWhore
-<br>pornTypeBreastGrowth: $activeSlave.pornTypeBreastGrowth
-<br>pornTypeAbusive: $activeSlave.pornTypeAbusive
-<br>pornTypeMalicious: $activeSlave.pornTypeMalicious
-<br>pornTypeSelfHating: $activeSlave.pornTypeSelfHating
-<br>pornTypeBreeder: $activeSlave.pornTypeBreeder
-<br>pornTypeSub: $activeSlave.pornTypeSub
-<br>pornTypeCumSlut: $activeSlave.pornTypeCumSlut
-<br>pornTypeAnal: $activeSlave.pornTypeAnal
-<br>pornTypeHumiliation: $activeSlave.pornTypeHumiliation
-<br>pornTypeBoobs: $activeSlave.pornTypeBoobs
-<br>pornTypeDom: $activeSlave.pornTypeDom
-<br>pornTypeSadist: $activeSlave.pornTypeSadist
-<br>pornTypeMasochist: $activeSlave.pornTypeMasochist
-<br>pornTypePregnancy: $activeSlave.pornTypePregnancy
+<br>pornFameType: $activeSlave.porn.fameType
+<br>pornFocus: $activeSlave.porn.focus
+<br>pornTypeGeneral: $activeSlave.porn.fame.general
+<br>pornTypeFuckdoll: $activeSlave.porn.fame.fuckdoll
+<br>pornTypeRape: $activeSlave.porn.fame.rape
+<br>pornTypePreggo: $activeSlave.porn.fame.preggo
+<br>pornTypeBBW: $activeSlave.porn.fame.BBW
+<br>pornTypeGainer: $activeSlave.porn.fame.gainer
+<br>pornTypeStud: $activeSlave.porn.fame.stud
+<br>pornTypeLoli: $activeSlave.porn.fame.loli
+<br>pornTypeDeepThroat: $activeSlave.porn.fame.deepThroat
+<br>pornTypeStruggleFuck: $activeSlave.porn.fame.struggleFuck
+<br>pornTypePainal: $activeSlave.porn.fame.painal
+<br>pornTypeTease: $activeSlave.porn.fame.tease
+<br>pornTypeRomantic: $activeSlave.porn.fame.romantic
+<br>pornTypePervert: $activeSlave.porn.fame.pervert
+<br>pornTypeCaring: $activeSlave.porn.fame.caring
+<br>pornTypeUnflinching: $activeSlave.porn.fame.unflinching
+<br>pornTypeSizeQueen: $activeSlave.porn.fame.sizeQueen
+<br>pornTypeNeglectful: $activeSlave.porn.fame.neglectful
+<br>pornTypeCumAddict: $activeSlave.porn.fame.cumAddict
+<br>pornTypeAnalAddict: $activeSlave.porn.fame.analAddict
+<br>pornTypeAttentionWhore: $activeSlave.porn.fame.attentionWhore
+<br>pornTypeBreastGrowth: $activeSlave.porn.fame.breastGrowth
+<br>pornTypeAbusive: $activeSlave.porn.fame.abusive
+<br>pornTypeMalicious: $activeSlave.porn.fame.malicious
+<br>pornTypeSelfHating: $activeSlave.porn.fame.selfHating
+<br>pornTypeBreeder: $activeSlave.porn.fame.breeder
+<br>pornTypeSub: $activeSlave.porn.fame.sub
+<br>pornTypeCumSlut: $activeSlave.porn.fame.cumSlut
+<br>pornTypeAnal: $activeSlave.porn.fame.anal
+<br>pornTypeHumiliation: $activeSlave.porn.fame.humiliation
+<br>pornTypeBoobs: $activeSlave.porn.fame.boobs
+<br>pornTypeDom: $activeSlave.porn.fame.dom
+<br>pornTypeSadist: $activeSlave.porn.fame.sadist
+<br>pornTypeMasochist: $activeSlave.porn.fame.masochist
+<br>pornTypePregnancy: $activeSlave.porn.fame.pregnancy
 <br>prestigeDesc: $activeSlave.prestigeDesc
 <br>recruiter: $activeSlave.recruiter
 <br>relation: $activeSlave.relation
@@ -388,4 +388,4 @@ slaveName: $activeSlave.slaveName	   /* TODO: figure out why this is being inden
 <br>lastWeeksRepExpenses: $activeSlave.lastWeeksRepExpenses
 <br>lastWeeksRepIncome: $activeSlave.lastWeeksRepIncome
 <br>Deadliness <<print Deadliness($activeSlave)>>
-<br><br>
\ No newline at end of file
+<br><br>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index c1c0a9853d580c63000f71f86be61036a8f327af..5c10b2c0be199a0245f0fa9876af20c2ec26f065 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -355,7 +355,7 @@ As the remote surgery's long recovery cycle completes,
 	<<set $activeSlave.eyes = 1>>
 
 <<case "newEyes">>
-	The implant surgery is @@.red;invasive@@ and $he spends some time in the autosurgery recovering. As soon as $he is allowed to open $his eyes and look around, $he notices nothing has changed; though the next time $he looks in the mirror, $he'll see a pair of familiar <<eyeColor>> eyes peering back at $him.
+	The implant surgery is @@.red;invasive@@ and $he spends some time in the autosurgery recovering. As soon as $he is allowed to open $his eyes and look around, $he notices nothing has changed; though the next time $he looks in the mirror, $he'll see a pair of familiar <<= App.Desc.EyeColor>> eyes peering back at $him.
 
 <<case "undeafen">>
 	The inner ear surgery is @@.red;invasive@@ and $he spends some time in the autosurgery recovering. As soon as the bandages around $his ears are removed, $his head tilts towards any source of sound with manic speed as $he processes $his new hearing. Hearing the world as it is is a gift that those who do not need it cannot properly understand.
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 33cd90b3cc57ab20d34f47c3791ecec64802f7ce..bb34bda797a64c05b44a754d1f022939d16b1452 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -1,75 +1,5 @@
 :: description widgets [widget nobr]
 
-<<widget "MainLinks">>
-
-/* cycle through slaves, for each slave cycle through completed organs and track how many are of the interrogated slave (and if organs have a slaves to be implanted on) */
-<<if $completedOrgans.length > 0>>
-	<<set _validOrgans = 0>>
-	<<for _dwi = 0; _dwi < $slaves.length; _dwi++>>
-		<<capture _dwi>>
-		<<set _slaveOrgans = 0>>
-		<<for _dwj = 0; _dwj < $completedOrgans.length; _dwj++>>
-			<<if ($completedOrgans[_dwj] != 0) && ($completedOrgans[_dwj].ID == $slaves[_dwi].ID)>>
-				<<set _slaveOrgans++>>
-				<<set _validOrgans++>>
-			<</if>>
-		<</for>>
-		/* if the interrogated slave has one or more organs ready: */
-		<<if _slaveOrgans > 0>>
-			<br>@@.yellow;The fabricator has completed <<if _slaveOrgans > 1>><<print _slaveOrgans>> organs<<else>>an organ<</if>> for@@
-			<<link "<<print $slaves[_dwi].slaveName>>">>
-				<<set $activeSlave = $slaves[_dwi]>>
-				<<goto "Slave Interact">>
-			<</link>>
-			, @@.yellow; which <<if _slaveOrgans > 1>>are<<else>>is<</if>> ready to be implanted.@@
-		<</if>>
-		<</capture>>
-	<</for>>
-	/* if the check returns true it means there are organs without slaves associated to. I think this was the purpose of the _validHost check in the original code */
-	<<if _validOrgans < $completedOrgans.length>>
-		<<for _dwj = 0; _dwj < $completedOrgans.length; _dwj++>>
-			<<set _isValid = 0>>
-			<<for _dwi = 0; _dwi < $slaves.length; _dwi++>>
-				<<if ($completedOrgans[_dwj] != 0) && ($completedOrgans[_dwj].ID == $slaves[_dwi].ID)>>
-					<<set _isValid = 1>>
-				<</if>>
-			<</for>>
-			/* if there is no associated slave delete the organ, should there be a notification for the player, here? */
-			<<if _isValid == 0>>
-				<<set $completedOrgans.deleteAt(_dwj)>>
-			<</if>>
-		<</for>>
-	<</if>>
-<</if>>
-
-<<if $limbsCompleted > 0>>
-<<for _dwj = 0; _dwj < $limbs.length; _dwj++>>
-	<<set _validHost = 0>>
-	<<for _dwi = 0; _dwi < $slaves.length; _dwi++>>
-		<<set _Slave = $slaves[_dwi]>>
-		<<if ($limbs[_dwj] != 0) && ($limbs[_dwj].ID == _Slave.ID)>>
-			<<set _validHost = 1>>
-			<<if ($limbs[_dwj].weeksToCompletion <= 0)>>
-				<br>@@.yellow;The facility has completed a set of limbs for@@ <span id="name"><<print "[[SlaveFullName(_Slave)|Slave Interact][$activeSlave = $slaves[" + _dwi + "]]]">></span>, @@.yellow; which is ready to be attached.@@
-			<</if>>
-		<</if>>
-	<</for>>
-	<<if _validHost == 0>>
-		<<set _dump = $limbs.deleteAt(_dwj), _dwj-->>
-	<</if>>
-<</for>>
-<</if>>
-
-<<if ($completedOrgans.length > 0) && ($limbsCompleted > 0)>>
-	<br>[[Implant and Attach|Multiple Organ Implant]] @@.yellow;all organs and limbs that are ready.@@
-<<elseif ($completedOrgans.length > 0)>>
-	<br>[[Implant|Multiple Organ Implant]] @@.yellow;all organs that are ready for implantation.@@
-<<elseif ($limbsCompleted > 0)>>
-	<br>[[Attach|Multiple Organ Implant]] @@.yellow;all sets of limbs that are ready to be attached.@@
-<</if>>
-
-<</widget>>
-
 <<widget "FlowerDesc">>
 
 <<if $activeSlave.dick > 0 && $activeSlave.balls == 0>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 47556516114aebc99b61c54e19519f95c6697c4b..2ccde923919cdfcd98b9de0839bcf259a8f1d43f 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -5266,144 +5266,6 @@ $He's got a
 
 <</widget>>
 
-<<widget "eyeDescription">>
-
-<<if $activeSlave.eyes == -2>>
-	<<if hasVisibleHeterochromia($activeSlave)>><<set _heterochromia = 1>><<else>><<set _heterochromia = 0>><</if>>
-	<<if $activeSlave.eyeColor != "empty">>
-		$His eyes are dull<<if $saleDescription == 1 && ($PC.medicine >= 50 || $PC.slaving >= 50)>>, unfocused<<if _heterochromia == 1>>, heterochromatic,<</if>> and clearly nonfunctional<<else>><<if _heterochromia == 1>>, heterochromatic,<</if>> and unfocused<</if>>,
-	<<else>>
-		$His gaze is empty,
-	<</if>>
-	<<if ($activeSlave.intelligence > 95)>>
-		but $his facial expressions reveal $he is incisive, quick, cunning;
-		<<if ($activeSlave.intelligence+$activeSlave.intelligenceImplant >= 130)>>
-			with $his education, $he is so far @@.deepskyblue;beyond brilliant@@ that $he is nearly peerless.
-		<<elseif $activeSlave.intelligenceImplant >= 15>>
-			$he is both @@.deepskyblue;brilliant@@ and <<if $activeSlave.intelligenceImplant >= 30>>well <</if>>educated.
-		<<else>>
-			$he is so @@.deepskyblue;brilliant@@ that $his <<if $activeSlave.intelligenceImplant > 0>>meager<<else>>lack of<</if>> education is unimportant.
-		<</if>>
-	<<elseif ($activeSlave.intelligence > 50)>>
-		<<if ($activeSlave.intelligence+$activeSlave.intelligenceImplant > 95)>>
-			but $his facial expressions reveal $he is incisive, quick, cunning; with $his education, $he can be considered @@.deepskyblue;brilliant.@@
-		<<elseif $activeSlave.intelligenceImplant >= 15>>
-			but $his face is alive with intelligence; $he is both @@.deepskyblue;highly intelligent@@ and <<if $activeSlave.intelligenceImplant >= 30>>well <</if>>educated.
-		<<else>>
-			but $his face is alive with intelligence; $he is so @@.deepskyblue;highly intelligent@@ that $his <<if $activeSlave.intelligenceImplant > 0>>meager<<else>>lack of<</if>> education is unimportant.
-		<</if>>
-	<<elseif ($activeSlave.intelligence > 15)>>
-		<<if ($activeSlave.intelligence+$activeSlave.intelligenceImplant > 50)>>
-			but $his face is alive with intelligence; with $his education, $he can be considered @@.deepskyblue;highly intelligent.@@
-		<<elseif $activeSlave.intelligenceImplant >= 15>>
-			but $his facial expressions reveal $his cleverness; $he is of @@.deepskyblue;above average intelligence@@ and <<if $activeSlave.intelligenceImplant >= 30>>well <</if>>educated.
-		<<else>>
-			but $his facial expressions reveal $his cleverness; $he is of @@.deepskyblue;above average intelligence@@ despite being undereducated.
-		<</if>>
-	<<elseif ($activeSlave.intelligence >= -15)>>
-		<<if ($activeSlave.intelligence+$activeSlave.intelligenceImplant > 15)>>
-			but $his facial expressions reveal $his cleverness; with $his education, $he can be considered of @@.deepskyblue;above average intelligence.@@
-		<<elseif $activeSlave.intelligenceImplant >= 15>>
-			but $his facial expressions reveal $his alertness; $he is of average intelligence due to being <<if $activeSlave.intelligenceImplant >= 30>>well <</if>>educated.
-		<<else>>
-			but $his facial expressions reveal $his alertness; $he is of average intelligence and is undereducated.
-		<</if>>
-	<<elseif ($activeSlave.intelligence >= -50)>>
-		<<if ($activeSlave.intelligence+$activeSlave.intelligenceImplant >= -15)>>
-			but $his facial expressions reveal $his alertness; with $his education, $he can be considered of average intelligence.
-		<<elseif $activeSlave.intelligenceImplant >= 15>>
-			but $his facial expressions reveal $he is rather dim; $he is of @@.orangered;below average intelligence@@ despite having been <<if $activeSlave.intelligenceImplant >= 30>>thoroughly <</if>>educated.
-		<<else>>
-			but $his facial expressions reveal $he is rather dim; $he is of @@.orangered;below average intelligence@@ and is poorly educated.
-		<</if>>
-	<<elseif ($activeSlave.intelligence >= -95)>>
-		<<if ($activeSlave.intelligence+$activeSlave.intelligenceImplant >= -50)>>
-			but $his facial expressions reveal $he is rather dim; even with $his education, $he can only be considered of @@.orangered;below average intelligence.@@
-		<<elseif $activeSlave.intelligenceImplant >= 15>>
-			but $his facial expressions reveal $he is as dull as $his eyes; $he is @@.orangered;quite stupid@@ despite having <<if $activeSlave.intelligenceImplant >= 30>>an advanced<<else>>some<</if>> education.
-		<<else>>
-			but $his facial expressions reveal $he is as dull as $his eyes; $he is @@.orangered;quite stupid@@ and ignorant.
-		<</if>>
-	<<else>>
-		though you doubt it would be much different if $he could see;
-		<<if ($activeSlave.intelligence+$activeSlave.intelligenceImplant >= -95)>>
-			even with $his education, $he is still @@.orangered;really stupid.@@
-		<<elseif $activeSlave.intelligenceImplant > 0>>
-			$he is @@.orangered;a moron,@@ yet somehow still remembers the basics of an education.
-		<<else>>
-			$he is @@.orangered;a moron,@@ and ignorant to boot.
-		<</if>>
-	<</if>>
-<<else>>
-	<<if ($activeSlave.intelligence > 95)>>
-		$His <<eyeColor>>-eyed gaze is incisive, quick, cunning;
-		<<if ($activeSlave.intelligence+$activeSlave.intelligenceImplant >= 130)>>
-			with $his education, $he is so far @@.deepskyblue;beyond brilliant@@ that $he is nearly peerless.
-		<<elseif $activeSlave.intelligenceImplant >= 15>>
-			$he is both @@.deepskyblue;brilliant@@ and <<if $activeSlave.intelligenceImplant >= 30>>well <</if>>educated.
-		<<else>>
-			$he is so @@.deepskyblue;brilliant@@ that $his <<if $activeSlave.intelligenceImplant > 0>>meager<<else>>lack of<</if>> education is unimportant.
-		<</if>>
-	<<elseif ($activeSlave.intelligence > 50)>>
-		<<if ($activeSlave.intelligence+$activeSlave.intelligenceImplant > 95)>>
-			$His <<eyeColor>>-eyed gaze is incisive, quick, cunning; with $his education, $he can be considered @@.deepskyblue;brilliant.@@
-		<<elseif $activeSlave.intelligenceImplant >= 15>>
-			$His <<eyeColor>> eyes are alive with intelligence; $he is both @@.deepskyblue;highly intelligent@@ and <<if $activeSlave.intelligenceImplant >= 30>>well <</if>>educated.
-		<<else>>
-			$His <<eyeColor>> eyes are alive with intelligence; $he is so @@.deepskyblue;highly intelligent@@ that $his <<if $activeSlave.intelligenceImplant > 0>>meager<<else>>lack of<</if>> education is unimportant.
-		<</if>>
-	<<elseif ($activeSlave.intelligence > 15)>>
-		$His <<eyeColor>> eyes are
-		<<if ($activeSlave.intelligence+$activeSlave.intelligenceImplant > 50)>>
-			alive with intelligence; with $his education, $he can be considered @@.deepskyblue;highly intelligent.@@
-		<<elseif $activeSlave.intelligenceImplant >= 15>>
-			clever; $he is of @@.deepskyblue;above average intelligence@@ and <<if $activeSlave.intelligenceImplant >= 30>>well <</if>>educated.
-		<<else>>
-			clever; $he is of @@.deepskyblue;above average intelligence@@ despite being undereducated.
-		<</if>>
-	<<elseif ($activeSlave.intelligence >= -15)>>
-		$His <<eyeColor>> eyes are
-		<<if ($activeSlave.intelligence+$activeSlave.intelligenceImplant > 15)>>
-			clever; with $his education, $he can be considered of @@.deepskyblue;above average intelligence.@@
-		<<elseif $activeSlave.intelligenceImplant >= 15>>
-			alert; $he is of average intelligence due to being <<if $activeSlave.intelligenceImplant >= 30>>well <</if>>educated.
-		<<else>>
-			alert; $he is of average intelligence and is undereducated.
-		<</if>>
-	<<elseif ($activeSlave.intelligence >= -50)>>
-		$His <<eyeColor>> eyes are
-		<<if ($activeSlave.intelligence+$activeSlave.intelligenceImplant >= -15)>>
-			alert; with $his education, $he can be considered of average intelligence.
-		<<elseif $activeSlave.intelligenceImplant >= 15>>
-			dim; $he is of @@.orangered;below average intelligence@@ despite having been <<if $activeSlave.intelligenceImplant >= 30>>thoroughly <</if>>educated.
-		<<else>>
-			dim; $he is of @@.orangered;below average intelligence@@ and is poorly educated.
-		<</if>>
-	<<elseif ($activeSlave.intelligence >= -95)>>
-		$His <<eyeColor>> eyes are
-		<<if ($activeSlave.intelligence+$activeSlave.intelligenceImplant >= -50)>>
-			dim; even with $his education, $he can only be considered of @@.orangered;below average intelligence.@@
-		<<elseif $activeSlave.intelligenceImplant >= 15>>
-			dull; $he is @@.orangered;quite stupid@@ despite having <<if $activeSlave.intelligenceImplant >= 30>>an advanced<<else>>some<</if>> education.
-		<<else>>
-			dull; $he is @@.orangered;quite stupid@@ and ignorant.
-		<</if>>
-	<<else>>
-		$His <<eyeColor>>-eyed gaze betrays near-total insensibility;
-		<<if ($activeSlave.intelligence+$activeSlave.intelligenceImplant >= -95)>>
-			even with $his education, $he is still @@.orangered;really stupid.@@
-		<<elseif $activeSlave.intelligenceImplant > 0>>
-			$he is @@.orangered;a moron,@@ yet somehow still remembers the basics of an education.
-		<<else>>
-			$he is @@.orangered;a moron,@@ and ignorant to boot.
-		<</if>>
-	<</if>>
-<</if>>
-<</widget>>
-
-/* to simplify heterochromia */
-<<widget "eyeColor">><<if def $args[0]>><<if hasVisibleHeterochromia($args[0])>>heterochromatic $args[0].eyeColor and $args[0].geneticQuirks.heterochromia<<else>>$args[0].eyeColor<</if>><<else>><<if hasVisibleHeterochromia($activeSlave)>>heterochromatic $activeSlave.eyeColor and $activeSlave.geneticQuirks.heterochromia<<else>>$activeSlave.eyeColor<</if>><</if>><</widget>>
-
 <<widget "earDescription">>
 /* ear shape description here */
 <<if $activeSlave.earShape == "none">>
diff --git a/src/utility/extendedFamilyWidgets.tw b/src/utility/extendedFamilyWidgets.tw
index 848bfd1c7be37d8e639c0a92dc72d8689c572cb6..86e86c9a783d3be075da9d0ab0efe00388a4047d 100644
--- a/src/utility/extendedFamilyWidgets.tw
+++ b/src/utility/extendedFamilyWidgets.tw
@@ -76,7 +76,7 @@
 	$He @@.lightgreen;gave birth to a single one of your slaves: _children[0].slaveName.@@
 <</if>>
 
-<<if def $showDistantRelatives && $showDistantRelatives == 1>>
+<<if (def $showDistantRelatives) && $showDistantRelatives == 1>>
 	/*testtest maternal grandma passage - determines if the current slave has a maternal grandmother*/
 	<<set _mi = $slaveIndices[$activeSlave.mother]>>
 	<<set _fi = $slaveIndices[$activeSlave.father]>>
@@ -96,7 +96,7 @@
 	<</if>>
 	<<if (def _mi || def _fi) && ndef _mmi && ndef _fmi && ndef _mfi && ndef _ffi>>
 		<<if def _mi>>
-			<<if def _fi && _mi == _fi>>
+			<<if (def _fi) && _mi == _fi>>
 				<<if $PC.ID == $slaves[_mi].mother && $PC.ID == $slaves[_fi].father>>
 					$He is @@.lightgreen;your grandchild.@@ You impregnated yourself with $his sole biological parent.
 				<<elseif $PC.ID == $slaves[_mi].mother>>
@@ -104,9 +104,9 @@
 				<<elseif $PC.ID == $slaves[_fi].father>>
 					$He is @@.lightgreen;your grandchild.@@ You fathered $his sole biological parent.
 				<</if>>
-			<<elseif def _fi && $PC.ID == $slaves[_mi].mother && $PC.ID == $slaves[_fi].mother>>
+			<<elseif (def _fi) && $PC.ID == $slaves[_mi].mother && $PC.ID == $slaves[_fi].mother>>
 				$He is @@.lightgreen;your grandchild.@@ You gave birth to both of $his parents.
-			<<elseif def _fi && $PC.ID == $slaves[_mi].father && $PC.ID == $slaves[_fi].father>>
+			<<elseif (def _fi) && $PC.ID == $slaves[_mi].father && $PC.ID == $slaves[_fi].father>>
 				$He is @@.lightgreen;your grandchild.@@ You fathered both of $his parents.
 			<<elseif $PC.ID == $slaves[_mi].mother>>
 				$He is @@.lightgreen;your grandchild.@@ You gave birth to $his mother.
@@ -121,10 +121,10 @@
 			<</if>>
 		<</if>>
 	<<else>>
-		<<if def _mmi && def _ffi && _mmi == _ffi>>
+		<<if (def _mmi) && (def _ffi) && _mmi == _ffi>>
 			$His sole @@.lightgreen;grandparent is $slaves[_mmi].slaveName.@@
 		<<else>>
-			<<if def _mmi && def _mfi && _mmi == _mfi>>
+			<<if (def _mmi) && (def _mfi) && _mmi == _mfi>>
 				$His sole @@.lightgreen;grandmother is $slaves[_mmi].slaveName.@@
 			<<else>>
 				<<if def _mmi>>
@@ -134,7 +134,7 @@
 					$His paternal @@.lightgreen;grandmother is $slaves[_mfi].slaveName.@@
 				<</if>>
 			<</if>>
-			<<if def _fmi && def _ffi && _fmi == _ffi>>
+			<<if (def _fmi) && (def _ffi) && _fmi == _ffi>>
 				$His sole @@.lightgreen;grandfather is $slaves[_ffi].slaveName.@@
 			<<else>>
 				<<if def _fmi>>
@@ -152,7 +152,7 @@
 	<<set _pcMother = $slaveIndices[$PC.mother]>>
 	<<set _pcFather = $slaveIndices[$PC.father]>>
 	<<if def _pcMother>>
-		<<if def _pcFather && _pcMother == _pcFather>>
+		<<if (def _pcFather) && _pcMother == _pcFather>>
 			<<if $activeSlave.ID == $slaves[_pcMother].mother && $activeSlave.ID == $slaves[_pcFather].father>>
 				$He is @@.lightgreen;your sole grandparent.@@ $He impregnated $himself with your mother/father who in turn impregnated themselves with you.
 			<<elseif $activeSlave.ID == $slaves[_pcMother].mother>>
@@ -160,9 +160,9 @@
 			<<elseif $activeSlave.ID == $slaves[_pcFather].father>>
 				$He is @@.lightgreen;your sole grandfather.@@ $He fathered $slaves[_pcFather].slaveName who in turn impregnated themselves with you.
 			<</if>>
-		<<elseif def _pcFather && $activeSlave.ID == $slaves[_pcMother].mother && $activeSlave.ID == $slaves[_pcFather].mother>>
+		<<elseif (def _pcFather) && $activeSlave.ID == $slaves[_pcMother].mother && $activeSlave.ID == $slaves[_pcFather].mother>>
 			$He is @@.lightgreen;your sole grandmother.@@ $He gave birth to both of your parents, $slaves[_pcMother].slaveName and $slaves[_pcFather].slaveName.
-		<<elseif def _pcFather && $activeSlave.ID == $slaves[_pcMother].father && $activeSlave.ID == $slaves[_pcFather].father>>
+		<<elseif (def _pcFather) && $activeSlave.ID == $slaves[_pcMother].father && $activeSlave.ID == $slaves[_pcFather].father>>
 			$He is @@.lightgreen;your sole grandfather.@@ $He fathered both of your parents, $slaves[_pcFather].slaveName and $slaves[_pcMother].slaveName.
 		<<elseif $activeSlave.ID == $slaves[_pcMother].mother>>
 			$He is @@.lightgreen;your maternal grandmother.@@
@@ -572,7 +572,7 @@
 	<<if _sisterCheck == 3>>
 		<<run ($slaves[_efw].genes == 'XX' ? _halfsisters : _halfbrothers).push($slaves[_efw])>>
 	<</if>>
-	<<if def $showDistantRelatives && $showDistantRelatives == 1>>
+	<<if (def $showDistantRelatives) && $showDistantRelatives == 1>>
 		<<set _cousinCheck = areCousins($slaves[_efw], $activeSlave)>>
 		<<if _cousinCheck == true>>
 			<<run _cousins.push($slaves[_efw])>>
@@ -706,7 +706,7 @@
 	@@.lightgreen;_children[0].slaveName is a half-brother to $him.@@
 <</if>>
 
-<<if def $showDistantRelatives && $showDistantRelatives == 1>>
+<<if (def $showDistantRelatives) && $showDistantRelatives == 1>>
 	/*testtest PC cousin passage - determines how many cousins you have*/
 	<<if areCousins($activeSlave, $PC)>>
 		$He
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 681062bdccf01cb13eb901fc892f19c52eb4c0a0..9a6bcacd6eb3c573f1ecb3ee0d3c705b13a54152 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -543,7 +543,7 @@
 <</widget>>
 
 <<widget "Master">><<if def $args[0]>><<run Enunciate($args[0])>><<elseif ndef $titleEnunciate>><<run Enunciate($activeSlave)>><</if>>$titleEnunciate<</widget>>
-<<widget "say">><<if def $args[0] && $sayEnunciate != "lisp">>$args[0]<<else>>$sayEnunciate<</if>><</widget>>
+<<widget "say">><<if (def $args[0]) && $sayEnunciate != "lisp">>$args[0]<<else>>$sayEnunciate<</if>><</widget>>
 <<widget "s">>$sEnunciate<</widget>>
 <<widget "S">>$SEnunciate<</widget>>
 <<widget "ss">>$ssEnunciate<</widget>>