diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index db3c8a5229fb2cc56017d58060ae1e801bab39a7..7e49198f4ab9f9142bc20301323d339b02bb8936 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,15 @@ Pregmod
 
 0.10.7.1-2.3.x
 
+04/11/2019
+
+	2
+	-fixes
+	-tweaked need
+
+	1
+	-major fixes to slave skills (BC required)
+
 04/09/2019
 
 	0
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index c6b8081943f26ef7372a661b742ac96b2aedeaf6..d02d962907ce01bb908eedaf712ac448e3c73252 100644
--- a/slave variables documentation - Pregmod.txt	
+++ b/slave variables documentation - Pregmod.txt	
@@ -2559,9 +2559,10 @@ drugs:
 
 aphrodisiacs:
 
-0 - none
-1 - standard
-2 - powerful
+-1 - anaphrodisiacs
+ 0 - none
+ 1 - standard
+ 2 - powerful
 
 curatives:
 
diff --git a/src/SecExp/secExpSmilingMan.tw b/src/SecExp/secExpSmilingMan.tw
index 0a3aff3d0c1d89e552566b11bca3b29fbbd7e43d..597770b741f354f355e827c9272242b6ea89d551 100644
--- a/src/SecExp/secExpSmilingMan.tw
+++ b/src/SecExp/secExpSmilingMan.tw
@@ -281,7 +281,7 @@
 	<<set $activeSlave.skill.vaginal = 0>>
 	<<set $activeSlave.skill.oral = 0>>
 	<<set $activeSlave.skill.anal = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 0>>
 	<<set $activeSlave.birthWeek = random(0,50)>>
 	<<set $activeSlave.voice = 2>>
diff --git a/src/SpecialForce/TrickShotNight.tw b/src/SpecialForce/TrickShotNight.tw
index 8d6a4eeb6444b1c6ea3bddcdbac0592f5cc0bdca..2463e042dabf46996eaa6c88f4b8fdf658e5056d 100644
--- a/src/SpecialForce/TrickShotNight.tw
+++ b/src/SpecialForce/TrickShotNight.tw
@@ -94,7 +94,7 @@ Despite your direct elevator, interaction with the majority of your security for
 			<</if>>
 			<<set $activeSlave.anus = 0>>
 			<<set $activeSlave.skill.anal = 0>>
-			<<set $activeSlave.skill.whore = 0>>
+			<<set $activeSlave.skill.whoring = 0>>
 			<<set $activeSlave.skill.combat = 1>>
 			<<set $activeSlave.accent = random(0,1)>>
 			<<set $activeSlave.behavioralFlaw = "arrogant">>
diff --git a/src/cheats/mod_EditChildCheatDatatypeCleanupNew.tw b/src/cheats/mod_EditChildCheatDatatypeCleanupNew.tw
index c3b46e51183a385078ee190b16359cb7f52f568b..dc30d71ae634eb35eef65b2922addeca1d262f20 100644
--- a/src/cheats/mod_EditChildCheatDatatypeCleanupNew.tw
+++ b/src/cheats/mod_EditChildCheatDatatypeCleanupNew.tw
@@ -238,12 +238,12 @@
 	<<print "Anal Skill Value set too high, reset to 100">><br>
 	<<set $tempSlave.skill.anal = 100>>
 <</if>>
-<<if $tempSlave.skill.whore < 0>>
+<<if $tempSlave.skill.whoring < 0>>
 	<<print "Whoring Skill Value set too low, reset to 0">><br>
-	<<set $tempSlave.skill.whore = 0>>
-<<elseif $tempSlave.skill.whore > 100>>
+	<<set $tempSlave.skill.whoring = 0>>
+<<elseif $tempSlave.skill.whoring > 100>>
 	<<print "Whoring Skill Value set too high, reset to 100">><br>
-	<<set $tempSlave.skill.whore = 100>>
+	<<set $tempSlave.skill.whoring = 100>>
 <</if>>
 <<if $tempSlave.skill.entertainment < 0>>
 	<<print "Entertainment Skill Value set too low, reset to 0">><br>
diff --git a/src/cheats/mod_EditChildCheatNew.tw b/src/cheats/mod_EditChildCheatNew.tw
index 590e1edc57828ca34529d500456fc52bec62bc02..e9ecbd8466d81e66c336fbe24382a78013718c36 100644
--- a/src/cheats/mod_EditChildCheatNew.tw
+++ b/src/cheats/mod_EditChildCheatNew.tw
@@ -2111,24 +2111,24 @@
 	<<radiobutton "$tempSlave.skill.anal" 100>> Masterful
 	<br>
 	''Prostitution (0 to 100):''
-	<<if $tempSlave.skill.whore <= 10>>
+	<<if $tempSlave.skill.whoring <= 10>>
 		@@.yellow;Unskilled@@.
-	<<elseif $tempSlave.skill.whore <= 30>>
+	<<elseif $tempSlave.skill.whoring <= 30>>
 		@@.cyan;Basic.@@
-	<<elseif $tempSlave.skill.whore <= 60>>
+	<<elseif $tempSlave.skill.whoring <= 60>>
 		@@.cyan;Skilled.@@
-	<<elseif $tempSlave.skill.whore < 100>>
+	<<elseif $tempSlave.skill.whoring < 100>>
 		@@.cyan;Expert.@@
 	<<else>>
 		@@.cyan;Masterful.@@
 	<</if>>
-	<<textbox "$tempSlave.skill.whore" $tempSlave.skill.whore>>
+	<<textbox "$tempSlave.skill.whoring" $tempSlave.skill.whoring>>
 	<br>
-	<<radiobutton "$tempSlave.skill.whore" 0>> Unskilled
-	<<radiobutton "$tempSlave.skill.whore" 15>> Basic
-	<<radiobutton "$tempSlave.skill.whore" 35>> Skilled
-	<<radiobutton "$tempSlave.skill.whore" 65>> Expert
-	<<radiobutton "$tempSlave.skill.whore" 100>> Masterful
+	<<radiobutton "$tempSlave.skill.whoring" 0>> Unskilled
+	<<radiobutton "$tempSlave.skill.whoring" 15>> Basic
+	<<radiobutton "$tempSlave.skill.whoring" 35>> Skilled
+	<<radiobutton "$tempSlave.skill.whoring" 65>> Expert
+	<<radiobutton "$tempSlave.skill.whoring" 100>> Masterful
 
 	<br>
 
diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw
index 6e9ea80974bd64e98055212f081b094f648d989e..e425afbe7bd7b5b01daf009460291899d29b407f 100644
--- a/src/cheats/mod_EditSlaveCheat.tw
+++ b/src/cheats/mod_EditSlaveCheat.tw
@@ -1066,24 +1066,24 @@ Monstrous.
 <br><br>
 
 ''Prostitution (0 to 100):''
-<<if $tempSlave.skill.whore <= 10>>
+<<if $tempSlave.skill.whoring <= 10>>
 Unskilled.
-<<elseif $tempSlave.skill.whore <= 30>>
+<<elseif $tempSlave.skill.whoring <= 30>>
 @@.cyan;Basic.@@
-<<elseif $tempSlave.skill.whore <= 60>>
+<<elseif $tempSlave.skill.whoring <= 60>>
 @@.cyan;Skilled.@@
-<<elseif $tempSlave.skill.whore < 100>>
+<<elseif $tempSlave.skill.whoring < 100>>
 @@.cyan;Expert.@@
 <<else>>
 @@.cyan;Masterful.@@
 <</if>>
-<<textbox "$tempSlave.skill.whore" $tempSlave.skill.whore>>
+<<textbox "$tempSlave.skill.whoring" $tempSlave.skill.whoring>>
 <br>
-<<radiobutton "$tempSlave.skill.whore" 0>> Unskilled
-<<radiobutton "$tempSlave.skill.whore" 15>> Basic
-<<radiobutton "$tempSlave.skill.whore" 35>> Skilled
-<<radiobutton "$tempSlave.skill.whore" 65>> Expert
-<<radiobutton "$tempSlave.skill.whore" 100>> Masterful
+<<radiobutton "$tempSlave.skill.whoring" 0>> Unskilled
+<<radiobutton "$tempSlave.skill.whoring" 15>> Basic
+<<radiobutton "$tempSlave.skill.whoring" 35>> Skilled
+<<radiobutton "$tempSlave.skill.whoring" 65>> Expert
+<<radiobutton "$tempSlave.skill.whoring" 100>> Masterful
 
 <br>
 
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index de082b12151dc657cba77dad003160b47dd631e3..3158bdcdcd3a182fb203dfcf42246d82ca30b7b4 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -2915,24 +2915,24 @@
 	<<radiobutton "$tempSlave.skill.anal" 100>> Masterful
 	<br>
 	''Prostitution (0 to 100):''
-	<<if $tempSlave.skill.whore <= 10>>
+	<<if $tempSlave.skill.whoring <= 10>>
 		@@.yellow;Unskilled@@.
-	<<elseif $tempSlave.skill.whore <= 30>>
+	<<elseif $tempSlave.skill.whoring <= 30>>
 		@@.cyan;Basic.@@
-	<<elseif $tempSlave.skill.whore <= 60>>
+	<<elseif $tempSlave.skill.whoring <= 60>>
 		@@.cyan;Skilled.@@
-	<<elseif $tempSlave.skill.whore < 100>>
+	<<elseif $tempSlave.skill.whoring < 100>>
 		@@.cyan;Expert.@@
 	<<else>>
 		@@.cyan;Masterful.@@
 	<</if>>
-	<<textbox "$tempSlave.skill.whore" $tempSlave.skill.whore>>
+	<<textbox "$tempSlave.skill.whoring" $tempSlave.skill.whoring>>
 	<br>
-	<<radiobutton "$tempSlave.skill.whore" 0>> Unskilled
-	<<radiobutton "$tempSlave.skill.whore" 15>> Basic
-	<<radiobutton "$tempSlave.skill.whore" 35>> Skilled
-	<<radiobutton "$tempSlave.skill.whore" 65>> Expert
-	<<radiobutton "$tempSlave.skill.whore" 100>> Masterful
+	<<radiobutton "$tempSlave.skill.whoring" 0>> Unskilled
+	<<radiobutton "$tempSlave.skill.whoring" 15>> Basic
+	<<radiobutton "$tempSlave.skill.whoring" 35>> Skilled
+	<<radiobutton "$tempSlave.skill.whoring" 65>> Expert
+	<<radiobutton "$tempSlave.skill.whoring" 100>> Masterful
 
 	<br>
 
diff --git a/src/endWeek/minorInjuryResponse.js b/src/endWeek/minorInjuryResponse.js
index 23072e1dd9549d5103b6b049aca63e313814e04b..8781ec6293afa63c2dc282585523c754f58bf6ba 100644
--- a/src/endWeek/minorInjuryResponse.js
+++ b/src/endWeek/minorInjuryResponse.js
@@ -18,7 +18,7 @@ window.minorInjuryResponse = /** @param {App.Entity.SlaveState} slave */ functio
 		} else if (arcologyUpgrade.grid === 1 && jsRandom(1, 100) > 50) {
 			r += ` The computer systems successfully detain him and require him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
 			cashX(50, "slaveUpkeep", slave);
-		} else if (slave.skill.whore > jsRandom(1, 100)) {
+		} else if (slave.skill.whoring > jsRandom(1, 100)) {
 			r += ` ${slave.slaveName} is used to this sort of thing, and convinces him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
 			cashX(50, "slaveUpkeep", slave);
 		} else if (slave.skill.combat > 0) {
@@ -32,7 +32,7 @@ window.minorInjuryResponse = /** @param {App.Entity.SlaveState} slave */ functio
 		} else if (arcologyUpgrade.grid === 1 && jsRandom(1, 100) > 50) {
 			r += ` The computer systems successfully detain him and require him to pay minor <span class="yellowgreen">compensation.</span>`;
 			cashX(10, "slaveUpkeep", slave);
-		} else if (slave.skill.whore > jsRandom(1, 100)) {
+		} else if (slave.skill.whoring > jsRandom(1, 100)) {
 			r += ` ${slave.slaveName} is used to this sort of thing, and convinces him to pay minor <span class="yellowgreen">compensation.</span>`;
 			cashX(10, "slaveUpkeep", slave);
 		} else if (slave.skill.combat > 0) {
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 128a3b61130b0c825909cf529276e88dff998635..91623ebf7e6091670f8fe31c62333e4902e733d8 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -260,9 +260,9 @@ __''General slave settings''__
 /% Begin mod section: toggle whether slaves lisp. %/
 
 <<options $disableLisping>>
-<<option 0 "Disable Lisping">>
+<<option 1 "Disable Lisping">>
 	Lisping: ''slaves will not lisp''.
-<<option 1 "Enable Lisping">>
+<<option 0 "Enable Lisping">>
 	Lisping: ''slaves with fat lips or heavy oral piercings will lisp''.
 <</options>>
 
diff --git a/src/facilities/nursery/longChildDescription.tw b/src/facilities/nursery/longChildDescription.tw
index a8a7c2c39e570c8adfcf83afd9bc2076d2d9138b..46b07d4b00f824bf92ae3c86acf26c1a5bb36900 100644
--- a/src/facilities/nursery/longChildDescription.tw
+++ b/src/facilities/nursery/longChildDescription.tw
@@ -821,7 +821,7 @@ is
 	<</if>>
 	Entertainment and prostitution skills are irrelevant for a Fuckdoll.
 <<else>>
-	<<if $activeChild.skill.whore <= 10>>
+	<<if $activeChild.skill.whoring <= 10>>
 		<<if $activeChild.skill.entertainment <= 10>>
 		<<elseif $activeChild.skill.entertainment <= 30>>
 			$He is @@.aquamarine;reasonably entertaining.@@
@@ -844,12 +844,12 @@ is
 			$He is a @@.aquamarine;master of entertainment@@ and
 		<</if>>
 	<</if>>
-	<<if $activeChild.skill.whore <= 10>>
-	<<elseif $activeChild.skill.whore <= 30>>
+	<<if $activeChild.skill.whoring <= 10>>
+	<<elseif $activeChild.skill.whoring <= 30>>
 		<<if $activeChild.skill.entertainment <= 10>>$He <</if>>has @@.aquamarine;basic experience as a prostitute.@@
-	<<elseif $activeChild.skill.whore <= 60>>
+	<<elseif $activeChild.skill.whoring <= 60>>
 		<<if $activeChild.skill.entertainment <= 10>>$He is <</if>>a @@.aquamarine;skilled streetwalker.@@
-	<<elseif $activeChild.skill.whore < 100>>
+	<<elseif $activeChild.skill.whoring < 100>>
 		<<if $activeChild.skill.entertainment <= 10>>$He is <</if>>an @@.aquamarine;expert working $girl.@@
 	<<else>>
 		<<if $activeChild.skill.entertainment <= 10>>$He is <</if>>a @@.aquamarine;masterful whore.@@
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 47cd7488a7f693d1109b9582b5bb52bc70b7ac82..93eb67cc5afc74d5865b58033a7bf2b831f448ec 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with thi
 <<set $returnTo = "init", $nextButton = "Continue", $nextLink = "Alpha disclaimer">>
 
 <<unset $releaseID>>
-<<set $ver = "0.10.7", $pmodVer = "2.3.X", $releaseID = 1043>>
+<<set $ver = "0.10.7", $pmodVer = "2.3.X", $releaseID = 1044>>
 <<if ndef $pmodVer>><<set $pmodVer = "2.3.X">><</if>>
 
 /* This needs to be broken down into individual files that can be added to StoryInit instead. */
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index 75ea237c1fc85b4157fba08aa86551721d8fbe31..33cd82f851a4e5f1b7a7f00162d4cee2159232d8 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -223,7 +223,7 @@ window.DefaultRules = (function() {
 
 			case "learn in the schoolroom":
 				if ((V.schoolroomSlaves < V.schoolroom && slave.fetish !== "mindbroken" && (slave.devotion >= -20 || slave.trust < -50 || (slave.devotion >= -50 && slave.trust < -20)))) {
-					if ((slave.intelligenceImplant < 30) || (slave.voice !== 0 && slave.accent+V.schoolroomUpgradeLanguage > 2) || (slave.skill.oral <= 10+V.schoolroomUpgradeSkills*20) || (slave.skill.whore <= 10+V.schoolroomUpgradeSkills*20) || (slave.skill.entertainment <= 10+V.schoolroomUpgradeSkills*20) || (slave.skill.anal < 10+V.schoolroomUpgradeSkills*20) || ((slave.vagina >= 0) && (slave.skill.vaginal < 10+V.schoolroomUpgradeSkills*20))) {
+					if ((slave.intelligenceImplant < 30) || (slave.voice !== 0 && slave.accent+V.schoolroomUpgradeLanguage > 2) || (slave.skill.oral <= 10+V.schoolroomUpgradeSkills*20) || (slave.skill.whoring <= 10+V.schoolroomUpgradeSkills*20) || (slave.skill.entertainment <= 10+V.schoolroomUpgradeSkills*20) || (slave.skill.anal < 10+V.schoolroomUpgradeSkills*20) || ((slave.vagina >= 0) && (slave.skill.vaginal < 10+V.schoolroomUpgradeSkills*20))) {
 						break;
 					} else {
 						RAFacilityRemove(slave, rule); // before deleting rule.setAssignment
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index db0232e0805944b3bebb4a88e979ac925246413e..17f928eb2aed368f386559caf3ecca06bc75284a 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -132,7 +132,7 @@ App.Entity.SlaveSkillsState = class {
 		 * * 61-99: expert
 		 * * 100+: master
 		 */
-		this.whore = 0;
+		this.whoring = 0;
 		/**
 		 * entertaining skill
 		 * * 0-10: unskilled
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index 7e8c76825fb4a3a130fe8348cfe3b05540fff004..64e903c05d796f3cdd2f363e25994ced98c4efea 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -1621,7 +1621,7 @@ window.DegradingName = /** @param {App.Entity.SlaveState} slave */ function Degr
 			names.push("Stumpy", "Tiny");
 			suffixes.push("Shortstack", "Stumpy");
 		}
-		if (slave.skill.whore > 95) {
+		if (slave.skill.whoring > 95) {
 			names.push("Money", "Street");
 			suffixes.push("Whore");
 		}
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index 807033b0b0ca792621f6801f8802234cea41f8d6..ed4119d3caf00566dec4f171739e85d16b0811bf 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -54,7 +54,7 @@ App.Entity.Utils.SlaveDataSchemeCleanup = (function () {
 			slave.skill.entertainment = slave["entertainSkill"];
 			slave.skill.oral = slave["oralSkill"];
 			slave.skill.vaginal = slave["vaginalSkill"];
-			slave.skill.whore = slave["whoreSkill"];
+			slave.skill.whoring = slave["whoreSkill"];
 			delete slave["analSkill"];
 			delete slave["combatSkill"];
 			delete slave["entertainSkill"];
@@ -684,7 +684,7 @@ window.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() {
 		slave.skill.oral = Math.clamp(+slave.skill.oral, 0, 100) || 0;
 		slave.skill.vaginal = Math.clamp(+slave.skill.vaginal, 0, 100) || 0;
 		slave.skill.anal = Math.clamp(+slave.skill.anal, 0, 100) || 0;
-		slave.skill.whore = Math.clamp(+slave.skill.whore, 0, 100) || 0;
+		slave.skill.whoring = Math.clamp(+slave.skill.whoring, 0, 100) || 0;
 		slave.skill.entertainment = Math.clamp(+slave.skill.entertainment, 0, 100) || 0;
 		slave.skill.combat = Math.clamp(+slave.skill.combat, 0, 1) || 0;
 		slave.skill.headGirl = Math.clamp(+slave.skill.headGirl, 0, 200) || 0;
@@ -1262,7 +1262,7 @@ window.childSkillsDatatypeCleanup = function childSkillsDatatypeCleanup(child) {
 	child.skill.oral = Math.clamp(+child.skill.oral, 0, 100) || 0;
 	child.skill.vaginal = Math.clamp(+child.skill.vaginal, 0, 100) || 0;
 	child.skill.anal = Math.clamp(+child.skill.anal, 0, 100) || 0;
-	child.skill.whore = Math.clamp(+child.skill.whore, 0, 100) || 0;
+	child.skill.whoring = Math.clamp(+child.skill.whoring, 0, 100) || 0;
 	child.skill.entertainment = Math.clamp(+child.skill.entertainment, 0, 100) || 0;
 	child.skill.combat = Math.clamp(+child.skill.combat, 0, 1) || 0;
 	child.skill.headGirl = Math.clamp(+child.skill.headGirl, 0, 200) || 0;
diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index dabb5f771cf0ae07935673696d840390d0f14f99..6b33b8d77be4e46282a7b0ea5666a71396d0011b 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -1242,7 +1242,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
 				}
 			}
 
-			if (eventSlave.skill.whore >= 100) {
+			if (eventSlave.skill.whoring >= 100) {
 				if (eventSlave.trust > 50) {
 					if (["whore", "work in the brothel"].includes(eventSlave.assignment)) {
 						State.variables.RESSevent.push("masterful whore");
@@ -1784,7 +1784,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
 						}
 					}
 
-					if (eventSlave.skill.whore >= 100) {
+					if (eventSlave.skill.whoring >= 100) {
 						if (eventSlave.assignment === "whore") {
 							State.variables.events.push("RE legendary whore");
 						}
diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index da4e3cf76803f6a6c1c3cf590a27162640d3121d..fe2d5bd8772842df582cf2dffcdd539e2c2b7034 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -878,7 +878,7 @@ window.generateGenetics = (function() {
 				}
 			}
 		}
-		
+
 		//rear lipedema
 		if (father !== 0) {
 			if (mother.geneticQuirks.rearLipedema === 2 && father.geneticQuirks.rearLipedema === 2) {
@@ -1488,7 +1488,7 @@ window.generateChild = function (mother, ova, destination) {
 		child.legsTat = 0;
 		child.backTat = 0;
 		child.skill.combat = 0;
-		child.skill.whore = 0;
+		child.skill.whoring = 0;
 		child.skill.entertainment = 0;
 		child.skill.oral = 0;
 		child.skill.anal = 0;
diff --git a/src/js/generateNewSlaveJS.js b/src/js/generateNewSlaveJS.js
index 356ce26c896cbf40de914b8f592a8e33afe6df13..4f7665fad0d04f12047b75055f023b8745339589 100644
--- a/src/js/generateNewSlaveJS.js
+++ b/src/js/generateNewSlaveJS.js
@@ -1439,7 +1439,7 @@ window.GenerateNewSlave = (function() {
 		slave.skill.anal = (slave.anus === 0 ? 0 : jsRandom(0, 15));
 		slave.skill.oral = jsRandom(0, 15);
 		slave.skill.entertainment = jsRandom(0, 15);
-		slave.skill.whore = jsRandom(0, 15);
+		slave.skill.whoring = jsRandom(0, 15);
 	}
 
 	function generateDisabilities() {
diff --git a/src/js/removeActiveSlave.js b/src/js/removeActiveSlave.js
index dc63e0ae2747168cae69d31c9ac4cdc077e21df8..ac53c3d5b3285b9899c115f468f5e596572bd65a 100644
--- a/src/js/removeActiveSlave.js
+++ b/src/js/removeActiveSlave.js
@@ -241,6 +241,7 @@ window.removeActiveSlave = function removeActiveSlave() {
 		removeSlave(INDEX);
 		LENGTH--;
 		V.activeSlave = 0;
+		V.JobIDArray = resetJobIDArray(); /* need to call this once more to update count of resting slaves*/
 	}
 };
 
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index 823ea65bf52d01fe421c4a7c91225e50ce8f61d6..fab2f5565cb5e40e66f094377ab9af6f2f1b61f3 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -306,7 +306,7 @@ window.Beauty = (function() {
 		beauty += slave.voice;
 		beauty += (slave.intelligence + slave.intelligenceImplant)/10;
 		beauty += slave.skill.entertainment/10;
-		beauty += slave.skill.whore/10;
+		beauty += slave.skill.whoring/10;
 		beauty -= 3*slave.visualAge;
 		if (setup.entertainmentCareers.includes(slave.career)) {
 			beauty += 20;
@@ -2104,7 +2104,7 @@ window.slaveCost = (function() {
 		if (slave.devotion > 20) {
 			startingSlaveMultiplier += (0.000117*(slave.devotion-20)*(slave.devotion-20))+(0.003167*(slave.devotion-20));
 		}
-		if (slave.skill.whore) {
+		if (slave.skill.whoring) {
 			startingSlaveMultiplier += 0.00001*slave.skill.whore*slave.skill.whore;
 		}
 		if (slave.skill.entertainment) {
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 066ba89a336fae1520bf9a4f2f611ef51abda406..01d66415960a527d5c9116bff693bfa879e8ec1a 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -2753,7 +2753,7 @@ window.SlaveSummaryUncached = (function () {
 	function short_sex_skills(slave) {
 		let _SSkills = slave.skill.anal + slave.skill.oral;
 		r += `<span class="aquamarine">`;
-		if (((_SSkills + slave.skill.whore + slave.skill.entertainment) >= 400) && ((slave.vagina < 0) || (slave.skill.vaginal >= 100))) {
+		if (((_SSkills + slave.skill.whoring + slave.skill.entertainment) >= 400) && ((slave.vagina < 0) || (slave.skill.vaginal >= 100))) {
 			r += `MSS`;
 		} else {
 			_SSkills += slave.skill.vaginal;
@@ -2773,18 +2773,18 @@ window.SlaveSummaryUncached = (function () {
 				r += `[${_SSkills}] `;
 			}
 			r += " ";
-			if (slave.skill.whore >= 100) {
+			if (slave.skill.whoring >= 100) {
 				r += `W+++`;
-			} else if (slave.skill.whore > 60) {
+			} else if (slave.skill.whoring > 60) {
 				r += `W++`;
-			} else if (slave.skill.whore > 30) {
+			} else if (slave.skill.whoring > 30) {
 				r += `W+`;
-			} else if (slave.skill.whore > 10) {
+			} else if (slave.skill.whoring > 10) {
 				r += `W`;
 			}
-			if (slave.skill.whore > 10) {
+			if (slave.skill.whoring > 10) {
 				if (V.summaryStats) {
-					r += `[${slave.skill.whore}] `;
+					r += `[${slave.skill.whoring}] `;
 				}
 			}
 			r += " ";
@@ -2899,7 +2899,7 @@ window.SlaveSummaryUncached = (function () {
 	function long_sex_skills(slave) {
 		let _SSkills = (slave.skill.anal + slave.skill.oral);
 		r += `<span class="aquamarine">`;
-		if (((_SSkills + slave.skill.whore + slave.skill.entertainment) >= 400) && ((slave.vagina < 0) || (slave.skill.vaginal >= 100))) {
+		if (((_SSkills + slave.skill.whoring + slave.skill.entertainment) >= 400) && ((slave.vagina < 0) || (slave.skill.vaginal >= 100))) {
 			r += `Masterful Sex Slave. `;
 		} else {
 			_SSkills += slave.skill.vaginal;
@@ -2915,14 +2915,14 @@ window.SlaveSummaryUncached = (function () {
 				r += `Sexually unskilled${V.summaryStats? `[${Math.trunc(_SSkills)}]` : ''}.`;
 			}
 			r += " ";
-			if (slave.skill.whore >= 100) {
-				r += `Masterful whore${V.summaryStats? `[${slave.skill.whore}]`: ''}.`;
-			} else if (slave.skill.whore >= 60) {
-				r += `Expert whore${V.summaryStats? `[${slave.skill.whore}]`: ''}.`;
-			} else if (slave.skill.whore >= 30) {
-				r += `Skilled whore${V.summaryStats? `[${slave.skill.whore}]`: ''}.`;
-			} else if (slave.skill.whore >= 10) {
-				r += `Basic whore${V.summaryStats? `[${slave.skill.whore}]`: ''}.`;
+			if (slave.skill.whoring >= 100) {
+				r += `Masterful whore${V.summaryStats? `[${slave.skill.whoring}]`: ''}.`;
+			} else if (slave.skill.whoring >= 60) {
+				r += `Expert whore${V.summaryStats? `[${slave.skill.whoring}]`: ''}.`;
+			} else if (slave.skill.whoring >= 30) {
+				r += `Skilled whore${V.summaryStats? `[${slave.skill.whoring}]`: ''}.`;
+			} else if (slave.skill.whoring >= 10) {
+				r += `Basic whore${V.summaryStats? `[${slave.skill.whoring}]`: ''}.`;
 			}
 			r += " ";
 			if (slave.skill.entertainment >= 100) {
@@ -5287,7 +5287,7 @@ App.UI.slaveSummaryList = function (passageName) {
 						continue;
 					}
 					if ((_Slave.devotion >= -20) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50)) {
-						if ((_Slave.intelligenceImplant < 30) || (_Slave.voice !== 0 && _Slave.accent + V.schoolroomUpgradeLanguage > 2) || (_Slave.skill.oral <= 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.skill.whore <= 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.skill.entertainment <= 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.skill.anal < 10 + V.schoolroomUpgradeSkills * 20) || ((_Slave.vagina >= 0) && (_Slave.skill.vaginal < 10 + V.schoolroomUpgradeSkills * 20))) {
+						if ((_Slave.intelligenceImplant < 30) || (_Slave.voice !== 0 && _Slave.accent + V.schoolroomUpgradeLanguage > 2) || (_Slave.skill.oral <= 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.skill.whoring <= 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.skill.entertainment <= 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.skill.anal < 10 + V.schoolroomUpgradeSkills * 20) || ((_Slave.vagina >= 0) && (_Slave.skill.vaginal < 10 + V.schoolroomUpgradeSkills * 20))) {
 							res.push(dividerAndImage(_Slave));
 							res.push(`[[${_slaveName}|Slave Interact][$activeSlave = $slaves[${_ssi}]]]`);
 						} else {
@@ -5711,7 +5711,7 @@ App.UI.slaveSummaryList = function (passageName) {
 					}
 
 					if (V.schoolroom !== 0) {
-						if (V.schoolroom > V.schoolroomSlaves && (_Slave.fetish !== "mindbroken" && (_Slave.devotion >= -20 || (_Slave.devotion >= -50 && _Slave.trust < -20) || _Slave.trust < -50) && ((_Slave.intelligenceImplant < 30) || (_Slave.voice !== 0 && _Slave.accent + V.schoolroomUpgradeLanguage > 2) || (_Slave.skill.oral <= 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.skill.whore <= 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.skill.entertainment <= 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.skill.anal < 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.vagina >= 0 && _Slave.skill.vaginal < 10 + V.schoolroomUpgradeSkills * 20)))) {
+						if (V.schoolroom > V.schoolroomSlaves && (_Slave.fetish !== "mindbroken" && (_Slave.devotion >= -20 || (_Slave.devotion >= -50 && _Slave.trust < -20) || _Slave.trust < -50) && ((_Slave.intelligenceImplant < 30) || (_Slave.voice !== 0 && _Slave.accent + V.schoolroomUpgradeLanguage > 2) || (_Slave.skill.oral <= 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.skill.whoring <= 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.skill.entertainment <= 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.skill.anal < 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.vagina >= 0 && _Slave.skill.vaginal < 10 + V.schoolroomUpgradeSkills * 20)))) {
 							transfers.push(`[[Schoolroom|Assign][$assignTo = "Schoolroom", $i = ${_ssi}]]`); /* $i = -1 tells Assign to use _Slave as-is */
 						} else {
 							transfers.push('Schoolroom');
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index c06363b153afe4b2a087818432b313afc076431d..1610af3941806f55167efba1a457a24bd7b2184a 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -1305,24 +1305,24 @@ window.SkillIncrease = (function() {
 		let r ="";
 		skillIncrease = skillIncrease || State.variables.skillIncrease || 1;
 
-		if (slave.skill.whore <= 10) {
-			if (slave.skill.whore + skillIncrease > 10) {
+		if (slave.skill.whoring <= 10) {
+			if (slave.skill.whoring + skillIncrease > 10) {
 				r = `<span class="green">${He} now has basic knowledge about how to whore,</span> and can avoid some potentially dangerous situations.`;
 			}
-		} else if (slave.skill.whore <= 30) {
-			if (slave.skill.whore + skillIncrease > 30) {
+		} else if (slave.skill.whoring <= 30) {
+			if (slave.skill.whoring + skillIncrease > 30) {
 				r = `<span class="green">${He} now has some skill as a whore,</span> and knows how to sell ${his} body at a good price.`;
 			}
-		} else if (slave.skill.whore <= 60) {
-			if (slave.skill.whore + skillIncrease > 60) {
+		} else if (slave.skill.whoring <= 60) {
+			if (slave.skill.whoring + skillIncrease > 60) {
 				r = `<span class="green">${He} is now an expert whore,</span> and can often make clients forget that $he's a prostitute they're paying for.`;
 			}
-		} else if (slave.skill.whore < 100) {
-			if (slave.skill.whore + skillIncrease >= 100) {
+		} else if (slave.skill.whoring < 100) {
+			if (slave.skill.whoring + skillIncrease >= 100) {
 				r = `<span class="green">${He} is now a masterful whore,</span> and can learn nothing more about prostitution.`;
 			}
 		}
-		slave.skill.whore += skillIncrease;
+		slave.skill.whoring += skillIncrease;
 		return r;
 	}
 
@@ -1484,7 +1484,7 @@ window.resyncSlaveToAge = function(slave) {
 		slave.anus = 0;
 		slave.skill.anal = 0;
 		slave.skill.oral = 0;
-		slave.skill.whore = 0;
+		slave.skill.whoring = 0;
 		slave.skill.entertainment = 0;
 		slave.skill.combat = 0;
 		slave.skill.vaginal = 0;
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index 8981fe80a8763fbe8cf0c96edfd23d5ce5b008bf..92704132135bde52cc3c1bb167701c7fa1a5fb8a 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -281,7 +281,7 @@ The previous owner seems to have left in something of a hurry.
 			<<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
 			<<set $activeSlave.skill.vaginal = random(15,35)>>
 		<</if>>
-		<<set $activeSlave.skill.whore = random(15,35)>>
+		<<set $activeSlave.skill.whoring = random(15,35)>>
 		<<set $activeSlave.clothes = "uncomfortable straps", $activeSlave.collar = "uncomfortable leather", $activeSlave.shoes = "flats">>
 		<<set $activeSlave.assignment = "whore">>
 	<<case "GenderRadicalist">>
@@ -293,7 +293,7 @@ The previous owner seems to have left in something of a hurry.
 		<<set $activeSlave.boobs += 100*random(2,4)>>
 		<<set $activeSlave.butt += random(1,2)>>
 		<<set $activeSlave.attrXY = random(70,90), $activeSlave.attrXX = 0>>
-		<<set $activeSlave.skill.oral = random(35,65), $activeSlave.skill.anal = random(35,65), $activeSlave.skill.whore = random(35,65)>>
+		<<set $activeSlave.skill.oral = random(35,65), $activeSlave.skill.anal = random(35,65), $activeSlave.skill.whoring = random(35,65)>>
 		<<run SoftenSexualFlaw($activeSlave)>>
 		<<set $activeSlave.clothes = "uncomfortable straps", $activeSlave.collar = "stylish leather", $activeSlave.shoes = "heels">>
 		<<set $activeSlave.assignment = "whore">>
@@ -331,7 +331,7 @@ The previous owner seems to have left in something of a hurry.
 		<<set $activeSlave.butt += random(2,3)>>
 		<<set $activeSlave.lips = random(2,4)>>
 		<<set $activeSlave.weight = random(-15,15)>>
-		<<set $activeSlave.skill.oral = 0, $activeSlave.skill.anal = 0, $activeSlave.skill.vaginal = 0, $activeSlave.skill.entertainment = 0, $activeSlave.skill.whore = 0>>
+		<<set $activeSlave.skill.oral = 0, $activeSlave.skill.anal = 0, $activeSlave.skill.vaginal = 0, $activeSlave.skill.entertainment = 0, $activeSlave.skill.whoring = 0>>
 		<<set $activeSlave.behavioralFlaw = "none", $activeSlave.sexualFlaw = "none">>
 		<<set $activeSlave.clothes = "a Fuckdoll suit">>
 		<<set $activeSlave.assignment = "please you">>
@@ -457,7 +457,7 @@ The previous owner seems to have left in something of a hurry.
 			<<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
 			<<set $activeSlave.skill.vaginal = random(15,35)>>
 		<</if>>
-		<<set $activeSlave.skill.whore = random(15,35)>>
+		<<set $activeSlave.skill.whoring = random(15,35)>>
 		<<set $activeSlave.clothes = "body oil", $activeSlave.collar = "none", $activeSlave.shoes = "none">>
 		<<set $activeSlave.assignment = "whore">>
 	<<case "ChattelReligionist">>
@@ -465,7 +465,7 @@ The previous owner seems to have left in something of a hurry.
 		<<include "Generate New Slave">>
 		<<set $activeSlave.devotion = random(55,65), $activeSlave.trust = random(55,65), $activeSlave.health = random(0,15)>>
 		<<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
-		<<set $activeSlave.skill.whore = random(10,20)>>
+		<<set $activeSlave.skill.whoring = random(10,20)>>
 		<<set $activeSlave.behavioralFlaw = "none", $activeSlave.behavioralQuirk = "sinful">>
 		<<set $activeSlave.clothes = "a chattel habit", $activeSlave.collar = "heavy gold", $activeSlave.shoes = "flats">>
 		<<set $activeSlave.assignment = "whore">>
@@ -544,7 +544,7 @@ The previous owner seems to have left in something of a hurry.
 			<<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
 			<<set $activeSlave.skill.vaginal = 100>>
 		<</if>>
-		<<set $activeSlave.skill.entertainment = 100, $activeSlave.skill.whore = 100>>
+		<<set $activeSlave.skill.entertainment = 100, $activeSlave.skill.whoring = 100>>
 		<<run SoftenBehavioralFlaw($activeSlave)>>
 		<<run SoftenSexualFlaw($activeSlave)>>
 		<<set $activeSlave.clothes = "a slutty qipao", $activeSlave.collar = "pretty jewelry", $activeSlave.shoes = "heels">>
@@ -563,7 +563,7 @@ The previous owner seems to have left in something of a hurry.
 			<<set $activeSlave.skill.vaginal = random(35,75)>>
 		<</if>>
 		<<set $activeSlave.skill.entertainment = random(15,35)>>
-		<<set $activeSlave.skill.whore = 0>>
+		<<set $activeSlave.skill.whoring = 0>>
 		<<run SoftenSexualFlaw($activeSlave)>>
 		<<set $activeSlave.clothes = "a ball gown", $activeSlave.shoes = "flats">>
 		<<set $activeSlave.assignment = "rest">>
diff --git a/src/npc/databases/cheatmodeDatabase.tw b/src/npc/databases/cheatmodeDatabase.tw
index 7461b41a61d1ba3c594c00a3a20bd6dd0139a5f3..a11c1407171f1c19b7ec6ef00109dbc6a0ab830f 100644
--- a/src/npc/databases/cheatmodeDatabase.tw
+++ b/src/npc/databases/cheatmodeDatabase.tw
@@ -2,7 +2,7 @@
 
 <<set $activeSlave = BaseSlave()>>
 <<set _HS = clone($activeSlave)>>
-<<set _HS.slaveName = "Miss Anne", _HS.birthName = "Lindy Anne", _HS.ID = 990000, _HS.relation = "mother", _HS.relationTarget = 990004, _HS.relationship = 4, _HS.relationshipTarget = 990001, _HS.rivalry = 1, _HS.rivalryTarget = 990002, _HS.assignment = "be your Head Girl", _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, _HS.ageImplant = 1, _HS.health = 50, _HS.devotion = 100, _HS.height = 175, _HS.eyeColor = "green", _HS.hColor = "honey blonde", _HS.skin = "pale", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.areolae = 1, _HS.butt = 4, _HS.buttImplant = 2, _HS.face = 55, _HS.lips = 35, _HS.anus = 1, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 100, _HS.skill.entertainment = 100, _HS.clothes = "a slave gown", _HS.intelligence = 100, _HS.energy = 65, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "'Miss Anne' is tattooed in lovely flowing script over her collarbone.", _HS.custom.desc = "She speaks with the rich accent of the Old South.">>
+<<set _HS.slaveName = "Miss Anne", _HS.birthName = "Lindy Anne", _HS.ID = 990000, _HS.relation = "mother", _HS.relationTarget = 990004, _HS.relationship = 4, _HS.relationshipTarget = 990001, _HS.rivalry = 1, _HS.rivalryTarget = 990002, _HS.assignment = "be your Head Girl", _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, _HS.ageImplant = 1, _HS.health = 50, _HS.devotion = 100, _HS.height = 175, _HS.eyeColor = "green", _HS.hColor = "honey blonde", _HS.skin = "pale", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.areolae = 1, _HS.butt = 4, _HS.buttImplant = 2, _HS.face = 55, _HS.lips = 35, _HS.anus = 1, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 100, _HS.skill.entertainment = 100, _HS.clothes = "a slave gown", _HS.intelligence = 100, _HS.energy = 65, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "'Miss Anne' is tattooed in lovely flowing script over her collarbone.", _HS.custom.desc = "She speaks with the rich accent of the Old South.">>
 <<if $seeDicks != 100>>
 	<<set _HS.genes = "XX", _HS.vagina = 2, _HS.ovaries = 1, _HS.skill.vaginal = 100, _HS.pubertyXX = 1>>
 <<else>>
@@ -13,7 +13,7 @@
 //There are quite a few left; their names are _HS.slaveName,//
 
 <<set _HS = clone($activeSlave)>>
-<<set _HS.slaveName = "Cornelia", _HS.birthName = "Cora", _HS.ID = 990001, _HS.relation = "mother", _HS.relationTarget = 990002, _HS.relationship = 4, _HS.relationshipTarget = 990000, _HS.assignment = "whore", _HS.birthWeek = random(0,51), _HS.actualAge = 36, _HS.physicalAge = 36, _HS.visualAge = 36, _HS.ovaryAge = 36, _HS.ageImplant = 1, _HS.health = 10, _HS.devotion = 100, _HS.muscles = 20, _HS.height = 190, _HS.race = "black", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "dark", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 1200, _HS.boobsImplant = 1000, _HS.areolae = 2, _HS.butt = 5, _HS.buttImplant = 3, _HS.preg = -2, _HS.face = 15, _HS.faceImplant = 65, _HS.lips = 35, _HS.lipsImplant = 10, _HS.anus = 2, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 100, _HS.skill.entertainment = 100, _HS.clothes = "a slave gown", _HS.energy = 65, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "A large letter S is branded into the back of her left hand.", _HS.custom.desc = "She speaks with the demeaning accent of slaves from the Old South.">>
+<<set _HS.slaveName = "Cornelia", _HS.birthName = "Cora", _HS.ID = 990001, _HS.relation = "mother", _HS.relationTarget = 990002, _HS.relationship = 4, _HS.relationshipTarget = 990000, _HS.assignment = "whore", _HS.birthWeek = random(0,51), _HS.actualAge = 36, _HS.physicalAge = 36, _HS.visualAge = 36, _HS.ovaryAge = 36, _HS.ageImplant = 1, _HS.health = 10, _HS.devotion = 100, _HS.muscles = 20, _HS.height = 190, _HS.race = "black", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "dark", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 1200, _HS.boobsImplant = 1000, _HS.areolae = 2, _HS.butt = 5, _HS.buttImplant = 3, _HS.preg = -2, _HS.face = 15, _HS.faceImplant = 65, _HS.lips = 35, _HS.lipsImplant = 10, _HS.anus = 2, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 100, _HS.skill.entertainment = 100, _HS.clothes = "a slave gown", _HS.energy = 65, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "A large letter S is branded into the back of her left hand.", _HS.custom.desc = "She speaks with the demeaning accent of slaves from the Old South.">>
 <<if $seeDicks != 0>>
 	<<set _HS.genes = "XY", _HS.vagina = -1, _HS.dick = 3, _HS.balls = 3, _HS.scrotum = 3, _HS.foreskin = 3, _HS.prostate = 1, _HS.pubertyXY = 1>>
 <<else>>
@@ -23,7 +23,7 @@
 //_HS.slaveName,//
 
 <<set _HS = clone($activeSlave)>>
-<<set _HS.slaveName = "Sheba", _HS.birthName = "Shaneequa", _HS.ID = 990002, _HS.relation = "daughter", _HS.relationTarget = 990001, _HS.rivalry = 1, _HS.rivalryTarget = 990000, _HS.assignment = "whore", _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 10, _HS.devotion = 12, _HS.height = 175, _HS.race = "black", _HS.pubicHColor = "black", _HS.skin = "brown", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 1600, _HS.boobsImplant = 600, _HS.nipplesPiercing = 1, _HS.areolae = 1, _HS.butt = 6, _HS.buttImplant = 2, _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 55, _HS.lipsImplant = 10, _HS.anus = 1, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.skill.whore = 35, _HS.skill.entertainment = 35, _HS.clothes = "a slave gown", _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "A large letter S is branded into the back of her left hand.", _HS.custom.desc = "She speaks with the demeaning accent of slaves from the Old South.", _HS.mother = 990001>>
+<<set _HS.slaveName = "Sheba", _HS.birthName = "Shaneequa", _HS.ID = 990002, _HS.relation = "daughter", _HS.relationTarget = 990001, _HS.rivalry = 1, _HS.rivalryTarget = 990000, _HS.assignment = "whore", _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 10, _HS.devotion = 12, _HS.height = 175, _HS.race = "black", _HS.pubicHColor = "black", _HS.skin = "brown", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 1600, _HS.boobsImplant = 600, _HS.nipplesPiercing = 1, _HS.areolae = 1, _HS.butt = 6, _HS.buttImplant = 2, _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 55, _HS.lipsImplant = 10, _HS.anus = 1, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.skill.whoring = 35, _HS.skill.entertainment = 35, _HS.clothes = "a slave gown", _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "A large letter S is branded into the back of her left hand.", _HS.custom.desc = "She speaks with the demeaning accent of slaves from the Old South.", _HS.mother = 990001>>
 <<if $seeDicks != 100>>
 	<<set _HS.genes = "XX", _HS.vagina = 1, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.pubertyXX = 1>>
 <<else>>
diff --git a/src/npc/databases/dSlavesDatabase.tw b/src/npc/databases/dSlavesDatabase.tw
index c7ec92e07d4f343a91c22a28b49820bd53e0ab0c..2814330568645165531afafd52933c71d1a5bc19 100644
--- a/src/npc/databases/dSlavesDatabase.tw
+++ b/src/npc/databases/dSlavesDatabase.tw
@@ -88,7 +88,7 @@
 /*Corrected tattoo syntax, added nympho and arrogant -BoneyM*/
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Kiki", _HS.birthName = "Kiki", _HS.origin = "She is a shinobi, and fanatically loyal to her master.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 20, _HS.devotion = 100, _HS.weight = -20, _HS.height = 175, _HS.nationality = "Japanese", _HS.race = "asian", _HS.origHColor = "black", _HS.override_H_Color = 1, _HS.hColor = "light purple", _HS.pubicHColor = "light purple", _HS.hLength = 10, _HS.hStyle = "short", _HS.boobs = 500, _HS.butt = 3, _HS.buttTat = "tribal patterns", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.skill.whore = 35, _HS.skill.entertainment = 35, _HS.skill.combat = 1, _HS.intelligence = 30, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.behavioralFlaw = "odd", _HS.custom.tattoo = "She has Yakuza-style tattoos across her back.">>
+<<set _HS.slaveName = "Kiki", _HS.birthName = "Kiki", _HS.origin = "She is a shinobi, and fanatically loyal to her master.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 20, _HS.devotion = 100, _HS.weight = -20, _HS.height = 175, _HS.nationality = "Japanese", _HS.race = "asian", _HS.origHColor = "black", _HS.override_H_Color = 1, _HS.hColor = "light purple", _HS.pubicHColor = "light purple", _HS.hLength = 10, _HS.hStyle = "short", _HS.boobs = 500, _HS.butt = 3, _HS.buttTat = "tribal patterns", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.skill.whoring = 35, _HS.skill.entertainment = 35, _HS.skill.combat = 1, _HS.intelligence = 30, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.behavioralFlaw = "odd", _HS.custom.tattoo = "She has Yakuza-style tattoos across her back.">>
 <<set $heroSlaves.push(_HS)>>
 /*shinobi*/
 /*Tweaked devotion upwards, added origin, corrected tattoo syntax, added odd quirk, added whoring and entertaining skill -BoneyM*/
@@ -191,7 +191,7 @@
 /*Changed her to Arabic, corrected tattoo syntax, added entertain skill -BoneyM*/
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Riya", _HS.birthName = "Riya", _HS.origin = "She grew up in a well-to-do family and discovered her fetish for servitude in college, and she decided to become the world's best slave and slave trainer in one.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 20, _HS.devotion = 40, _HS.weight = -20, _HS.height = 155, _HS.race = "indo-aryan", _HS.eyeColor = "grey", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "brown", _HS.hStyle = "long", _HS.boobs = 500, _HS.butt = 3, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.skill.oral = 15, _HS.skill.whore = 15, _HS.skill.entertainment = 15, _HS.intelligence = 30, _HS.intelligenceImplant = 30, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "She has a barcode of her identifying information tattooed on her left shoulder.", _HS.career = "a slaver">>
+<<set _HS.slaveName = "Riya", _HS.birthName = "Riya", _HS.origin = "She grew up in a well-to-do family and discovered her fetish for servitude in college, and she decided to become the world's best slave and slave trainer in one.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 20, _HS.devotion = 40, _HS.weight = -20, _HS.height = 155, _HS.race = "indo-aryan", _HS.eyeColor = "grey", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "brown", _HS.hStyle = "long", _HS.boobs = 500, _HS.butt = 3, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.skill.oral = 15, _HS.skill.whoring = 15, _HS.skill.entertainment = 15, _HS.intelligence = 30, _HS.intelligenceImplant = 30, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "She has a barcode of her identifying information tattooed on her left shoulder.", _HS.career = "a slaver">>
 <<set $heroSlaves.push(_HS)>>
 /*Changed eyes to grey, reduced height and weight, added origin, smart piercing, entertain and whore skill (representing theoretical knowledge from being a trainer), added ear piercings -BoneyM*/
 
@@ -262,7 +262,7 @@
 /*Added barcode tattoo and origin -BoneyM*/
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Emm", _HS.birthName = "Emm", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 24, _HS.physicalAge = 24, _HS.visualAge = 24, _HS.ovaryAge = 24, _HS.health = 20, _HS.devotion = 40, _HS.weight = 20, _HS.race = "white", _HS.eyeColor = "green", _HS.hColor = "strawberry blonde", _HS.pubicHColor = "strawberry blonde", _HS.skin = "white", _HS.hStyle = "long", _HS.boobs = 650, _HS.butt = 5, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 35, _HS.skill.whore = 15, _HS.skill.entertainment = 15, _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1, _HS.custom.desc = "She is friendly, clever, and quick.">>
+<<set _HS.slaveName = "Emm", _HS.birthName = "Emm", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 24, _HS.physicalAge = 24, _HS.visualAge = 24, _HS.ovaryAge = 24, _HS.health = 20, _HS.devotion = 40, _HS.weight = 20, _HS.race = "white", _HS.eyeColor = "green", _HS.hColor = "strawberry blonde", _HS.pubicHColor = "strawberry blonde", _HS.skin = "white", _HS.hStyle = "long", _HS.boobs = 650, _HS.butt = 5, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 35, _HS.skill.whoring = 15, _HS.skill.entertainment = 15, _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1, _HS.custom.desc = "She is friendly, clever, and quick.">>
 <<set $heroSlaves.push(_HS)>>
 /*fluctuating weight*/
 /*Increased weight, added entertain and whore skill, added ear piercing, changed eyes -BoneyM*/
@@ -289,7 +289,7 @@
 /*Added origin, increased weight, pierced ears, added customdesc -BoneyM*/
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Klara", _HS.birthName = "Klara", _HS.origin = "She was forced into slavery and rather brutally broken in.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 20, _HS.devotion = -75, _HS.height = 175, _HS.race = "white", _HS.eyeColor = "blue", _HS.skin = "fair", _HS.hStyle = "long and braided", _HS.boobs = 800, _HS.butt = 4, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 35, _HS.skill.entertainment = 35, _HS.intelligence = -30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.desc = "'Cum slut' is branded on her right ass cheek, and 'bitch whore' is tattooed on her inner left thigh.">>
+<<set _HS.slaveName = "Klara", _HS.birthName = "Klara", _HS.origin = "She was forced into slavery and rather brutally broken in.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 20, _HS.devotion = -75, _HS.height = 175, _HS.race = "white", _HS.eyeColor = "blue", _HS.skin = "fair", _HS.hStyle = "long and braided", _HS.boobs = 800, _HS.butt = 4, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 35, _HS.skill.entertainment = 35, _HS.intelligence = -30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.desc = "'Cum slut' is branded on her right ass cheek, and 'bitch whore' is tattooed on her inner left thigh.">>
 <<set $heroSlaves.push(_HS)>>
 /*Fixed typo in customdesc, increased whore and entertainskill, changed eye color -BoneyM*/
 
@@ -399,7 +399,7 @@
 /*Corrected birthname (was 'Jasmine'), changed eye color, added customdesc -BoneyM*/
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Beatrice (No. 525)", _HS.birthName = "Beatrice", _HS.origin = "She comes from old money and sold herself into slavery to satisfy her obsession with the practice, believing her family would buy her back out of slavery later.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 20, _HS.devotion = 30, _HS.height = 155, _HS.race = "white", _HS.eyeColor = "blue-green", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.origHColor = "red", _HS.hColor = "bright red", _HS.eyebrowHColor = "red", _HS.pubicHColor = "red", _HS.underArmHColor = "red", _HS.skin = "pure white", _HS.hLength = 80, _HS.hStyle = "long and wavy, and down past her ass", _HS.waist = -55, _HS.boobs = 800, _HS.butt = 4, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.skill.whore = 15, _HS.skill.entertainment = 15, _HS.clothes = "a slave gown", _HS.intelligence = 30, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.custom.tattoo = "She has a fine, intricate vine-like tattoo around her right ankle.">>
+<<set _HS.slaveName = "Beatrice (No. 525)", _HS.birthName = "Beatrice", _HS.origin = "She comes from old money and sold herself into slavery to satisfy her obsession with the practice, believing her family would buy her back out of slavery later.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 20, _HS.devotion = 30, _HS.height = 155, _HS.race = "white", _HS.eyeColor = "blue-green", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.origHColor = "red", _HS.hColor = "bright red", _HS.eyebrowHColor = "red", _HS.pubicHColor = "red", _HS.underArmHColor = "red", _HS.skin = "pure white", _HS.hLength = 80, _HS.hStyle = "long and wavy, and down past her ass", _HS.waist = -55, _HS.boobs = 800, _HS.butt = 4, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.skill.whoring = 15, _HS.skill.entertainment = 15, _HS.clothes = "a slave gown", _HS.intelligence = 30, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.custom.tattoo = "She has a fine, intricate vine-like tattoo around her right ankle.">>
 <<set $heroSlaves.push(_HS)>>
 /*contraception but breeder naturally, well trained*/
 /*Fetish was 'arrogant', changed it to flaw. Added origin, whore and entertainskill. Changed eye color, corrected tattoo syntax, pierced ears, reduced weight -BoneyM*/
@@ -421,11 +421,11 @@
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Terminatrix' Heaven", _HS.birthName = "Gabrielle", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 80, _HS.devotion = 100, _HS.muscles = 50, _HS.height = 190, _HS.race = "black", _HS.hColor = "black", _HS.pubicHColor = "brown", _HS.skin = "black", _HS.hLength = 5, _HS.hStyle = "very short and a poor emulation of a military cut", _HS.boobs = 250, _HS.nipplesPiercing = 1, _HS.butt = 5, _HS.buttTat = "tribal patterns", _HS.lipsPiercing = 1, _HS.lipsTat = "tribal patterns", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaTat = "tribal patterns", _HS.clit = 2, _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "tribal patterns", _HS.earPiercing = 1, _HS.nosePiercing = 1, _HS.eyebrowPiercing = 1, _HS.navelPiercing = 1, _HS.shouldersTat = "tribal patterns", _HS.armsTat = "tribal patterns", _HS.legsTat = "tribal patterns", _HS.stampTat = "tribal patterns", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 35, _HS.skill.entertainment = 15, _HS.skill.combat = 1, _HS.clothes = "a comfortable bodysuit", _HS.collar = "heavy gold", _HS.shoes = "flats", _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.desc = "Amongst the scars that decorate her body, one in the shape of a heart can be made out on the top of her right hand.">>
+<<set _HS.slaveName = "'Terminatrix' Heaven", _HS.birthName = "Gabrielle", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 80, _HS.devotion = 100, _HS.muscles = 50, _HS.height = 190, _HS.race = "black", _HS.hColor = "black", _HS.pubicHColor = "brown", _HS.skin = "black", _HS.hLength = 5, _HS.hStyle = "very short and a poor emulation of a military cut", _HS.boobs = 250, _HS.nipplesPiercing = 1, _HS.butt = 5, _HS.buttTat = "tribal patterns", _HS.lipsPiercing = 1, _HS.lipsTat = "tribal patterns", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaTat = "tribal patterns", _HS.clit = 2, _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "tribal patterns", _HS.earPiercing = 1, _HS.nosePiercing = 1, _HS.eyebrowPiercing = 1, _HS.navelPiercing = 1, _HS.shouldersTat = "tribal patterns", _HS.armsTat = "tribal patterns", _HS.legsTat = "tribal patterns", _HS.stampTat = "tribal patterns", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 35, _HS.skill.entertainment = 15, _HS.skill.combat = 1, _HS.clothes = "a comfortable bodysuit", _HS.collar = "heavy gold", _HS.shoes = "flats", _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.desc = "Amongst the scars that decorate her body, one in the shape of a heart can be made out on the top of her right hand.">>
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Lilliana", _HS.birthName = "Zuzanna", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 25, _HS.physicalAge = 25, _HS.visualAge = 25, _HS.ovaryAge = 25, _HS.health = 13, _HS.devotion = 100, _HS.muscles = 100, _HS.height = 190, _HS.eyeColor = "white", _HS.eyes = -2, _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.hColor = "white with red stripes", _HS.eyebrowHColor = "white", _HS.pubicHColor = "white", _HS.underArmHColor = "white", _HS.override_Skin = 1, _HS.skin = "sun tanned", _HS.hLength = 100, _HS.hStyle = "back in a large ass length braid", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 400, _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.face = 15, _HS.faceImplant = 65, _HS.lipsPiercing = 1, _HS.tonguePiercing = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.makeup = 2, _HS.nails = 1, _HS.earPiercing = 1, _HS.nosePiercing = 1, _HS.eyebrowPiercing = 1, _HS.skill.whore = 15, _HS.skill.entertainment = 15, _HS.skill.combat = 1, _HS.clothes = "nice business attire", _HS.collar = "leather with cowbell", _HS.shoes = "heels", _HS.intelligence = -30, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Lilliana", _HS.birthName = "Zuzanna", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 25, _HS.physicalAge = 25, _HS.visualAge = 25, _HS.ovaryAge = 25, _HS.health = 13, _HS.devotion = 100, _HS.muscles = 100, _HS.height = 190, _HS.eyeColor = "white", _HS.eyes = -2, _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.hColor = "white with red stripes", _HS.eyebrowHColor = "white", _HS.pubicHColor = "white", _HS.underArmHColor = "white", _HS.override_Skin = 1, _HS.skin = "sun tanned", _HS.hLength = 100, _HS.hStyle = "back in a large ass length braid", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 400, _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.face = 15, _HS.faceImplant = 65, _HS.lipsPiercing = 1, _HS.tonguePiercing = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.makeup = 2, _HS.nails = 1, _HS.earPiercing = 1, _HS.nosePiercing = 1, _HS.eyebrowPiercing = 1, _HS.skill.whoring = 15, _HS.skill.entertainment = 15, _HS.skill.combat = 1, _HS.clothes = "nice business attire", _HS.collar = "leather with cowbell", _HS.shoes = "heels", _HS.intelligence = -30, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1>>
 <<set $heroSlaves.push(_HS)>>
 /*Blind*/
 
@@ -443,15 +443,15 @@
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Top' Lillium", _HS.birthName = "Sarah", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, _HS.health = 90, _HS.devotion = 100, _HS.muscles = 20, _HS.height = 190, _HS.eyeColor = "green", _HS.origHColor = "red", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.hColor = "deep red", _HS.eyebrowHColor = "red", _HS.pubicHColor = "red", _HS.underArmHColor = "red", _HS.skin = "fair", _HS.hLength = 20, _HS.hStyle = "short and pleasantly frames her face", _HS.waist = -55, _HS.boobs = 900, _HS.butt = 4, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "all", _HS.anus = 2, _HS.ovaries = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 100, _HS.skill.entertainment = 100, _HS.skill.combat = 1, _HS.clothes = "nice business attire", _HS.collar = "heavy gold", _HS.shoes = "flats", _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "She has a small, grinning harlequin tattoo on her inner thigh.", _HS.custom.desc = "In place of her left hand's pinkie finger is a large pink scar that crosses the entire back of her hand.">>
+<<set _HS.slaveName = "'Top' Lillium", _HS.birthName = "Sarah", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, _HS.health = 90, _HS.devotion = 100, _HS.muscles = 20, _HS.height = 190, _HS.eyeColor = "green", _HS.origHColor = "red", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.hColor = "deep red", _HS.eyebrowHColor = "red", _HS.pubicHColor = "red", _HS.underArmHColor = "red", _HS.skin = "fair", _HS.hLength = 20, _HS.hStyle = "short and pleasantly frames her face", _HS.waist = -55, _HS.boobs = 900, _HS.butt = 4, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "all", _HS.anus = 2, _HS.ovaries = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 100, _HS.skill.entertainment = 100, _HS.skill.combat = 1, _HS.clothes = "nice business attire", _HS.collar = "heavy gold", _HS.shoes = "flats", _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "She has a small, grinning harlequin tattoo on her inner thigh.", _HS.custom.desc = "In place of her left hand's pinkie finger is a large pink scar that crosses the entire back of her hand.">>
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Cammy", _HS.birthName = "Viktoriya", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 27, _HS.physicalAge = 27, _HS.visualAge = 27, _HS.ovaryAge = 27, _HS.health = 80, _HS.devotion = 70, _HS.muscles = 75, _HS.height = 145, _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "pale", _HS.hStyle = "tied back into two long braids", _HS.boobs = 800, _HS.butt = 2.5, _HS.face = 15, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 15, _HS.skill.entertainment = 15, _HS.clothes = "a comfortable bodysuit", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.custom.desc = "She has a long horizontal scar on her left cheek.">>
+<<set _HS.slaveName = "Cammy", _HS.birthName = "Viktoriya", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 27, _HS.physicalAge = 27, _HS.visualAge = 27, _HS.ovaryAge = 27, _HS.health = 80, _HS.devotion = 70, _HS.muscles = 75, _HS.height = 145, _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "pale", _HS.hStyle = "tied back into two long braids", _HS.boobs = 800, _HS.butt = 2.5, _HS.face = 15, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 15, _HS.skill.entertainment = 15, _HS.clothes = "a comfortable bodysuit", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.custom.desc = "She has a long horizontal scar on her left cheek.">>
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Sheena", _HS.birthName = "Penelope", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 80, _HS.devotion = 90, _HS.height = 155, _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.hColor = "black with deep red highlights", _HS.eyebrowHColor = "red", _HS.pubicHColor = "red", _HS.underArmHColor = "red", _HS.skin = "pale", _HS.hStyle = "long and disheveled", _HS.waist = -55, _HS.boobs = 500, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.lipsPiercing = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clitPiercing = 1, _HS.clitSetting = "anal", _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.makeup = 2, _HS.nails = 2, _HS.earPiercing = 2, _HS.nosePiercing = 1, _HS.navelPiercing = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 35, _HS.skill.whore = 15, _HS.skill.entertainment = 15, _HS.clothes = "a slutty outfit", _HS.intelligence = -30, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.custom.tattoo = "She has been heavily tattooed, with her chest, thighs and both arms covered in various punk-style pieces. The biggest and most impressive piece is the large logo of a legendary late 20th century punk band.">>
+<<set _HS.slaveName = "Sheena", _HS.birthName = "Penelope", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 80, _HS.devotion = 90, _HS.height = 155, _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.hColor = "black with deep red highlights", _HS.eyebrowHColor = "red", _HS.pubicHColor = "red", _HS.underArmHColor = "red", _HS.skin = "pale", _HS.hStyle = "long and disheveled", _HS.waist = -55, _HS.boobs = 500, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.lipsPiercing = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clitPiercing = 1, _HS.clitSetting = "anal", _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.makeup = 2, _HS.nails = 2, _HS.earPiercing = 2, _HS.nosePiercing = 1, _HS.navelPiercing = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 35, _HS.skill.whoring = 15, _HS.skill.entertainment = 15, _HS.clothes = "a slutty outfit", _HS.intelligence = -30, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.custom.tattoo = "She has been heavily tattooed, with her chest, thighs and both arms covered in various punk-style pieces. The biggest and most impressive piece is the large logo of a legendary late 20th century punk band.">>
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
@@ -459,7 +459,7 @@
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Sakura", _HS.birthName = "Sakura", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 100, _HS.devotion = 100, _HS.muscles = 20, _HS.race = "asian", _HS.skin = "dark", _HS.hLength = 25, _HS.hStyle = "short and held back by a white bandana", _HS.boobs = 600, _HS.butt = 4, _HS.faceImplant = 15, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clit = 1, _HS.clitPiercing = 3, _HS.clitSetting = "humiliation", _HS.anus = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.whore = 100, _HS.skill.entertainment = 100, _HS.skill.combat = 1, _HS.clothes = "a slutty outfit", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.fetishKnown = 1, _HS.custom.desc = "She is an enthusiastic high school graduate, eager to make her teacher proud by becoming the greatest slave known to any owner.", _HS.career = "a student">>
+<<set _HS.slaveName = "Sakura", _HS.birthName = "Sakura", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 100, _HS.devotion = 100, _HS.muscles = 20, _HS.race = "asian", _HS.skin = "dark", _HS.hLength = 25, _HS.hStyle = "short and held back by a white bandana", _HS.boobs = 600, _HS.butt = 4, _HS.faceImplant = 15, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clit = 1, _HS.clitPiercing = 3, _HS.clitSetting = "humiliation", _HS.anus = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.whoring = 100, _HS.skill.entertainment = 100, _HS.skill.combat = 1, _HS.clothes = "a slutty outfit", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.fetishKnown = 1, _HS.custom.desc = "She is an enthusiastic high school graduate, eager to make her teacher proud by becoming the greatest slave known to any owner.", _HS.career = "a student">>
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
@@ -467,17 +467,17 @@
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Caroline", _HS.birthName = "Carl", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "She was once a rising free cities politician who argued for compulsory female enslavement, but she became an addict, fell into debt, and was subsequently enslaved.", _HS.birthWeek = random(0,51), _HS.genes = "XY", _HS.actualAge = 44, _HS.physicalAge = 44, _HS.visualAge = 44, _HS.ovaryAge = 44, _HS.health = 60, _HS.devotion = 90, _HS.height = 145, _HS.heightImplant = -1, _HS.race = "white", _HS.nationality = "French", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.skin = "spray tanned", _HS.hLength = 70, _HS.hStyle = "ass-length", _HS.waist = -55, _HS.heels = 1, _HS.boobs = 1100, _HS.boobsImplant = 400, _HS.nipplesPiercing = 1, _HS.areolae = 1, _HS.butt = 4, _HS.buttImplant = 2, _HS.face = 55, _HS.faceImplant = 65, _HS.lips = 55, _HS.lipsImplant = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.preg = -2, _HS.anus = 2, _HS.anusTat = "bleached", _HS.makeup = 3, _HS.nails = 1, _HS.earPiercing = 1, _HS.navelPiercing = 1, _HS.legsTat = "degradation", _HS.stampTat = "degradation", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 15, _HS.skill.entertainment = 35, _HS.drugs = "breast injections", _HS.addict = 1, _HS.clothes = "slutty jewelry", _HS.collar = "tight steel", _HS.intelligence = -90, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.behavioralFlaw = "arrogant", _HS.custom.tattoo = "She has a tattoo down her left arm, which reads 'Once a tall, muscular, handsome man with a big dick and big balls.'", _HS.custom.desc = "Since becoming a slave she has been turned into a little bimbo.">>
+<<set _HS.slaveName = "Caroline", _HS.birthName = "Carl", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "She was once a rising free cities politician who argued for compulsory female enslavement, but she became an addict, fell into debt, and was subsequently enslaved.", _HS.birthWeek = random(0,51), _HS.genes = "XY", _HS.actualAge = 44, _HS.physicalAge = 44, _HS.visualAge = 44, _HS.ovaryAge = 44, _HS.health = 60, _HS.devotion = 90, _HS.height = 145, _HS.heightImplant = -1, _HS.race = "white", _HS.nationality = "French", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.skin = "spray tanned", _HS.hLength = 70, _HS.hStyle = "ass-length", _HS.waist = -55, _HS.heels = 1, _HS.boobs = 1100, _HS.boobsImplant = 400, _HS.nipplesPiercing = 1, _HS.areolae = 1, _HS.butt = 4, _HS.buttImplant = 2, _HS.face = 55, _HS.faceImplant = 65, _HS.lips = 55, _HS.lipsImplant = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.preg = -2, _HS.anus = 2, _HS.anusTat = "bleached", _HS.makeup = 3, _HS.nails = 1, _HS.earPiercing = 1, _HS.navelPiercing = 1, _HS.legsTat = "degradation", _HS.stampTat = "degradation", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 15, _HS.skill.entertainment = 35, _HS.drugs = "breast injections", _HS.addict = 1, _HS.clothes = "slutty jewelry", _HS.collar = "tight steel", _HS.intelligence = -90, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.behavioralFlaw = "arrogant", _HS.custom.tattoo = "She has a tattoo down her left arm, which reads 'Once a tall, muscular, handsome man with a big dick and big balls.'", _HS.custom.desc = "Since becoming a slave she has been turned into a little bimbo.">>
 <<set $heroSlaves.push(_HS)>>
 
 <<if $seePreg != 0>>
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Milkmaid' Megan", _HS.birthName = "Megan", _HS.origin = "She was sold to you from the public slave market, and was probably kidnapped or otherwise forced into slavery.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 34, _HS.physicalAge = 34, _HS.visualAge = 34, _HS.ovaryAge = 34, _HS.health = 100, _HS.devotion = 100, _HS.nationality = "American", _HS.skin = "light", _HS.hStyle = "long", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 1350, _HS.lactation = 1, _HS.lactationDuration = 4, _HS.butt = 3, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.preg = 27, _HS.pregType = 1, _HS.pregWeek = 27, _HS.pregKnown = 1, _HS.belly = 5000, _HS.bellyPreg = 5000, _HS.counter.births = 1, _HS.counter.birthsTotal = 1, _HS.anus = 3, _HS.ovaries = 1, _HS.brand = "SLAVE", _HS.brandLocation = "buttocks", _HS.earPiercing = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 100, _HS.skill.entertainment = 35, _HS.skill.combat = 0, _HS.collar = "heavy gold", _HS.shoes = "flats", _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.face = 0, _HS.intelligence = 0>>
+<<set _HS.slaveName = "'Milkmaid' Megan", _HS.birthName = "Megan", _HS.origin = "She was sold to you from the public slave market, and was probably kidnapped or otherwise forced into slavery.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 34, _HS.physicalAge = 34, _HS.visualAge = 34, _HS.ovaryAge = 34, _HS.health = 100, _HS.devotion = 100, _HS.nationality = "American", _HS.skin = "light", _HS.hStyle = "long", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 1350, _HS.lactation = 1, _HS.lactationDuration = 4, _HS.butt = 3, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.preg = 27, _HS.pregType = 1, _HS.pregWeek = 27, _HS.pregKnown = 1, _HS.belly = 5000, _HS.bellyPreg = 5000, _HS.counter.births = 1, _HS.counter.birthsTotal = 1, _HS.anus = 3, _HS.ovaries = 1, _HS.brand = "SLAVE", _HS.brandLocation = "buttocks", _HS.earPiercing = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring =100, _HS.skill.entertainment = 35, _HS.skill.combat = 0, _HS.collar = "heavy gold", _HS.shoes = "flats", _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.face = 0, _HS.intelligence = 0>>
 <<set $heroSlaves.push(_HS)>>
 <</if>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Horsepussy", _HS.birthName = "Amber", _HS.origin = "She was sold to you from the public slave market, and was probably kidnapped or otherwise forced into slavery.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 35, _HS.physicalAge = 35, _HS.visualAge = 35, _HS.ovaryAge = 35, _HS.health = 80, _HS.devotion = 55.7, _HS.height = 170, _HS.race = "white", _HS.nationality = "American", _HS.eyeColor = "blue", _HS.skin = "pale", _HS.hLength = 10, _HS.boobs = 500, _HS.butt = 5, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.clitPiercing = 3, _HS.clitSetting = "vanilla", _HS.anus = 3, _HS.ovaries = 1, _HS.anusPiercing = 1, _HS.makeup = 1, _HS.brand = "SLAVE", _HS.brandLocation = "buttocks", _HS.earPiercing = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 100, _HS.skill.entertainment = 35, _HS.collar = "heavy gold", _HS.shoes = "heels", _HS.intelligence = 96, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "Her nickname, 'Horsepussy,' is tattooed on her forehead.", _HS.custom.desc = "Her pussy has been extensively surgically altered. Her labia are large and puffy, sticking out nearly an inch from her crotch. Her cunt is exquisitely pink at the center, but her large labia are dark at the edges, almost black.", _HS.labia = 3>>
+<<set _HS.slaveName = "Horsepussy", _HS.birthName = "Amber", _HS.origin = "She was sold to you from the public slave market, and was probably kidnapped or otherwise forced into slavery.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 35, _HS.physicalAge = 35, _HS.visualAge = 35, _HS.ovaryAge = 35, _HS.health = 80, _HS.devotion = 55.7, _HS.height = 170, _HS.race = "white", _HS.nationality = "American", _HS.eyeColor = "blue", _HS.skin = "pale", _HS.hLength = 10, _HS.boobs = 500, _HS.butt = 5, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.clitPiercing = 3, _HS.clitSetting = "vanilla", _HS.anus = 3, _HS.ovaries = 1, _HS.anusPiercing = 1, _HS.makeup = 1, _HS.brand = "SLAVE", _HS.brandLocation = "buttocks", _HS.earPiercing = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring =100, _HS.skill.entertainment = 35, _HS.collar = "heavy gold", _HS.shoes = "heels", _HS.intelligence = 96, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "Her nickname, 'Horsepussy,' is tattooed on her forehead.", _HS.custom.desc = "Her pussy has been extensively surgically altered. Her labia are large and puffy, sticking out nearly an inch from her crotch. Her cunt is exquisitely pink at the center, but her large labia are dark at the edges, almost black.", _HS.labia = 3>>
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
@@ -489,15 +489,15 @@
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Virago' Kissa", _HS.birthName = "", _HS.birthSurname = "", _HS.origin = "In spite of the great demand for her kind, she has apparently eluded enslavement until recently.", _HS.career = "a wanderer", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "She is a natural albino.", _HS.birthWeek = random(0,51), _HS.health = 100, _HS.devotion = 100, _HS.muscles = 50, _HS.height = 190, _HS.nationality = "Ugandan", _HS.race = "black", _HS.eyeColor = "pale grey", _HS.hColor = "white", _HS.pubicHColor = "white", _HS.skin = "extremely pale", _HS.hLength = 100, _HS.hStyle = "extremely long and bushy", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 600, _HS.face = 55, _HS.lips = 35, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "oral", _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.skill.oral = 100, _HS.skill.whore = 100, _HS.skill.entertainment = 100, _HS.skill.combat = 3, _HS.livingRules = "luxurious", _HS.speechRules = "permissive", _HS.releaseRules = "permissive", _HS.collar = "pretty jewelry", _HS.shoes = "flats", _HS.intelligence = 100, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd", _HS.geneticQuirks = {albinism: 2}, _HS.custom.tattoo = "Her entire body is tattooed with a detailed map of her arteries which, combined with her albinism, gives her a quasi-translucent quality.", _HS.custom.desc = "Her eyes are unsettling; though her irises are a pale grey color, in some lights the whole eye takes on a red cast.">>
+<<set _HS.slaveName = "'Virago' Kissa", _HS.birthName = "", _HS.birthSurname = "", _HS.origin = "In spite of the great demand for her kind, she has apparently eluded enslavement until recently.", _HS.career = "a wanderer", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "She is a natural albino.", _HS.birthWeek = random(0,51), _HS.health = 100, _HS.devotion = 100, _HS.muscles = 50, _HS.height = 190, _HS.nationality = "Ugandan", _HS.race = "black", _HS.eyeColor = "pale grey", _HS.hColor = "white", _HS.pubicHColor = "white", _HS.skin = "extremely pale", _HS.hLength = 100, _HS.hStyle = "extremely long and bushy", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 600, _HS.face = 55, _HS.lips = 35, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "oral", _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.skill.oral = 100, _HS.skill.whoring =100, _HS.skill.entertainment = 100, _HS.skill.combat = 3, _HS.livingRules = "luxurious", _HS.speechRules = "permissive", _HS.releaseRules = "permissive", _HS.collar = "pretty jewelry", _HS.shoes = "flats", _HS.intelligence = 100, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd", _HS.geneticQuirks = {albinism: 2}, _HS.custom.tattoo = "Her entire body is tattooed with a detailed map of her arteries which, combined with her albinism, gives her a quasi-translucent quality.", _HS.custom.desc = "Her eyes are unsettling; though her irises are a pale grey color, in some lights the whole eye takes on a red cast.">>
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Annabelle", _HS.birthName = "Annabelle", _HS.origin = "She came to be a slave not long after fleeing farm life for the Free Cities.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = -65, _HS.height = 155, _HS.nationality = "American", _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.skin = "sun tanned", _HS.hStyle = "braided into pigtails", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 500, _HS.butt = 4, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.skill.whore = 15, _HS.attrXY = 40, _HS.behavioralFlaw = "hates women", _HS.custom.desc = "The pale skin within her tan lines is lightly freckled.", _HS.markings = "freckles">>
+<<set _HS.slaveName = "Annabelle", _HS.birthName = "Annabelle", _HS.origin = "She came to be a slave not long after fleeing farm life for the Free Cities.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = -65, _HS.height = 155, _HS.nationality = "American", _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.skin = "sun tanned", _HS.hStyle = "braided into pigtails", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 500, _HS.butt = 4, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.skill.whoring = 15, _HS.attrXY = 40, _HS.behavioralFlaw = "hates women", _HS.custom.desc = "The pale skin within her tan lines is lightly freckled.", _HS.markings = "freckles">>
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Vampire' Elvira", _HS.birthName = "Elvira", _HS.career = "a service worker", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 20, _HS.physicalAge = 20, _HS.visualAge = 20, _HS.ovaryAge = 20, _HS.health = 90, _HS.devotion = 100, _HS.height = 145, _HS.nationality = "Swedish", _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.override_Skin = 1, _HS.skin = "sun tanned", _HS.hLength = 85, _HS.hStyle = "ass-length", _HS.waist = -55, _HS.boobs = 650, _HS.boobsImplant = 200, _HS.nipplesPiercing = 2, _HS.butt = 3, _HS.buttImplant = 1, _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 35, _HS.tonguePiercing = 1, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.clitPiercing = 1, _HS.anus = 3, _HS.ovaries = 1, _HS.brand = "your initials", _HS.brandLocation = "buttocks", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 100, _HS.skill.entertainment = 15, _HS.livingRules = "luxurious", _HS.clothes = "choosing her own clothes", _HS.collar = "heavy gold", _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "'Vampire' Elvira", _HS.birthName = "Elvira", _HS.career = "a service worker", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 20, _HS.physicalAge = 20, _HS.visualAge = 20, _HS.ovaryAge = 20, _HS.health = 90, _HS.devotion = 100, _HS.height = 145, _HS.nationality = "Swedish", _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.override_Skin = 1, _HS.skin = "sun tanned", _HS.hLength = 85, _HS.hStyle = "ass-length", _HS.waist = -55, _HS.boobs = 650, _HS.boobsImplant = 200, _HS.nipplesPiercing = 2, _HS.butt = 3, _HS.buttImplant = 1, _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 35, _HS.tonguePiercing = 1, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.clitPiercing = 1, _HS.anus = 3, _HS.ovaries = 1, _HS.brand = "your initials", _HS.brandLocation = "buttocks", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring =100, _HS.skill.entertainment = 15, _HS.livingRules = "luxurious", _HS.clothes = "choosing her own clothes", _HS.collar = "heavy gold", _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1>>
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
@@ -532,16 +532,16 @@
 
 <<if $seePreg != 0>>
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Fucknugget' Pillow", _HS.birthName = "Anika", _HS.origin = "She sold herself into slavery to escape life on the streets.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 37, _HS.physicalAge = 37, _HS.visualAge = 37, _HS.ovaryAge = 37, _HS.health = 80, _HS.devotion = 100, _HS.weight = 40, _HS.origRace = "white", _HS.override_Race = 1, _HS.race = "latina", _HS.eyeColor = "blue", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.hStyle = "long", _HS.waist = -100, _HS.amp = 1, _HS.boobs = 6260, _HS.boobsImplant = 4200, _HS.nipplesPiercing = 2, _HS.areolae = 3, _HS.boobsTat = "flowers", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 12, _HS.buttImplant = 1, _HS.buttTat = "flowers", _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 55, _HS.lipsImplant = 10, _HS.lipsPiercing = 2, _HS.lipsTat = "flowers", _HS.tonguePiercing = 2, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.vaginaTat = "flowers", _HS.preg = 37, _HS.pregType = 1, _HS.pregWeek = 37, _HS.pregKnown = 1, _HS.belly = 13000, _HS.bellyPreg = 13000, _HS.counter.births = 2, _HS.counter.birthsTotal = 2, _HS.clitPiercing = 3, _HS.clitSetting = "boobs", _HS.anus = 2, _HS.ovaries = 1, _HS.anusPiercing = 2, _HS.anusTat = "flowers", _HS.makeup = 3, _HS.earPiercing = 2, _HS.nosePiercing = 2, _HS.eyebrowPiercing = 2, _HS.navelPiercing = 2, _HS.shouldersTat = "advertisements", _HS.stampTat = "flowers", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 15, _HS.aphrodisiacs = 1, _HS.addict = 99, _HS.clothes = "restrictive latex", _HS.collar = "leather with cowbell", _HS.intelligence = -70, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "'Fucknugget' Pillow", _HS.birthName = "Anika", _HS.origin = "She sold herself into slavery to escape life on the streets.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 37, _HS.physicalAge = 37, _HS.visualAge = 37, _HS.ovaryAge = 37, _HS.health = 80, _HS.devotion = 100, _HS.weight = 40, _HS.origRace = "white", _HS.override_Race = 1, _HS.race = "latina", _HS.eyeColor = "blue", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.hStyle = "long", _HS.waist = -100, _HS.amp = 1, _HS.boobs = 6260, _HS.boobsImplant = 4200, _HS.nipplesPiercing = 2, _HS.areolae = 3, _HS.boobsTat = "flowers", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 12, _HS.buttImplant = 1, _HS.buttTat = "flowers", _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 55, _HS.lipsImplant = 10, _HS.lipsPiercing = 2, _HS.lipsTat = "flowers", _HS.tonguePiercing = 2, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.vaginaTat = "flowers", _HS.preg = 37, _HS.pregType = 1, _HS.pregWeek = 37, _HS.pregKnown = 1, _HS.belly = 13000, _HS.bellyPreg = 13000, _HS.counter.births = 2, _HS.counter.birthsTotal = 2, _HS.clitPiercing = 3, _HS.clitSetting = "boobs", _HS.anus = 2, _HS.ovaries = 1, _HS.anusPiercing = 2, _HS.anusTat = "flowers", _HS.makeup = 3, _HS.earPiercing = 2, _HS.nosePiercing = 2, _HS.eyebrowPiercing = 2, _HS.navelPiercing = 2, _HS.shouldersTat = "advertisements", _HS.stampTat = "flowers", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 15, _HS.aphrodisiacs = 1, _HS.addict = 99, _HS.clothes = "restrictive latex", _HS.collar = "leather with cowbell", _HS.intelligence = -70, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1>>
 <<set $heroSlaves.push(_HS)>>
 <</if>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'DoL Toy' Allie", _HS.birthName = "Aliana", _HS.origin = "She is an enslaved member of an anti-slavery extremist group.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 33, _HS.physicalAge = 33, _HS.visualAge = 33, _HS.ovaryAge = 33, _HS.health = 80, _HS.devotion = 65, _HS.height = 155, _HS.nationality = "Mexican", _HS.race = "latina", _HS.override_H_Color = 1, _HS.hColor = "raven black with red highlights", _HS.skin = "brown", _HS.hLength = 10, _HS.waist = -55, _HS.boobs = 700, _HS.butt = 3, _HS.face = 15, _HS.lips = 35, _HS.lipsTat = "permanent makeup", _HS.vagina = 2, _HS.vaginaLube = 1, _HS.bellyAccessory = "an extreme corset", _HS.clitPiercing = 3, _HS.clitSetting = "submissive", _HS.anus = 2, _HS.ovaries = 1, _HS.stampTat = "degradation", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 35, _HS.skill.entertainment = 15, _HS.collar = "heavy gold", _HS.shoes = "heels", _HS.intelligence = 25, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.custom.tattoo = "Her left butt cheek is tattooed with a small shield bearing the words 'Daughter of Liberty' with a large red 'not' symbol added over it.">>
+<<set _HS.slaveName = "'DoL Toy' Allie", _HS.birthName = "Aliana", _HS.origin = "She is an enslaved member of an anti-slavery extremist group.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 33, _HS.physicalAge = 33, _HS.visualAge = 33, _HS.ovaryAge = 33, _HS.health = 80, _HS.devotion = 65, _HS.height = 155, _HS.nationality = "Mexican", _HS.race = "latina", _HS.override_H_Color = 1, _HS.hColor = "raven black with red highlights", _HS.skin = "brown", _HS.hLength = 10, _HS.waist = -55, _HS.boobs = 700, _HS.butt = 3, _HS.face = 15, _HS.lips = 35, _HS.lipsTat = "permanent makeup", _HS.vagina = 2, _HS.vaginaLube = 1, _HS.bellyAccessory = "an extreme corset", _HS.clitPiercing = 3, _HS.clitSetting = "submissive", _HS.anus = 2, _HS.ovaries = 1, _HS.stampTat = "degradation", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring =35, _HS.skill.entertainment = 15, _HS.collar = "heavy gold", _HS.shoes = "heels", _HS.intelligence = 25, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.custom.tattoo = "Her left butt cheek is tattooed with a small shield bearing the words 'Daughter of Liberty' with a large red 'not' symbol added over it.">>
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Onahole' Lian the Liberty Whore", _HS.birthName = "Lian", _HS.origin = "She is an enslaved member of an anti-slavery extremist group.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 27, _HS.physicalAge = 27, _HS.visualAge = 27, _HS.ovaryAge = 27, _HS.health = -70, _HS.devotion = 100, _HS.muscles = 20, _HS.nationality = "Chinese", _HS.race = "asian", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.waist = -100, _HS.amp = 1, _HS.boobs = 2000, _HS.boobsImplant = 600, _HS.areolae = 2, _HS.butt = 8, _HS.face = 55, _HS.faceImplant = 65, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.clit = 2, _HS.anus = 2, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 100, _HS.collar = "shock punishment", _HS.shoes = "flats", _HS.intelligence = 25, _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "'Onahole' Lian the Liberty Whore", _HS.birthName = "Lian", _HS.origin = "She is an enslaved member of an anti-slavery extremist group.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 27, _HS.physicalAge = 27, _HS.visualAge = 27, _HS.ovaryAge = 27, _HS.health = -70, _HS.devotion = 100, _HS.muscles = 20, _HS.nationality = "Chinese", _HS.race = "asian", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.waist = -100, _HS.amp = 1, _HS.boobs = 2000, _HS.boobsImplant = 600, _HS.areolae = 2, _HS.butt = 8, _HS.face = 55, _HS.faceImplant = 65, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.clit = 2, _HS.anus = 2, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring =100, _HS.collar = "shock punishment", _HS.shoes = "flats", _HS.intelligence = 25, _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1>>
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
diff --git a/src/npc/databases/ddSlavesDatabase.tw b/src/npc/databases/ddSlavesDatabase.tw
index 77f2668539680da7d32cdeaa83a7dc607c512dd0..591b2c40ef706f41a3d2f225526640d80a8c31de 100644
--- a/src/npc/databases/ddSlavesDatabase.tw
+++ b/src/npc/databases/ddSlavesDatabase.tw
@@ -116,7 +116,7 @@
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Mistress Izzy", _HS.birthName = "Isabella", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 70, _HS.devotion = 100, _HS.eyeColor = "black", _HS.hColor = "sparkling and shiny golden red", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.skin = "sun tanned", _HS.hLength = 60, _HS.hStyle = "in thick long heavy braids", _HS.waist = -100, _HS.boobs = 9200, _HS.boobsImplant = 6000, _HS.nipplesPiercing = 2, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.counter.milk = 3010, _HS.butt = 8, _HS.buttImplant = 1, _HS.buttTat = "bovine patterns", _HS.face = 55, _HS.faceImplant = 65, _HS.lips = 55, _HS.lipsImplant = 2, _HS.lipsPiercing = 2, _HS.lipsTat = "bovine patterns", _HS.tonguePiercing = 2, _HS.vagina = 2, _HS.vaginaPiercing = 2, _HS.vaginaTat = "bovine patterns", _HS.preg = -2, _HS.clitPiercing = 3, _HS.anus = 2, _HS.dick = 5, _HS.prostate = 1, _HS.balls = 3, _HS.scrotum = 2, _HS.anusPiercing = 2, _HS.anusTat = "bovine patterns", _HS.makeup = 2, _HS.nails = 2, _HS.brand = "SLUT", _HS.brandLocation = "buttocks", _HS.earPiercing = 2, _HS.nosePiercing = 2, _HS.eyebrowPiercing = 2, _HS.navelPiercing = 2, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.skill.vaginal = 35, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 100, _HS.skill.entertainment = 35, _HS.collar = "leather with cowbell", _HS.shoes = "heels", _HS.intelligence = 20, _HS.energy = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "She has tattoos of teasing, enticing messages begging others to come taste her addictive milk.", _HS.custom.desc = "Her musky milky aura drives men and women around her giggly and dumb with lust.">>
+<<set _HS.slaveName = "Mistress Izzy", _HS.birthName = "Isabella", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 70, _HS.devotion = 100, _HS.eyeColor = "black", _HS.hColor = "sparkling and shiny golden red", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.skin = "sun tanned", _HS.hLength = 60, _HS.hStyle = "in thick long heavy braids", _HS.waist = -100, _HS.boobs = 9200, _HS.boobsImplant = 6000, _HS.nipplesPiercing = 2, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.counter.milk = 3010, _HS.butt = 8, _HS.buttImplant = 1, _HS.buttTat = "bovine patterns", _HS.face = 55, _HS.faceImplant = 65, _HS.lips = 55, _HS.lipsImplant = 2, _HS.lipsPiercing = 2, _HS.lipsTat = "bovine patterns", _HS.tonguePiercing = 2, _HS.vagina = 2, _HS.vaginaPiercing = 2, _HS.vaginaTat = "bovine patterns", _HS.preg = -2, _HS.clitPiercing = 3, _HS.anus = 2, _HS.dick = 5, _HS.prostate = 1, _HS.balls = 3, _HS.scrotum = 2, _HS.anusPiercing = 2, _HS.anusTat = "bovine patterns", _HS.makeup = 2, _HS.nails = 2, _HS.brand = "SLUT", _HS.brandLocation = "buttocks", _HS.earPiercing = 2, _HS.nosePiercing = 2, _HS.eyebrowPiercing = 2, _HS.navelPiercing = 2, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.skill.vaginal = 35, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 100, _HS.skill.entertainment = 35, _HS.collar = "leather with cowbell", _HS.shoes = "heels", _HS.intelligence = 20, _HS.energy = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "She has tattoos of teasing, enticing messages begging others to come taste her addictive milk.", _HS.custom.desc = "Her musky milky aura drives men and women around her giggly and dumb with lust.">>
 <<set $heroSlaves.push(_HS)>>
 /*Dropped desc = She has two cute horns protruding from her forehead. A few addicted milkslaves of her own tag along behind her. */
 
@@ -133,7 +133,7 @@
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Dragon Goddess' Chae-won", _HS.genes = "XY", _HS.birthName = "Chae-won", _HS.origin = "She is a former Kkangpae gang member who was sold into slavery by her former boss as a punishment.", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "She is a famed Free Cities whore, and commands top prices.", _HS.birthWeek = random(0,51), _HS.actualAge = 26, _HS.physicalAge = 26, _HS.visualAge = 26, _HS.ovaryAge = 26, _HS.health = 50, _HS.devotion = 31, _HS.muscles = 50, _HS.height = 155, _HS.nationality = "Korean", _HS.race = "asian", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.origHColor = "black", _HS.hColor = "onyx black and rainbow-streaked", _HS.eyebrowHColor = "black", _HS.pubicHColor = "black", _HS.underArmHColor = "black", _HS.override_Skin = 1, _HS.skin = "sun tanned", _HS.hLength = 60, _HS.hStyle = "styled in high chignon resembling a traditional Japanese geisha's Shimada hairstyle, with plenty of decorated hairpins", _HS.waist = -55, _HS.boobs = 6000, _HS.boobsImplant = 3000, _HS.nipples = "huge", _HS.butt = 4.5, _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 35, _HS.lipsTat = "permanent makeup", _HS.tonguePiercing = 1, _HS.vagina = -1, _HS.preg = -2, _HS.anus = 1, _HS.dick = 5, _HS.prostate = 1, _HS.balls = 4, _HS.scrotum = 4, _HS.anusTat = "bleached", _HS.nails = 3, _HS.earPiercing = 1, _HS.legsTat = "flowers", _HS.stampTat = "flowers", _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 100, _HS.clothes = "a slave gown", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = -3, _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.custom.tattoo = "She has two neon-blue butterflies tattooed on her right temple and one more right above right eyebrow; a bright blue, luminescent tattoo of an oriental dragon is intertwining with floral tattoos on her right leg.", _HS.custom.desc = "She is almost never seen without her long, thin, lavishly decorated smoking pipe, either holding it in hand, or carrying it tucked in her chignon.", _HS.career = "a gang member">>
+<<set _HS.slaveName = "'Dragon Goddess' Chae-won", _HS.genes = "XY", _HS.birthName = "Chae-won", _HS.origin = "She is a former Kkangpae gang member who was sold into slavery by her former boss as a punishment.", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "She is a famed Free Cities whore, and commands top prices.", _HS.birthWeek = random(0,51), _HS.actualAge = 26, _HS.physicalAge = 26, _HS.visualAge = 26, _HS.ovaryAge = 26, _HS.health = 50, _HS.devotion = 31, _HS.muscles = 50, _HS.height = 155, _HS.nationality = "Korean", _HS.race = "asian", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.origHColor = "black", _HS.hColor = "onyx black and rainbow-streaked", _HS.eyebrowHColor = "black", _HS.pubicHColor = "black", _HS.underArmHColor = "black", _HS.override_Skin = 1, _HS.skin = "sun tanned", _HS.hLength = 60, _HS.hStyle = "styled in high chignon resembling a traditional Japanese geisha's Shimada hairstyle, with plenty of decorated hairpins", _HS.waist = -55, _HS.boobs = 6000, _HS.boobsImplant = 3000, _HS.nipples = "huge", _HS.butt = 4.5, _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 35, _HS.lipsTat = "permanent makeup", _HS.tonguePiercing = 1, _HS.vagina = -1, _HS.preg = -2, _HS.anus = 1, _HS.dick = 5, _HS.prostate = 1, _HS.balls = 4, _HS.scrotum = 4, _HS.anusTat = "bleached", _HS.nails = 3, _HS.earPiercing = 1, _HS.legsTat = "flowers", _HS.stampTat = "flowers", _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 100, _HS.clothes = "a slave gown", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = -3, _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.custom.tattoo = "She has two neon-blue butterflies tattooed on her right temple and one more right above right eyebrow; a bright blue, luminescent tattoo of an oriental dragon is intertwining with floral tattoos on her right leg.", _HS.custom.desc = "She is almost never seen without her long, thin, lavishly decorated smoking pipe, either holding it in hand, or carrying it tucked in her chignon.", _HS.career = "a gang member">>
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
@@ -141,15 +141,15 @@
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Mistress' Ingrid", _HS.birthName = "Ingrid", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, _HS.health = 100, _HS.devotion = 100, _HS.muscles = 20, _HS.height = 190, _HS.race = "white", _HS.nationality = "Norwegian", _HS.eyeColor = "blue", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.origHColor = "black", _HS.hColor = "onyx black", _HS.eyebrowHColor = "black", _HS.pubicHColor = "black", _HS.underArmHColor = "black", _HS.skin = "pale", _HS.hLength = 90, _HS.hStyle = "ass-length with Nordic braids throughout", _HS.waist = -55, _HS.boobs = 800, _HS.butt = 5, _HS.face = 55, _HS.lips = 35, _HS.preg = -2, _HS.clitPiercing = 3, _HS.dick = 4, _HS.prostate = 1, _HS.balls = 4, _HS.scrotum = 4, _HS.ovaries = 1, _HS.makeup = 2, _HS.nails = 2, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 15, _HS.skill.whore = 35, _HS.skill.entertainment = 35, _HS.skill.combat = 1, _HS.clothes = "a slave gown", _HS.collar = "pretty jewelry", _HS.shoes = "boots", _HS.intelligence = 25, _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.desc = "She has the style of Gothic royalty, and the demeanor to match.">>
+<<set _HS.slaveName = "'Mistress' Ingrid", _HS.birthName = "Ingrid", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, _HS.health = 100, _HS.devotion = 100, _HS.muscles = 20, _HS.height = 190, _HS.race = "white", _HS.nationality = "Norwegian", _HS.eyeColor = "blue", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.origHColor = "black", _HS.hColor = "onyx black", _HS.eyebrowHColor = "black", _HS.pubicHColor = "black", _HS.underArmHColor = "black", _HS.skin = "pale", _HS.hLength = 90, _HS.hStyle = "ass-length with Nordic braids throughout", _HS.waist = -55, _HS.boobs = 800, _HS.butt = 5, _HS.face = 55, _HS.lips = 35, _HS.preg = -2, _HS.clitPiercing = 3, _HS.dick = 4, _HS.prostate = 1, _HS.balls = 4, _HS.scrotum = 4, _HS.ovaries = 1, _HS.makeup = 2, _HS.nails = 2, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 15, _HS.skill.whoring = 35, _HS.skill.entertainment = 35, _HS.skill.combat = 1, _HS.clothes = "a slave gown", _HS.collar = "pretty jewelry", _HS.shoes = "boots", _HS.intelligence = 25, _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.desc = "She has the style of Gothic royalty, and the demeanor to match.">>
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Demon Whore' Yuzuki", _HS.birthName = "Yuri", _HS.genes = "XY", _HS.origin = "Her origins are unknown, but rumor has it that she is a literal demon.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 60, _HS.devotion = 90.4, _HS.muscles = 20, _HS.height = 190, _HS.nationality = "Japanese", _HS.race = "asian", _HS.eyeColor = "green", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hStyle = "long", _HS.pubicHStyle = "in a strip", _HS.waist = -100, _HS.boobs = 10000, _HS.boobsImplant = 4800, _HS.areolae = 2, _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 9, _HS.face = 55, _HS.faceImplant = 65, _HS.lips = 35, _HS.vagina = 1, _HS.clitPiercing = 3, _HS.clitSetting = "humiliation", _HS.anus = 1, _HS.dick = 5, _HS.prostate = 1, _HS.balls = 5, _HS.scrotum = 4, _HS.ovaries = 1, _HS.makeup = 2, _HS.nails = 2, _HS.skill.vaginal = 15, _HS.skill.oral = 100, _HS.skill.anal = 15, _HS.skill.whore = 15, _HS.skill.entertainment = 15, _HS.skill.combat = 1, _HS.clothes = "a string bikini", _HS.collar = "pretty jewelry", _HS.shoes = "boots", _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.fetishKnown = 1, _HS.pupil = "demonic">>
+<<set _HS.slaveName = "'Demon Whore' Yuzuki", _HS.birthName = "Yuri", _HS.genes = "XY", _HS.origin = "Her origins are unknown, but rumor has it that she is a literal demon.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 60, _HS.devotion = 90.4, _HS.muscles = 20, _HS.height = 190, _HS.nationality = "Japanese", _HS.race = "asian", _HS.eyeColor = "green", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hStyle = "long", _HS.pubicHStyle = "in a strip", _HS.waist = -100, _HS.boobs = 10000, _HS.boobsImplant = 4800, _HS.areolae = 2, _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 9, _HS.face = 55, _HS.faceImplant = 65, _HS.lips = 35, _HS.vagina = 1, _HS.clitPiercing = 3, _HS.clitSetting = "humiliation", _HS.anus = 1, _HS.dick = 5, _HS.prostate = 1, _HS.balls = 5, _HS.scrotum = 4, _HS.ovaries = 1, _HS.makeup = 2, _HS.nails = 2, _HS.skill.vaginal = 15, _HS.skill.oral = 100, _HS.skill.anal = 15, _HS.skill.whoring = 15, _HS.skill.entertainment = 15, _HS.skill.combat = 1, _HS.clothes = "a string bikini", _HS.collar = "pretty jewelry", _HS.shoes = "boots", _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.fetishKnown = 1, _HS.pupil = "demonic">>
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Fuckmeat", _HS.birthName = "Alva", _HS.genes = "XY", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "She is a famed Free Cities slut, and can please anyone.", _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 100, _HS.devotion = 100, _HS.muscles = 20, _HS.height = 145, _HS.race = "white", _HS.nationality = "Swedish", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "pale", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.pubicHStyle = "bushy", _HS.boobs = 1700, _HS.boobsTat = "rude words", _HS.butt = 8, _HS.buttTat = "rude words", _HS.face = 55, _HS.lips = 35, _HS.vagina = -1, _HS.vaginaTat = "rude words", _HS.preg = -2, _HS.anus = 3, _HS.dick = 2, _HS.dickTat = "rude words", _HS.prostate = 1, _HS.balls = 1, _HS.scrotum = 2, _HS.anusTat = "rude words", _HS.makeup = 3, _HS.nails = 3, _HS.brand = "a penis symbol", _HS.brandLocation = "cheek", _HS.shouldersTat = "rude words", _HS.armsTat = "rude words", _HS.legsTat = "rude words", _HS.stampTat = "rude words", _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 100, _HS.skill.entertainment = 100, _HS.skill.combat = 1, _HS.diet = "muscle building", _HS.clothes = "harem gauze", _HS.collar = "heavy gold", _HS.shoes = "boots", _HS.energy = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishStrength = 0, _HS.fetishKnown = 1, _HS.custom.tattoo = "She has a swastika tattooed on her ballsack.">>
+<<set _HS.slaveName = "Fuckmeat", _HS.birthName = "Alva", _HS.genes = "XY", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "She is a famed Free Cities slut, and can please anyone.", _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 100, _HS.devotion = 100, _HS.muscles = 20, _HS.height = 145, _HS.race = "white", _HS.nationality = "Swedish", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "pale", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.pubicHStyle = "bushy", _HS.boobs = 1700, _HS.boobsTat = "rude words", _HS.butt = 8, _HS.buttTat = "rude words", _HS.face = 55, _HS.lips = 35, _HS.vagina = -1, _HS.vaginaTat = "rude words", _HS.preg = -2, _HS.anus = 3, _HS.dick = 2, _HS.dickTat = "rude words", _HS.prostate = 1, _HS.balls = 1, _HS.scrotum = 2, _HS.anusTat = "rude words", _HS.makeup = 3, _HS.nails = 3, _HS.brand = "a penis symbol", _HS.brandLocation = "cheek", _HS.shouldersTat = "rude words", _HS.armsTat = "rude words", _HS.legsTat = "rude words", _HS.stampTat = "rude words", _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 100, _HS.skill.entertainment = 100, _HS.skill.combat = 1, _HS.diet = "muscle building", _HS.clothes = "harem gauze", _HS.collar = "heavy gold", _HS.shoes = "boots", _HS.energy = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishStrength = 0, _HS.fetishKnown = 1, _HS.custom.tattoo = "She has a swastika tattooed on her ballsack.">>
 <<set $heroSlaves.push(_HS)>>
 
 <<if $seeExtreme == 1>>
diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw
index 3d1449214c4ac2a7328f992efc133311d49f9a3f..f253578503c356702214eef85615399478562ac3 100644
--- a/src/npc/fFeelings.tw
+++ b/src/npc/fFeelings.tw
@@ -1093,7 +1093,7 @@ My favorite part of my body i<<s>>
 	I'm really proud of my <<s>>e<<x>> <<s>>kill<<s>>, it'<<s>> ni<<c>>e to be good at what you do. Without a cunt my poor <<if $activeSlave.anus > 2>>a<<ss>>pu<<ss>>y<<elseif $activeSlave.anus == 2>>butthole<<else>>little anu<<s>><</if>> doe<<s>> double duty, but I can take it.
 <<elseif ($activeSlave.skill.oral + $activeSlave.skill.vaginal + $activeSlave.skill.anal) >= 180>>
 	I'm really proud of my <<s>>e<<x>> <<s>>kill<<s>>, it'<<s>> ni<<c>>e to be good at what you do.
-<<elseif ($activeSlave.skill.whore >= 100)>>
+<<elseif ($activeSlave.skill.whoring >= 100)>>
 	I'm really proud of my whoring <<s>>kill<<s>>, pro<<s>>titution i<<s>> ju<<s>>t a job like any other to me.
 <<elseif ($activeSlave.skill.entertainment >= 100)>>
 	I'm really proud of my <<s>>kill<<s>>, I feel like I can make anyone want me.
diff --git a/src/npc/rgASDump.tw b/src/npc/rgASDump.tw
index 4e3baf27c16a47fb6b348e3f6480029f14a3310c..34235efc79e346283f776b6a55c6471b538a7d47 100644
--- a/src/npc/rgASDump.tw
+++ b/src/npc/rgASDump.tw
@@ -41,7 +41,7 @@
 <<if $applyCareerBonus == 1>>
 	<<set _seed = 2>>
 	<<if $PC.career == "capitalist">>
-		<<if $activeSlave.skill.whore < 60>><<set $activeSlave.skill.whore += 20>><</if>>
+		<<if $activeSlave.skill.whoring < 60>><<set $activeSlave.skill.whoring += 20>><</if>>
 	<<elseif $PC.career == "mercenary">>
 		<<set $activeSlave.trust += 10>>
 	<<elseif $PC.career == "slaver">>
@@ -67,8 +67,8 @@
 		<<if $activeSlave.skill.entertainment < 60>>
 			<<set $activeSlave.skill.entertainment += 20>>
 		<</if>>
-		<<if $activeSlave.skill.whore < 60>>
-			<<set $activeSlave.skill.whore += 20>>
+		<<if $activeSlave.skill.whoring < 60>>
+			<<set $activeSlave.skill.whoring += 20>>
 		<</if>>
 		<<if ($activeSlave.skill.oral < 60)>>
 			<<set $activeSlave.skill.oral += 20, _seed-->>
@@ -91,7 +91,7 @@
 		<</if>>
 	<<else>>
 		<<set $activeSlave.devotion += 10>>
-		<<if $activeSlave.skill.whore < 60>><<set $activeSlave.skill.whore += 20>><</if>>
+		<<if $activeSlave.skill.whoring < 60>><<set $activeSlave.skill.whoring += 20>><</if>>
 		<<if $activeSlave.skill.entertainment < 60>><<set $activeSlave.skill.entertainment += 20>><</if>>
 		<<if ($activeSlave.skill.oral < 60)>>
 			<<set $activeSlave.skill.oral += 20, _seed-->>
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index cfa05eba285bfeda19d37384cbb5b12c28978875..915c613cf52bdde1a2245b058bb6e983ea5749bb 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -1208,7 +1208,7 @@ __You are customizing this slave:__
 <</if>>
 
 <br>
-<<options $activeSlave.skill.whore>>
+<<options $activeSlave.skill.whoring>>
 	''Prostitution:''
 	<<optionlte 10 0 "Unskilled">>  Unskilled.
 	<<optionlte 30 15 "Basic">>  @@.cyan;Basic.@@
@@ -1231,11 +1231,11 @@ __You are customizing this slave:__
 	<<option 1 "Skilled">>@@.cyan;Skilled.@@
 <</options>>
 <br>
-<<if $activeSlave.skill.whore+$activeSlave.skill.entertainment+$activeSlave.skill.vaginal+$activeSlave.skill.anal+$activeSlave.skill.oral+($activeSlave.skill.combat*100) > 200>>
+<<if $activeSlave.skill.whoring+$activeSlave.skill.entertainment+$activeSlave.skill.vaginal+$activeSlave.skill.anal+$activeSlave.skill.oral+($activeSlave.skill.combat*100) > 200>>
 	<<options>>
 		<<option>>
 			//@@.red;Starting slaves incur
-			<<if $activeSlave.skill.whore+$activeSlave.skill.entertainment+$activeSlave.skill.vaginal+$activeSlave.skill.anal+$activeSlave.skill.oral+($activeSlave.skill.combat*100) > 400>>
+			<<if $activeSlave.skill.whoring+$activeSlave.skill.entertainment+$activeSlave.skill.vaginal+$activeSlave.skill.anal+$activeSlave.skill.oral+($activeSlave.skill.combat*100) > 400>>
 					a severe cost penalty at for being highly
 			<<else>>
 					an additional cost penalty for being
@@ -1606,7 +1606,7 @@ __You are customizing this slave:__
 <br>&nbsp;&nbsp;&nbsp;&nbsp;
 <<link "Novice">>
 	<<StartingGirlsWorkaround>>
-	<<set $activeSlave.skill.anal = 0, $activeSlave.skill.oral = 0, $activeSlave.skill.vaginal = 0, $activeSlave.skill.whore = 0, $activeSlave.skill.entertainment = 0, $activeSlave.skill.combat = 0, $activeSlave.actualAge = 18, $activeSlave.visualAge = 18, $activeSlave.physicalAge = 18, $activeSlave.fetishKnown = 0, $activeSlave.attrKnown = 0>>
+	<<set $activeSlave.skill.anal = 0, $activeSlave.skill.oral = 0, $activeSlave.skill.vaginal = 0, $activeSlave.skill.whoring = 0, $activeSlave.skill.entertainment = 0, $activeSlave.skill.combat = 0, $activeSlave.actualAge = 18, $activeSlave.visualAge = 18, $activeSlave.physicalAge = 18, $activeSlave.fetishKnown = 0, $activeSlave.attrKnown = 0>>
 	<<goto "Starting Girls">>
 <</link>>
 //Train your own and save//
@@ -1621,14 +1621,14 @@ __You are customizing this slave:__
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;
 	<<link "Wellspring">>
 		<<StartingGirlsWorkaround>>
-		<<set $activeSlave.skill.anal = 0, $activeSlave.skill.oral = 0, $activeSlave.skill.vaginal = 0, $activeSlave.skill.whore = 0, $activeSlave.skill.entertainment = 0, $activeSlave.skill.combat = 0, $activeSlave.actualAge = 18, $activeSlave.visualAge = 18, $activeSlave.physicalAge = 18, $activeSlave.fetishKnown = 0, $activeSlave.attrKnown = 0, $activeSlave.health = 10, $activeSlave.intelligence = -100, $activeSlave.intelligenceImplant = 0, $activeSlave.vagina = 3, $activeSlave.anus = 3, $activeSlave.ovaries = 1, $activeSlave.dick = 5, $activeSlave.balls = 5, $activeSlave.prostate = 1, $activeSlave.lactation = 2, $activeSlave.lactationDuration = 2, $activeSlave.nipples = "huge", $activeSlave.boobs = 10000>>
+		<<set $activeSlave.skill.anal = 0, $activeSlave.skill.oral = 0, $activeSlave.skill.vaginal = 0, $activeSlave.skill.whoring = 0, $activeSlave.skill.entertainment = 0, $activeSlave.skill.combat = 0, $activeSlave.actualAge = 18, $activeSlave.visualAge = 18, $activeSlave.physicalAge = 18, $activeSlave.fetishKnown = 0, $activeSlave.attrKnown = 0, $activeSlave.health = 10, $activeSlave.intelligence = -100, $activeSlave.intelligenceImplant = 0, $activeSlave.vagina = 3, $activeSlave.anus = 3, $activeSlave.ovaries = 1, $activeSlave.dick = 5, $activeSlave.balls = 5, $activeSlave.prostate = 1, $activeSlave.lactation = 2, $activeSlave.lactationDuration = 2, $activeSlave.nipples = "huge", $activeSlave.boobs = 10000>>
 		<<goto "Starting Girls">>
 	<</link>>
 	//Capable of producing all kinds of useful fluids//
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;
 	<<link "Onahole">>
 		<<StartingGirlsWorkaround>>
-		<<set $activeSlave.skill.anal = 0, $activeSlave.skill.oral = 0, $activeSlave.skill.vaginal = 0, $activeSlave.skill.whore = 0, $activeSlave.skill.entertainment = 0, $activeSlave.skill.combat = 0, $activeSlave.fetish = "mindbroken", $activeSlave.amp = 1, $activeSlave.voice = 0, $activeSlave.eyes = 1, $activeSlave.hears = 0>>
+		<<set $activeSlave.skill.anal = 0, $activeSlave.skill.oral = 0, $activeSlave.skill.vaginal = 0, $activeSlave.skill.whoring = 0, $activeSlave.skill.entertainment = 0, $activeSlave.skill.combat = 0, $activeSlave.fetish = "mindbroken", $activeSlave.amp = 1, $activeSlave.voice = 0, $activeSlave.eyes = 1, $activeSlave.hears = 0>>
 		<<goto "Starting Girls">>
 	<</link>>
 	//A living cocksleeve//
diff --git a/src/npc/uploadSlave.tw b/src/npc/uploadSlave.tw
index 340d6a4d764358578b6c4f16f764dd242b7ab331..b5f53d89ff269f368893f3ece823ee775aa4f8bc 100644
--- a/src/npc/uploadSlave.tw
+++ b/src/npc/uploadSlave.tw
@@ -149,7 +149,7 @@ stampTat: "$activeSlave.stampTat",
 skill.vaginal: $activeSlave.skill.vaginal,
 skill.oral: $activeSlave.skill.oral,
 skill.anal: $activeSlave.skill.anal,
-skill.whore: $activeSlave.skill.whore,
+skill.whoring: $activeSlave.skill.whoring,
 skill.entertainment: $activeSlave.skill.entertainment,
 skill.combat: $activeSlave.skill.combat,
 livingRules: "$activeSlave.livingRules",
diff --git a/src/pregmod/eliteTakeOverResult.tw b/src/pregmod/eliteTakeOverResult.tw
index 2e410e966d6969565fe3ff24990064189996c198..13fd792c24261ed16402ba5c9ff0d2b40e864a31 100644
--- a/src/pregmod/eliteTakeOverResult.tw
+++ b/src/pregmod/eliteTakeOverResult.tw
@@ -154,7 +154,7 @@
 		<<set $activeSlave.intelligence = random(70,100)>>
 		<<set $activeSlave.intelligenceImplant = 30>>
 		<<set $activeSlave.skill.entertainment = 0>>
-		<<set $activeSlave.skill.whore = 0>>
+		<<set $activeSlave.skill.whoring = 0>>
 		<<set $activeSlave.health = random(60,75)>>
 		<<set $activeSlave.canRecruit = 0>>
 		<<run newSlave($activeSlave)>> /* skip New Slave Intro */
@@ -200,7 +200,7 @@
 		<<set $activeSlave.intelligence = random(0,60)>>
 		<<set $activeSlave.intelligenceImplant = 30>>
 		<<set $activeSlave.skill.entertainment = 0>>
-		<<set $activeSlave.skill.whore = 0>>
+		<<set $activeSlave.skill.whoring = 0>>
 		<<set $activeSlave.health = random(60,75)>>
 		<<set $activeSlave.canRecruit = 0>>
 		<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index 581a76abbf5fbe68aec96818b57077d9aac8b68f..77533d4db65907b9e8202f9b6fc06acc1aad6ec7 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -31,19 +31,107 @@
 	<</if>>
 <</if>>
 
+/* Setup Millie art, since she is on multiple channels */
+<<if $seeImages == 1>>
+	<<set _millie = BaseSlave()>>
+	<<set _millie.devotion = 100>>
+	<<set _millie.trust = 100>>
+	<<set _millie.weight = 120>>
+	<<set _millie.boobs = 5000>>
+	<<set _millie.hips = 2>>
+	<<set _millie.butt = 5>>
+	<<set _millie.hLength = 50>>
+	<<set _millie.skin = "dark olive">>
+	<<set _millie.hStyle = "luxurious">>
+	<<set _millie.hColor = "strawberry blonde">>
+	<<set _millie.clothes = "a leotard">>/*no cow suit yet, sadly*/
+<</if>>
+
 <br><br>
 <<switch $randShow>>
 <<case 0>>
+	<<if $seeImages == 1>>
+		<<set _kirk = BaseSlave()>>
+		<<set _kirk.actualAge = 44>>
+		<<set _kirk.devotion = 0>>
+		<<set _kirk.trust = 0>>
+		<<set _kirk.health = random(60,80)>>
+		<<set _kirk.muscles = 60>>
+		<<set _kirk.weight = 30>>
+		<<set _kirk.waist = 90>>
+		<<set _kirk.boobs = 0>>
+		<<set _kirk.shoulders = 3>>
+		<<set _kirk.butt = 0>>
+		<<set _kirk.hips = -1>>
+		<<set _kirk.hLength = 10>>
+		<<set _kirk.hColor = "dark brown">>
+		<<set _kirk.faceShape = "masculine">>
+		<<set _kirk.hStyle = "messy">>
+		<<set _kirk.eyewear = "glasses">>
+		<<set _kirk.clothes = "conservative clothing">>
+		<<set _kirk.shoes = "flats">>
+
+		<<set _jules = BaseSlave()>>
+		<<set _jules.devotion = 0>>
+		<<set _jules.trust = 0>>
+		<<set _jules.health = random(60,80)>>
+		<<set _jules.weight = 30>>
+		<<set _jules.waist = 30>>
+		<<set _jules.boobs = 700>>
+		<<set _jules.butt = 3>>
+		<<set _jules.hLength = 50>>
+		<<set _jules.hStyle = "luxurious">>
+		<<set _jules.hColor = "auburn">>
+		<<set _jules.boobshape = "perky">>
+		<<set _jules.clothes = "panties and pasties">>/*pasties alone don't have art at this time, apaprently */
+		<<set _jules.collar = "styligh leather">>
+	<</if>>
 	<<set $showOne += 1, $lastShow = 0>>
 	It looks like the random function chose the FCNN stream channel, and you've started watching in the middle of a news segment.
 	<<set $randShow = random(0,2)+1>>
 	<<if $randShow == 1 && $showOne > 3 || $showOne == 1>>
+		<<if $seeImages == 1>>
+			<div class="imageColumn">
+				<div class="imageRef medImg">
+					<<SlaveArt _kirk 2 0>>
+				</div>
+				<div class="imageRef medImg">
+					<<SlaveArt _jules 2 0>>
+				</div>
+			</div>
+		<</if>>
 		The segment is being anchored by the middle aged Kirk McMahon, and he's joined by the ever-popular "Anchor Slave", Jules. She's got a nice figure, and the only thing she's wearing to cover her perky breasts is a pair of FCNN pasties. She has on a fine leather collar; the large gold charm hanging from the front seems to be a stylized emblem of a ship's anchor merged with a microphone. The pair seems to be discussing the recent actions and punishment of the reality show slave Slooty.
 		<br><br>Jules seems to be quite passionate about the subject, the animated way she talks is causing her sizable tits to bounce all over the place. "It doesn't matter how famous or valuable that slut thinks she is, her behavior was just wrong on SO many levels. It makes all of us good slaves look bad. If you ask me, her master's choice of punishment fits the attention whore perfectly!"
 		<br><br>Kirk's face looks more than a little surprised, but you can't quite tell if it's an act or not. "You won't get any argument from me that she deserves to be punished... but getting chained up with an obedience collar and feeder system in the middle of Times Square, free for public use? A slum like Manhattan, she'll never <<if $seeExtreme == 0>><i>enjoy</i><<else>>survive<</if>> the 10 day sentence!"
 		<br><br>Jules smiles. "That's exactly right Master McMahon, she's going to be <<if $seeExtreme == 0>><i>hugged until she smiles</i><<else>>fucked to death<</if>>. Her precious popularity in the old world will have the locals lined up all the way to New New Jersey waiting for their turn. I'd never question her master's decision, but if it were me, I'd pump her full of curatives and stimulants during the sentence. That way, she doesn't <<if $seeExtreme == 0>><i>smile</i><<else>>die or pass out<</if>> too soon. I think her master is being lenient after the way she badmouthed him in a live broadcast."
 		<br><br>...
 	<<elseif $randShow == 2 && $showOne > 3 || $showOne == 2>>
+		<<if $seeImages == 1>>
+			<<set _model = BaseSlave()>>
+			<<set _model.devotion = -90>>
+			<<set _model.trust = 0>>
+			<<set _model.health = random(60,80)>>
+			<<set _model.face = -20>>
+			<<set _model.hLength = 50>>
+			<<set _model.hStyle = "messy">>
+			<<set _model.hColor = "blazing red">>
+			<<set _model.underArmHStyle = "bushy">>
+			<<set _model.underArmHColor = "blazing red">>
+			<<set _model.height = 150>>
+			<<set _model.boobs = 700>>
+			<<set _model.boobshape = "perky">>
+			<<set _model.shoulders = 0>>
+			<<set _model.waist = 180>>
+			<<set _model.butt = 3>>
+			<<set _model.hips = 3>>
+			<<set _model.clothes = "spats and a tank top">>
+			<<set _model.shoes = "flats">>
+			<div class="imageColumn">
+				<div class="imageRef medImg">
+					<<SlaveArt _model 2 0>>
+				</div>
+			</div>
+		<</if>>
 		The program is showing some poorly-shot video showing a woman with flaming-red short hair angrily shouting at a large but uncomfortable-looking man. The title text at the bottom says: <b>"EmancipationGate: Emancipation Movement Exposed"</b> The video continues, revealing more of the angry woman. She's short, wearing a sweaty tank top that makes her bushy underarm hair stand out. Based on the audio thus far, it seems she's trying to tell the large man to keep <<if $seeExtreme == 0>><i>hugging their captives until they smile</i><<else>>torturing their captives until they die<</if>>, that it has to be convincing for the camera. The man says he isn't comfortable doing that to kids, but the woman shouts him down by saying they're only migrant man brats before beginning some nonsensical babble about patriarchy and slavery. The video seems to be being shot on a small handheld device, and pans over to reveal a bunch of severely <<if $seeExtreme == 0>><i>hugged</i><<else>>beaten<</if>> children in slave chains that look like obvious S&M props to your well-trained eye. The angry woman's rant is still continuing from the background, but suddenly stops to be replaced with a yell: <i>"Get the fuck away from the subjects, you better not be fucking filming any..."</i> and the video cuts out.
 		<br><br>
 		The segment cuts back to two news anchors, a dark-haired man with a mustache and an aging bottle blonde.
@@ -51,6 +139,17 @@
 		<br><br>The mustached man looks knowingly at the camera. "Anyone remotely familiar with Free City slavery knew the documentary was complete bullshit, but what we didn't know was just how far those radicalists were willing to go to make us all look bad."
 		<br><br>...
 	<<elseif $randShow == 3 && $showOne > 3 || $showOne == 3>>
+		<<if $seeImages == 1>>
+			<<set _jules.vaginalAccessory = "large dildo">>
+			<div class="imageColumn">
+				<div class="imageRef medImg">
+					<<SlaveArt _kirk 2 0>>
+				</div>
+				<div class="imageRef medImg">
+					<<SlaveArt _jules 2 0>>
+				</div>
+			</div>
+		<</if>>
 		The segment seems to be more of a conversational piece. The two hosts are sitting next to each other on one couch. Samuel Klein, a handsome man with dark blonde hair and a winning smile, can't help but be overshadowed by his cohost. The popular SlaveAnchor Jules might be mistaken for just another gorgeous face and body, but it's her brilliant wit and sure-footed advocacy that made her famous. She's wearing her usual slave anchor collar, and her large natural breasts are only covered by the standard FCNN pasties, leaving the perky flesh free to jiggle enticingly. On this show her lower half is revealed; it's usually hidden behind a desk. The dark red material of her narrow panties matches her auburn hair, and reveals her broad hips and long slender legs.
 		<br><br>The camera cuts back to two distinguished looking gentlemen, one is labeled by the screen as medical researchers. <<if $PC.medicine == 100>>You vaguely recognize both of them from your time studying medicine. <</if>>One of them continues the conversation, apparently answering a question. <i>"That's right, the results of our research tell us what everyone already suspected, but now with an indisputable weight of evidence behind it."</i> The other nods and continues, <i>"our meta analysis examines over two decades of data, and nearly 6000 independent studies. We can safely say that free city slaves are healthier than the average person living anywhere in the old world. While a few of the wealthiest countries of the old world may surpass one or two areas, our slaves have better nutrition, standard of living, are more psychologically stable, have longer lives, and are happier on average as well."</i> The first gentleman interjects, <i>"We even found strong evidence that the higher sexual tempo and libido-stimulating training given to sex slaves greatly contributes to their life span; they live even longer than the average slave, and even look younger than their age."</i>
 		<br><br>The camera switches back to the two anchors, showing an excited Jules hefting and bouncing her tits. "They've barely sagged at all since they stopped growing, now I know why!"
@@ -77,6 +176,28 @@
 		You don't spend very much time actually watching the show; the randy opening, perverted competitions, and constant talk of creampies quickly has the pleasure slave in your bed eager for some attention from her own arcology owner. You spend the rest of the evening doing something a lot more fun than watching reality TV.
 	<</if>>
 <<case 2>>
+	<<if $seeImages == 1>>
+		<<set _model = BaseSlave()>>
+		<<set _model.devotion = 0>>
+		<<set _model.trust = 0>>
+		<<set _model.health = random(60,80)>>
+		<<set _model.muscles = 60>>
+		<<set _model.boobs = 700>>
+		<<set _model.butt = 3>>
+		<<set _model.hLength = 50>>
+		<<set _model.skin = "tan">>
+		<<set _model.hStyle = "messy">>
+		<<set _model.hColor = "blonde">>
+		<<set _model.boobshape = "perky">>
+		<div class="imageColumn">
+			<div class="imageRef medImg">
+				<<SlaveArt _model 2 0>>
+			</div>
+			<div class="imageRef medImg">
+				<<SlaveArt _model 2 0>>
+			</div>
+		</div>
+	<</if>>
 	<<set $showThree += 1, $lastShow = 2>>
 	<<set $randShow = random(0,2)+1>>
 	It looks like the random function chose to play the 'Home and Slave' stream channel. The current show features a set of female twins wearing nothing but tool belts. Their assets aren't particularly noteworthy, but they have a great hourglass figure, toned muscles, and gorgeous girl-next-door faces. The girls are hosting a DIY show, and seem to be performing a lot of the work themselves. The occasional bead of sweat makes their smooth tan skin really stand out. It seems like this time they are
@@ -151,7 +272,7 @@
 		<<set $activeSlave.skill.entertainment = random(50,80)>>
 		<<set $activeSlave.skill.oral = random(20,60)>>
 		<<set $activeSlave.skill.anal = 0>>
-		<<set $activeSlave.skill.whore = 0>>
+		<<set $activeSlave.skill.whoring = 0>>
 		<<set $activeSlave.intelligence = random(51,70)>>
 		<<set $activeSlave.intelligenceImplant = 30>>
 		<<set $activeSlave.devotion = random(60,90)>>
@@ -198,7 +319,7 @@
 		<<set $activeSlave.skill.vaginal = random(50,80)>>
 		<<set $activeSlave.skill.oral = random(40,80)>>
 		<<set $activeSlave.skill.anal = random(20,50)>>
-		<<set $activeSlave.skill.whore = random(0,50)>>
+		<<set $activeSlave.skill.whoring = random(0,50)>>
 		<<set $activeSlave.devotion = random(40,70)>>
 		<<set $activeSlave.trust = random(40,70)>>
 		<<set $activeSlave.fetish = "pregnancy">>
@@ -292,7 +413,7 @@
 		<<set $activeSlave.skill.oral = random(50,100)>>
 		<<set $activeSlave.skill.vaginal = random(50,100)>>
 		<<set $activeSlave.skill.anal = random(20,80)>>
-		<<set $activeSlave.skill.whore = random(20,80)>>
+		<<set $activeSlave.skill.whoring = random(20,80)>>
 		<<set $activeSlave.intelligence = random(-15,80)>>
 		<<set $activeSlave.intelligenceImplant = 15>>
 		<<set $activeSlave.devotion = random(60,90)>>
@@ -326,7 +447,7 @@
 		<<set $activeSlave.skill.vaginal = 15>>
 		<<set $activeSlave.skill.oral = 15>>
 		<<set $activeSlave.skill.anal = 15>>
-		<<set $activeSlave.skill.whore = 15>>
+		<<set $activeSlave.skill.whoring = 15>>
 		<<set $activeSlave.sexualFlaw = either("hates anal", "hates oral", "hates penetration", "idealistic")>>
 		<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy", "hates men")>>
 		<<set $activeSlave.energy = 10>>
@@ -347,7 +468,7 @@
 		<<set $activeSlave.prostate = 2>>
 		<<set $activeSlave.skill.oral = random(30,60)>>
 		<<set $activeSlave.skill.anal = random(20,50)>>
-		<<set $activeSlave.skill.whore = random(0,25)>>
+		<<set $activeSlave.skill.whorng = random(0,25)>>
 		<<set $activeSlave.devotion = random(50,80)>>
 		<<set $activeSlave.trust = random(50,80)>>
 		<<set $activeSlave.origin = "You purchased her from FCTV's Home Slave Shopping stream channel.">>
@@ -365,7 +486,7 @@
 		<<set $activeSlave.balls = random(3,6)>>
 		<<set $activeSlave.skill.oral = random(40,80)>>
 		<<set $activeSlave.skill.anal = random(40,80)>>
-		<<set $activeSlave.skill.whore = random(40,70)>>
+		<<set $activeSlave.skill.whoring = random(40,70)>>
 		<<set $activeSlave.muscles = either(20, 50)>>
 		<<set $activeSlave.energy = random(70,100)>>
 		<<set $activeSlave.attrXY = random(70,100)>>
@@ -406,33 +527,53 @@
 	<<elseif $randShow == 9>> /* mpreg dickgirl */
 		a strong young $activeSlave.race $girl that retains $his cock and balls. $activeSlave.slaveName has something that makes $him special: thanks to medical science $he's got a @@.pink;functional ass womb.@@ That's right folks, this slave is fertile and can get knocked up if you inseminate $his asshole. That's pretty amazing, to be honest, and exceptionally rare. Don't let this opportunity slip by!"
 	<</if>>
-<<slaveCost $activeSlave>>
-<<if $randShow < 3>>
-	<<set $slaveCost *= 1.3>>
-<<elseif $randShow == 4>>
-	<<set $slaveCost *= 2>>
-<<elseif $randShow == 6>>
-	<<set $slaveCost *= 0.7>>
-<<elseif $randShow > 6>>
-	<<set $slaveCost *= 1.3>>
-<</if>>
-<<set $slaveCost = 500*Math.trunc($slaveCost/500)>>
-The offered price is <<print cashFormat($slaveCost)>>.
+	<<slaveCost $activeSlave>>
+	<<if $randShow < 3>>
+		<<set $slaveCost *= 1.3>>
+	<<elseif $randShow == 4>>
+		<<set $slaveCost *= 2>>
+	<<elseif $randShow == 6>>
+		<<set $slaveCost *= 0.7>>
+	<<elseif $randShow > 6>>
+		<<set $slaveCost *= 1.3>>
+	<</if>>
+	<<set $slaveCost = 500*Math.trunc($slaveCost/500)>>
+	The offered price is <<print cashFormat($slaveCost)>>.
 
-<<if $cash >= $slaveCost>>
-	<br>
-	<<link "Buy $his slave contract">>
-		<<run cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave)>>
-		<<set $nextLink = "Scheduled Event", $returnTo = "Scheduled Event">>
-		<<goto "New Slave Intro">>
-	<</link>>
-<<else>>
-	//@@.red;You lack the necessary funds to buy this slave.@@//
-<</if>>
-<br><br>
-<<set $saleDescription = 1>><<include "Long Slave Description">><<set $saleDescription = 0>>
+	<<if $cash >= $slaveCost>>
+		<br>
+		<<link "Buy $his slave contract">>
+			<<run cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave)>>
+			<<set $nextLink = "Scheduled Event", $returnTo = "Scheduled Event">>
+			<<goto "New Slave Intro">>
+		<</link>>
+	<<else>>
+		//@@.red;You lack the necessary funds to buy this slave.@@//
+	<</if>>
+	<br><br>
+	<<set $saleDescription = 1>><<include "Long Slave Description">><<set $saleDescription = 0>>
 
 <<case 5>>
+	<<if $seeImages == 1>>
+		<<set _model = BaseSlave()>>
+		<<set _model.devotion = 0>>
+		<<set _model.trust = 0>>
+		<<set _model.boobs = 700>>
+		<<set _model.hips = 2>>
+		<<set _model.butt = 5>>
+		<<set _model.hLength = 50>>
+		<<set _model.hStyle = "luxurious">>
+		<<set _model.hColor = "blonde">>
+		<<set _model.boobshape = "perky">>
+		<<set _model.belly = 10000>>
+		<<set _model.preg = 35>>
+		<<set _model.clothes = "a maternity dress">>
+		<div class="imageColumn">
+			<div class="imageRef medImg">
+				<<SlaveArt _model 2 0>>
+			</div>
+		</div>
+	<</if>>
 	<<set $showFive += 1, $lastShow = 5>>
 	It looks like the random function chose to play an episode of the slave-breeding for beginners series: 'Husbandry with Millie'. The show is hosted by the famous and charismatic Millie, a slave breeder from Arcturus who appears to be in her mid thirties. She's wearing something resembling a maternity dress over her large pregnant belly, but the loose fabric doesn't hide her enormous hips and complementary ass. The dress only comes part of the way up her chest, leaving her large milk-engorged breasts exposed as they rest atop the fabric. Millie begins the show the same way as always, by giving her viewers some encouragement. "Anyone can become a breeder, even you! Just be willing to learn, and as I always say..." she pats her full belly meaningfully "be ready to get your hands dirty!"
 	<br><br>
@@ -451,7 +592,7 @@ The offered price is <<print cashFormat($slaveCost)>>.
 		<br><br>
 		Sitting down in her comfortable-looking chair, Millie begins her lecture. "So, thanks to the miracles of the modern dairy and industrial <<if $seeDicks == 0>><i>banana</i><<else>>cock<</if>> milkers, a reliable supply of <<if $seeDicks == 0>><i>banana juice</i><<else>>cum<</if>> is available for most citizens. This is definitely the least expensive option for those starting out, and combined with easy access, seems to be a popular choice for new breeders. It's also a common pitfall, so thank goodness you're watching now! Industrial dairies simply aren't focused on reproduction in most arcologies. Owners are focused on production, quantity over quality, and most of the material is used for slave nutrition and industrial purposes. Even if your arcology has a reproduction-focused <<if $seeDicks == 0>><i>banana cream</i><<else>>jizz<</if>> farm, they're usually focused on breeding menials. You still have no way of knowing what you're getting. It makes any attempt at proper husbandry nearly impossible. You don't want to sink all your resources into buying and caring for breeding sluts, only to end up with a litter only fit to be menials!"
 		<br><br>
-		Your best bet if you're low on resources is looking to prominent citizens with high quality slaves. Often times, for a modest stud fee, you can get your bitches pregnant with a known stud of high quality. Particularly when it comes to older bulls, you can often get your bitches bred for nearly the same cost as dairy <<if $seeDicks == 0>><i>cream</i><<else>>jizz<</if>>! You do have to do the leg work, but think of it as picking the best bull for your breeding plan. As you get more established, purchase an older bull for yourself. Older bulls are better-behaved, and still perfectly capable of helping to take care of your pregnant sluts, when they aren't knocking up the empty ones, that is. A slave may be old, but the DNA in that <<if $seeDicks == 0>><i>banana juice</i><<else>>cum<</if>> is the same as it was 20 years ago!"
+		"Your best bet if you're low on resources is looking to prominent citizens with high quality slaves. Often times, for a modest stud fee, you can get your bitches pregnant with a known stud of high quality. Particularly when it comes to older bulls, you can often get your bitches bred for nearly the same cost as dairy <<if $seeDicks == 0>><i>cream</i><<else>>jizz<</if>>! You do have to do the leg work, but think of it as picking the best bull for your breeding plan. As you get more established, purchase an older bull for yourself. Older bulls are better-behaved, and still perfectly capable of helping to take care of your pregnant sluts, when they aren't knocking up the empty ones, that is. A slave may be old, but the DNA in that <<if $seeDicks == 0>><i>banana juice</i><<else>>cum<</if>> is the same as it was 20 years ago!"
 		<br><br>
 		Millie gives the viewers a big smile. "If you take anything away from this episode, just remember that industrial <<if $seeDicks == 0>><i>juice</i><<else>>cum<</if>> is used to make industrial slaves!"
 		<br><br>.....
@@ -469,6 +610,13 @@ The offered price is <<print cashFormat($slaveCost)>>.
 	<</if>>
 
 <<case 6>>
+	<<if $seeImages == 1>>
+		<div class="imageColumn">
+			<div class="imageRef medImg">
+				<<SlaveArt _millie 2 0>>
+			</div>
+		</div>
+	<</if>>
 	<<set $showSix += 1, $lastShow = 6>>
 	It looks like the random function chose to play an episode of the 'Modern Dairy' edutainment series, which opens with a montage of milk-related food and cooking shots. After the last of the opening credits disappears, the show sticks to a single shot from the montage, a delicious looking bowl of cereal. The camera zooms out to reveal the show's host wearing her trademark cow print leotard, and getting just a little too much enjoyment out of her cereal. She slowly puts the spoon down while savoring her cereal, reluctantly swallowing and starting the show. "Hi there y'all, welcome to another episode of Modern Dairy!" She gives the camera a wave — setting her gargantuan melons wobbling inside the spandex-like leotard — and the camera fades to black.
 	<br><br>
@@ -549,14 +697,48 @@ The offered price is <<print cashFormat($slaveCost)>>.
 	<</if>>
 
 <<case 8>>
+	<<if $seeImages == 1>>
+		<div class="imageColumn">
+			<div class="imageRef medImg">
+				<<SlaveArt _millie 2 0>>
+			</div>
+		</div>
+	<</if>>
 	<<set $showEight += 1, $lastShow = 8>>
 	It looks like the random function chose to play a preview of the how-to series "Extreme Gestation for Fun and Profit", hosted by Millie. It seems like the show's going to cover topics ranging from hyper-pregnancy to broodmother implants, and even hints and some sort of medical technique to allow anal pregnancy in males.
 	<br><br>.....
 
 <<case 9>>
+	<<if $seeImages == 1>>
+		<<set _model = BaseSlave()>>
+		<<set _model.devotion = 0>>
+		<<set _model.trust = 0>>
+		<<set _model.health = 70>>
+		<<set _model.hLength = 50>>
+		<<set _model.hStyle = "neat">>
+		<<set _model.hColor = "brown">>
+		<<set _model.boobs = 700>>
+		<<set _model.boobshape = "perky">>
+		<<set _model.waist = 180>>
+		<<set _model.butt = 3>>
+		<<set _model.hips = 3>>
+		<<set _model.clothes = "conservative clothing">>
+		<<set _model.shoes = "flats">>
+	<</if>>
 	<<set $showNine += 1, $lastShow = 9, $randShow = random(0,3)+1>>
 	It looks like the random function chose to play
 	<<if $randShow == 1>>
+		<<if $seeImages == 1>>
+			<<set _model.belly = 10000>>
+			<<set _model.preg = 35>>
+			<<set _model.makeup = 2>>
+			<<set _model.shoes = "none">>
+			<div class="imageColumn">
+				<div class="imageRef medImg">
+					<<SlaveArt _model 2 0>>
+				</div>
+			</div>
+		<</if>>
 		a documentary on the surging Repopulation movement: "Continuing the Dream". After the opening credits, the documentary introduces a young and extremely pregnant woman as the commentator. The program makes an impassioned argument about the need for a new generation of citizens and slaves that were born into the dream of the free cities. The woman is wearing semi-conservative business attire, and has on elegant makeup. She looks somewhat plain when compared to the hyper-sexualized style of other FCTV programming, though she does make it plain over the course of the program that she loves sex more than ever. She tends to use herself as an example to show that pregnancy no longer means limitations or sacrifice, instead emphasizing that she's on her fifth pregnancy and would rather be with child than without.
 		<br><br>The woman makes two main points during the course of the documentary. The first is that the combined population of the free cities needs to grow explosively for 'Free City Society' to become stable. She points out several economic reasons, including the drive to invest in research and infrastructure. She has interviews with experts explaining the need for independence; that the Free Cities are still dependent on the old world industrially and financially, and that the population must expand dramatically to avoid going down with the metaphorical ship. The more Free Cities there are, the more they become free and independent of the old world.
 		<br><br>The second point concerns the source of the new citizens and slaves that the Free Cities need. Her arguments concerning citizens focus on the unique culture of the Free Cities, and the direction that the future society will take. She points out that immigrants from the old world are rooted in its decaying culture. She asks her viewers how long it took them to adapt to their new lives, and how often they find themselves doubting their new home subconsciously. She admits that even she sometimes finds something wrong or repulsive, until she realizes that it's the ghost of her past life clinging to her. A noted psychologist talks about the strong hold people's earlier lives has on them, and how developing the promise of the Free Cities will need a generation untainted by the old world. The documentary's argument for slaves largely comes down to the fact that second-generation slaves are happier, better adjusted, and simply better slaves.
@@ -566,35 +748,152 @@ The offered price is <<print cashFormat($slaveCost)>>.
 		<br><br>Overall, it's a convincing documentary, if a little too emotional for your tastes.
 
 	<<elseif $arcologies[0].FSGenderFundamentalist == "unset" && $randShow == 2>>
+		<<if $seeImages == 1>>
+			<<set _model.dick = 6>>
+			<<set _model.boobs = 750>>
+			<div class="imageColumn">
+				<div class="imageRef medImg">
+					<<SlaveArt _model 2 0>>
+				</div>
+			</div>
+		<</if>>
 		a documentary on the increasingly-popular Gender Radicalist movement titled: "Power, not Biology". After the opening credits, the documentary introduces an androgynous documentarian in a nicely-cut suit. The finely tailored suit doesn't try to hide the person's breasts, which seem to be a pretty average D-cup. Similarly, another bulge is visible stretching down one of the pants legs. The futanari opens with a pretty simple question: "Am I a man, or am I a woman?" The documentary is focused on answering that question in the context of a modern era where medical science means that genitalia are irrelevant. It argues that a person's body no longer has any relation to their sexuality or ambition, that being free means choosing the body that pleases you most, and that society needs new criteria from which to determine gender.
 		<br><br>The criteria suggested by the documentary is power. The idea is simple; the powerful are male, the weak are female. It argues that the biology and sexual proclivities of a person simply can't represent them any longer. The powerful are often free to choose the body and activities they wish to pursue, while the weak have those decisions made for them. It's a practical argument, and the documentary gives a long list of evidence supporting it, from expert interviews to ancient civilizations that followed a similar idea. The concept is somewhat appealing to you; after all, you wield extraordinary power, and a large part of that power includes altering the bodies of others. Whatever you choose to do, you can't see any reason to let your slaves and citizens criticize you for it.
 		<br><br>.....
 
 	<<elseif $arcologies[0].FSGenderRadicalist == "unset" && $randShow == 2>>
+		<<if $seeImages == 1>>
+			<<set _model.faceShape = "masculine">>
+			<<set _model.waist = 180>>
+			<<set _model.weight = 180>>
+			<<set _model.boobs = 0>>
+			<<set _model.butt = 0>>
+			<<set _model.hips = -1>>
+			<<set _model.shoulders = 1>>
+			<<set _model.dick = 2>>
+			<div class="imageColumn">
+				<div class="imageRef medImg">
+					<<SlaveArt _model 2 0>>
+				</div>
+			</div>
+		<</if>>
 		a documentary on conservative Gender Fundamentalism movement titled: "It's Eve, NOT Steve". After the outdated graphics finish displaying the garish opening credits, a portly man in late middle age introduces himself as Reverend Brad, the apparent commentator of the program. You don't pay much attention, but learn that apparently the Futanari Sisters are whore agents of Satan. You also learn that you're apparently destined for hell because of the medical technology in your penthouse that could be used to alter someone's naughty bits. You did get a good laugh when the reverend started yelling that choir boys are boys, and if he wanted a girl he would've found a nun.
 		<br><br>You have to admit that most of the show is complete bullshit, but you can't deny that it's useful for controlling your citizens. As long as they're filling their heads with this bullshit, they won't be getting any dangerous ideas from somewhere else. In a more practical sense, it's a lot easier to manage an arcology and a house full of slaves when you don't have to worry about crazy gender issues or people disliking pregnant slaves.
 		<br><br>.....
 
 	<<elseif $arcologies[0].FSSlimnessEnthusiast == "unset" && $randShow == 3>>
+		<<if $seeImages == 1>>
+			<<set _model.dick = 4>>
+			<<set _model.boobs = 0>>
+			<<set _model.hLength = 10>>
+			<<set _model.hColor = "black">>
+			
+			<<set _model2 = BaseSlave()>>
+			<<set _model2.devotion = 0>>
+			<<set _model2.trust = 0>>
+			<<set _model2.health = 70>>
+			<<set _model2.hLength = 50>>
+			<<set _model2.hStyle = "luxurious">>
+			<<set _model2.hColor = "blonde">>
+			<<set _model2.boobs = 700>>
+			<<set _model2.boobshape = "perky">>
+			<<set _model2.waist = 180>>
+			<<set _model2.butt = 3>>
+			<<set _model2.hips = 3>>
+			<<set _model2.clothes = "a ball gown">>
+			<<set _model2.shoes = "heels">>
+			<div class="imageColumn">
+				<div class="imageRef medImg">
+					<<SlaveArt _model 2 0>>
+				</div>
+				<div class="imageRef medImg">
+					<<SlaveArt _model2 2 0>>
+				</div>
+			</div>
+		<</if>>
 		a documentary on the growing Asset Expansionist movement titled: "More of a Good Thing". After a brief set of opening credits the documentary dives immediately into short clips of numerous interviews with stacked women stating that they love having big tits and a big ass. Eventually, a man and woman are introduced as the hosts of the program. Both are finely dressed in the recent fashions, and despite the subject of the documentary, they don't have humongous assets. The woman does have huge breasts, wide hips, and a large derrière; the man has a noticeable bulge in his pants, but nothing extreme. The hosts explain that seeing Asset Expansionism as a call for ridiculous size is something of a misconception. They emphasize that it's about the freedom to enjoy more of a good thing.
 		<br><br>The documentary makes several arguments in favor of the movement, and is clear about explaining the natural biological attraction humans have to large assets. By interviewing stacked members of the movement and psychological experts alike, they try to demonstrate how larger assets lead to happier and more pleasurable lives, both in and out of the bedroom. The documentary neatly tops off its argument by demonstrating how assets have been expanding naturally since the start of the twentieth century, and claiming that it's silly to idolize the way humans looked before modern nutrition and medicine. Western countries in the old world already had average bust sizes of D-cup or larger by the turn of the century, the hosts claim that trying to go back to smaller sizes is synonymous with reducing the prosperity of free citizens.
 		<br><br>.....
 
 	<<elseif $arcologies[0].FSAssetExpansionist == "unset" && $randShow == 3>>
+		<<if $seeImages == 1>>
+			<<set _model.weight = -30>>
+			<<set _model.butt = 0>>
+			<<set _model.boobs = 450>>
+			<<set _model2.clothes = "a slave gown">>
+			<div class="imageColumn">
+				<div class="imageRef medImg">
+					<<SlaveArt _model 2 0>>
+				</div>
+			</div>
+		<</if>>
 		a documentary on the Slimness Enthusiast counter movement titled: "Slim Is In". Artistic opening credits play across the screen before a slim woman walks up and begins talking to the camera conversationally. She seems to be in her mid to late thirties, and is wearing conservative makeup to accent her natural beauty. Her narrow waist combines with her slim hips and full shoulders to create a balanced but muted hourglass profile. It's a look that was popular for decades on fashion models in the old world, and it improves the attractiveness of her B- or C-cup breasts and taut butt. It's obvious that the woman aspires to be a role model in addition to being the documentary's commentator.
 		<br><br>Much of the documentary's arguments center around the concept of fashion and the privileged. They point out how in the past societal changes have altered what people find attractive, giving skin tans as an example. When most worked outside and only the privileged stayed indoors pale skin was considered attractive. When the world changed and most people worked indoors, suddenly the tan skin of those with leisure time to spend outside came into vogue. She argues that modern hormones can easily expand the assets of the masses, but that only the privileged can afford to sculpt themselves into an ideal form like hers. She points out that even though the masses may imitate with surgery, they'll never be able to copy the naturally good bone structure and vibrancy of the well-bred elite.
 		<br><br>.....
 
 	<<elseif $arcologies[0].FSTransformationFetishist == "unset" && $randShow == 4>>
+		<<if $seeImages == 1>>
+			<<set _model.devotion = 100>>
+			<<set _model.trust = 100>>
+			<<set _model.health = 70>>
+			<<set _model.hLength = 50>>
+			<<set _model.hStyle = "luxurious">>
+			<<set _model.hColor = "blonde">>
+			<<set _model.boobs = 700>>
+			<<set _model.boobshape = "perky">>
+			<<set _model.waist = 180>>
+			<<set _model.butt = 3>>
+			<<set _model.hips = 3>>
+			<<set _model.clothes = "a ball gown">>
+			<<set _model.shoes = "heels">>
+			
+			<<set _model2 = BaseSlave()>>
+			<<set _model2.dick = 4>>
+			<<set _model2.boobs = 0>>
+			<<set _model2.hLength = 10>>
+			<<set _model2.hColor = "grey">>
+			<<set _model2.clothes = "conservative clothing">>
+			<<set _model2.shoes = "flats">>
+			<div class="imageColumn">
+				<div class="imageRef medImg">
+					<<SlaveArt _model 2 0>>
+				</div>
+				<div class="imageRef medImg">
+					<<SlaveArt _model2 2 0>>
+				</div>
+			</div>
+		<</if>>
 		a documentary on the spreading Body Purist movement titled: "Don't Settle for Imitations". The opening credits are displayed over a series of comparison images showing beautiful breasts and asses next to obviously artificial imitations of the same. The screen splits and shows the two hosts in their own environments side by side. One is an extremely attractive doctor, her body is exquisitely curvy underneath her lab coat and her face is an impossible combination of beautiful and cute. The other host is an artist with graying hair; he's working in his studio to create a life-size sculpture of the first host. He starts off the documentary by asking why people are so eager to destroy the natural beauty of the human form. The doctor continues by asking why people are so impatient that they get implants instead of using a superior process of targeted hormonal growth.
 		<br><br>The documentary keeps up the two-viewpoint style and approaches the issue from two directions. The first is the stark aesthetic differences between natural and artificial bodies. It demonstrates why implants always fall short of the beauty they seek to imitate, and how those with implants are doomed to a vicious cycle of surgery to try and recapture the beauty they lost in the initial surgery. The other angle, presented by the doctor, is a lot more practical. It points out the numerous shortcomings of implants when compared to natural growth, such as the frequent need for maintenance surgeries, the significant extra health risks, the reduced pleasure and sensitivity felt by implant patients, and the extreme difficulty of a patient to get what they want. Taken together the argument is pretty simple: why get implants when other medical options are cheaper, safer, more effective, healthier, and more attractive?
 		<br><br>.....
 
 	<<elseif $arcologies[0].FSBodyPurist == "unset" && $randShow == 4>>
+		<<if $seeImages == 1>>
+			<<set _model2.dick = 4>>
+			<<set _model2.boobs = 0>>
+			<<set _model2.hLength = 10>>
+			<<set _model2.hColor = "grey">>
+			<div class="imageColumn">
+				<div class="imageRef medImg">
+					<<SlaveArt _model 2 0>>
+				</div>
+			</div>
+		<</if>>
 		a documentary on the rise of the Transformation Fetish titled: "The Mass Insanity of Adding Mass". The opening credits are styled to look like a psychological case study from a mental institution. When the credits finish, the video cuts to a scene of a man sitting behind a desk, the whole shot is high contrast due to the harsh lighting from a lone desk lamp. The middle-aged man screams 'hard-boiled' and looks like he walked straight out of a noir film to host this documentary. His opening monologue makes it pretty clear that this documentary has a lot of parallels with a crime documentary. Worse, is that the evidence and expert witnesses available to the producers were apparently overwhelming, because the program seems rushed trying to fit as much as it can into a narrow time slot.
 		<br><br>Evidence and whatever else be damned, this isn't the kind of documentary that should be on the FCTV stream in your arcology. You tell $assistantName to remind you to send a complaint in the morning.
 
 	<<else>>
+		<<if $seeImages == 1>>
+			<<set _model.belly = 10000>>
+			<<set _model.preg = 35>>
+			<<set _model.makeup = 2>>
+			<<set _model.shoes = "none">>
+			<div class="imageColumn">
+				<div class="imageRef medImg">
+					<<SlaveArt _model 2 0>>
+				</div>
+			</div>
+		<</if>>
 		a documentary on the surging Repopulation movement: "Continuing the Dream". After the opening credits, the documentary introduces a young and extremely pregnant woman as the commentator. The program makes an impassioned argument about the need for a new generation of citizens and slaves that were born into the dream of the free cities. The woman is wearing semi-conservative business attire, and has on elegant makeup. She looks somewhat plain when compared to the hyper-sexualized style of other FCTV programming, though she does make it plain over the course of the program that she loves sex more than ever. She tends to use herself as an example to show that pregnancy no longer means limitations or sacrifice, instead emphasizing that she's on her fifth pregnancy and would rather be with child than without.
 		<br><br>The woman makes two main points during the course of the documentary. The first is that the combined population of the free cities needs to grow explosively for 'Free City Society' to become stable. She points out several economic reasons, including the drive to invest in research and infrastructure. She has interviews with experts explaining the need for independence; that the Free Cities are still dependent on the old world industrially and financially, and that the population must expand dramatically to avoid going down with the metaphorical ship. The more Free Cities there are, the more they become free and independent of the old world.
 		<br><br>The second point concerns the source of the new citizens and slaves that the Free Cities need. Her arguments concerning citizens focus on the unique culture of the Free Cities, and the direction that the future society will take. She points out that immigrants from the old world are rooted in its decaying culture. She asks her viewers how long it took them to adapt to their new lives, and how often they find themselves doubting their new home subconsciously. She admits that even she sometimes finds something wrong or repulsive, until she realizes that it's the ghost of her past life clinging to her. A noted psychologist talks about the strong hold people's earlier lives has on them, and how developing the promise of the Free Cities will need a generation untainted by the old world. The documentary's argument for slaves largely comes down to the fact that second-generation slaves are happier, better adjusted, and simply better slaves.
@@ -605,6 +904,39 @@ The offered price is <<print cashFormat($slaveCost)>>.
 	<</if>>
 
 <<case 10>>
+	<<if $seeImages == 1>>
+		<<set _mindy = BaseSlave()>>
+		<<set _mindy.devotion = 100>>
+		<<set _mindy.trust = 100>>
+		<<set _mindy.health = 70>>
+		<<set _mindy.hLength = 50>>
+		<<set _mindy.hStyle = "luxurious">>
+		<<set _mindy.hColor = "strawberry blonde">>
+		<<set _mindy.boobs = 1400>>
+		<<set _mindy.nipples = "huge">>
+		<<set _mindy.boobshape = "perky">>
+		<<set _mindy.areolae = 4>>
+		<<set _mindy.waist = 180>>
+		<<set _mindy.butt = 3>>
+		<<set _mindy.hips = 3>>
+		<<set _mindy.clothes = "a string bikini">>
+		
+		<<set _mike = BaseSlave()>>
+		<<set _mike.dick = 7>>
+		<<set _mike.faceShape = "masculine">>
+		<<set _mike.boobs = 0>>
+		<<set _mike.hLength = 10>>
+		<<set _mike.hColor = "dark brown">>
+		<<set _mike.clothes = "sport shorts">>
+		<div class="imageColumn">
+			<div class="imageRef medImg">
+				<<SlaveArt _mindy 2 0>>
+			</div>
+			<div class="imageRef medImg">
+				<<SlaveArt _mike 2 0>>
+			</div>
+		</div>
+	<</if>>
 	<<set $showTen += 1, $lastShow = 10>>
 	It looks like the random function chose to play a competitive game show 'Cum and Cream Challenge' The program has a short opening sequence showing a variety of male and female contestants competing in a variety of lewd and messy body fluid competitions. The program flashes to a title screen where the letters are being spelled out in white fluids: "CUM and CREAM CHALLENGE". The writing is messy enough to <<if $showTen == 1>>make you wonder<<else>>keep you wondering<</if>> if slaves were actually trained to spell out the text each week, or if it's just some clever camera work. The camera pans up past a large dripping <<if $seeDicks == 0>><i>frankfurter</i><<else>>cock<</if>> and two massive nipples, eventually revealing the two hosts that look to be in their early twenties. <<if $showTen < 2>>A muscular man wearing athletic clothes, and a buxom young woman in a bikini that looks more like a microkini on her large breasts and hips. The pair is helpfully labeled on screen as Mike and Mindy, and as the camera gets closer it reveals that both have rather sizable endowments. Mike's crotch is soaked, and Mindy's bikini top allows small rivulets of milk to stream down from the sodden fabric. <<else>>The fluid enthusiast Mike and Mindy pair are wearing their usual style in new colors, the clothes appearing to be as soddenly wet as any other episode.<</if>>
 	<br><br>
@@ -701,15 +1033,15 @@ The offered price is <<print cashFormat($slaveCost)>>.
 		<br><br>"Hey Scott, do you have anything a bit more conservative?" The woman asked. "We've been over this." Scott said. "Not showing off your breasts is seen as very rude here." Scott frowned, "Well, that's not entirely correct, but it is seen as distinctly unfriendly; the only girls who don't show some cleavage are frigid cunts and old-worlders fresh off the boat."
 		<br><br>The woman kept glaring in the mirror. "I understand that, but what is the point of this?" she said, pulling at the slits in the fabric at her sides. "Oh, those are for girls who want get milked on-the-go and not disrupt the view of their cleavage. Also, for this." The man said as he reached through the slits to give her breasts a polite squeeze.
 		<br><br>The woman wriggled out of the man's grasp and turned to face him. She attempted to cross her arms across her chest in a protective fashion, but all she managed to do was make her breasts bulge enticingly. Scott sighed and pinched the bridge of his nose, "You really need to work on that." he said. She just glared at him "I'll never be able to take you out in public, much less find you a job, if you keep acting like that when people try to greet you."
-		<br><br>The woman huffed and turned back to continue glaring at the mirror. "Don't you huff at me young lady." Scott said, his face a stern mask. "If someone doesn't give you a squeeze or press breasts with you the first time you meet, it doesn't mean that they hold your beloved old-world values, it means they're snubbing you." The woman wilted at his words and turned around, opening her mouth to speak
+		<br><br>The woman huffed and turned back to continue glaring at the mirror. "Don't you huff at me young lady." Scott said, his face a stern mask. "If someone doesn't give you a squeeze or press breasts with you the first time you meet, it doesn't mean that they hold your beloved old-world values, it means they're snubbing you." The woman wilted at his words and turned around, opening her mouth to speak.
 		<br><br>Any response died on her lips as a little golden haired girl bounced into the room. She wore a thong printed with cartoon cows and nothing else. An old-worlder would say the girl looked 'absurd' or 'cartoonishly proportioned', an arcology citizen would say the old-worlder looked like they needed some cheap tooth removal. In the girl's arms she carried a bundle of clothing. "Daddy, I got more clothes for Cathy." The little girl said, presenting the bundle.
 		<br><br>Scott's face softened and gave the little girl's breasts a gentle squeeze before taking the bundle. "Thank you, sweetheart." He said before presenting the bundle to Cathy. His daughter beamed and then jiggled over to sit on the love seat across from the mirror. He followed her to the love seat, sat down, and lifted her on to his lap. She squealed and giggled before wiggling her bottom on his crotch. The girl grabbed her father's hands and guided them to her breasts. Scott obligingly started groping her. Cathy just stared at the bundle with such intensity one might think she was trying to force the clothes to change into jeans and a hoodie with force of will alone. "Go try it on." Scott said. Cathy sighed, walked into the adjacent bathroom and closed the door.
-		<br><br>"Daddy, why does Cathy have to leave when she changes clothes?" the little girl questioned. Scott continued groping his daughter and thought for a moment before replying. "Sarah, Cathy comes from a very different place and they do things differently there. From her perspective, she is a stranger in an even stranger land" He gave Sarah's breasts a firm squeeze before continuing. "She'll do things that will confuse and irritate you, but I want you keep being patient with her, ok?"
-		<br><br>After a moment, she nodded her head and begrudgingly said, "Ok". Scott smiled at his daughter and kissed the crown of her head before giving her another firm squeeze. "Thank you, sweetheart." Scott grinned and his voice took on a tone that only a parent can manage. "Hey, who's my cuddly moo cow?" Sarah blushed, but said nothing. "Who's my cuddly moo cow?" he asked again, his tone reaching diabetes inducing levels. "I am" she said softly "You are!" he declared before giving her breasts a jiggle and another kiss on her crown.
+		<br><br>"Daddy, why does Cathy have to leave when she changes clothes?" the little girl questioned. Scott continued groping his daughter and thought for a moment before replying. "Sarah, Cathy comes from a very different place and they do things differently there. From her perspective, she is a stranger in an even stranger land." He gave Sarah's breasts a firm squeeze before continuing. "She'll do things that will confuse and irritate you, but I want you keep being patient with her, ok?"
+		<br><br>After a moment, she nodded her head and begrudgingly said, "Ok". Scott smiled at his daughter and kissed the crown of her head before giving her another firm squeeze. "Thank you, sweetheart." Scott grinned and his voice took on a tone that only a parent can manage. "Hey, who's my cuddly moo cow?" Sarah blushed, but said nothing. "Who's my cuddly moo cow?" he asked again, his tone reaching diabetes inducing levels. "I am," she said softly "You are!" he declared before giving her breasts a jiggle and another kiss on her crown.
 		<br><br>A moment past in companionable silence before Scott remembered something. "Hey sweetheart, why didn't Sadie come back with you?" Sarah made a sound of surprise and said, "Oh, mommy got a bit drippy getting into her exo and needed Sadie for licky. Mommy also wants you to pound her boobies after you're done with Cathy."
-		<br><br>"Alright, June will help you take care of your morning milkies while Sadie and I tend to your mother." he said. "But I wanna watch" she pleaded. He shook his head and said, "You need to have your milkies and mommy's going to use the bedroom milker, so you're going to use the one in the kitchen." "I can use my backpack milker" she said quickly. He gave her a look and his voice took on a wry tone. "Weren't you just telling me that your milker is old and we need to get you a new one? I guess you'll have to wait until then." Sarah looked up at her father, unshed tears in her eyes. "Please?" she pleaded. Scott sighed deeply and said, "Alright, go get your milker after we're done here." Sarah gave her father a sunny smile and cheered.
+		<br><br>"Alright, June will help you take care of your morning milkies while Sadie and I tend to your mother," he said. "But I wanna watch!" she pleaded. He shook his head and said, "You need to have your milkies and mommy's going to use the bedroom milker, so you're going to use the one in the kitchen." "I can use my backpack milker" she said quickly. He gave her a look and his voice took on a wry tone. "Weren't you just telling me that your milker is old and we need to get you a new one? I guess you'll have to wait until then." Sarah looked up at her father, unshed tears in her eyes. "Please?" she pleaded. Scott sighed deeply and said, "Alright, go get your milker after we're done here." Sarah gave her father a sunny smile and cheered.
 		<br><br>Scott called out to Cathy, "Come on out and give us a look!" The door to the bathroom opened and Cathy stepped out, tugging at her skirt. The clothing was a simple blouse and skirt affair with a Holstein pattern. In truth, it didn't look like something that would offend old world sensibilities, except for the fact the skirt was so short that her frilly panties were in plain view.
-		<br><br>"Do you have a skirt that's a little longer?" Cathy said and tugged at her skirt again. "It's supposed to look like that." Scott explained. Cathy looked skeptical. "Really?" she asked. Sarah gave Cathy a look that asked if she really was that stupid. "Why would you wear pretty panties and never show anyone?" She asked rhetorically. Cathy started on a hot retort, but was interrupted by Scott. "We'll stop for now and pick this later. You can put your new clothes away." Cathy sighed, picked up her cloths, and walked out the door.
+		<br><br>"Do you have a skirt that's a little longer?" Cathy said and tugged at her skirt again. "It's supposed to look like that." Scott explained. Cathy looked skeptical. "Really?" she asked. Sarah gave Cathy a look that asked if she really was that stupid. "Why would you wear pretty panties and never show anyone?" She asked rhetorically. Cathy started on a hot retort, but was interrupted by Scott. "We'll stop for now and pick this later. You can put your new clothes away." Cathy sighed, picked up her clothes, and walked out the door.
 		<br><br>Scott stood up and set his daughter on her feet. She turned her back to her father, bent over slightly, and wiggled her bottom meaningfully. Scott smacked her right butt cheek and said, "Off you go." Sarah didn't move. "Daddy" she said pleadingly and wiggled her bottom again. He smacked her left butt cheek. She giggled happily and jiggled out the door. Scott smiled at his daughter's antics, shook his head, and made his way to his bedroom.
 	<<elseif $showTwelve == 2>>
 		The random function has brought up another episode of that drama series for you.
@@ -1173,23 +1505,19 @@ The offered price is <<print cashFormat($slaveCost)>>.
 		<<set _nun.hStyle = "buzzcut">>
 		<<set _nun.clothes = "a penitent nuns habit">>
 
-		<span id="artFrame">
-		/* 000-250-006 */
 		<<if $seeImages == 1>>
-		<div class="imageColumn">
-			<div class="imageRef medImg">
-				<<SlaveArt _hostess 2 0>>
-			</div>
-			<div class="imageRef medImg">
-				<<SlaveArt _scientist 2 0>>
-			</div>
-			<div class="imageRef medImg">
-				<<SlaveArt _nun 2 0>>
+			<div class="imageColumn">
+				<div class="imageRef medImg">
+					<<SlaveArt _hostess 2 0>>
+				</div>
+				<div class="imageRef medImg">
+					<<SlaveArt _scientist 2 0>>
+				</div>
+				<div class="imageRef medImg">
+					<<SlaveArt _nun 2 0>>
+				</div>
 			</div>
-		</div>
 		<</if>>
-		/* 000-250-006 */
-		</span>
 		The random function begins playing a Free Cities documentary on the benefits of aphrodisiacs, which is almost halfway over. A montage of out-of-context shots of injectors, suppositories, and bottles of liquid interspersed with very horny, sweaty slaves needily grinding on each other plays before cutting back to the presenter, a gorgeous young woman with long, brown hair in a tight one-piece red dress and matching heels. Her dress, practically a second skin, proudly reveals that she definitely isn't wearing a bra or panties of any kind but still leaves plenty up to the imagination increasing her enticing presence. She's with a handsome man in a lab coat, and they're sitting on a couch in an office with a microphone on a coffee table between them.
 		<br>
 		"I met with one of the leading scientists working on cleaner, higher-purity aphrodisiacs." the woman presenting narrates.
diff --git a/src/pregmod/seHuskSlaveDelivery.tw b/src/pregmod/seHuskSlaveDelivery.tw
index b86b11c70310bd3c11c45906561d31fc1349f620..3e8a54e1455a0ef6b7ee05eb2d80639c7ea49924 100644
--- a/src/pregmod/seHuskSlaveDelivery.tw
+++ b/src/pregmod/seHuskSlaveDelivery.tw
@@ -36,7 +36,7 @@
 <<set $activeSlave.skill.vaginal = 0>>
 <<set $activeSlave.skill.oral = 0>>
 <<set $activeSlave.skill.anal = 0>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.skill.entertainment = 0>>
 <<set $activeSlave.skill.combat = 0>>
 
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 509a1e68651715c6aa7028d7b88ec79b982989f6..410c749cf1b7c1ea700e189a57195b218f16334c 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -3441,6 +3441,20 @@ Done<br>
 	Done<br>
 <</if>>
 
+<<if $releaseID === 1043>>
+	<<run $slaves.forEach(s => { s.skill.whoring = s.skill.whore/2; })>>
+	<<run $tanks.forEach(s => { s.skill.whoring = s.skill.whore/2; })>>
+	<<run $cribs.forEach(s => { s.skill.whoring = s.skill.whore/2; })>>
+	<<run $heroSlaves.forEach(hs => {
+			if (hs.hasOwnProperty("skill") && hs.skill.hasOwnProperty("whore")) {
+				hs.skill.whoring = hs.skill.whore;
+				delete hs.skill.whore;
+			}
+		});
+	>>
+<</if>>
+
+
 <<set $slavesOriginal = []>> /* not used by pregmod */
 
 Updating gene pool records:
@@ -3526,6 +3540,10 @@ Updating gene pool records:
 		<<set _Slave.eyeColor = _Slave.origEye>>
 		<<set _Slave.eyes = -4>>
 	<</if>>
+	
+	<<if ndef _Slave.custom>>
+	    <<set _Slave.custom = {tattoo: _Slave.customTat}>> /* should be the only thing needed */
+	<</if>>
 
 	<<run App.Entity.Utils.GenePoolRecordCleanup(_Slave)>>
 	<<set $genePool[_bci] = _Slave>>
@@ -3685,8 +3703,8 @@ Done!
 	<</for>>
 <</if>>
 
-<<if $releaseID < 1043>>
-	<<set $releaseID = 1043>>
+<<if $releaseID < 1044>>
+	<<set $releaseID = 1044>>
 <</if>>
 
 <<set $HackingSkillMultiplier = HackingSkillMultiplier()>>
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index 7e24501d06ee5f62fe289bd2861ba6f49bdfedfc..36c3e1ae6f7380728a6ba911be00278ad7a832de 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -31,7 +31,7 @@
 <<set $activeSlave.skill.entertainment = 45>>
 <<set $activeSlave.skill.anal = 0>>
 <<set $activeSlave.skill.oral = 0>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.canRecruit = 0>>
 <<set $activeSlave.health = random(30,60)>>
 <<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
@@ -82,7 +82,7 @@
 <<set $activeSlave.faceImplant = 15>>
 <<set $activeSlave.skill.anal = 0>>
 <<set $activeSlave.skill.oral = 0>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.skill.combat = 1>>
 <<set $activeSlave.canRecruit = 0>>
 <<set $activeSlave.health = random(30,60)>>
@@ -134,7 +134,7 @@
 <<set $activeSlave.intelligence = random(15,100)>>
 <<set $activeSlave.intelligenceImplant = 30>>
 <<set $activeSlave.skill.entertainment = 45>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.counter.birthsTotal = 2>>
 <<set $activeSlave.pubertyXX = 1>>
 <<set $activeSlave.pubertyXY = 0>>
@@ -356,7 +356,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
 			<<set $activeSlave.intelligence = random(-50,70)>>
 			<<set $activeSlave.intelligenceImplant = 15>>
 			<<set $activeSlave.skill.entertainment = 25>>
-			<<set $activeSlave.skill.whore = 0>>
+			<<set $activeSlave.skill.whoring = 0>>
 			<<set $activeSlave.health = random(30,60)>>
 			<<set $activeSlave.canRecruit = 0>>
 			<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
@@ -407,7 +407,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
 			<<set $activeSlave.intelligence = random(-50,70)>>
 			<<set $activeSlave.intelligenceImplant = 15>>
 			<<set $activeSlave.skill.entertainment = 25>>
-			<<set $activeSlave.skill.whore = 0>>
+			<<set $activeSlave.skill.whoring = 0>>
 			<<set $activeSlave.health = random(30,60)>>
 			<<set $activeSlave.canRecruit = 0>>
 			<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
@@ -583,7 +583,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
 			<<set $activeSlave.intelligence = random(-50,70)>>
 			<<set $activeSlave.intelligenceImplant = 15>>
 			<<set $activeSlave.skill.entertainment = 25>>
-			<<set $activeSlave.skill.whore = 0>>
+			<<set $activeSlave.skill.whoring = 0>>
 			<<set $activeSlave.health = random(30,60)>>
 			<<set $activeSlave.canRecruit = 0>>
 			<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
@@ -642,7 +642,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
 			<<set $activeSlave.intelligence = random(-50,70)>>
 			<<set $activeSlave.intelligenceImplant = 15>>
 			<<set $activeSlave.skill.entertainment = 25>>
-			<<set $activeSlave.skill.whore = 0>>
+			<<set $activeSlave.skill.whoring = 0>>
 			<<set $activeSlave.health = random(30,60)>>
 			<<set $activeSlave.canRecruit = 0>>
 			<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
@@ -699,7 +699,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
 			<<set $activeSlave.intelligence = random(-50,70)>>
 			<<set $activeSlave.intelligenceImplant = 15>>
 			<<set $activeSlave.skill.entertainment = 25>>
-			<<set $activeSlave.skill.whore = 0>>
+			<<set $activeSlave.skill.whoring = 0>>
 			<<set $activeSlave.health = random(30,60)>>
 			<<set $activeSlave.canRecruit = 0>>
 			<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
@@ -777,7 +777,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
 			<<set $activeSlave.intelligence = random(-50,70)>>
 			<<set $activeSlave.intelligenceImplant = 15>>
 			<<set $activeSlave.skill.entertainment = 25>>
-			<<set $activeSlave.skill.whore = 0>>
+			<<set $activeSlave.skill.whoring = 0>>
 			<<set $activeSlave.health = random(30,60)>>
 			<<set $activeSlave.canRecruit = 0>>
 			<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index 4e4310bb99d59253ed0294da40bda5246d05d976..38a1b8377cac4e289fb59c858abe1d66ae680d08 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -57,15 +57,15 @@
 	<<elseif (_FLsFetish == 2)>>
 		$He's careful that all of the whores under $his supervision are all warmed up and ready to get fucked every morning, and $he @@.lightsalmon;becomes more dominant.@@
 	<</if>>
-	<<if ($Madam.skill.whore <= 10)>>
+	<<if ($Madam.skill.whoring <= 10)>>
 		Though $Madam.slaveName does $his best to manage the brothel, with $his lack of skill $he can do little.
-	<<elseif ($Madam.skill.whore <= 30)>>
+	<<elseif ($Madam.skill.whoring <= 30)>>
 		$Madam.slaveName's basic skills marginally @@.yellowgreen;improve@@ business at $brothelName.
 		<<set $madamCashBonus += 0.05>>
-	<<elseif ($Madam.skill.whore <= 60)>>
+	<<elseif ($Madam.skill.whoring <= 60)>>
 		$Madam.slaveName's skills @@.yellowgreen;improve@@ business at $brothelName.
 		<<set $madamCashBonus += 0.1>>
-	<<elseif ($Madam.skill.whore < 100)>>
+	<<elseif ($Madam.skill.whoring < 100)>>
 		$Madam.slaveName's skills greatly @@.yellowgreen;improve@@ business at $brothelName.
 		<<set $madamCashBonus += 0.15>>
 	<<else>>
@@ -292,7 +292,7 @@
 		<<if ($legendaryWombID == 0) && ($slaves[$i].amp != 1) && ($slaves[$i].preg > $slaves[$i].pregData.normalBirth/1.33) && ($slaves[$i].broodmother == 0) && ($slaves[$i].eggType == "human") && ($slaves[$i].counter.births > 10) && ($slaves[$i].devotion > 50) && ($slaves[$i].prestige == 0)>>
 			<<set $legendaryWombID = $slaves[$i].ID>>
 		<</if>>
-		<<if ($legendaryWhoreID == 0) && ($slaves[$i].skill.whore >= 100) && ($slaves[$i].devotion > 50) && ($slaves[$i].prestige == 0)>>
+		<<if ($legendaryWhoreID == 0) && ($slaves[$i].skill.whoring >= 100) && ($slaves[$i].devotion > 50) && ($slaves[$i].prestige == 0)>>
 			<<set $legendaryWhoreID = $slaves[$i].ID>>
 		<</if>>
 
diff --git a/src/uncategorized/customSlave.tw b/src/uncategorized/customSlave.tw
index 282907037a1444bdb79104034ac5d262e823ee09..a4033e028fd5284a00acd872cb9d2299f81b1610 100644
--- a/src/uncategorized/customSlave.tw
+++ b/src/uncategorized/customSlave.tw
@@ -1031,23 +1031,23 @@ Skin tone: <span id = "skin">
 <br>
 
 <span id = "whoreskills">
-<<if $customSlave.skill.whores <= 10>>Unskilled at prostitution and entertainment.
-<<elseif $customSlave.skill.whores <= 15>>Basic skills at prostitution and entertainment.
+<<if $customSlave.whoreSkills <= 10>>Unskilled at prostitution and entertainment.
+<<elseif $customSlave.whoreSkills <= 15>>Basic skills at prostitution and entertainment.
 <<else>>Skilled at prostitution and entertainment.
 <</if>>
 </span>
 <<link "Unskilled">>
-	<<set $customSlave.skill.whores = 0>>
+	<<set $customSlave.whoreSkills = 0>>
 	<<CustomSlaveWhoreSkills>>
 <</link>>
 |
 <<link "Skilled">>
-	<<set $customSlave.skill.whores = 15>>
+	<<set $customSlave.whoreSkills = 15>>
 	<<CustomSlaveWhoreSkills>>
 <</link>>
 |
 <<link "Expert">>
-	<<set $customSlave.skill.whores = 35>>
+	<<set $customSlave.whoreSkills = 35>>
 	<<CustomSlaveWhoreSkills>>
 <</link>>
 
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index a36a60d4dd8ff449a2e1f778f12e5f8e37d0b031..96dd1e91b78c9542f0d5c06c4bfe138386c949a5 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -755,8 +755,8 @@
 					<<set $slaves[$i].devotion -= 10>>
 				<<elseif ($slaves[$i].trust >= -20)>>
 					<<set $slaves[$i].trust -= 10>>
-				<<elseif ($slaves[$i].skill.whore > 0)>>
-					<<set $slaves[$i].skill.whore -= 10, _skillsLost++>>
+				<<elseif ($slaves[$i].skill.whoring > 0)>>
+					<<set $slaves[$i].skill.whoring -= 10, _skillsLost++>>
 				<<elseif ($slaves[$i].skill.entertainment > 0)>>
 					<<set $slaves[$i].skill.entertainment -= 10, _skillsLost++>>
 				<<elseif ($slaves[$i].intelligence >= -50)>>
@@ -805,8 +805,8 @@
 				<<set $slaves[$i].devotion -= 8>>
 			<<elseif ($slaves[$i].trust >= -20)>>
 				<<set $slaves[$i].trust -= 8>>
-			<<elseif ($slaves[$i].skill.whore >= 20)>>
-				<<set $slaves[$i].skill.whore -= 10, _skillsLost++>>
+			<<elseif ($slaves[$i].skill.whoring >= 20)>>
+				<<set $slaves[$i].skill.whoring -= 10, _skillsLost++>>
 			<<elseif ($slaves[$i].skill.entertainment >= 20)>>
 				<<set $slaves[$i].skill.entertainment -= 10, _skillsLost++>>
 			<<elseif ($slaves[$i].intelligence >= -50)>>
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index 5885ec51d1226e344e63531def6e22bcffc68541..0603596103df07dad3888161c291c6b0adde37da 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -80,7 +80,7 @@ As you step off the elevator, you hear several <<if $seeDicks != 100>>female <</
 	<</if>>
 	<<set $activeSlave.skill.oral = 15>>
 	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whore = 15>>
+	<<set $activeSlave.skill.whoring = 15>>
 	<<set $activeSlave.addict = 2>>
 	<<slaveCost $activeSlave>>
 <<elseif $PStrip == 2>>
@@ -96,7 +96,7 @@ As you step off the elevator, you hear several <<if $seeDicks != 100>>female <</
 	<</if>>
 	<<set $activeSlave.skill.oral = 35>>
 	<<set $activeSlave.skill.anal = 35>>
-	<<set $activeSlave.skill.whore = 35>>
+	<<set $activeSlave.skill.whoring = 35>>
 	<<set $activeSlave.boobs += 600>>
 	<<set $activeSlave.boobsImplant = 600>>
 	<<set $activeSlave.boobsImplantType = 1>>
@@ -268,7 +268,7 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
 	<<set $activeSlave.skill.vaginal = 0>>
 	<<set $activeSlave.skill.oral = 35>>
 	<<set $activeSlave.skill.anal = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 0>>
 	<<set $activeSlave.pubicHStyle = "bushy">>
 	<<set $activeSlave.fetish = "dom">>
@@ -295,7 +295,7 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
 		<<set $activeSlave.skill.vaginal = 0>>
 		<<set $activeSlave.skill.oral = 15>>
 		<<set $activeSlave.skill.anal = 0>>
-		<<set $activeSlave.skill.whore = 0>>
+		<<set $activeSlave.skill.whoring = 0>>
 		<<set $activeSlave.skill.entertainment = 0>>
 		<<set $activeSlave.pubicHStyle = "bushy">>
 		<<set $activeSlave.behavioralFlaw = "devout">>
@@ -324,7 +324,7 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
 	<<set $activeSlave.skill.vaginal = 15>>
 	<<set $activeSlave.skill.oral = 15>>
 	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 15>>
 	<<set $activeSlave.pubicHStyle = "waxed">>
 	<<set $activeSlave.fetish = "dom">>
@@ -350,7 +350,7 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
 		<<set $activeSlave.skill.vaginal = 0>>
 		<<set $activeSlave.skill.oral = 0>>
 		<<set $activeSlave.skill.anal = 15>>
-		<<set $activeSlave.skill.whore = 0>>
+		<<set $activeSlave.skill.whoring = 0>>
 		<<set $activeSlave.skill.entertainment = 0>>
 		<<set $activeSlave.fetish = "buttslut">>
 		<<set $activeSlave.behavioralFlaw = either("anorexic", "arrogant", "bitchy")>>
@@ -430,7 +430,7 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
 	<<set $activeSlave.energy = random(30,80)>>
 	<<set $activeSlave.skill.oral = random(50,100)>>
 	<<set $activeSlave.skill.anal = random(50,100)>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = random(15,40)>>
 	<<set $activeSlave.pubicHStyle = "waxed">>
 	<<set $activeSlave.fetish = either("submissive", "cumslut", "buttslut")>>
@@ -455,7 +455,7 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
 		<<set $activeSlave.energy = random(30,70)>>
 		<<set $activeSlave.skill.oral = random(15,40)>>
 		<<set $activeSlave.skill.anal = random(15,40)>>
-		<<set $activeSlave.skill.whore = 0>>
+		<<set $activeSlave.skill.whoring = 0>>
 		<<set $activeSlave.skill.entertainment = 0>>
 		<<set $activeSlave.fetish = "buttslut">>
 		<<set $activeSlave.behavioralFlaw = either("anorexic", "bitchy", "devout", "odd")>>
@@ -709,7 +709,7 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
 		<<set $activeSlave.skill.vaginal = 15>>
 		<<set $activeSlave.skill.oral = 15>>
 		<<set $activeSlave.skill.anal = 0>>
-		<<set $activeSlave.skill.whore = 0>>
+		<<set $activeSlave.skill.whoring = 0>>
 		<<set $activeSlave.skill.entertainment = 15>>
 		<<set $activeSlave.behavioralFlaw = either("anorexic", "arrogant", "bitchy", "liberated")>>
 		<<set $activeSlave.sexualFlaw = either("apathetic", "hates anal", "hates oral", "idealistic", "shamefast")>>
@@ -1136,7 +1136,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
 	<<set $activeSlave.skill.vaginal = 15>>
 	<<set $activeSlave.skill.oral = 15>>
 	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 0>>
 	<<set $activeSlave.counter.vaginal += 1>>
 	<<set $vaginalTotal += 1>>
@@ -1182,7 +1182,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
 	<<set $activeSlave.origin = "You won her at a shotgun match against other arcology owners.">>
 	<<set $activeSlave.lips = random(5,25)>>
 	<<set $activeSlave.anus = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 0>>
 	<<set $activeSlave.counter.vaginal += 1>>
 	<<set $vaginalTotal += 1>>
@@ -1242,7 +1242,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
 	<<set $activeSlave.vagina = 1>>
 	<<set $activeSlave.skill.vaginal = 15>>
 	<<set $activeSlave.skill.oral = 15>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 0>>
 	<<set $activeSlave.counter.vaginal += 1>>
 	<<set $vaginalTotal += 1>>
@@ -1291,7 +1291,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
 	<<set $activeSlave.origin = "You won her at a shotgun match against other arcology owners.">>
 	<<set $activeSlave.skill.vaginal = 15>>
 	<<set $activeSlave.skill.oral = 15>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 0>>
 	<<set $activeSlave.counter.anal += 1>>
 	<<set $analTotal += 1>>
diff --git a/src/uncategorized/jeSlaveDispute.tw b/src/uncategorized/jeSlaveDispute.tw
index 9710c23bf7c68a2b81af9a9ac197ade57e46095e..9ad59683dd50ecef950fab5ad93eecf13682ffb2 100644
--- a/src/uncategorized/jeSlaveDispute.tw
+++ b/src/uncategorized/jeSlaveDispute.tw
@@ -37,7 +37,7 @@
 	<<set $activeSlave.vagina = 3>>
 	<<set $activeSlave.skill.anal = 0>>
 	<<set $activeSlave.skill.oral = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.vaginal = 0>>
 	<<set $activeSlave.skill.entertainment = 0>>
 	<<set $activeSlave.bellySag = 10>>
@@ -61,7 +61,7 @@
 	<<set $activeSlave.anus = 2>>
 	<<set $activeSlave.skill.anal = 35>>
 	<<set $activeSlave.skill.oral = 35>>
-	<<set $activeSlave.skill.whore = 35>>
+	<<set $activeSlave.skill.whoring = 35>>
 	<<set $activeSlave.skill.entertainment = 35>>
 	<<set $activeSlave.nipplesPiercing = 1>>
 	<<set $activeSlave.clitPiercing = 1>>
@@ -104,7 +104,7 @@
 	<<set $activeSlave.anus = 0>>
 	<<set $activeSlave.skill.anal = 0>>
 	<<set $activeSlave.skill.oral = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.vaginal = 0>>
 	<<set $activeSlave.skill.entertainment = 0>>
 <<case "indenture deal">>
@@ -121,7 +121,7 @@
 	<<set $activeSlave.skill.vaginal = 15>>
 	<<set $activeSlave.skill.oral = 15>>
 	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 15>>
 	<<set $activeSlave.boobs += 600>>
 	<<set $activeSlave.boobsImplant = 600>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index cf20b6163bdc13e7f55f9d5c2630fb0446b051cf..b5b3711602f30708a69baf4c8bf22487b4842b92 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -1624,7 +1624,7 @@ is
 	<</if>>
 	Entertainment and prostitution skills are irrelevant for a Fuckdoll.
 <<else>>
-	<<if $activeSlave.skill.whore <= 10>>
+	<<if $activeSlave.skill.whoring <= 10>>
 		<<if $activeSlave.skill.entertainment <= 10>>
 		<<elseif $activeSlave.skill.entertainment <= 30>>
 			$He is @@.aquamarine;reasonably entertaining.@@
@@ -1647,12 +1647,12 @@ is
 			$He is a @@.aquamarine;master of entertainment@@ and
 		<</if>>
 	<</if>>
-	<<if $activeSlave.skill.whore <= 10>>
-	<<elseif $activeSlave.skill.whore <= 30>>
+	<<if $activeSlave.skill.whoring <= 10>>
+	<<elseif $activeSlave.skill.whoring <= 30>>
 		<<if $activeSlave.skill.entertainment <= 10>>$He <</if>>has @@.aquamarine;basic experience as a prostitute.@@
-	<<elseif $activeSlave.skill.whore <= 60>>
+	<<elseif $activeSlave.skill.whoring <= 60>>
 		<<if $activeSlave.skill.entertainment <= 10>>$He is <</if>>a @@.aquamarine;skilled streetwalker.@@
-	<<elseif $activeSlave.skill.whore < 100>>
+	<<elseif $activeSlave.skill.whoring < 100>>
 		<<if $activeSlave.skill.entertainment <= 10>>$He is <</if>>an @@.aquamarine;expert working $girl.@@
 	<<else>>
 		<<if $activeSlave.skill.entertainment <= 10>>$He is <</if>>a @@.aquamarine;masterful whore.@@
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index f8c38728ca088f148b358f9ce8b8cc18234979db..e4a0522e79578636d9b36f5c8dffc3ab044aa513 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -172,7 +172,7 @@
 				<<set $slaves[$i].devotion++>>
 			<</if>>
 			<<set $beauty = Beauty($Concubine)>>
-			<<run repX($beauty * 5 + ($Concubine.skill.vaginal || 0) + $Concubine.skill.anal + $Concubine.skill.oral + $Concubine.skill.whore + $Concubine.skill.entertainment, "concubine", $Concubine)>>
+			<<run repX($beauty * 5 + ($Concubine.skill.vaginal || 0) + $Concubine.skill.anal + $Concubine.skill.oral + $Concubine.skill.whoring + $Concubine.skill.entertainment, "concubine", $Concubine)>>
 		<<else>> /* not Concubine */
 			''__@@.pink;<<= SlaveFullName($slaves[$i])>>@@__''
 			<<if $slaves[$i].choosesOwnAssignment == 2>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 165f9b6a7759de2bee6397997efd1c8e555df909..48b09ffb105bc480f6739dbdb7ecdb9a76b1bc14 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -889,7 +889,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;
 	<<link "Use $his big sister as an example">>
 		<<replace "#introResult">>
-			Your new slave appears <<if $activeSlave.devotion < -10>>reluctant to assume $his new duties.<<else>>unsure what $his new duties are.<</if>> You gesture towards $eventSlave.slaveName. $He is <<if $eventSlave.intelligence+$eventSlave.intelligenceImplant > 15>>bright enough<<elseif (($eventSlave.skill.vaginal + $eventSlave.skill.anal + $eventSlave.skill.oral) > 100)>>skilled enough<<else>>obedient enough<</if>> to understand you mean a demonstration is in order. $eventSlave.slaveName starts things off with a <<if $eventSlave.skill.entertainment >= 100>>masterful<<elseif $eventSlave.skill.entertainment > 10>>skillful<<else>>passable<</if>> striptease, culminating in $him <<if ($eventSlave.anus > 0) && ($eventSlave.fetish != "cumslut")>>bending over<<else>>kneeling<</if>> in front of you. $He eagerly moans as you enter $him, begging for your seed<<if $eventSlave.energy > 95>> like the slut $he is<<elseif $eventSlave.skill.whore > 30>> like the whore $he is<<elseif ($eventSlave.assignment == "serve in the master suite") || ($eventSlave.assignment == "please you")>> like the fucktoy $he is<</if>>. As you finish, $he <<if $eventSlave.fetish == "cumslut">>opens $his mouth and savors your gift, thanking you once $he's swallowed enough to be able to talk again.<<elseif ($eventSlave.fetish == "buttslut") || ($eventSlave.fetish == "submissive")>>collapses on the floor with $his ass high in the air, thanking you for painting $his hole white.<<else>>thanks you.<</if>> Witnessing this display of servitude from $his big sister @@.hotpink;eases $activeSlave.slaveName into $his new life,@@ and @@.mediumaquamarine;gives $him hope@@ $he can find a place here.
+			Your new slave appears <<if $activeSlave.devotion < -10>>reluctant to assume $his new duties.<<else>>unsure what $his new duties are.<</if>> You gesture towards $eventSlave.slaveName. $He is <<if $eventSlave.intelligence+$eventSlave.intelligenceImplant > 15>>bright enough<<elseif (($eventSlave.skill.vaginal + $eventSlave.skill.anal + $eventSlave.skill.oral) > 100)>>skilled enough<<else>>obedient enough<</if>> to understand you mean a demonstration is in order. $eventSlave.slaveName starts things off with a <<if $eventSlave.skill.entertainment >= 100>>masterful<<elseif $eventSlave.skill.entertainment > 10>>skillful<<else>>passable<</if>> striptease, culminating in $him <<if ($eventSlave.anus > 0) && ($eventSlave.fetish != "cumslut")>>bending over<<else>>kneeling<</if>> in front of you. $He eagerly moans as you enter $him, begging for your seed<<if $eventSlave.energy > 95>> like the slut $he is<<elseif $eventSlave.skill.whoring > 30>> like the whore $he is<<elseif ($eventSlave.assignment == "serve in the master suite") || ($eventSlave.assignment == "please you")>> like the fucktoy $he is<</if>>. As you finish, $he <<if $eventSlave.fetish == "cumslut">>opens $his mouth and savors your gift, thanking you once $he's swallowed enough to be able to talk again.<<elseif ($eventSlave.fetish == "buttslut") || ($eventSlave.fetish == "submissive")>>collapses on the floor with $his ass high in the air, thanking you for painting $his hole white.<<else>>thanks you.<</if>> Witnessing this display of servitude from $his big sister @@.hotpink;eases $activeSlave.slaveName into $his new life,@@ and @@.mediumaquamarine;gives $him hope@@ $he can find a place here.
 		<</replace>>
 		<<set $activeSlave.devotion += 4>>
 		<<set $activeSlave.trust += 4>>
@@ -901,7 +901,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;
 	<<link "Use $his little sister as an example">>
 		<<replace "#introResult">>
-			Your new slave appears <<if $activeSlave.devotion < -10>>reluctant to assume $his new duties.<<else>>unsure what $his new duties are.<</if>> You gesture towards $eventSlave.slaveName. $He is <<if $eventSlave.intelligence+$eventSlave.intelligenceImplant > 15>>bright enough<<elseif (($eventSlave.skill.vaginal + $eventSlave.skill.anal + $eventSlave.skill.oral) > 100)>>skilled enough<<else>>obedient enough<</if>> to understand you mean a demonstration is in order. $eventSlave.slaveName starts things off with a <<if $eventSlave.skill.entertainment >= 100>>masterful<<elseif $eventSlave.skill.entertainment > 10>>skillful<<else>>passable<</if>> striptease, culminating in $him <<if ($eventSlave.anus > 0) && ($eventSlave.fetish != "cumslut")>>bending over<<else>>kneeling<</if>> in front of you. $He eagerly moans as you enter $him, begging for your seed<<if $eventSlave.energy > 95>> like the slut $he is<<elseif $eventSlave.skill.whore > 30>> like the whore $he is<<elseif ($eventSlave.assignment == "serve in the master suite") || ($eventSlave.assignment == "please you")>> like the fucktoy $he is<</if>>. As you finish, $he <<if $eventSlave.fetish == "cumslut">>opens $his mouth and savors your gift, thanking you once $he's swallowed enough to be able to talk again.<<elseif ($eventSlave.fetish == "buttslut") || ($eventSlave.fetish == "submissive")>>collapses on the floor with $his ass high in the air, thanking you for painting $his hole white.<<else>>thanks you.<</if>> Witnessing this display of servitude from $his little sister @@.hotpink;eases $activeSlave.slaveName into $his new life,@@ and @@.mediumaquamarine;gives $him hope@@ $he can find a place here.
+			Your new slave appears <<if $activeSlave.devotion < -10>>reluctant to assume $his new duties.<<else>>unsure what $his new duties are.<</if>> You gesture towards $eventSlave.slaveName. $He is <<if $eventSlave.intelligence+$eventSlave.intelligenceImplant > 15>>bright enough<<elseif (($eventSlave.skill.vaginal + $eventSlave.skill.anal + $eventSlave.skill.oral) > 100)>>skilled enough<<else>>obedient enough<</if>> to understand you mean a demonstration is in order. $eventSlave.slaveName starts things off with a <<if $eventSlave.skill.entertainment >= 100>>masterful<<elseif $eventSlave.skill.entertainment > 10>>skillful<<else>>passable<</if>> striptease, culminating in $him <<if ($eventSlave.anus > 0) && ($eventSlave.fetish != "cumslut")>>bending over<<else>>kneeling<</if>> in front of you. $He eagerly moans as you enter $him, begging for your seed<<if $eventSlave.energy > 95>> like the slut $he is<<elseif $eventSlave.skill.whoring > 30>> like the whore $he is<<elseif ($eventSlave.assignment == "serve in the master suite") || ($eventSlave.assignment == "please you")>> like the fucktoy $he is<</if>>. As you finish, $he <<if $eventSlave.fetish == "cumslut">>opens $his mouth and savors your gift, thanking you once $he's swallowed enough to be able to talk again.<<elseif ($eventSlave.fetish == "buttslut") || ($eventSlave.fetish == "submissive")>>collapses on the floor with $his ass high in the air, thanking you for painting $his hole white.<<else>>thanks you.<</if>> Witnessing this display of servitude from $his little sister @@.hotpink;eases $activeSlave.slaveName into $his new life,@@ and @@.mediumaquamarine;gives $him hope@@ $he can find a place here.
 		<</replace>>
 		<<set $activeSlave.devotion += 4>>
 		<<set $activeSlave.trust += 4>>
@@ -913,7 +913,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;
 	<<link "Use $his sister as an example">>
 		<<replace "#introResult">>
-			Your new slave appears <<if $activeSlave.devotion < -10>>reluctant to assume $his new duties.<<else>>unsure what $his new duties are.<</if>> You gesture towards $eventSlave.slaveName. $He is <<if $eventSlave.intelligence+$eventSlave.intelligenceImplant > 15>>bright enough<<elseif (($eventSlave.skill.vaginal + $eventSlave.skill.anal + $eventSlave.skill.oral) > 100)>>skilled enough<<else>>obedient enough<</if>> to understand you mean a demonstration is in order. $eventSlave.slaveName starts things off with a <<if $eventSlave.skill.entertainment >= 100>>masterful<<elseif $eventSlave.skill.entertainment > 10>>skillful<<else>>passable<</if>> striptease, culminating in $him <<if ($eventSlave.anus > 0) && ($eventSlave.fetish != "cumslut")>>bending over<<else>>kneeling<</if>> in front of you. $He eagerly moans as you enter $him, begging for your seed<<if $eventSlave.energy > 95>> like the slut $he is<<elseif $eventSlave.skill.whore > 30>> like the whore $he is<<elseif ($eventSlave.assignment == "serve in the master suite") || ($eventSlave.assignment == "please you")>> like the fucktoy $he is<</if>>. As you finish, $he <<if $eventSlave.fetish == "cumslut">>opens $his mouth and savors your gift, thanking you once $he's swallowed enough to be able to talk again.<<elseif ($eventSlave.fetish == "buttslut") || ($eventSlave.fetish == "submissive")>>collapses on the floor with $his ass high in the air, thanking you for painting $his hole white.<<else>>thanks you.<</if>> Witnessing this display of servitude from $his twin sister @@.hotpink;eases $activeSlave.slaveName into $his new life,@@ and @@.mediumaquamarine;gives $him hope@@ $he can find a place here.
+			Your new slave appears <<if $activeSlave.devotion < -10>>reluctant to assume $his new duties.<<else>>unsure what $his new duties are.<</if>> You gesture towards $eventSlave.slaveName. $He is <<if $eventSlave.intelligence+$eventSlave.intelligenceImplant > 15>>bright enough<<elseif (($eventSlave.skill.vaginal + $eventSlave.skill.anal + $eventSlave.skill.oral) > 100)>>skilled enough<<else>>obedient enough<</if>> to understand you mean a demonstration is in order. $eventSlave.slaveName starts things off with a <<if $eventSlave.skill.entertainment >= 100>>masterful<<elseif $eventSlave.skill.entertainment > 10>>skillful<<else>>passable<</if>> striptease, culminating in $him <<if ($eventSlave.anus > 0) && ($eventSlave.fetish != "cumslut")>>bending over<<else>>kneeling<</if>> in front of you. $He eagerly moans as you enter $him, begging for your seed<<if $eventSlave.energy > 95>> like the slut $he is<<elseif $eventSlave.skill.whoring > 30>> like the whore $he is<<elseif ($eventSlave.assignment == "serve in the master suite") || ($eventSlave.assignment == "please you")>> like the fucktoy $he is<</if>>. As you finish, $he <<if $eventSlave.fetish == "cumslut">>opens $his mouth and savors your gift, thanking you once $he's swallowed enough to be able to talk again.<<elseif ($eventSlave.fetish == "buttslut") || ($eventSlave.fetish == "submissive")>>collapses on the floor with $his ass high in the air, thanking you for painting $his hole white.<<else>>thanks you.<</if>> Witnessing this display of servitude from $his twin sister @@.hotpink;eases $activeSlave.slaveName into $his new life,@@ and @@.mediumaquamarine;gives $him hope@@ $he can find a place here.
 		<</replace>>
 		<<set $activeSlave.devotion += 4>>
 		<<set $activeSlave.trust += 4>>
@@ -925,7 +925,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;
 	<<link "Use $his mother as an example">>
 		<<replace "#introResult">>
-			You gesture towards $eventSlave.slaveName. $He is <<if $eventSlave.intelligence+$eventSlave.intelligenceImplant > 15>>bright enough<<elseif (($eventSlave.skill.vaginal + $eventSlave.skill.anal + $eventSlave.skill.oral) > 100)>>skilled enough<<else>>obedient enough<</if>> to understand you mean a demonstration is in order. $eventSlave.slaveName starts things off with a <<if $eventSlave.skill.entertainment >= 100>>masterful<<elseif $eventSlave.skill.entertainment > 10>>skillful<<else>>passable<</if>> striptease, culminating in $him <<if ($eventSlave.anus > 0) && ($eventSlave.fetish != "cumslut")>>bending over<<else>>kneeling<</if>> in front of you. $He eagerly moans as you enter $him, begging for your seed<<if $eventSlave.energy > 95>> like the slut $he is<<elseif $eventSlave.skill.whore > 30>> like the whore $he is<<elseif ($eventSlave.assignment == "serve in the master suite") || ($eventSlave.assignment == "please you")>> like the fucktoy $he is<</if>>. As you finish, $he <<if $eventSlave.fetish == "cumslut">>opens $his mouth and savors your gift, thanking you once $he's swallowed enough to be able to talk again.<<elseif ($eventSlave.fetish == "buttslut") || ($eventSlave.fetish == "submissive")>>collapses on the floor with $his ass high in the air, thanking you for painting $his hole white.<<else>>thanks you.<</if>> Witnessing this display of servitude from $his mother @@.hotpink;eases $activeSlave.slaveName into $his new life,@@ and @@.mediumaquamarine;gives $him hope@@ $he can find a place here.
+			You gesture towards $eventSlave.slaveName. $He is <<if $eventSlave.intelligence+$eventSlave.intelligenceImplant > 15>>bright enough<<elseif (($eventSlave.skill.vaginal + $eventSlave.skill.anal + $eventSlave.skill.oral) > 100)>>skilled enough<<else>>obedient enough<</if>> to understand you mean a demonstration is in order. $eventSlave.slaveName starts things off with a <<if $eventSlave.skill.entertainment >= 100>>masterful<<elseif $eventSlave.skill.entertainment > 10>>skillful<<else>>passable<</if>> striptease, culminating in $him <<if ($eventSlave.anus > 0) && ($eventSlave.fetish != "cumslut")>>bending over<<else>>kneeling<</if>> in front of you. $He eagerly moans as you enter $him, begging for your seed<<if $eventSlave.energy > 95>> like the slut $he is<<elseif $eventSlave.skill.whoring > 30>> like the whore $he is<<elseif ($eventSlave.assignment == "serve in the master suite") || ($eventSlave.assignment == "please you")>> like the fucktoy $he is<</if>>. As you finish, $he <<if $eventSlave.fetish == "cumslut">>opens $his mouth and savors your gift, thanking you once $he's swallowed enough to be able to talk again.<<elseif ($eventSlave.fetish == "buttslut") || ($eventSlave.fetish == "submissive")>>collapses on the floor with $his ass high in the air, thanking you for painting $his hole white.<<else>>thanks you.<</if>> Witnessing this display of servitude from $his mother @@.hotpink;eases $activeSlave.slaveName into $his new life,@@ and @@.mediumaquamarine;gives $him hope@@ $he can find a place here.
 		<</replace>>
 		<<set $activeSlave.devotion += 4>>
 		<<set $activeSlave.trust += 4>>
@@ -937,7 +937,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;
 	<<link "Use $his parent as an example">>
 		<<replace "#introResult">>
-			You gesture towards $eventSlave.slaveName. $He is <<if $eventSlave.intelligence+$eventSlave.intelligenceImplant > 15>>bright enough<<elseif (($eventSlave.skill.vaginal + $eventSlave.skill.anal + $eventSlave.skill.oral) > 100)>>skilled enough<<else>>obedient enough<</if>> to understand you mean a demonstration is in order. $eventSlave.slaveName starts things off with a <<if $eventSlave.skill.entertainment >= 100>>masterful<<elseif $eventSlave.skill.entertainment > 10>>skillful<<else>>passable<</if>> striptease, culminating in $him <<if ($eventSlave.anus > 0) && ($eventSlave.fetish != "cumslut")>>bending over<<else>>kneeling<</if>> in front of you. $He eagerly moans as you enter $him, begging for your seed<<if $eventSlave.energy > 95>> like the slut $he is<<elseif $eventSlave.skill.whore > 30>> like the whore $he is<<elseif ($eventSlave.assignment == "serve in the master suite") || ($eventSlave.assignment == "please you")>> like the fucktoy $he is<</if>>. As you finish, $he <<if $eventSlave.fetish == "cumslut">>opens $his mouth and savors your gift, thanking you once $he's swallowed enough to be able to talk again.<<elseif ($eventSlave.fetish == "buttslut") || ($eventSlave.fetish == "submissive")>>collapses on the floor with $his ass high in the air, thanking you for painting $his hole white.<<else>>thanks you.<</if>> Witnessing this display of servitude from $his <<if $activeSlave.mother == $eventSlave.ID>>mother<<else>>father<</if>> @@.hotpink;eases $activeSlave.slaveName into $his new life,@@ and @@.mediumaquamarine;gives $him hope@@ $he can find a place here.
+			You gesture towards $eventSlave.slaveName. $He is <<if $eventSlave.intelligence+$eventSlave.intelligenceImplant > 15>>bright enough<<elseif (($eventSlave.skill.vaginal + $eventSlave.skill.anal + $eventSlave.skill.oral) > 100)>>skilled enough<<else>>obedient enough<</if>> to understand you mean a demonstration is in order. $eventSlave.slaveName starts things off with a <<if $eventSlave.skill.entertainment >= 100>>masterful<<elseif $eventSlave.skill.entertainment > 10>>skillful<<else>>passable<</if>> striptease, culminating in $him <<if ($eventSlave.anus > 0) && ($eventSlave.fetish != "cumslut")>>bending over<<else>>kneeling<</if>> in front of you. $He eagerly moans as you enter $him, begging for your seed<<if $eventSlave.energy > 95>> like the slut $he is<<elseif $eventSlave.skill.whoring > 30>> like the whore $he is<<elseif ($eventSlave.assignment == "serve in the master suite") || ($eventSlave.assignment == "please you")>> like the fucktoy $he is<</if>>. As you finish, $he <<if $eventSlave.fetish == "cumslut">>opens $his mouth and savors your gift, thanking you once $he's swallowed enough to be able to talk again.<<elseif ($eventSlave.fetish == "buttslut") || ($eventSlave.fetish == "submissive")>>collapses on the floor with $his ass high in the air, thanking you for painting $his hole white.<<else>>thanks you.<</if>> Witnessing this display of servitude from $his <<if $activeSlave.mother == $eventSlave.ID>>mother<<else>>father<</if>> @@.hotpink;eases $activeSlave.slaveName into $his new life,@@ and @@.mediumaquamarine;gives $him hope@@ $he can find a place here.
 		<</replace>>
 		<<set $activeSlave.devotion += 4>>
 		<<set $activeSlave.trust += 4>>
@@ -949,7 +949,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;
 	<<link "Use $his daughter as an example">>
 		<<replace "#introResult">>
-			You gesture towards $eventSlave.slaveName. $He is <<if $eventSlave.intelligence+$eventSlave.intelligenceImplant > 15>>bright enough<<elseif (($eventSlave.skill.vaginal + $eventSlave.skill.anal + $eventSlave.skill.oral) > 100)>>skilled enough<<else>>obedient enough<</if>> to understand you mean a demonstration is in order. $eventSlave.slaveName starts things off with a <<if $eventSlave.skill.entertainment >= 100>>masterful<<elseif $eventSlave.skill.entertainment > 10>>skillful<<else>>passable<</if>> striptease, culminating in $him <<if ($eventSlave.anus > 0) && ($eventSlave.fetish != "cumslut")>>bending over<<else>>kneeling<</if>> in front of you. $He eagerly moans as you enter $him, begging for your seed<<if $eventSlave.energy > 95>> like the slut $he is<<elseif $eventSlave.skill.whore > 30>> like the whore $he is<<elseif ($eventSlave.assignment == "serve in the master suite") || ($eventSlave.assignment == "please you")>> like the fucktoy $he is<</if>>. As you finish, $he <<if $eventSlave.fetish == "cumslut">>opens $his mouth and savors your gift, thanking you once $he's swallowed enough to be able to talk again.<<elseif ($eventSlave.fetish == "buttslut") || ($eventSlave.fetish == "submissive")>>collapses on the floor with $his ass high in the air, thanking you for painting $his hole white.<<else>>thanks you.<</if>> Witnessing this display of servitude from $his <<if $eventSlave.genes == "XX">>daughter<<else>>son<</if>> @@.hotpink;eases $activeSlave.slaveName into $his new life,@@ and @@.mediumaquamarine;gives $him hope@@ $he can find a place here.
+			You gesture towards $eventSlave.slaveName. $He is <<if $eventSlave.intelligence+$eventSlave.intelligenceImplant > 15>>bright enough<<elseif (($eventSlave.skill.vaginal + $eventSlave.skill.anal + $eventSlave.skill.oral) > 100)>>skilled enough<<else>>obedient enough<</if>> to understand you mean a demonstration is in order. $eventSlave.slaveName starts things off with a <<if $eventSlave.skill.entertainment >= 100>>masterful<<elseif $eventSlave.skill.entertainment > 10>>skillful<<else>>passable<</if>> striptease, culminating in $him <<if ($eventSlave.anus > 0) && ($eventSlave.fetish != "cumslut")>>bending over<<else>>kneeling<</if>> in front of you. $He eagerly moans as you enter $him, begging for your seed<<if $eventSlave.energy > 95>> like the slut $he is<<elseif $eventSlave.skill.whoring > 30>> like the whore $he is<<elseif ($eventSlave.assignment == "serve in the master suite") || ($eventSlave.assignment == "please you")>> like the fucktoy $he is<</if>>. As you finish, $he <<if $eventSlave.fetish == "cumslut">>opens $his mouth and savors your gift, thanking you once $he's swallowed enough to be able to talk again.<<elseif ($eventSlave.fetish == "buttslut") || ($eventSlave.fetish == "submissive")>>collapses on the floor with $his ass high in the air, thanking you for painting $his hole white.<<else>>thanks you.<</if>> Witnessing this display of servitude from $his <<if $eventSlave.genes == "XX">>daughter<<else>>son<</if>> @@.hotpink;eases $activeSlave.slaveName into $his new life,@@ and @@.mediumaquamarine;gives $him hope@@ $he can find a place here.
 		<</replace>>
 		<<set $activeSlave.devotion += 4>>
 		<<set $activeSlave.trust += 4>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index 9a8ce2a9c3ba77ea11eb952e27b37903c58baac8..f9cce74eb5fbd051de2a68ac6be2f108bc854cfd 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -192,7 +192,7 @@
 	<<set $slaves[_i].skill.oral = Math.clamp($slaves[_i].skill.oral.toFixed(1), 0, 100)>>
 	<<set $slaves[_i].skill.vaginal = Math.clamp($slaves[_i].skill.vaginal.toFixed(1), 0, 100)>>
 	<<set $slaves[_i].skill.anal = Math.clamp($slaves[_i].skill.anal.toFixed(1), 0, 100)>>
-	<<set $slaves[_i].skill.whore = Math.clamp($slaves[_i].skill.whore.toFixed(1), 0, 100)>>
+	<<set $slaves[_i].skill.whoring = Math.clamp($slaves[_i].skill.whoring.toFixed(1), 0, 100)>>
 	<<set $slaves[_i].skill.entertainment = Math.clamp($slaves[_i].skill.entertainment.toFixed(1), 0, 100)>>
 	<<set $slaves[_i].lactationAdaptation = Math.clamp($slaves[_i].lactationAdaptation.toFixed(1), 0, 100)>>
 	<<set $slaves[_i].intelligenceImplant = Number($slaves[_i].intelligenceImplant.toFixed(1), 0, 30)>>
diff --git a/src/uncategorized/pRivalryCapture.tw b/src/uncategorized/pRivalryCapture.tw
index 77d16ad4a5efc5dd04e119afa5a13d1c2b51be10..2ad6402d52c62c876b13bc1dbb030b8b14a2bb0d 100644
--- a/src/uncategorized/pRivalryCapture.tw
+++ b/src/uncategorized/pRivalryCapture.tw
@@ -46,7 +46,7 @@
 	<<set $activeSlave.weight = 20>>
 	<<set $activeSlave.skill.oral = 100>>
 	<<set $activeSlave.skill.anal = 100>>
-	<<set $activeSlave.skill.whore = 15>>
+	<<set $activeSlave.skill.whoring = 15>>
 	<<set $activeSlave.skill.entertainment = 100>>
 	<<set $activeSlave.skill.combat = 0>>
 	<<set $activeSlave.clitPiercing = 2>>
@@ -83,7 +83,7 @@
 	<<set $activeSlave.weight = -35>>
 	<<set $activeSlave.skill.oral = 0>>
 	<<set $activeSlave.skill.anal = 100>>
-	<<set $activeSlave.skill.whore = 15>>
+	<<set $activeSlave.skill.whoring = 15>>
 	<<set $activeSlave.skill.entertainment = 100>>
 	<<set $activeSlave.skill.combat = 0>>
 	<<set $activeSlave.dickPiercing = 2>>
@@ -116,7 +116,7 @@
 	<<set $activeSlave.weight = -35>>
 	<<set $activeSlave.skill.oral = 0>>
 	<<set $activeSlave.skill.anal = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 100>>
 	<<set $activeSlave.skill.combat = 0>>
 	<<set $activeSlave.dickPiercing = 2>>
@@ -150,7 +150,7 @@
 	<<set $activeSlave.skill.vaginal = 0>>
 	<<set $activeSlave.skill.oral = 15>>
 	<<set $activeSlave.skill.anal = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 15>>
 	<<set $activeSlave.skill.combat = 1>>
 	<<set $activeSlave.behavioralFlaw = "hates men">>
@@ -181,7 +181,7 @@
 	<<set $activeSlave.skill.vaginal = 0>>
 	<<set $activeSlave.skill.oral = 15>>
 	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 15>>
 	<<set $activeSlave.skill.combat = 0>>
 	<<set $activeSlave.behavioralFlaw = "hates men">>
@@ -215,7 +215,7 @@
 	<<set $activeSlave.skill.vaginal = 15>>
 	<<set $activeSlave.skill.oral = 0>>
 	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 0>>
 	<<set $activeSlave.skill.combat = 1>>
 	<<set $activeSlave.clitPiercing = 1>>
@@ -269,7 +269,7 @@
 	<<set $activeSlave.skill.vaginal = 100>>
 	<<set $activeSlave.skill.oral = 15>>
 	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whore = 35>>
+	<<set $activeSlave.skill.whoring = 35>>
 	<<set $activeSlave.skill.entertainment = 15>>
 	<<set $activeSlave.skill.combat = 0>>
 	<<set $activeSlave.fetish = "pregnancy">>
@@ -303,7 +303,7 @@
 	<<set $activeSlave.skill.vaginal = 0>>
 	<<set $activeSlave.skill.oral = 0>>
 	<<set $activeSlave.skill.anal = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 15>>
 	<<set $activeSlave.skill.combat = 0>>
 	<<set $activeSlave.behavioralFlaw = "odd">>
@@ -336,7 +336,7 @@
 	<<set $activeSlave.skill.vaginal = 15>>
 	<<set $activeSlave.skill.oral = 15>>
 	<<set $activeSlave.skill.anal = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 15>>
 	<<set $activeSlave.skill.combat = 0>>
 	<<set $activeSlave.behavioralFlaw = "odd">>
@@ -368,7 +368,7 @@
 	<<set $activeSlave.skill.vaginal = 100>>
 	<<set $activeSlave.skill.oral = 100>>
 	<<set $activeSlave.skill.anal = 35>>
-	<<set $activeSlave.skill.whore = 35>>
+	<<set $activeSlave.skill.whoring = 35>>
 	<<set $activeSlave.skill.entertainment = 35>>
 	<<set $activeSlave.skill.combat = 0>>
 	<<set $activeSlave.clitPiercing = 1>>
@@ -401,7 +401,7 @@
 	<<set $activeSlave.skill.vaginal = 100>>
 	<<set $activeSlave.skill.oral = 100>>
 	<<set $activeSlave.skill.anal = 100>>
-	<<set $activeSlave.skill.whore = 100>>
+	<<set $activeSlave.skill.whoring = 100>>
 	<<set $activeSlave.skill.entertainment = 0>>
 	<<set $activeSlave.skill.combat = 0>>
 	<<set $activeSlave.clitPiercing = 1>>
diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw
index c25cd57e3d222105f39a715af3460c9536a6d099..1f670163c7c2dbcf7279455e2ffa582c424f22a9 100644
--- a/src/uncategorized/pRivalryHostage.tw
+++ b/src/uncategorized/pRivalryHostage.tw
@@ -70,7 +70,7 @@
 	<<set $activeSlave.skill.entertainment = 100>>
 	<<set $activeSlave.skill.anal = 100>>
 	<<set $activeSlave.skill.vaginal = 100>>
-	<<set $activeSlave.skill.whore = 100>>
+	<<set $activeSlave.skill.whoring = 100>>
 	<<set $activeSlave.counter.oral = 453>>
 	<<set $activeSlave.counter.vaginal = 158>>
 	<<set $activeSlave.counter.anal = 76>>
@@ -90,7 +90,7 @@
 	<<set $activeSlave.skill.entertainment = 0>>
 	<<set $activeSlave.skill.anal = 15>>
 	<<set $activeSlave.skill.vaginal = 15>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.counter.oral = 57>>
 	<<set $activeSlave.counter.vaginal = 65>>
 	<<set $activeSlave.counter.anal = 12>>
@@ -192,7 +192,7 @@
 	<</if>>
 	<<set $activeSlave.face = 100, $activeSlave.faceImplant = 15>>
 	<<set $activeSlave.intelligence = 100, $activeSlave.intelligenceImplant = 30>>
-	<<set $activeSlave.skill.whore = 100, $activeSlave.skill.entertainment = 100>>
+	<<set $activeSlave.skill.whoring = 100, $activeSlave.skill.entertainment = 100>>
 <</switch>>
 
 <<set $activeSlave.trust = 0>>
diff --git a/src/uncategorized/pSlaveMedic.tw b/src/uncategorized/pSlaveMedic.tw
index 575d8f21986552ba362926d2844409fe7b28a79a..1bbfba4eaf8a780522e11a947859f2d274362dd5 100644
--- a/src/uncategorized/pSlaveMedic.tw
+++ b/src/uncategorized/pSlaveMedic.tw
@@ -26,7 +26,7 @@
 <<set $activeSlave.skill.vaginal = 35>>
 <<set $activeSlave.skill.oral = 35>>
 <<set $activeSlave.skill.anal = 15>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.skill.entertainment = 15>>
 <<set $activeSlave.intelligence = random(51,95)>>
 <<set $activeSlave.intelligenceImplant = 15>>
@@ -70,7 +70,7 @@
 <<set $activeSlave.skill.vaginal = 35>>
 <<set $activeSlave.skill.oral = 35>>
 <<set $activeSlave.skill.anal = 15>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.skill.entertainment = 15>>
 <<set $activeSlave.intelligence = random(51,95)>>
 <<set $activeSlave.intelligenceImplant = 30>>
diff --git a/src/uncategorized/pSnatchAndGrabResult.tw b/src/uncategorized/pSnatchAndGrabResult.tw
index 442729f22bc4ebcf38f0df69c9aede57d1ada83d..e39a7201b34e99475d3b934aa932990e37b6aca0 100644
--- a/src/uncategorized/pSnatchAndGrabResult.tw
+++ b/src/uncategorized/pSnatchAndGrabResult.tw
@@ -43,7 +43,7 @@
 <<set $activeSlave.skill.vaginal = 0>>
 <<set $activeSlave.skill.oral = 0>>
 <<set $activeSlave.skill.anal = 0>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.skill.entertainment = 0>>
 <<set $activeSlave.birthWeek = 0>>
 <<set $activeSlave.voice = 2>>
@@ -106,7 +106,7 @@
 <<set $activeSlave.skill.vaginal = 0>>
 <<set $activeSlave.skill.oral = 0>>
 <<set $activeSlave.skill.anal = 0>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.skill.entertainment = 0>>
 <<set $activeSlave.birthWeek = 0>>
 <<set $activeSlave.height = Math.round(Height.random($activeSlave, {skew: 1, limitMult: [0, 2]}))>>
diff --git a/src/uncategorized/personalAttentionSelect.tw b/src/uncategorized/personalAttentionSelect.tw
index ad0e7f82d37e55d80dddce157be1f6e9fbd695cd..2f0d636e14039d596a368aa7a7f6b790e7ec3367 100644
--- a/src/uncategorized/personalAttentionSelect.tw
+++ b/src/uncategorized/personalAttentionSelect.tw
@@ -240,13 +240,13 @@
 		<</if>>
 
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;
-		<<if ($activeSlave.skill.anal >= 100) && ($activeSlave.skill.oral >= 100) && ($activeSlave.skill.vaginal >= 100) && ($activeSlave.skill.whore > 0) && ($activeSlave.skill.entertainment > 0)>>
+		<<if ($activeSlave.skill.anal >= 100) && ($activeSlave.skill.oral >= 100) && ($activeSlave.skill.vaginal >= 100) && ($activeSlave.skill.whoring > 0) && ($activeSlave.skill.entertainment > 0)>>
 			//$He knows all the skills you can teach//
-		<<elseif ($activeSlave.skill.anal >= 100) && ($activeSlave.skill.oral >= 100) && ($activeSlave.skill.whore > 0) && ($activeSlave.skill.entertainment > 0) && ($activeSlave.vagina == -1) && ($activeSlave.balls == 0)>>
+		<<elseif ($activeSlave.skill.anal >= 100) && ($activeSlave.skill.oral >= 100) && ($activeSlave.skill.whoring > 0) && ($activeSlave.skill.entertainment > 0) && ($activeSlave.vagina == -1) && ($activeSlave.balls == 0)>>
 			//$He knows all the skills you can teach a gelded slave//
-		<<elseif ($activeSlave.skill.anal >= 100) && ($activeSlave.skill.oral >= 100) && ($activeSlave.skill.whore > 0) && ($activeSlave.skill.entertainment > 0) && ($activeSlave.vagina == -1)>>
+		<<elseif ($activeSlave.skill.anal >= 100) && ($activeSlave.skill.oral >= 100) && ($activeSlave.skill.whoring > 0) && ($activeSlave.skill.entertainment > 0) && ($activeSlave.vagina == -1)>>
 			//$He knows all the skills you can teach a shemale slave//
-		<<elseif ($activeSlave.skill.anal >= 100) && ($activeSlave.skill.oral >= 100) && ($activeSlave.skill.whore > 0) && ($activeSlave.skill.entertainment > 0) && ($activeSlave.chastityVagina)>>
+		<<elseif ($activeSlave.skill.anal >= 100) && ($activeSlave.skill.oral >= 100) && ($activeSlave.skill.whoring > 0) && ($activeSlave.skill.entertainment > 0) && ($activeSlave.chastityVagina)>>
 			//$He knows all the skills you can teach while $he's wearing a chastity belt//
 		<<elseif ($activeSlave.devotion <= 20) && ($activeSlave.trust >= -20)>>
 			//$He's too disobedient to learn sex skills//
diff --git a/src/uncategorized/prestigiousSlave.tw b/src/uncategorized/prestigiousSlave.tw
index 6adac7fdae05390be83ab26953163ee223233411..be36aea136143c1889f8ed0c82c4b4a76ed5eea4 100644
--- a/src/uncategorized/prestigiousSlave.tw
+++ b/src/uncategorized/prestigiousSlave.tw
@@ -75,7 +75,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.skill.vaginal = 100>>
 	<<set $activeSlave.skill.oral = 100>>
 	<<set $activeSlave.skill.anal = 100>>
-	<<set $activeSlave.skill.whore = 15>>
+	<<set $activeSlave.skill.whoring = 15>>
 	<<set $activeSlave.skill.entertainment = 100>>
 	<<set $activeSlave.pubicHStyle = "waxed">>
 	<<set $activeSlave.underArmHStyle = "waxed">>
@@ -114,7 +114,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.skill.vaginal = 35>>
 	<<set $activeSlave.skill.oral = 35>>
 	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whore = 35>>
+	<<set $activeSlave.skill.whoring = 35>>
 	<<set $activeSlave.skill.entertainment = 15>>
 	<<set $activeSlave.pubicHStyle = "waxed">>
 	<<set $activeSlave.underArmHStyle = "waxed">>
@@ -149,7 +149,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.skill.vaginal = 15>>
 	<<set $activeSlave.skill.oral = 15>>
 	<<set $activeSlave.skill.anal = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 0>>
 	<<set $activeSlave.skill.combat = 1>>
 	<<set $activeSlave.pubicHStyle = "waxed">>
@@ -180,7 +180,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.skill.vaginal = 15>>
 	<<set $activeSlave.skill.oral = 15>>
 	<<set $activeSlave.skill.anal = 0>>
-	<<set $activeSlave.skill.whore = 15>>
+	<<set $activeSlave.skill.whoring = 15>>
 	<<set $activeSlave.skill.entertainment = 35>>
 	<<set $activeSlave.pubicHStyle = "waxed">>
 	<<set $activeSlave.underArmHStyle = "waxed">>
@@ -249,7 +249,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.skill.vaginal = 100>>
 	<<set $activeSlave.skill.oral = 100>>
 	<<set $activeSlave.skill.anal = 100>>
-	<<set $activeSlave.skill.whore = 100>>
+	<<set $activeSlave.skill.whoring = 100>>
 	<<set $activeSlave.skill.entertainment = 0>>
 	<<set $activeSlave.pubicHStyle = "waxed">>
 	<<set $activeSlave.underArmHStyle = "waxed">>
@@ -290,7 +290,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.skill.vaginal = 15>>
 	<<set $activeSlave.skill.oral = 15>>
 	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 100>>
 	<<set $activeSlave.pubicHStyle = "waxed">>
 	<<set $activeSlave.underArmHStyle = "waxed">>
@@ -323,7 +323,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.skill.vaginal = 15>>
 	<<set $activeSlave.skill.oral = 0>>
 	<<set $activeSlave.skill.anal = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 35>>
 	<<set $activeSlave.pubicHStyle = "waxed">>
 	<<set $activeSlave.underArmHStyle = "waxed">>
@@ -353,7 +353,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.skill.vaginal = 0>>
 	<<set $activeSlave.skill.oral = 100>>
 	<<set $activeSlave.skill.anal = 0>>
-	<<set $activeSlave.skill.whore = 15>>
+	<<set $activeSlave.skill.whoring = 15>>
 	<<set $activeSlave.skill.entertainment = 35>>
 	<<set $activeSlave.pubicHStyle = "waxed">>
 	<<set $activeSlave.underArmHStyle = "waxed">>
@@ -412,7 +412,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.skill.vaginal = 15>>
 	<<set $activeSlave.skill.oral = 15>>
 	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 0>>
 	<<set $activeSlave.pubicHStyle = "waxed">>
 	<<set $activeSlave.underArmHStyle = "waxed">>
@@ -444,7 +444,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.skill.vaginal = 15>>
 	<<set $activeSlave.skill.oral = 15>>
 	<<set $activeSlave.skill.anal = 1>>
-	<<set $activeSlave.skill.whore = 5>>
+	<<set $activeSlave.skill.whoring = 5>>
 	<<set $activeSlave.skill.entertainment = 70>>
 	<<set $activeSlave.pubicHStyle = "waxed">>
 	<<set $activeSlave.underArmHStyle = "waxed">>
@@ -480,7 +480,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.skill.vaginal = 0>>
 	<<set $activeSlave.skill.oral = 15>>
 	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 0>>
 	<<set $activeSlave.pubicHStyle = "waxed">>
 	<<set $activeSlave.underArmHStyle = "waxed">>
@@ -513,7 +513,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.skill.vaginal = 0>>
 	<<set $activeSlave.skill.oral = 0>>
 	<<set $activeSlave.skill.anal = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 15>>
 	<<set $activeSlave.pubicHStyle = "waxed">>
 	<<set $activeSlave.underArmHStyle = "waxed">>
@@ -559,7 +559,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.earPiercing = 1>>
 	<<set $activeSlave.skill.oral = 100>>
 	<<set $activeSlave.skill.anal = 100>>
-	<<set $activeSlave.skill.whore = 15>>
+	<<set $activeSlave.skill.whoring = 15>>
 	<<set $activeSlave.skill.entertainment = 100>>
 	<<set $activeSlave.pubicHStyle = "waxed">>
 	<<set $activeSlave.underArmHStyle = "waxed">>
@@ -588,7 +588,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.clitPiercing = 1>>
 	<<set $activeSlave.skill.oral = 15>>
 	<<set $activeSlave.skill.anal = 0>>
-	<<set $activeSlave.skill.whore = 15>>
+	<<set $activeSlave.skill.whoring = 15>>
 	<<set $activeSlave.skill.entertainment = 15>>
 	<<set $activeSlave.pubicHStyle = "waxed">>
 	<<set $activeSlave.underArmHStyle = "waxed">>
@@ -621,7 +621,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.weight = 0>>
 	<<set $activeSlave.skill.oral = 15>>
 	<<set $activeSlave.skill.anal = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 0>>
 	<<set $activeSlave.skill.combat = 1>>
 	<<set $activeSlave.pubicHStyle = "waxed">>
@@ -653,7 +653,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.earPiercing = 1>>
 	<<set $activeSlave.skill.oral = 100>>
 	<<set $activeSlave.skill.anal = 0>>
-	<<set $activeSlave.skill.whore = 15>>
+	<<set $activeSlave.skill.whoring = 15>>
 	<<set $activeSlave.skill.entertainment = 35>>
 	<<set $activeSlave.pubicHStyle = "waxed">>
 	<<set $activeSlave.underArmHStyle = "waxed">>
@@ -723,7 +723,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.earPiercing = 2>>
 	<<set $activeSlave.skill.oral = 100>>
 	<<set $activeSlave.skill.anal = 100>>
-	<<set $activeSlave.skill.whore = 100>>
+	<<set $activeSlave.skill.whoring = 100>>
 	<<set $activeSlave.skill.entertainment = 0>>
 	<<set $activeSlave.pubicHStyle = "waxed">>
 	<<set $activeSlave.underArmHStyle = "waxed">>
@@ -762,7 +762,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.earPiercing = 1>>
 	<<set $activeSlave.skill.oral = 15>>
 	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 100>>
 	<<set $activeSlave.pubicHStyle = "waxed">>
 	<<set $activeSlave.underArmHStyle = "waxed">>
@@ -792,7 +792,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.weight = 0>>
 	<<set $activeSlave.skill.oral = 0>>
 	<<set $activeSlave.skill.anal = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 35>>
 	<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
 	<<set $activeSlave.custom.tattoo = "A small tattoo of the crest of an old world fraternity is visible on $his left shoulder blade.">>
@@ -824,7 +824,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.skill.vaginal = 0>>
 	<<set $activeSlave.skill.oral = 100>>
 	<<set $activeSlave.skill.anal = 0>>
-	<<set $activeSlave.skill.whore = 15>>
+	<<set $activeSlave.skill.whoring = 15>>
 	<<set $activeSlave.skill.entertainment = 35>>
 	<<set $activeSlave.pubicHStyle = "waxed">>
 	<<set $activeSlave.underArmHStyle = "waxed">>
@@ -873,7 +873,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.stampTat = "rude words">>
 	<<set $activeSlave.skill.oral = 15>>
 	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 0>>
 	<<set $activeSlave.pubicHStyle = "waxed">>
 	<<set $activeSlave.underArmHStyle = "waxed">>
@@ -905,7 +905,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.earPiercing = 1>>
 	<<set $activeSlave.skill.oral = 30>>
 	<<set $activeSlave.skill.anal = 1>>
-	<<set $activeSlave.skill.whore = 5>>
+	<<set $activeSlave.skill.whoring = 5>>
 	<<set $activeSlave.skill.entertainment = 70>>
 	<<set $activeSlave.pubicHStyle = "waxed">>
 	<<set $activeSlave.underArmHStyle = "waxed">>
diff --git a/src/uncategorized/ptWorkaround.tw b/src/uncategorized/ptWorkaround.tw
index 6829463cb1577e453b21f134235bf1ebabfaf6ee..45395352ecd534382ba5b5df93d8019a235dc3ba 100644
--- a/src/uncategorized/ptWorkaround.tw
+++ b/src/uncategorized/ptWorkaround.tw
@@ -369,13 +369,13 @@
 	<<elseif ($activeSlave.skill.anal < 100) && ($activeSlave.anus > 0) && canDoAnal($activeSlave)>>
 		$He is already a skilled anal bitch, but $his skills can be polished further. You train $him in the basics of <<if $seePee == 1>>urine play, <</if>>massage, pet play, needle play, and many other niche skills. You also expand $his knowledge of sexual positions. $He learns to balance $himself on tiptoe for the challenge of standing anal sex without support. @@.lime;$His sexual skills have improved.@@
 		<<AnalSkillIncrease $activeSlave>>
-	<<elseif $activeSlave.skill.whore <= 10>>
+	<<elseif $activeSlave.skill.whoring <= 10>>
 		Since $he's dangerously naïve about selling sex, you teach $him the basics of self protection and business. @@.lime;$His prostitution skills have improved.@@
 		<<WhoreSkillIncrease $activeSlave>>
 	<<elseif $activeSlave.skill.entertainment <= 10>>
 		Since $he's rough and unskilled at entertainment, you teach $him the basics of polite conversation, music, and dance. @@.lime;$His entertainment skills have improved.@@
 		<<EntertainSkillIncrease $activeSlave>>
-	<<elseif $activeSlave.skill.whore <= 30>>
+	<<elseif $activeSlave.skill.whoring <= 30>>
 		Since $he has only basic entertainment skills, you teach $him to steer clients to more lucrative sex acts. @@.lime;$His prostitution skills have improved.@@
 		<<WhoreSkillIncrease $activeSlave>>
 	<<elseif $activeSlave.skill.entertainment <= 30>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 437f123d77fe0d815634cdabf01bb5858cab84e8..1efa81b1b0721135ea77293682c4cdc45b3085d2 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -480,7 +480,7 @@
 		<<set $PETSevent.push("stewardess beating")>>
 	<</if>>
 
-	<<if ($Madam != 0) && ($brothelSlaves >= 5) && ($Madam.actualAge >= 35 || $AgePenalty == 0) && ($Madam.skill.whore >= 100)>>
+	<<if ($Madam != 0) && ($brothelSlaves >= 5) && ($Madam.actualAge >= 35 || $AgePenalty == 0) && ($Madam.skill.whoring >= 100)>>
 		<<set $PESSevent.push("madam strategy")>>
 	<</if>>
 
@@ -604,7 +604,7 @@
 		<<if ($HeadGirl.devotion > 50) && ($HeadGirl.skill.entertainment >= 100)>>
 			<<set $recruit.push("female recruit")>>
 		<</if>>
-		<<if ($HeadGirl.devotion > 50) && ($HeadGirl.skill.whore >= 100)>>
+		<<if ($HeadGirl.devotion > 50) && ($HeadGirl.skill.whoring >= 100)>>
 			<<set $recruit.push("whore recruit")>>
 		<</if>>
 		<<if $PC.hacking >= 50 && random(0,100) < $PC.hacking>>
diff --git a/src/uncategorized/reAWOL.tw b/src/uncategorized/reAWOL.tw
index 48b988358db2d5fbc760ee65e255e7f8d101d35a..19c3425334a9619799d462d8c6e4c4e69eaa0241 100644
--- a/src/uncategorized/reAWOL.tw
+++ b/src/uncategorized/reAWOL.tw
@@ -32,7 +32,7 @@
 <<set $activeSlave.hears = 0>>
 <<set $activeSlave.anus = 0>>
 <<set $activeSlave.skill.anal = 0>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.skill.combat = 1>>
 <<set $activeSlave.behavioralFlaw = "arrogant">>
 <<set $activeSlave.sexualFlaw = "hates men">>
diff --git a/src/uncategorized/reBrothelFunction.tw b/src/uncategorized/reBrothelFunction.tw
index 54eb7983dfa523066a766fb0a9a9b0c87149d991..d80d1382ecd64004bd7b694c85ae8fef8af50a14 100644
--- a/src/uncategorized/reBrothelFunction.tw
+++ b/src/uncategorized/reBrothelFunction.tw
@@ -31,8 +31,8 @@ The last of these requests comes in the form of a letter, stamped with the heral
 	Though a citizen he may be, this serial seducer may have more notches on his proverbial bedpost than even your oldest slaves. Though you are not present to view his mastery of the sexual craft first-hand, the dreamy fucked-out looks of exhaustion and gratified satisfaction painting every single one of your girls' faces at the end of the day speak volumes. Indeed, all of your brothel slaves with any room for improvement in their whoring skills @@.green;learn from his skillful coupling,@@ while even those with nothing to learn from him @@.hotpink;gain confidence@@ from the intensity of their sexual congress.
 	<<for $i = 0; $i < $slaves.length; $i++>>
 		<<if $slaves[$i].assignment == "work in the brothel">>
-			<<if $slaves[$i].skill.whore < 100>>
-				<<set $slaves[$i].skill.whore += 10>>
+			<<if $slaves[$i].skill.whoring < 100>>
+				<<set $slaves[$i].skill.whoring += 10>>
 			<<else>>
 				<<set $slaves[$i].devotion += 4>>
 			<</if>>
diff --git a/src/uncategorized/reBusyBrothel.tw b/src/uncategorized/reBusyBrothel.tw
index c29c284ac8db2aff805b776bd61dd88974da2372..13653ccc002d342e3ecea26f3dce2e59c337fb62 100644
--- a/src/uncategorized/reBusyBrothel.tw
+++ b/src/uncategorized/reBusyBrothel.tw
@@ -29,8 +29,8 @@ Of course, $brothelName is the best establishment of its kind in the arcology. C
 	<<for $i = 0; $i < $BrothiIDs.length; $i++>>
 		<<set $slaves[$slaveIndices[$BrothiIDs[$i]]].lastWeeksCashIncome += 250>>
 		<<set $slaves[$slaveIndices[$BrothiIDs[$i]]].lifetimeCashIncome += 250>>
-		<<if $slaves[$slaveIndices[$BrothiIDs[$i]]].skill.whore < 100>>
-			<<set $slaves[$i].skill.whore += 10>>
+		<<if $slaves[$slaveIndices[$BrothiIDs[$i]]].skill.whoring < 100>>
+			<<set $slaves[$i].skill.whoring += 10>>
 		<<else>>
 			<<set $slaves[$slaveIndices[$BrothiIDs[$i]]].devotion += 4>>
 		<</if>>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index d4bc8f64209fc5779c8fe79d124c13431d167568..1d47e4812e2fe4f0499046fb9ec734f48ed19e7e 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -274,7 +274,7 @@
 <<set $activeSlave.skill.vaginal = random(50,100)>>
 <<set $activeSlave.skill.oral = random(50,100)>>
 <<set $activeSlave.skill.anal = random(50,100)>>
-<<set $activeSlave.skill.whore = random(50,100)>>
+<<set $activeSlave.skill.whoring = random(50,100)>>
 <<set $activeSlave.skill.entertainment = random(50,100)>>
 <<set $activeSlave.pubicHStyle = "waxed">>
 <<set $activeSlave.underArmHStyle = "waxed">>
@@ -872,7 +872,7 @@
 <<set $activeSlave.skill.vaginal = 0>>
 <<set $activeSlave.skill.anal = 0>>
 <<set $activeSlave.skill.oral = 0>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.skill.entertainment = 0>>
 <<set $activeSlave.intelligence = random(16,95)>>
 <<set $activeSlave.intelligenceImplant = 15>>
@@ -898,7 +898,7 @@
 <<set $activeSlave.skill.vaginal = 1>>
 <<set $activeSlave.skill.anal = 1>>
 <<set $activeSlave.skill.oral = 1>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.skill.entertainment = 0>>
 <<set $activeSlave.intelligence = random(16,95)>>
 <<set $activeSlave.intelligenceImplant = 15>>
@@ -931,7 +931,7 @@
 <<set $activeSlave.vagina = 0>>
 <<set $activeSlave.trueVirgin = 1>>
 <<set $activeSlave.skill.vaginal = 0>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.skill.entertainment = 0>>
 <<set $activeSlave.intelligence = random(-50,50)>>
 <<set $activeSlave.intelligenceImplant = 15>>
@@ -959,7 +959,7 @@
 <<set $activeSlave.face = random(15,100)>>
 <<set $activeSlave.skill.oral = 35>>
 <<set $activeSlave.skill.anal = 15>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.skill.entertainment = 100>>
 <<set $activeSlave.intelligence = random(51,95)>>
 <<set $activeSlave.intelligenceImplant = 15>>
@@ -984,7 +984,7 @@
 <<set $activeSlave.face = 15>>
 <<set $activeSlave.skill.oral = random(15,40)>>
 <<set $activeSlave.skill.anal = random(15,40)>>
-<<set $activeSlave.skill.whore = random(15,40)>>
+<<set $activeSlave.skill.whoring = random(15,40)>>
 <<set $activeSlave.skill.entertainment = random(15,40)>>
 <<set $activeSlave.intelligence = random(51,95)>>
 <<set $activeSlave.intelligenceImplant = 15>>
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index 7febece333fb8419ed526c2e89d43630ee2c239f..2c6ba6712033fccfe0639c7724010d6652a29da6 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -26,7 +26,7 @@
 <</if>>
 <<set $activeSlave.skill.oral = 15>>
 <<set $activeSlave.skill.anal = 35>>
-<<set $activeSlave.skill.whore = 15>>
+<<set $activeSlave.skill.whoring = 15>>
 <<set $activeSlave.earPiercing = 1>>
 <<set $activeSlave.nosePiercing = 1>>
 <<set $activeSlave.nipplesPiercing = 1>>
@@ -59,7 +59,7 @@
 <</if>>
 <<set $activeSlave.skill.oral = 0>>
 <<set $activeSlave.skill.anal = 0>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.sexualFlaw = "hates penetration">>
 <<set $activeSlave.behavioralFlaw = "odd">>
 
@@ -124,7 +124,7 @@
 <</if>>
 <<set $activeSlave.skill.oral = 0>>
 <<set $activeSlave.skill.anal = 0>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.sexualFlaw = "apathetic">>
 <<set $activeSlave.behavioralFlaw = "gluttonous">>
 
@@ -183,7 +183,7 @@
 <</if>>
 <<set $activeSlave.skill.oral = 35>>
 <<set $activeSlave.skill.anal = 35>>
-<<set $activeSlave.skill.whore = 35>>
+<<set $activeSlave.skill.whoring = 35>>
 <<set $activeSlave.boobs += 400>>
 <<set $activeSlave.boobsImplant = 400>>
 <<set $activeSlave.butt += 1>>
@@ -278,7 +278,7 @@
 <<set $activeSlave.skill.vaginal = 0>>
 <<set $activeSlave.skill.oral = 0>>
 <<set $activeSlave.skill.anal = 0>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.skill.combat = 1>>
 <<set $activeSlave.anus = 0>>
 <<set $activeSlave.health = random(60,80)>>
diff --git a/src/uncategorized/rePokerNight.tw b/src/uncategorized/rePokerNight.tw
index 8e1b5cf985fefb96209e29ff35d70794639eb3b9..a8676a3ccc5482412465aff820355a3380373d67 100644
--- a/src/uncategorized/rePokerNight.tw
+++ b/src/uncategorized/rePokerNight.tw
@@ -88,7 +88,7 @@ On a particularly lackadaisical evening, you find yourself alerted to a message
 					<</if>>
 					<<set $activeSlave.anus = 0>>
 					<<set $activeSlave.skill.anal = 0>>
-					<<set $activeSlave.skill.whore = 0>>
+					<<set $activeSlave.skill.whoring = 0>>
 					<<set $activeSlave.skill.combat = 1>>
 					<<set $activeSlave.accent = random(0,1)>>
 					<<set $activeSlave.behavioralFlaw = "arrogant">>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 95cdc40676b0e0f56372b2a27fe39d8722ab3848..4ecfdb4597d57b1ea2f33841abec9a9c0351d624 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -111,7 +111,7 @@
 <<set $activeSlave.skill.vaginal = 35>>
 <<set $activeSlave.skill.oral = 35>>
 <<set $activeSlave.skill.anal = 35>>
-<<set $activeSlave.skill.whore = 35>>
+<<set $activeSlave.skill.whoring = 35>>
 <<set $activeSlave.boobs += 600>>
 <<set $activeSlave.boobsImplant = 600>>
 <<set $activeSlave.butt += 1>>
@@ -162,7 +162,7 @@
 <<set $activeSlave.anus = 0>>
 <<set $activeSlave.skill.anal = 0>>
 <<set $activeSlave.skill.oral = 0>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.hStyle = either("short", "very short")>>
 
 <<case "desperate preg">>
@@ -507,7 +507,7 @@
 <<set $activeSlave.skill.vaginal = random(0,15)>>
 <<set $activeSlave.skill.anal = 0>>
 <<set $activeSlave.skill.oral = random(0,15)>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.boobs = random(2,6)*100>>
 <<set $activeSlave.vagina = 1>>
 <<set $activeSlave.labia = 0>>
@@ -544,7 +544,7 @@
 <<set $activeSlave.skill.vaginal = 0>>
 <<set $activeSlave.skill.anal = random(0,40)>>
 <<set $activeSlave.skill.oral = random(0,40)>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.boobs = 150>>
 <<set $activeSlave.vagina = -1>>
 <<set $activeSlave.labia = 0>>
@@ -583,7 +583,7 @@
 <<set $activeSlave.skill.vaginal = 0>>
 <<set $activeSlave.skill.anal = 0>>
 <<set $activeSlave.skill.oral = random(0,30)>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.boobs = random(2,4)*100>>
 <<set $activeSlave.vagina = 0>>
 <<set $activeSlave.labia = 0>>
@@ -637,7 +637,7 @@
 <<set $activeSlave.skill.vaginal = 0>>
 <<set $activeSlave.skill.anal = 0>>
 <<set $activeSlave.skill.oral = random(15,40)>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.boobs = random(2,6)*100>>
 <<set $activeSlave.vagina = 0>>
 <<set $activeSlave.skill.vaginal = 0>>
@@ -677,7 +677,7 @@
 <<set $activeSlave.skill.vaginal = 0>>
 <<set $activeSlave.skill.anal = 0>>
 <<set $activeSlave.skill.oral = random(15,40)>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.boobsImplant = random(3,6)*100>>
 <<set $activeSlave.boobs = $activeSlave.boobsImplant+150>>
 <<set $activeSlave.vagina = 0>>
@@ -718,7 +718,7 @@
 <<set $activeSlave.skill.vaginal = 0>>
 <<set $activeSlave.skill.anal = 0>>
 <<set $activeSlave.skill.oral = 35>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.boobs = 150>>
 <<set $activeSlave.boobsImplant = random(2,6)*100>>
 <<set $activeSlave.vagina = -1>>
@@ -753,7 +753,7 @@
 <<set $activeSlave.faceImplant = 15>>
 <<set $activeSlave.skill.anal = 0>>
 <<set $activeSlave.skill.oral = 0>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.skill.combat = 1>>
 <<set $activeSlave.hStyle = either("short", "very short")>>
 <<set $activeSlave.boobs = 150>>
@@ -786,7 +786,7 @@
 <<set $activeSlave.skill.vaginal = 0>>
 <<set $activeSlave.skill.anal = 15>>
 <<set $activeSlave.skill.oral = 15>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.boobs = random(2,6)*100>>
 <<set $activeSlave.vagina = -1>>
 <<set $activeSlave.labia = 1>>
@@ -826,7 +826,7 @@
 <<set $activeSlave.skill.vaginal = 15>>
 <<set $activeSlave.skill.anal = 15>>
 <<set $activeSlave.skill.oral = 15>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.boobs = random(3,7)*100>>
 <<set $activeSlave.vagina = 3>>
 <<set $activeSlave.labia = 1>>
@@ -872,7 +872,7 @@
 <<set $activeSlave.skill.vaginal = 15>>
 <<set $activeSlave.skill.anal = 15>>
 <<set $activeSlave.skill.oral = 15>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.boobs = random(3,7)*100>>
 <<set $activeSlave.vagina = 3>>
 <<set $activeSlave.labia = 1>>
@@ -918,7 +918,7 @@
 <<set $activeSlave.skill.vaginal = 0>>
 <<set $activeSlave.skill.anal = 0>>
 <<set $activeSlave.skill.oral = 35>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.skill.entertainment = 35>>
 <<set $activeSlave.boobs = random(2,7)*100>>
 <<set $activeSlave.vagina = 0>>
@@ -964,7 +964,7 @@
 <<set $activeSlave.skill.vaginal = random(50,100)>>
 <<set $activeSlave.skill.anal = random(50,100)>>
 <<set $activeSlave.skill.oral = random(50,100)>>
-<<set $activeSlave.skill.whore = random(50,100)>>
+<<set $activeSlave.skill.whoring = random(50,100)>>
 <<set $activeSlave.skill.entertainment = 35>>
 <<set $activeSlave.boobs = random(2,7)*100>>
 <<set $activeSlave.vagina = 2>>
@@ -1012,7 +1012,7 @@
 <<set $activeSlave.skill.vaginal = 0>>
 <<set $activeSlave.skill.anal = random(0,15)>>
 <<set $activeSlave.skill.oral = random(0,15)>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.boobs = random(1,4)*100>>
 <<set $activeSlave.vagina = -1>>
 <<set $activeSlave.ovaries = 0>>
@@ -1056,7 +1056,7 @@
 <<set $activeSlave.skill.vaginal = 0>>
 <<set $activeSlave.skill.anal = random(0,15)>>
 <<set $activeSlave.skill.oral = random(0,15)>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.boobs = random(1,4)*100>>
 <<set $activeSlave.vagina = 1>>
 <<set $activeSlave.labia = 1>>
@@ -1104,7 +1104,7 @@
 <<set $activeSlave.skill.vaginal = 0>>
 <<set $activeSlave.skill.anal = random(0,15)>>
 <<set $activeSlave.skill.oral = random(0,15)>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.boobs = either(100, 200, 300)>>
 <<set $activeSlave.vagina = 0>>
 <<set $activeSlave.trueVirgin = 1>>
@@ -1142,7 +1142,7 @@
 <<set $activeSlave.skill.anal = 15>>
 <<set $activeSlave.skill.oral = 15>>
 <<set $activeSlave.skill.entertainment = 15>>
-<<set $activeSlave.skill.whore = 15>>
+<<set $activeSlave.skill.whoring = 15>>
 <<set $activeSlave.boobs = random(3,8)*100>>
 <<set $activeSlave.vagina = random(1,2)>>
 <<set $activeSlave.vaginaLube = 1>>
@@ -1178,7 +1178,7 @@
 <<set $activeSlave.skill.anal = 0>>
 <<set $activeSlave.skill.oral = 0>>
 <<set $activeSlave.skill.entertainment = random(15,40)>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.boobs = random(3,8)*100>>
 <<set $activeSlave.vagina = 0>>
 <<set $activeSlave.vaginaLube = 1>>
@@ -1219,7 +1219,7 @@
 <<set $activeSlave.skill.anal = 15>>
 <<set $activeSlave.skill.oral = 15>>
 <<set $activeSlave.skill.entertainment = 0>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.boobs = random(8,20)*100>>
 <<set $activeSlave.vagina = 2>>
 <<set $activeSlave.vaginaLube = 1>>
@@ -1268,7 +1268,7 @@
 <<set $activeSlave.skill.anal = 35>>
 <<set $activeSlave.skill.oral = 15>>
 <<set $activeSlave.skill.entertainment = 0>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.boobs = 0>>
 <<set $activeSlave.vagina = -1>>
 <<set $activeSlave.vaginaLube = 1>>
@@ -1306,7 +1306,7 @@
 <<set $activeSlave.skill.anal = 15>>
 <<set $activeSlave.skill.oral = 15>>
 <<set $activeSlave.skill.entertainment = 0>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.boobs = random(6,12)*100>>
 <<set $activeSlave.vagina = 0>>
 <<set $activeSlave.trueVirgin = 1>>
@@ -1344,7 +1344,7 @@
 <<set $activeSlave.skill.anal = 15>>
 <<set $activeSlave.skill.oral = 15>>
 <<set $activeSlave.skill.entertainment = 0>>
-<<set $activeSlave.skill.whore = 15>>
+<<set $activeSlave.skill.whoring = 15>>
 <<set $activeSlave.boobs = random(4,8)*100>>
 <<set $activeSlave.vagina = 1>>
 <<set $activeSlave.vaginaLube = 1>>
@@ -1383,7 +1383,7 @@
 <<set $activeSlave.skill.anal = 15>>
 <<set $activeSlave.skill.oral = 35>>
 <<set $activeSlave.skill.entertainment = 0>>
-<<set $activeSlave.skill.whore = 15>>
+<<set $activeSlave.skill.whoring = 15>>
 <<set $activeSlave.boobs = 0>>
 <<set $activeSlave.vagina = -1>>
 <<set $activeSlave.vaginaLube = 1>>
@@ -1424,7 +1424,7 @@
 <<set $activeSlave.skill.anal = 0>>
 <<set $activeSlave.skill.oral = 0>>
 <<set $activeSlave.skill.entertainment = 0>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.boobs = random(3,10)*100>>
 <<set $activeSlave.vagina = 1>>
 <<set $activeSlave.vaginaLube = random(1,2)>>
@@ -1488,7 +1488,7 @@
 <<set $activeSlave.skill.anal = 0>>
 <<set $activeSlave.skill.oral = 0>>
 <<set $activeSlave.skill.entertainment = 0>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.boobs = random(3,10)*100>>
 <<set $activeSlave.vagina = 1>>
 <<set $activeSlave.vaginaLube = random(1,2)>>
@@ -1557,7 +1557,7 @@
 <<set $activeSlave.skill.anal = 25>>
 <<set $activeSlave.skill.oral = 25>>
 <<set $activeSlave.skill.entertainment = 25>>
-<<set $activeSlave.skill.whore = 25>>
+<<set $activeSlave.skill.whoring = 25>>
 <<set $activeSlave.boobs = random(3,8)*100>>
 <<set $activeSlave.vagina = random(1,2)>>
 <<set $activeSlave.vaginaLube = 1>>
@@ -1836,7 +1836,7 @@
 <<set $activeSlave.skill.vaginal = 0>>
 <<set $activeSlave.skill.anal = 0>>
 <<set $activeSlave.skill.oral = 0>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.skill.entertainment = 20>>
 <<set $activeSlave.boobs = random(4,7)*100>>
 <<set $activeSlave.vagina = 0>>
@@ -1950,7 +1950,7 @@
 <<set $activeSlave.skill.anal = 0>>
 <<set $activeSlave.skill.oral = 50>>
 <<set $activeSlave.skill.entertainment = 0>>
-<<set $activeSlave.skill.whore = 50>>
+<<set $activeSlave.skill.whoring = 50>>
 <<set $activeSlave.vagina = 1>>
 <<set $activeSlave.vaginaLube = random(1,2)>>
 <<set $activeSlave.pubicHStyle = "waxed">>
@@ -1981,7 +1981,7 @@
 <<set $activeSlave.skill.anal = 15>>
 <<set $activeSlave.skill.oral = 50>>
 <<set $activeSlave.skill.entertainment = 0>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.vagina = 1>>
 <<set $activeSlave.anus = 1>>
 <<set $activeSlave.pubicHStyle = "waxed">>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index 8e0cfdaf41b374f8741eb4ccecda0a8caf52b66f..c6036bb6d5863795d3fa9d3ce4e8474a154ed76f 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -168,7 +168,7 @@
 	<<set $activeSlave.skill.vaginal = 30>>
 	<<set $activeSlave.skill.anal = 15>>
 	<<set $activeSlave.skill.entertainment = 10>>
-	<<set $activeSlave.skill.whore = 10>>
+	<<set $activeSlave.skill.whoring = 10>>
 	<<set $activeSlave.boobs = (random(12,20)*100)>>
 	<<set $activeSlave.butt = random(4,6)>>
 	<<set $activeSlave.boobShape = "saggy">>
@@ -221,7 +221,7 @@
 	<<set $activeSlave.skill.vaginal += random(0,20)>>
 	<<set $activeSlave.skill.anal += random(0,20)>>
 	<<set $activeSlave.skill.entertainment += random(0,20)>>
-	<<set $activeSlave.skill.whore += random(0,20)>>
+	<<set $activeSlave.skill.whoring += random(0,20)>>
 	<<set $activeSlave.nipplesPiercing = 1>>
 	<<set $activeSlave.lipsPiercing = 1>>
 	<<set $activeSlave.tonguePiercing = 1>>
@@ -247,7 +247,7 @@
 	<<set $activeSlave.skill.oral += random(0,20)>>
 	<<set $activeSlave.skill.anal += random(0,20)>>
 	<<set $activeSlave.skill.entertainment += random(0,20)>>
-	<<set $activeSlave.skill.whore += random(0,20)>>
+	<<set $activeSlave.skill.whoring += random(0,20)>>
 	<<set $activeSlave.lips = random(60,90)>>
 	<<set $activeSlave.lipsImplant = 40>>
 	<<set $activeSlave.lipsPiercing = 1>>
@@ -277,7 +277,7 @@
 	<<set $activeSlave.skill.vaginal += random(0,20)>>
 	<<set $activeSlave.skill.anal += random(0,20)>>
 	<<set $activeSlave.skill.entertainment += random(0,20)>>
-	<<set $activeSlave.skill.whore += random(0,20)>>
+	<<set $activeSlave.skill.whoring += random(0,20)>>
 
 <<case "younger sister">>
 	<<set $activeSlave.origin = "She was recruited into your service by her older sister.">>
@@ -304,7 +304,7 @@
 	<<set $activeSlave.prostate = 1>>
 	<<set $activeSlave.actualAge = $eventSlave.actualAge+2>>
 	<<set $activeSlave.skill.entertainment += random(0,20)>>
-	<<set $activeSlave.skill.whore += random(0,20)>>
+	<<set $activeSlave.skill.whoring += random(0,20)>>
 	<<set $activeSlave.anus = 0>>
 	<<set $activeSlave.vagina = -1>>
 	<<set $activeSlave.energy = 70>>
@@ -336,7 +336,7 @@
 	<<set $activeSlave.nails = 5>>
 	<<set $activeSlave.skill.anal = 70>>
 	<<set $activeSlave.skill.oral = 70>>
-	<<set $activeSlave.skill.whore = 100>>
+	<<set $activeSlave.skill.whoring = 100>>
 	<<set $activeSlave.energy = 100>>
 	<<set $activeSlave.actualAge = $eventSlave.actualAge-2>>
 	<<set $activeSlave.skill.entertainment += random(0,20)>>
@@ -919,7 +919,7 @@ You look up the _relationType. _He2 costs <<print cashFormat($slaveCost)>>, a ba
 	<<set $activeSlave.skill.vaginal = 0>>
 	<<set $activeSlave.skill.anal = 0>>
 	<<set $activeSlave.skill.entertainment = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.lactation = 0>>
 	<<set $activeSlave.lactationDuration = 0>>
 	<<set $activeSlave.boobsMilk = 0>>
@@ -939,7 +939,7 @@ You look up the _relationType. _He2 costs <<print cashFormat($slaveCost)>>, a ba
 	<<set $activeSlave.skill.vaginal += random(0,20)>>
 	<<set $activeSlave.skill.anal += random(0,20)>>
 	<<set $activeSlave.skill.entertainment += random(0,20)>>
-	<<set $activeSlave.skill.whore += random(0,20)>>
+	<<set $activeSlave.skill.whoring += random(0,20)>>
 	<<set $activeSlave.lactation = 0>>
 	<<set $activeSlave.lactationDuration = 0>>
 	<<set $activeSlave.boobsMilk = 0>>
diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw
index 62f4f6d7f9d5b7381d51e5696713836b61a89fdc..bebc851112629a3ef4d367cd5232f571b6383931 100644
--- a/src/uncategorized/reShelterInspection.tw
+++ b/src/uncategorized/reShelterInspection.tw
@@ -23,7 +23,7 @@
 <<set $activeSlave.health = random(30,50)>>
 <<set $activeSlave.skill.anal = 0>>
 <<set $activeSlave.skill.oral = 0>>
-<<set $activeSlave.skill.whore = 0>>
+<<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.skill.vaginal = 0>>
 <<set $activeSlave.skill.entertainment = 0>>
 <<set $activeSlave.butt = random(4,6)>>
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index aa972562e009cfecad2ec17ee2cf817cc52005df..0f66b4535cf05264d56d68ff85ad3525c142489b 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -706,7 +706,7 @@
 <<set $activeSlave.face = 15>>
 <<set $activeSlave.vagina = 4>>
 <<set $activeSlave.skill.vaginal = 45>>
-<<set $activeSlave.skill.whore = 20>>
+<<set $activeSlave.skill.whoring = 20>>
 <<set $activeSlave.skill.anal = 10>>
 <<set $activeSlave.anus = 1>>
 <<set $activeSlave.weight = random(-80,-50)>>
@@ -1269,7 +1269,7 @@
 	<<set $activeSlave.counter.birthsTotal = 0>>
 	<<set $activeSlave.anus = 0>>
 	<<set $activeSlave.skill.vaginal = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.anal = 0>>
 	<<set $activeSlave.weight = random(-80,-50)>>
 	<<set $activeSlave.muscles = 0>>
@@ -1328,7 +1328,7 @@
 	<<set $activeSlave.counter.birthsTotal = 0>>
 	<<set $activeSlave.anus = 0>>
 	<<set $activeSlave.skill.vaginal = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.anal = 0>>
 	<<set $activeSlave.weight = random(-80,-50)>>
 	<<set $activeSlave.muscles = 0>>
diff --git a/src/uncategorized/resFailure.tw b/src/uncategorized/resFailure.tw
index 5c9bf35d4b69c934ec793554ac9e66a41059435c..9502f2d28aee4301c121fe222894e9c854e00cc5 100644
--- a/src/uncategorized/resFailure.tw
+++ b/src/uncategorized/resFailure.tw
@@ -66,13 +66,13 @@
 			<<set $activeSlave.skill.vaginal = 0>>
 			<<set $activeSlave.skill.oral = 0>>
 			<<set $activeSlave.skill.anal = 0>>
-			<<set $activeSlave.skill.whore = 0>>
+			<<set $activeSlave.skill.whoring = 0>>
 			<<set $activeSlave.skill.entertainment = 15>>
 		<<else>>
 			<<set $activeSlave.skill.vaginal = 15>>
 			<<set $activeSlave.skill.oral = 15>>
 			<<set $activeSlave.skill.anal = 15>>
-			<<set $activeSlave.skill.whore = 15>>
+			<<set $activeSlave.skill.whoring = 15>>
 			<<set $activeSlave.skill.entertainment = 15>>
 		<</if>>
 		<<set $activeSlave.skill.combat = 0>>
@@ -127,7 +127,7 @@
 		<<set $activeSlave.skill.vaginal = 0>>
 		<<set $activeSlave.skill.oral = 0>>
 		<<set $activeSlave.skill.anal = 0>>
-		<<set $activeSlave.skill.whore = 0>>
+		<<set $activeSlave.skill.whoring = 0>>
 		<<set $activeSlave.skill.entertainment = 0>>
 		<<set $activeSlave.skill.combat = 0>>
 		<<set $activeSlave.pubicHStyle = "waxed">>
@@ -194,7 +194,7 @@
 		<<set $activeSlave.skill.vaginal = 0>>
 		<<set $activeSlave.skill.oral = 0>>
 		<<set $activeSlave.skill.anal = 0>>
-		<<set $activeSlave.skill.whore = 0>>
+		<<set $activeSlave.skill.whoring = 0>>
 		<<set $activeSlave.skill.entertainment = 0>>
 		<<set $activeSlave.skill.combat = 0>>
 		<<set $activeSlave.pubicHStyle = "waxed">>
@@ -254,13 +254,13 @@
 			<<set $activeSlave.skill.vaginal = 15>>
 			<<set $activeSlave.skill.oral = 15>>
 			<<set $activeSlave.skill.anal = 15>>
-			<<set $activeSlave.skill.whore = 15>>
+			<<set $activeSlave.skill.whoring = 15>>
 			<<set $activeSlave.skill.entertainment = 15>>
 		<<else>>
 			<<set $activeSlave.skill.vaginal = 0>>
 			<<set $activeSlave.skill.oral = 0>>
 			<<set $activeSlave.skill.anal = 0>>
-			<<set $activeSlave.skill.whore = 0>>
+			<<set $activeSlave.skill.whoring = 0>>
 			<<set $activeSlave.skill.entertainment = 0>>
 		<</if>>
 		<<set $activeSlave.skill.combat = 0>>
@@ -336,7 +336,7 @@
 		<<set $activeSlave.skill.vaginal = 0>>
 		<<set $activeSlave.skill.oral = 15>>
 		<<set $activeSlave.skill.anal = 100>>
-		<<set $activeSlave.skill.whore = 15>>
+		<<set $activeSlave.skill.whoring = 15>>
 		<<set $activeSlave.skill.entertainment = 15>>
 		<<set $activeSlave.skill.combat = 0>>
 		<<set $activeSlave.pubicHStyle = "waxed">>
@@ -391,7 +391,7 @@
 		<<set $activeSlave.skill.vaginal = 0>>
 		<<set $activeSlave.skill.oral = 0>>
 		<<set $activeSlave.skill.anal = 0>>
-		<<set $activeSlave.skill.whore = 0>>
+		<<set $activeSlave.skill.whoring = 0>>
 		<<set $activeSlave.skill.entertainment = 0>>
 		<<if $TGA.schoolUpgrade == 2>>
 			<<set $activeSlave.skill.combat = 1>>
@@ -457,7 +457,7 @@
 		<<set $activeSlave.skill.vaginal = 10>>
 		<<set $activeSlave.skill.oral = 10>>
 		<<set $activeSlave.skill.anal = 10>>
-		<<set $activeSlave.skill.whore = 10>>
+		<<set $activeSlave.skill.whoring = 10>>
 		<<set $activeSlave.skill.entertainment = either(10,10,30)>>
 		<<set $activeSlave.skill.combat = 1>>
 		<<set $activeSlave.sexualFlaw = either("apathetic", "judgemental", "none", "none")>>
@@ -657,7 +657,7 @@
 		<<set $activeSlave.skill.vaginal = 100>>
 		<<set $activeSlave.skill.oral = 100>>
 		<<set $activeSlave.skill.anal = 100>>
-		<<set $activeSlave.skill.whore = 15>>
+		<<set $activeSlave.skill.whoring = 15>>
 		<<set $activeSlave.skill.entertainment = 100>>
 		<<set $activeSlave.skill.combat = 0>>
 		<<set $activeSlave.pubicHStyle = "waxed">>
@@ -741,7 +741,7 @@
 	<<set $activeSlave.skill.vaginal = 100>>
 	<<set $activeSlave.skill.oral = 100>>
 	<<set $activeSlave.skill.anal = 100>>
-	<<set $activeSlave.skill.whore = 15>>
+	<<set $activeSlave.skill.whoring = 15>>
 	<<set $activeSlave.skill.entertainment = 100>>
 	<<set $activeSlave.skill.combat = 0>>
 	<<set $activeSlave.pubicHStyle = "waxed">>
diff --git a/src/uncategorized/saChoosesOwnJob.tw b/src/uncategorized/saChoosesOwnJob.tw
index a403c8aff639f7e7aadff057e7035dce92c8b9b4..0e95126bc68e48a2e7b804044dfba7643c3d40e3 100644
--- a/src/uncategorized/saChoosesOwnJob.tw
+++ b/src/uncategorized/saChoosesOwnJob.tw
@@ -445,7 +445,7 @@
 				<<= assignJob($slaves[$i], "rest")>>
 			<</if>>
 		<<else>>
-			<<if ($slaves[$i].skill.whore > $slaves[$i].skill.entertainment)>>
+			<<if ($slaves[$i].skill.whoring > $slaves[$i].skill.entertainment)>>
 				<<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
 					<<set $slaves[$i].choosesOwnAssignmentText += " decides to work in $brothelName, since $he thinks $himself a better whore than a public slut.">>
 					<<= assignJob($slaves[$i], "work in the brothel")>>
@@ -453,7 +453,7 @@
 					<<set $slaves[$i].choosesOwnAssignmentText += " decides to whore, since $he thinks $himself a better whore than a public slut.">>
 					<<= assignJob($slaves[$i], "whore")>>
 				<</if>>
-			<<elseif ($slaves[$i].skill.entertainment > $slaves[$i].skill.whore)>>
+			<<elseif ($slaves[$i].skill.entertainment > $slaves[$i].skill.whoring)>>
 				<<if ($universalRulesAssignsSelfFacility == 1) && ($club > $clubSlaves)>>
 					<<set $slaves[$i].choosesOwnAssignmentText += " decides to be a club $girl, since $he thinks $himself a better public slut than a whore.">>
 					<<= assignJob($slaves[$i], "serve in the club")>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 372214faf4defc6aec5aa506bc8f0b134ac1e5a6..9085f49bec623dd2bdc37fed96b59e120acfe03c 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -24,9 +24,9 @@
 			<</if>>
 		<<elseif $slaves[$i].fuckdoll <= 15>>
 			This is $his second week as a living sex toy. $His suit continues $his training as a living sex toy, @@.green;forcing $him to accept any treatment@@ $he is subjected to. Though the suit is capable of resisting unacceptable movement to a degree, and it includes integral shackles to secure the toy in any position desired, the Fuckdoll is now severely punished if $he attempts any resistance at all.
-			<<if $slaves[$i].skill.whore > 50>>
+			<<if $slaves[$i].skill.whoring > 50>>
 				$He @@.red;loses $his refined courtesanship,@@ since all $he has to remember now is how to be used.
-				<<set $slaves[$i].skill.whore = 50>>
+				<<set $slaves[$i].skill.whoring = 50>>
 			<</if>>
 		<<elseif $slaves[$i].fuckdoll <= 25>>
 			This week $he @@.green;learns the most basic commands@@ $his suit can pass, those for simple postures. <<if $slaves[$i].amp == 1>>These are very simple, since $he lacks limbs.<<else>>One command directs $him to remain standing, but cock $his hips to offer $his rear hole. Another requires $him to get instantly down on all fours and arch $his back, offering both $his face hole and <<if $slaves[$i].vagina > -1>>lower holes<<else>>rear hole<</if>>.<</if>>
@@ -90,9 +90,9 @@
 				There is @@.red;no entertainment and no elegance@@ for $him anymore. $He cannot even hear the lewd noises $his holes make.
 				<<set $slaves[$i].skill.entertainment = 15>>
 			<</if>>
-			<<if $slaves[$i].skill.whore > 15>>
+			<<if $slaves[$i].skill.whoring > 15>>
 				$He @@.red;cannot remember prostitution@@ at all. $He can barely remember anything but being fucked.
-				<<set $slaves[$i].skill.whore = 15>>
+				<<set $slaves[$i].skill.whoring = 15>>
 			<</if>>
 			<<if $slaves[$i].intelligence+$slaves[$i].intelligenceImplant > 15>>
 				$His @@.red;mind steadily degrades@@ under the stress of this treatment.
@@ -123,7 +123,7 @@
 <<include "SA clothes">>
 
 <<if $slaves[$i].fetish == "mindbroken">>
-	<<set $slaves[$i].fetishStrength = 10, $slaves[$i].attrXY = 50, $slaves[$i].attrXX = 50, $slaves[$i].attrKnown = 1, $slaves[$i].devotion = 40, $slaves[$i].trust = -40, $slaves[$i].skill.vaginal = Math.clamp($slaves[$i].skill.vaginal,0,15), $slaves[$i].skill.oral = Math.clamp($slaves[$i].skill.oral,0,15), $slaves[$i].skill.anal = Math.clamp($slaves[$i].skill.anal,0,15), $slaves[$i].skill.combat = 0, $slaves[$i].skill.whore = 0, $slaves[$i].skill.entertainment = 0, $slaves[$i].intelligence = -75, $slaves[$i].intelligenceImplant = 0, $slaves[$i].sexualFlaw = "none", $slaves[$i].sexualQuirk = "none", $slaves[$i].behavioralFlaw = "none", $slaves[$i].behavioralQuirk = "none">>
+	<<set $slaves[$i].fetishStrength = 10, $slaves[$i].attrXY = 50, $slaves[$i].attrXX = 50, $slaves[$i].attrKnown = 1, $slaves[$i].devotion = 40, $slaves[$i].trust = -40, $slaves[$i].skill.vaginal = Math.clamp($slaves[$i].skill.vaginal,0,15), $slaves[$i].skill.oral = Math.clamp($slaves[$i].skill.oral,0,15), $slaves[$i].skill.anal = Math.clamp($slaves[$i].skill.anal,0,15), $slaves[$i].skill.combat = 0, $slaves[$i].skill.whoring = 0, $slaves[$i].skill.entertainment = 0, $slaves[$i].intelligence = -75, $slaves[$i].intelligenceImplant = 0, $slaves[$i].sexualFlaw = "none", $slaves[$i].sexualQuirk = "none", $slaves[$i].behavioralFlaw = "none", $slaves[$i].behavioralQuirk = "none">>
 <<else>>
 	<<if $slaves[$i].fuckdoll == 0>>
 
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index 6c5798e4d4866feef5fcac4b908e3a133405f188..7474ea9e101fe5e87e2b8127b3249cd4cb2063b8 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -17,7 +17,7 @@
 			<<elseif $slaves[$i].energy <= 20>>
 				is frigid and has little interest in getting off, not that $he gets a choice.
 				<<set $slaves[$i].need = 0>>
-			<<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
+			<<elseif $slaves[$i].need < $slaves[$i].needCap*0.5>>
 				<<if ($slaves[$i].devotion <= 20)>>
 					gets off at work despite $his reluctance, @@.hotpink;habituating $him to being a fuckhole.@@
 					<<set $slaves[$i].devotion += 1>>
@@ -49,7 +49,7 @@
 			<<if $slaves[$i].energy <= 20>>
 				is frigid and has little interest in getting off<<if (_release != "permissive")>>, making the rule restricting $his sexual outlets superfluous<</if>>.
 				<<set $slaves[$i].need = 0>>
-			<<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
+			<<elseif $slaves[$i].need < $slaves[$i].needCap*0.5>>
 				<<if (_release != "permissive") && (_release != "masturbation") && (_release != "chastity")>>
 					gets off at work, so being forbidden from masturbation doesn't really bother $him.
 					<<set $slaves[$i].need -= 20>>
@@ -203,7 +203,7 @@
 			<<elseif $slaves[$i].energy <= 20>>
 				is frigid and has little interest in getting off, not that $his clients care.
 				<<set $slaves[$i].need = 0>>
-			<<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
+			<<elseif $slaves[$i].need < $slaves[$i].needCap*0.5>>
 				<<if ($slaves[$i].devotion <= 20)>>
 					gets off at work despite $his reluctance, @@.hotpink;habituating $him to sexual slavery.@@
 					<<set $slaves[$i].devotion += 1>>
@@ -534,7 +534,7 @@
 			<<if $slaves[$i].energy <= 20>>
 				is frigid and has little interest in getting off<<if (_release != "permissive")>>, making the rule restricting $his sexual outlets superfluous<</if>>.
 				<<set $slaves[$i].need = 0>>
-			<<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
+			<<elseif $slaves[$i].need < $slaves[$i].needCap*0.5>>
 				<<if (_release != "permissive") && (_release != "masturbation") && (_release != "chastity")>>
 					gets off at work, so being forbidden from masturbation doesn't really bother $him.
 					<<set $slaves[$i].need -= 20>>
@@ -696,7 +696,7 @@
 			<<elseif $slaves[$i].energy <= 20>>
 				is frigid and has little interest in getting off, not that $his spectators care.
 				<<set $slaves[$i].need = 0>>
-			<<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
+			<<elseif $slaves[$i].need < $slaves[$i].needCap*0.5>>
 				<<if ($slaves[$i].devotion <= 20)>>
 					gets off at work despite $his reluctance, @@.hotpink;habituating $him to sexual slavery.@@
 					<<set $slaves[$i].devotion += 1>>
@@ -1000,7 +1000,7 @@
 			<<if $slaves[$i].energy <= 20>>
 				is frigid and has little interest in getting off<<if (_release != "permissive")>>, making the rule restricting $his sexual outlets superfluous<</if>>.
 				<<set $slaves[$i].need = 0>>
-			<<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
+			<<elseif $slaves[$i].need < $slaves[$i].needCap*0.5>>
 				<<if (_release != "permissive") && (_release != "masturbation") && (_release != "chastity")>>
 					gets off at work, so being forbidden from masturbation doesn't really bother $him.
 					<<set $slaves[$i].need -= 20>>
@@ -1412,7 +1412,7 @@
 			<<if $slaves[$i].energy <= 20>>
 				is frigid and has little interest in getting off<<if (_release != "permissive")>>, making the rule restricting $his sexual outlets superfluous<</if>>.
 				<<set $slaves[$i].need = 0>>
-			<<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
+			<<elseif $slaves[$i].need < $slaves[$i].needCap*0.5>>
 				gets off at work, so $he doesn't feel the need for release that often.
 				<<set $slaves[$i].need -= 20>>
 			<<else>>
@@ -1539,7 +1539,7 @@
 				<<elseif canDoAnal($slaves[$i]) && $slaves[$i].anus > 0>>
 					<<set $slaves[$i].counter.anal += 7, $analTotal += 7>>
 				<</if>>
-			<<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
+			<<elseif $slaves[$i].need < $slaves[$i].needCap*0.5>>
 				<<if $Wardeness != 0 && canPenetrate($Wardeness)>>
 					<<run SimpleSlaveFucking($slaves[$i], _wardenFunTimes)>>
 					<<set $slaves[_FLs].counter.penetrative += _wardenFunTimes, $penetrativeTotal += _wardenFunTimes>>
@@ -1665,7 +1665,7 @@
 			<<if $slaves[$i].energy <= 20>>
 				is frigid and has little interest in getting off<<if (_release != "permissive")>>, making the rule restricting $his sexual outlets superfluous<</if>>.
 				<<set $slaves[$i].need = 0>>
-			<<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
+			<<elseif $slaves[$i].need < $slaves[$i].needCap*0.5>>
 				<<if (_release != "permissive") && (_release != "masturbation") && (_release != "chastity")>>
 					gets off while relieving $his charges, so being forbidden from masturbation doesn't really bother $him.
 					<<set $slaves[$i].need -= 20>>
@@ -2162,7 +2162,7 @@
 			<<if $slaves[$i].energy <= 20>>
 				is frigid and has little interest in getting off<<if (_release != "permissive")>>, making the rule restricting $his sexual outlets superfluous<</if>>.
 				<<set $slaves[$i].need = 0>>
-			<<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
+			<<elseif $slaves[$i].need < $slaves[$i].needCap*0.5>>
 				<<if (_release != "permissive") && (_release != "masturbation") && (_release != "chastity")>>
 					gets off while relieving $his charges, so being forbidden from masturbation doesn't really bother $him.
 					<<set $slaves[$i].need -= 20>>
@@ -2675,7 +2675,7 @@
 			<<if $slaves[$i].energy <= 20>>
 				is frigid and has little interest in getting off<<if (_release != "permissive")>>, making the rule restricting $his sexual outlets superfluous<</if>>.
 				<<set $slaves[$i].need = 0>>
-			<<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
+			<<elseif $slaves[$i].need < $slaves[$i].needCap*0.5>>
 				<<if (_release != "permissive") && (_release != "masturbation") && (_release != "chastity")>>
 					gets off with $his students, so being forbidden from masturbation doesn't really bother $him.
 					<<set $slaves[$i].need -= 20>>
@@ -2862,7 +2862,7 @@
 			<<elseif $slaves[$i].energy <= 20>>
 				is frigid and has little interest in getting off, making the rule restricting $his sexual outlets superfluous.
 				<<set $slaves[$i].need = 0>>
-			<<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
+			<<elseif $slaves[$i].need < $slaves[$i].needCap*0.5>>
 				<<if ($slaves[$i].devotion <= 20)>>
 					gets off during class despite $his reluctance, @@.hotpink;habituating $him to sexual slavery.@@
 					<<set $slaves[$i].devotion += 1>>
@@ -3164,7 +3164,7 @@
 			<<if $slaves[$i].energy <= 20>>
 				is frigid and has little interest in getting off<<if (_release != "permissive")>>, making the rule restricting $his sexual outlets superfluous<</if>>.
 				<<set $slaves[$i].need = 0>>
-			<<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
+			<<elseif $slaves[$i].need < $slaves[$i].needCap*0.5>>
 				<<if (_release != "permissive") && (_release != "masturbation") && (_release != "chastity")>>
 					gets off while performing $his duties, so being forbidden from masturbation doesn't really bother $him.
 					<<set $slaves[$i].need -= 20>>
@@ -3319,7 +3319,7 @@
 			<<elseif $slaves[$i].energy <= 20>>
 				is frigid and has little interest in getting off.
 				<<set $slaves[$i].need = 0>>
-			<<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
+			<<elseif $slaves[$i].need < $slaves[$i].needCap*0.5>>
 				<<if ($slaves[$i].devotion <= 20)>>
 					gets off at work despite $his reluctance, @@.hotpink;habituating $him to sexual slavery.@@
 					<<set $slaves[$i].devotion += 1>>
@@ -3655,7 +3655,7 @@
 			<<if $slaves[$i].energy <= 20>>
 				is frigid and has little interest in getting off<<if (_release != "permissive")>>, making the rule restricting $his sexual outlets superfluous<</if>>.
 				<<set $slaves[$i].need = 0>>
-			<<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
+			<<elseif $slaves[$i].need < $slaves[$i].needCap*0.5>>
 				<<if (_release != "permissive") && (_release != "masturbation") && (_release != "chastity")>>
 					gets off while performing $his duties, so being forbidden from masturbation doesn't really bother $him.
 					<<set $slaves[$i].need -= 20>>
@@ -3821,7 +3821,7 @@
 				<<elseif $slaves[$i].energy <= 20>>
 					is frigid and has little interest in getting off<<if (_release != "permissive")>>, making the rule restricting $his sexual outlets superfluous<</if>>.
 					<<set $slaves[$i].need = 0>>
-				<<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
+				<<elseif $slaves[$i].need < $slaves[$i].needCap*0.5>>
 					<<if ($slaves[$i].devotion <= 20)>>
 						gets off from being milked despite $his reluctance, @@.hotpink;habituating $him to sexual slavery.@@
 						<<set $slaves[$i].devotion += 1>>
@@ -4200,7 +4200,7 @@
 			<<if $slaves[$i].energy <= 20>>
 				is frigid and has little interest in getting off<<if (_release != "permissive")>>, making the rule restricting $his sexual outlets superfluous<</if>>.
 				<<set $slaves[$i].need = 0>>
-			<<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
+			<<elseif $slaves[$i].need < $slaves[$i].needCap*0.5>>
 				<<if (_release != "permissive") && (_release != "masturbation") && (_release != "chastity")>>
 					gets off while performing $his duties, so being forbidden from masturbation doesn't really bother $him.
 					<<set $slaves[$i].need -= 20>>
@@ -4354,7 +4354,7 @@
 			<<elseif $slaves[$i].energy <= 20>>
 				is frigid and has little interest in getting off<<if (_release != "permissive")>>, making the rule restricting $his sexual outlets superfluous<</if>>.
 				<<set $slaves[$i].need = 0>>
-			<<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
+			<<elseif $slaves[$i].need < $slaves[$i].needCap*0.5>>
 				<<if ($slaves[$i].devotion <= 20)>>
 					gets off from working as a farmhand despite $his reluctance, @@.hotpink;habituating $him to sexual slavery.@@
 					<<set $slaves[$i].devotion += 1>>
@@ -4804,7 +4804,7 @@
 			<<elseif $masterSuiteUpgradeLuxury == 2 && $MastSiIDs.length > 3>>
 				never goes unsatisfied with all the action in the fuckpit.
 				<<set $slaves[$i].need -= 80>>
-			<<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
+			<<elseif $slaves[$i].need < $slaves[$i].needCap*0.5>>
 				<<if ($slaves[$i].devotion <= 20)>>
 					gets off regularly despite $his reluctance, @@.hotpink;habituating $him to sexual slavery.@@
 					<<set $slaves[$i].devotion += 1>>
@@ -4956,7 +4956,7 @@
 			<<elseif $slaves[$i].energy <= 20>>
 				is frigid and has little interest in getting off, though it doesn't stop $HeadGirl.slaveName.
 				<<set $slaves[$i].need = 0>>
-			<<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
+			<<elseif $slaves[$i].need < $slaves[$i].needCap*0.5>>
 				<<if ($slaves[$i].devotion <= 20)>>
 					gets off with $HeadGirl.slaveName despite $his reluctance, @@.hotpink;habituating $him to sexual slavery.@@
 					<<set $slaves[$i].devotion += 1>>
@@ -5105,7 +5105,7 @@
 			<<elseif $slaves[$i].energy <= 20>>
 				is frigid and has little interest in getting off<<if (_release != "permissive")>>, making the rule restricting $his sexual outlets superfluous<</if>>.
 				<<set $slaves[$i].need = 0>>
-			<<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
+			<<elseif $slaves[$i].need < $slaves[$i].needCap*0.5>>
 				<<if ($slaves[$i].devotion <= 20)>>
 					gets off at work despite $his reluctance, @@.hotpink;habituating $him to sexual slavery.@@
 					<<set $slaves[$i].devotion += 1>>
diff --git a/src/uncategorized/saTakeClasses.tw b/src/uncategorized/saTakeClasses.tw
index 585271086e37d52712c003e5ee61a240892d57b4..60ff204f23d84994c61c3dee13c592b480b97d4a 100644
--- a/src/uncategorized/saTakeClasses.tw
+++ b/src/uncategorized/saTakeClasses.tw
@@ -163,7 +163,7 @@
 		<<elseif ($slaves[$i].skill.anal <= 10) && ($slaves[$i].anus >= 0)>>
 			Since $he is a novice at taking it up $his butt and not permitted to learn through practice, $he is taught relaxation exercises and other simple anal basics.
 			<<AnalSkillIncrease $slaves[$i]>>
-		<<elseif ($slaves[$i].skill.whore <= 10)>>
+		<<elseif ($slaves[$i].skill.whoring <= 10)>>
 			Since $he has little idea what's involved in selling $his body, $he is taught basic safety practices and other simple prostitution skills.
 			<<WhoreSkillIncrease $slaves[$i]>>
 		<<elseif ($slaves[$i].skill.entertainment <= 10)>>
@@ -173,7 +173,7 @@
 			<<if ($slaves[$i].skill.oral <= 30)>>
 				Having completed the basic sex slave curriculum, $he studies more advanced ways to use $his lips and tongue to please cocks, cunts, and asses.
 				<<OralSkillIncrease $slaves[$i]>>
-			<<elseif ($slaves[$i].skill.whore <= 30)>>
+			<<elseif ($slaves[$i].skill.whoring <= 30)>>
 				Having completed the basic sex slave curriculum, $he studies intermediate prostitution, including how to stay as safe as possible and maximize $his efficiency.
 				<<WhoreSkillIncrease $slaves[$i]>>
 			<<elseif ($slaves[$i].skill.entertainment <= 30)>>
@@ -245,7 +245,7 @@
 	<<if ($slaves[$i].intelligenceImplant >= 15) && ($slaves[$i].assignment == "take classes")>>
 		<<if ($slaves[$i].voice == 0) || ($slaves[$i].accent <= 1) || (($schoolroomUpgradeLanguage == 0) && ($slaves[$i].accent <= 2))>>
 			<<if ($slaves[$i].skill.oral > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].skill.oral > 10))>>
-				<<if ($slaves[$i].skill.whore > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].skill.whore > 10))>>
+				<<if ($slaves[$i].skill.whoring > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].skill.whoring > 10))>>
 					<<if ($slaves[$i].skill.entertainment > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].skill.entertainment > 10))>>
 						<<if ($slaves[$i].skill.anal > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].skill.anal > 10))>>
 							<<if ($slaves[$i].skill.vaginal > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].skill.vaginal > 10)) || ($slaves[$i].vagina < 0)>>
diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw
index 901b3cd513b394b7a9dddf0e2ae98b21f92d97cb..f3be3cad23d52913428b9485fd41c086ee93279d 100644
--- a/src/uncategorized/saWhore.tw
+++ b/src/uncategorized/saWhore.tw
@@ -397,22 +397,22 @@ $His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a d
 <<if ($slaves[$i].devotion > 20)>>
 <<elseif !canWalk($slaves[$i])>>
 	Since $he can't walk, $he spends all of $his time in $his own room in the brothel. Customers come in, fuck $him, and leave.
-	<<if ($slaves[$i].skill.whore <= 10)>>
-	<<elseif ($slaves[$i].skill.whore <= 30)>>
+	<<if ($slaves[$i].skill.whoring <= 10)>>
+	<<elseif ($slaves[$i].skill.whoring <= 30)>>
 		As a skilled prostitute, $he gets a little more money out of customers.
-	<<elseif ($slaves[$i].skill.whore <= 60)>>
+	<<elseif ($slaves[$i].skill.whoring <= 60)>>
 		As an expert prostitute, $he gets more money out of customers.
-	<<elseif ($slaves[$i].skill.whore >= 100)>>
+	<<elseif ($slaves[$i].skill.whoring >= 100)>>
 		As a masterful prostitute, $he makes more money.
 	<</if>>
 <</if>>
 <<if ($slaves[$i].amp != 1)>>
-	<<if ($slaves[$i].skill.whore < 100)>>
-		<<set $slaves[$i].skill.whore += 10+Math.floor(($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/32)>>
+	<<if ($slaves[$i].skill.whoring < 100)>>
+		<<set $slaves[$i].skill.whoring += 10+Math.floor(($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/32)>>
 		$He @@.green;gains experience as a public slut,@@ and gets better at
-		<<if ($slaves[$i].skill.whore <= 30)>>
+		<<if ($slaves[$i].skill.whoring <= 30)>>
 			basic street smarts.
-		<<elseif ($slaves[$i].skill.whore <= 60)>>
+		<<elseif ($slaves[$i].skill.whoring <= 60)>>
 			steering clients to more lucrative sex acts.
 		<<else>>
 			squeezing johns for every penny.
@@ -467,7 +467,7 @@ $His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a d
 		<</if>>
 	<</if>>
 	<<if ($slaves[$i].amp != 1)>>
-	<<if ($slaves[$i].skill.whore < 100)>>
+	<<if ($slaves[$i].skill.whoring < 100)>>
 		$He gains experience as a prostitute.
 		<<set $skillIncrease = 10+Math.floor(($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/32)>>
 		<<WhoreSkillIncrease $slaves[$i]>>
@@ -1062,8 +1062,8 @@ $His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a d
 <</if>>
 
 In total, you were paid @@.yellowgreen;<<print cashFormat(Math.trunc($beauty*$FResult))>>@@ for the use of $slaves[$i].slaveName's body this week.
-<<set _cashX = Math.trunc(($beauty*$FResult)*(1+(0.002*$slaves[$i].skill.whore)))>>
-<<set _incomeStats.income += Math.trunc(($beauty*$FResult)*(1+(0.002*$slaves[$i].skill.whore)))>>
+<<set _cashX = Math.trunc(($beauty*$FResult)*(1+(0.002*$slaves[$i].skill.whoring)))>>
+<<set _incomeStats.income += Math.trunc(($beauty*$FResult)*(1+(0.002*$slaves[$i].skill.whoring)))>>
 
 <<if $slaves[$i].assignment == "work in the brothel">>
 	<<run cashX(_cashX, "whoreBrothel", $slaves[$i])>>
diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw
index 39912e08d1cd98e873a902efef106d8321cd085a..88a8b99f07d76bee09f62a30e726a3d63c272e48 100644
--- a/src/uncategorized/schoolroomReport.tw
+++ b/src/uncategorized/schoolroomReport.tw
@@ -169,7 +169,7 @@
 		<<if ($slaves[$i].intelligenceImplant >= 30)>>
 		<<if ($slaves[$i].voice == 0) || ($slaves[$i].accent <= 1) || (($schoolroomUpgradeLanguage == 0) && ($slaves[$i].accent <= 2))>>
 		<<if ($slaves[$i].skill.oral > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].skill.oral > 10))>>
-		<<if ($slaves[$i].skill.whore > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].skill.whore > 10))>>
+		<<if ($slaves[$i].skill.whoring > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].skill.whoring > 10))>>
 		<<if ($slaves[$i].skill.entertainment > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].skill.entertainment > 10))>>
 		<<if ($slaves[$i].skill.anal > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].skill.anal > 10))>>
 		<<if ($slaves[$i].skill.vaginal > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].skill.vaginal > 10)) || ($slaves[$i].vagina < 0)>>
diff --git a/src/uncategorized/seCoursing.tw b/src/uncategorized/seCoursing.tw
index e616fb971b9e8b76fb897aca199b5ff359914ad1..8fbf50998c2cf91d1b2d4883d4fe6d771feba819 100644
--- a/src/uncategorized/seCoursing.tw
+++ b/src/uncategorized/seCoursing.tw
@@ -111,7 +111,7 @@ You lead your lurcher $Lurcher.slaveName out on a leash, naked just like the har
 	<<set $activeSlave.skill.vaginal = 0>>
 	<<set $activeSlave.skill.oral = 0>>
 	<<set $activeSlave.skill.anal = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.weight = random(-50,50)>>
 <<elseif $origin == "heavily pregnant">>
 	<<set $activeSlaveOneTimeMinAge = $fertilityAge>>
@@ -129,7 +129,7 @@ You lead your lurcher $Lurcher.slaveName out on a leash, naked just like the har
 	<<set $activeSlave.skill.vaginal = 0>>
 	<<set $activeSlave.skill.oral = 0>>
 	<<set $activeSlave.skill.anal = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.weight = random(-20,100)>>
 	<<set $activeSlave.career = setup.youngCareers.random()>>
 <<elseif $origin == "housewife">>
@@ -151,7 +151,7 @@ You lead your lurcher $Lurcher.slaveName out on a leash, naked just like the har
 	<<set $activeSlave.skill.vaginal = 35>>
 	<<set $activeSlave.skill.oral = 100>>
 	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whore = 35>>
+	<<set $activeSlave.skill.whoring = 35>>
 	<<set $activeSlave.career = either("a housewife", "a trophy wife")>>
 	<<set $activeSlave.weight = random(-50,100)>>
 <<elseif $origin == "disobedient young">>
@@ -166,7 +166,7 @@ You lead your lurcher $Lurcher.slaveName out on a leash, naked just like the har
 	<<set $activeSlave.skill.vaginal = 15>>
 	<<set $activeSlave.skill.oral = 15>>
 	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whore = 15>>
+	<<set $activeSlave.skill.whoring = 15>>
 	<<set $activeSlave.sexualFlaw = either("hates anal", "hates oral", "hates penetration", "idealistic")>>
 	<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy", "hates men")>>
 	<<set $activeSlave.energy = 10>>
@@ -183,7 +183,7 @@ You lead your lurcher $Lurcher.slaveName out on a leash, naked just like the har
 	<<set $activeSlave.balls = random(2,4)>>
 	<<set $activeSlave.skill.oral = 0>>
 	<<set $activeSlave.skill.anal = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.sexualFlaw = either("hates oral", "hates anal", "hates penetration")>>
 	<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy", "hates men")>>
 	<<set $activeSlave.attrXY = 0>>
@@ -202,7 +202,7 @@ You lead your lurcher $Lurcher.slaveName out on a leash, naked just like the har
 	<<set $activeSlave.dick = random(3,5)>>
 	<<set $activeSlave.skill.oral = 0>>
 	<<set $activeSlave.skill.anal = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.weight = random(-50,100)>>
 <<elseif $origin == "feminized">>
 	<<set $activeSlaveOneTimeMaxAge = 25>>
@@ -220,7 +220,7 @@ You lead your lurcher $Lurcher.slaveName out on a leash, naked just like the har
 	<<set $activeSlave.dick = random(1,2)>>
 	<<set $activeSlave.skill.oral = 15>>
 	<<set $activeSlave.skill.anal = 35>>
-	<<set $activeSlave.skill.whore = 15>>
+	<<set $activeSlave.skill.whoring = 15>>
 	<<set $activeSlave.attrXY = 100>>
 	<<set $activeSlave.attrXX = 0>>
 	<<set $activeSlave.weight = random(-100,200)>>
diff --git a/src/uncategorized/seCustomSlaveDelivery.tw b/src/uncategorized/seCustomSlaveDelivery.tw
index e5f233517eab1e5f55493da0355365e3b4fa835c..cc8f82d287d781e9602a4f7f4a2a551f5de82954 100644
--- a/src/uncategorized/seCustomSlaveDelivery.tw
+++ b/src/uncategorized/seCustomSlaveDelivery.tw
@@ -188,8 +188,8 @@
 <<set $activeSlave.butt = $customSlave.butt>>
 <<set $activeSlave.skill.anal = $customSlave.skills>>
 <<set $activeSlave.skill.oral = $customSlave.skills>>
-<<set $activeSlave.skill.entertainment = $customSlave.skill.whores>>
-<<set $activeSlave.skill.whore = $customSlave.skill.whores>>
+<<set $activeSlave.skill.entertainment = $customSlave.whoreSkills>>
+<<set $activeSlave.skill.whoring = $customSlave.whoreSkills>>
 <<set $activeSlave.skill.combat = $customSlave.skill.combats>>
 <<set $activeSlave.eyes = $customSlave.eyes>>
 <<set $activeSlave.hears = $customSlave.hears>>
diff --git a/src/uncategorized/seRaiding.tw b/src/uncategorized/seRaiding.tw
index 7a4f15f0986b05aaa510365d77e38931403268be..f6ebc1fff1b6c55a6d0d9da278b34393fd0113ab 100644
--- a/src/uncategorized/seRaiding.tw
+++ b/src/uncategorized/seRaiding.tw
@@ -101,7 +101,7 @@ target
 	<<set $activeSlave.skill.vaginal = 35>>
 	<<set $activeSlave.skill.oral = 35>>
 	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whore = 35>>
+	<<set $activeSlave.skill.whoring = 35>>
 	<<set $activeSlave.teeth = "normal">>
 	<<set $activeSlave.weight = random(-50,130)>>
 	<<set $activeSlave.career = either("a housewife", "a trophy wife")>>
@@ -116,7 +116,7 @@ target
 	<<set $activeSlave.vagina = 1>>
 	<<set $activeSlave.skill.oral = 35>>
 	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 10>>
 	<<set $activeSlave.intelligence = random(70,90)>>
 	<<set $activeSlave.intelligenceImplant = 30>>
@@ -147,7 +147,7 @@ target
 	<<set $activeSlave.skill.vaginal = 0>>
 	<<set $activeSlave.skill.anal = 0>>
 	<<set $activeSlave.skill.oral = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 0>>
 	<<set $activeSlave.intelligence = random(0,60)>>
 	<<set $activeSlave.intelligenceImplant = 15>>
@@ -176,7 +176,7 @@ target
 	<<set $activeSlave.vagina = 1>>
 	<<set $activeSlave.skill.oral = 35>>
 	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.combat = 1>>
 	<<set $activeSlave.skill.entertainment = 10>>
 	<<set $activeSlave.intelligence = random(20,60)>>
@@ -195,7 +195,7 @@ target
 	<<set $activeSlave.faceImplant += 20>>
 	<<set $activeSlave.skill.anal = 0>>
 	<<set $activeSlave.skill.oral = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.combat = 1>>
 	<<set $activeSlave.hStyle = either("very short", "short")>>
 	<<set $activeSlave.boobs = 150>>
@@ -224,7 +224,7 @@ target
 	<<set $activeSlave.vagina = 1>>
 	<<set $activeSlave.skill.oral = 35>>
 	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.combat = 1>>
 	<<set $activeSlave.skill.entertainment = 10>>
 	<<set $activeSlave.intelligenceImplant = 15>>
@@ -254,7 +254,7 @@ target
 	<<set $activeSlave.vagina = 1>>
 	<<set $activeSlave.skill.oral = 35>>
 	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 10>>
 	<<set $activeSlave.intelligence = random(60,90)>>
 	<<set $activeSlave.intelligenceImplant = 30>>
@@ -286,7 +286,7 @@ target
 	<<set $activeSlave.skill.vaginal = 0>>
 	<<set $activeSlave.skill.oral = 15>>
 	<<set $activeSlave.skill.anal = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 0>>
 	<<set $activeSlave.behavioralFlaw = "devout">>
 	<<set $activeSlave.sexualFlaw = "repressed">>
@@ -303,7 +303,7 @@ target
 	<<set $activeSlave.skill.vaginal = 0>>
 	<<set $activeSlave.skill.anal = 0>>
 	<<set $activeSlave.skill.oral = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 35>>
 	<<set $activeSlave.behavioralFlaw = "liberated">>
 	<<set $activeSlave.sexualFlaw = "idealistic">>
@@ -339,7 +339,7 @@ target
 	<<set $activeSlave.skill.vaginal = 35>>
 	<<set $activeSlave.skill.oral = 35>>
 	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whore = 35>>
+	<<set $activeSlave.skill.whoring = 35>>
 	<<set $activeSlave.skill.entertainment = 35>>
 	<<set $activeSlave.career = "a local news anchor">>
 	<<set $activeSlave.weight = random(-40,40)>>
@@ -356,7 +356,7 @@ target
 	<<set $activeSlave.skill.vaginal = 0>>
 	<<set $activeSlave.skill.anal = 0>>
 	<<set $activeSlave.skill.oral = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 50>>
 	<<if $activeSlave.physicalAge >= 12>>
 		<<set $activeSlave.teeth = "normal">>
@@ -377,7 +377,7 @@ target
 	<<set $activeSlave.vagina = 1>>
 	<<set $activeSlave.skill.oral = 35>>
 	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.combat = 1>>
 	<<set $activeSlave.skill.entertainment = 10>>
 	<<set $activeSlave.intelligenceImplant = 15>>
@@ -408,7 +408,7 @@ target
 	<<set $activeSlave.skill.vaginal = 0>>
 	<<set $activeSlave.skill.anal = 0>>
 	<<set $activeSlave.skill.oral = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 50>>
 	<<if $activeSlave.physicalAge >= 12>>
 		<<set $activeSlave.teeth = "normal">>
@@ -442,7 +442,7 @@ target
 	<<set $activeSlave.vagina = 1>>
 	<<set $activeSlave.skill.oral = 35>>
 	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 10>>
 	<<set $activeSlave.intelligence = random(60,90)>>
 	<<set $activeSlave.intelligenceImplant = 30>>
@@ -470,7 +470,7 @@ target
 	<<set $activeSlave.vagina = 0>>
 	<<set $activeSlave.skill.oral = 35>>
 	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 10>>
 	<<set $activeSlave.weight = random(-100,60)>>
 <<case "procuress">>
@@ -484,7 +484,7 @@ target
 	<<set $activeSlave.vagina = 1>>
 	<<set $activeSlave.skill.oral = 35>>
 	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whore = 25>>
+	<<set $activeSlave.skill.whoring = 25>>
 	<<set $activeSlave.skill.entertainment = 25>>
 	<<set $activeSlave.intelligence = random(51,80)>>
 	<<set $activeSlave.weight = random(-10,120)>>
@@ -501,7 +501,7 @@ target
 	<<set $activeSlave.vagina = 1>>
 	<<set $activeSlave.skill.oral = 35>>
 	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 10>>
 	<<set $activeSlave.intelligence = random(51,80)>>
 	<<set $activeSlave.intelligenceImplant = 15>>
@@ -529,7 +529,7 @@ target
 	<<set $activeSlave.vagina = 1>>
 	<<set $activeSlave.skill.oral = 35>>
 	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 10>>
 	<<set $activeSlave.intelligence = random(70,90)>>
 	<<set $activeSlave.intelligenceImplant = 30>>
@@ -546,7 +546,7 @@ target
 	<<set $activeSlave.vagina = 1>>
 	<<set $activeSlave.skill.oral = 35>>
 	<<set $activeSlave.skill.anal = 15>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 20>>
 	<<set $activeSlave.intelligence = random(20,50)>>
 	<<set $activeSlave.intelligenceImplant = 15>>
diff --git a/src/uncategorized/seRecruiterSuccess.tw b/src/uncategorized/seRecruiterSuccess.tw
index 34eaa4daa258cea23de5a0cf189e3f5c00b790de..e3c909ecd22b970dfd708f2aa73e82029ba3b23b 100644
--- a/src/uncategorized/seRecruiterSuccess.tw
+++ b/src/uncategorized/seRecruiterSuccess.tw
@@ -181,7 +181,7 @@
 <</if>>
 <<set $activeSlave.skill.oral = random(15,40)>>
 <<set $activeSlave.skill.anal = random(15,40)>>
-<<set $activeSlave.skill.whore = random(15,40)>>
+<<set $activeSlave.skill.whoring = random(15,40)>>
 <<set $activeSlave.boobsImplant = random(0,3)*200>>
 <<set $activeSlave.boobs += $activeSlave.boobsImplant>>
 <<set $activeSlave.buttImplant = random(0,2)>>
diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw
index c852255003c4c5b95c2a13ce11bc028793afbb15..597b13e68270c6ff65a5102be57f0b77e0937ecc 100644
--- a/src/uncategorized/sellSlave.tw
+++ b/src/uncategorized/sellSlave.tw
@@ -1258,7 +1258,7 @@ __Bids Received__
 <<if $activeSlave.skill.vaginal <= 10>>
 	<<if $activeSlave.skill.anal <= 10>>
 		<<if $activeSlave.skill.oral <= 10>>
-			<<if $activeSlave.skill.whore <= 10>>
+			<<if $activeSlave.skill.whoring <= 10>>
 				<<if $activeSlave.skill.entertainment <= 10>>
 					<<if random(1,100) > 80>>
 						<br>''<<print cashFormat(500*Math.trunc(($slaveCost*1.15)/500))>>'' from a prominent citizen who's a notoriously inexperienced lover; it's painfully obvious that he prefers inexperienced slaves as they make him feel less insecure.
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index 8fc88f3beb3aca507e09792471e1803fc433cd77..37d26f4d3fdd06d76ba46737325bd30a806162d3 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -163,9 +163,9 @@ $NPCMarketShareLC = Math.trunc(($NPCSexSupply.lowerClass * 1000) / ($NPCSexSuppl
 
 <<for $i = 0; $i < _SL; $i++>>
 
-<<if ndef $slaves[$i].skill.whore>>
+<<if ndef $slaves[$i].skill.whoring>>
 	@@.yellow;Reset bad whore skill for $slaves[$i].slaveName.@@ Report this as a bug if it reoccurs.<br>
-	<<set $slaves[$i].skill.whore = 0>>
+	<<set $slaves[$i].skill.whoring = 0>>
 <</if>>
 <<if ndef $slaves[$i].skill.entertainment>>
 	@@.yellow;Reset bad entertain skill for $slaves[$i].slaveName.@@ Report this as a bug if it reoccurs.<br>
@@ -571,6 +571,7 @@ $NPCMarketShareLC = Math.trunc(($NPCSexSupply.lowerClass * 1000) / ($NPCSexSuppl
 
 /* end of preg speed and advance*/
 
+/* set up sexual need */
 <<if $slaves[$i].devotion >= -50>>
 	<<if $slaves[$i].energy > 20>>
 		<<if $slaves[$i].physicalAge < $slaves[$i].pubertyAgeXY && $slaves[$i].genes == "XY" && $slaves[$i].energy <= 80>>
@@ -591,6 +592,15 @@ $NPCMarketShareLC = Math.trunc(($NPCSexSupply.lowerClass * 1000) / ($NPCSexSuppl
 		<<if $slaves[$i].diet == "fertility">>
 			<<set $slaves[$i].need += 10>>
 		<</if>>
+		<<if $slaves[$i].aphrodisiacs == -1>>
+			<<set $slaves[$i].need = ($slaves[$i].need*0.5)>>
+		<<elseif $slaves[$i].aphrodisiacs == 1>>
+			<<set $slaves[$i].need = ($slaves[$i].need*1.5)>>
+		<<elseif $slaves[$i].aphrodisiacs == 2>>
+			<<set $slaves[$i].need = ($slaves[$i].need*2)>>
+		<</if>>
+		<<set $slaves[$i].need = Math.round($slaves[$i].need)>>
+		<<set $slaves[$i].needCap = $slaves[$i].need>>
 	<</if>>
 <</if>>
 
@@ -683,7 +693,7 @@ $NPCMarketShareLC = Math.trunc(($NPCSexSupply.lowerClass * 1000) / ($NPCSexSuppl
 				<<set _HGPossibleSlaves[5].push({ID: _Slave.ID, training: "fuck skill"})>>
 			<<elseif (_Slave.skill.anal < $HeadGirl.skill.anal) && (_Slave.anus > 0) && (canDoAnal(_Slave))>>
 				<<set _HGPossibleSlaves[5].push({ID: _Slave.ID, training: "anal skill"})>>
-			<<elseif (_Slave.skill.whore < $HeadGirl.skill.whore)>>
+			<<elseif (_Slave.skill.whoring < $HeadGirl.skill.whoring)>>
 				<<set _HGPossibleSlaves[5].push({ID: _Slave.ID, training: "whore skill"})>>
 			<<elseif (_Slave.skill.entertainment < $HeadGirl.skill.entertainment) && (_Slave.amp != 1)>>
 				<<set _HGPossibleSlaves[5].push({ID: _Slave.ID, training: "entertain skill"})>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 5acbd606a9c197a31e9ad99287573dd8f6603652..db850c6b6ba9a0d7dc638093bc0b900540440b0e 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -601,7 +601,7 @@
 	<</if>>
 
 	<<if $schoolroom != 0>>
-		<<if $schoolroom > $schoolroomSlaves && ($activeSlave.fetish != "mindbroken" && ($activeSlave.devotion >= -20 || ($activeSlave.devotion >= -50 && $activeSlave.trust < -20) || $activeSlave.trust < -50) && (($activeSlave.intelligenceImplant < 30) || ($activeSlave.voice != 0 && $activeSlave.accent+$schoolroomUpgradeLanguage > 2) || ($activeSlave.skill.oral <= 10+$schoolroomUpgradeSkills*20) || ($activeSlave.skill.whore <= 10+$schoolroomUpgradeSkills*20) || ($activeSlave.skill.entertainment <= 10+$schoolroomUpgradeSkills*20) || ($activeSlave.skill.anal < 10+$schoolroomUpgradeSkills*20) || ($activeSlave.vagina >= 0 && $activeSlave.skill.vaginal < 10+$schoolroomUpgradeSkills*20)))>>
+		<<if $schoolroom > $schoolroomSlaves && ($activeSlave.fetish != "mindbroken" && ($activeSlave.devotion >= -20 || ($activeSlave.devotion >= -50 && $activeSlave.trust < -20) || $activeSlave.trust < -50) && (($activeSlave.intelligenceImplant < 30) || ($activeSlave.voice != 0 && $activeSlave.accent+$schoolroomUpgradeLanguage > 2) || ($activeSlave.skill.oral <= 10+$schoolroomUpgradeSkills*20) || ($activeSlave.skill.whoring <= 10+$schoolroomUpgradeSkills*20) || ($activeSlave.skill.entertainment <= 10+$schoolroomUpgradeSkills*20) || ($activeSlave.skill.anal < 10+$schoolroomUpgradeSkills*20) || ($activeSlave.vagina >= 0 && $activeSlave.skill.vaginal < 10+$schoolroomUpgradeSkills*20)))>>
 			[[Schoolroom|Assign][$assignTo = "Schoolroom", $i = -1]] /* $i = -1 tells Assign to use $activeSlave as-is */
 		<<else>>Schoolroom<</if>>
 		<<if _numFacilities-- > 1>>|<</if>>
diff --git a/src/uncategorized/slaveShelter.tw b/src/uncategorized/slaveShelter.tw
index fe211d6bec6204cce7db09f45251e4668de104ee..b1f633103de19562b9e1e72b63a13cc6db05c943 100644
--- a/src/uncategorized/slaveShelter.tw
+++ b/src/uncategorized/slaveShelter.tw
@@ -49,7 +49,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
 	<<set $shelterSlave.anus = 3>>
 	<<set $shelterSlave.skill.oral = 0>>
 	<<set $shelterSlave.skill.anal = 0>>
-	<<set $shelterSlave.skill.whore = 0>>
+	<<set $shelterSlave.skill.whoring = 0>>
 	<<set $shelterSlave.skill.entertainment = 0>>
 	<<set $shelterSlave.skill.combat = 0>>
 	<<set $shelterSlave.intelligence = -70>>
@@ -118,7 +118,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
 	<<set $shelterSlave.bellySag = 20>>
 	<<set $shelterSlave.skill.oral = 0>>
 	<<set $shelterSlave.skill.anal = 0>>
-	<<set $shelterSlave.skill.whore = 0>>
+	<<set $shelterSlave.skill.whoring = 0>>
 	<<set $shelterSlave.skill.entertainment = 0>>
 	<<set $shelterSlave.skill.combat = 0>>
 	<<set $shelterSlave.intelligence = -70>>
@@ -236,7 +236,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
 	<<set $shelterSlave.anus = 4>>
 	<<set $shelterSlave.skill.oral = 0>>
 	<<set $shelterSlave.skill.anal = 15>>
-	<<set $shelterSlave.skill.whore = 0>>
+	<<set $shelterSlave.skill.whoring = 0>>
 	<<set $shelterSlave.skill.entertainment = 0>>
 	<<set $shelterSlave.skill.combat = 0>>
 	<<set $shelterSlave.attrXY = random(40,60)>>
@@ -259,7 +259,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
 	<<set $shelterSlave.anus = 0>>
 	<<set $shelterSlave.skill.oral = 0>>
 	<<set $shelterSlave.skill.anal = 0>>
-	<<set $shelterSlave.skill.whore = 0>>
+	<<set $shelterSlave.skill.whoring = 0>>
 	<<set $shelterSlave.skill.entertainment = 0>>
 	<<set $shelterSlave.skill.combat = 0>>
 	<<set $shelterSlave.energy = random(5,10)>>
@@ -282,7 +282,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
 	<<set $shelterSlave.skill.oral = 15>>
 	<<set $shelterSlave.skill.anal = 15>>
 	<<set $shelterSlave.skill.vaginal = 15>>
-	<<set $shelterSlave.skill.whore = 0>>
+	<<set $shelterSlave.skill.whoring = 0>>
 	<<set $shelterSlave.skill.entertainment = 0>>
 	<<set $shelterSlave.skill.combat = 0>>
 	<<set $shelterSlave.behavioralFlaw = either("anorexic", "gluttonous", "odd")>>
@@ -311,7 +311,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
 	<<set $shelterSlave.skill.oral = 0>>
 	<<set $shelterSlave.skill.anal = 0>>
 	<<set $shelterSlave.skill.vaginal = 0>>
-	<<set $shelterSlave.skill.whore = 0>>
+	<<set $shelterSlave.skill.whoring = 0>>
 	<<set $shelterSlave.skill.entertainment = 0>>
 	<<set $shelterSlave.skill.combat = 0>>
 	<<set $shelterSlave.behavioralFlaw = either("gluttonous", "hates men", "odd")>>
@@ -335,7 +335,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
 	<<set $shelterSlave.skill.oral = 35>>
 	<<set $shelterSlave.skill.anal = 35>>
 	<<set $shelterSlave.skill.vaginal = 35>>
-	<<set $shelterSlave.skill.whore = 35>>
+	<<set $shelterSlave.skill.whoring = 35>>
 	<<set $shelterSlave.skill.entertainment = 15>>
 	<<set $shelterSlave.skill.combat = 0>>
 	<<set $shelterSlave.behavioralFlaw = either("anorexic", "gluttonous", "hates men", "odd")>>
diff --git a/src/uncategorized/wardrobe.tw b/src/uncategorized/wardrobe.tw
index 341b701cbed3df81d15573543781dd45320f3dd1..aa26b714b8f39be153190a51469693160c6f3d17 100644
--- a/src/uncategorized/wardrobe.tw
+++ b/src/uncategorized/wardrobe.tw
@@ -471,7 +471,7 @@ The room containing all the clothes and accessories you have available to dress
 </td>
 
 <td>
-<<set _model.clothes = either("a schutzstaffel uniform", "a klan robe", "a slutty klan robe", "a schutzstaffel uniform", "a slutty schutzstaffel uniform")>>
+<<set _model.clothes = either("a klan robe", "a slutty klan robe", "a schutzstaffel uniform", "a slutty schutzstaffel uniform")>>
 <<if $seeImages == 1>>
 	<div class= "imageRef smlImg">
 		<<SlaveArt _model 1 0>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 101e55033f596843f9a5addf9dfba5c73ba4a8ac..46c5eebe450377b4f95db17f8f0ca71f815ebc80 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -528,8 +528,8 @@
 %/
 <<widget "CustomSlaveWhoreSkills">>
 	<<replace #whoreskills>>
-		<<if $customSlave.skill.whores <= 10>>Unskilled at prostitution and entertainment.
-		<<elseif $customSlave.skill.whores <= 15>>Basic prostitution and entertainment skills.
+		<<if $customSlave.whoreSkills <= 10>>Unskilled at prostitution and entertainment.
+		<<elseif $customSlave.whoreSkills <= 15>>Basic prostitution and entertainment skills.
 		<<else>>Skilled at prostitution and entertainment.
 		<</if>>
 	<</replace>>
@@ -540,7 +540,7 @@
 %/
 <<widget "CustomSlaveCombatSkills">>
 	<<replace #combatskills>>
-		<<if $customSlave.skill.combats == 0>>Unskilled at combat.
+		<<if $customSlave.skill.combat == 0>>Unskilled at combat.
 		<<else>>Skilled at combat.
 		<</if>>
 	<</replace>>
@@ -818,7 +818,7 @@
 	<</if>>
 	<<if $corpSpecEducation > 0>>
 		<<set $activeSlave.intelligenceImplant = 15 * $corpSpecEducation,
-		$activeSlave.skill.whore = Math.clamp($activeSlave.skill.whore, 15 * $corpSpecEducation, 100),
+		$activeSlave.skill.whoring = Math.clamp($activeSlave.skill.whoring, 15 * $corpSpecEducation, 100),
 		$activeSlave.skill.entertainment = Math.clamp($activeSlave.skill.entertainment, 15 * $corpSpecEducation, 100)>>
 		<<if $corpSpecEducation == 1>>
 			Its slave students receive basic slave educations.
@@ -1612,7 +1612,7 @@
 	<<set $activeSlave.skill.vaginal = 0>>
 	<<set $activeSlave.skill.oral = 0>>
 	<<set $activeSlave.skill.anal = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 0>>
 	<<set $activeSlave.skill.combat = 0>>
 	<<set $activeSlave.addict = either(0, 0, 0, 10, 10, 20, 30)>>
@@ -1664,7 +1664,7 @@
 	<<set $activeSlave.skill.vaginal = random(50,100)>>
 	<<set $activeSlave.skill.oral = random(50,100)>>
 	<<set $activeSlave.skill.anal = random(50,100)>>
-	<<set $activeSlave.skill.whore = random(50,100)>>
+	<<set $activeSlave.skill.whoring = random(50,100)>>
 	<<set $activeSlave.skill.entertainment = random(50,100)>>
 	<<switch $activeSlave.career>>
 		<<case "a lawyer">>
@@ -1690,7 +1690,7 @@
 		<<case "a teacher">>
 			<<set $activeSlave.slaveName = "WCPU-TE">>
 	<</switch>>
-	<<set $activeSlave.slaveSurname = "#"+$activeSlave.skill.vaginal+$activeSlave.skill.oral+$activeSlave.skill.anal+$activeSlave.skill.whore+$activeSlave.skill.entertainment+"-"+$activeSlave.intelligence>>
+	<<set $activeSlave.slaveSurname = "#"+$activeSlave.skill.vaginal+$activeSlave.skill.oral+$activeSlave.skill.anal+$activeSlave.skill.whoring+$activeSlave.skill.entertainment+"-"+$activeSlave.intelligence>>
 	<<set $activeSlave.birthName = "", $activeSlave.birthSurname = "">>
 	<<if $activeSlave.career == "a soldier">>
 		<<set $activeSlave.skill.combat = 1>>
@@ -1774,7 +1774,7 @@
 	<</if>>
 	<<set $activeSlave.skill.combat = either(0, 0, 0, 0, 0, 1)>>
 	<<set $activeSlave.skill.entertainment = random(15,100)>>
-	<<set $activeSlave.skill.whore = random(15,100)>>
+	<<set $activeSlave.skill.whoring = random(15,100)>>
 	<<set $activeSlave.skill.oral = random(15,100)>>
 	<<set $activeSlave.skill.anal = random(15,100)>>
 	<<set $activeSlave.anus = random(1,3)>>
@@ -1828,7 +1828,7 @@
 	<<set $activeSlave.skill.anal = 0>>
 	<<set $activeSlave.anus = 0>>
 	<<set $activeSlave.skill.oral = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 
 
 <<case "raiders">>
@@ -1857,7 +1857,7 @@
 	<<if random(1,2) == 1>>
 		<<set $activeSlave.skill.oral = 0>>
 	<</if>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 
 
 <<case "trainers">>
@@ -1934,13 +1934,13 @@
 		<<set $activeSlave.skill.vaginal = 0>>
 		<<set $activeSlave.skill.oral = 0>>
 		<<set $activeSlave.skill.anal = 0>>
-		<<set $activeSlave.skill.whore = 0>>
+		<<set $activeSlave.skill.whoring = 0>>
 		<<set $activeSlave.skill.entertainment = 15>>
 	<<else>>
 		<<set $activeSlave.skill.vaginal = 15>>
 		<<set $activeSlave.skill.oral = 15>>
 		<<set $activeSlave.skill.anal = 15>>
-		<<set $activeSlave.skill.whore = 15>>
+		<<set $activeSlave.skill.whoring = 15>>
 		<<set $activeSlave.skill.entertainment = 15>>
 	<</if>>
 	<<set $activeSlave.skill.combat = 0>>
@@ -1989,7 +1989,7 @@
 	<<set $activeSlave.skill.vaginal = 0>>
 	<<set $activeSlave.skill.oral = 0>>
 	<<set $activeSlave.skill.anal = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 0>>
 	<<set $activeSlave.skill.combat = 0>>
 	<<set $activeSlave.pubicHStyle = "waxed">>
@@ -2045,13 +2045,13 @@
 		<<set $activeSlave.skill.vaginal = 15>>
 		<<set $activeSlave.skill.oral = 15>>
 		<<set $activeSlave.skill.anal = 15>>
-		<<set $activeSlave.skill.whore = 15>>
+		<<set $activeSlave.skill.whoring = 15>>
 		<<set $activeSlave.skill.entertainment = 15>>
 	<<else>>
 		<<set $activeSlave.skill.vaginal = 0>>
 		<<set $activeSlave.skill.oral = 0>>
 		<<set $activeSlave.skill.anal = 0>>
-		<<set $activeSlave.skill.whore = 0>>
+		<<set $activeSlave.skill.whoring = 0>>
 		<<set $activeSlave.skill.entertainment = 0>>
 	<</if>>
 	<<set $activeSlave.skill.combat = 0>>
@@ -2120,7 +2120,7 @@
 	<<set $activeSlave.skill.vaginal = 0>>
 	<<set $activeSlave.skill.oral = 15>>
 	<<set $activeSlave.skill.anal = 100>>
-	<<set $activeSlave.skill.whore = 15>>
+	<<set $activeSlave.skill.whoring = 15>>
 	<<set $activeSlave.skill.entertainment = 15>>
 	<<set $activeSlave.skill.combat = 0>>
 	<<set $activeSlave.pubicHStyle = "waxed">>
@@ -2168,7 +2168,7 @@
 	<<set $activeSlave.skill.vaginal = 0>>
 	<<set $activeSlave.skill.oral = 0>>
 	<<set $activeSlave.skill.anal = 0>>
-	<<set $activeSlave.skill.whore = 0>>
+	<<set $activeSlave.skill.whoring = 0>>
 	<<set $activeSlave.skill.entertainment = 0>>
 	<<if $TGA.schoolUpgrade == 2>>
 		<<set $activeSlave.skill.combat = 1>>
@@ -2217,7 +2217,7 @@
 		<<set $activeSlave.skill.vaginal = 0>>
 		<<set $activeSlave.skill.oral = 0>>
 		<<set $activeSlave.skill.anal = 0>>
-		<<set $activeSlave.skill.whore = 0>>
+		<<set $activeSlave.skill.whoring = 0>>
 		<<set $activeSlave.skill.entertainment = 0>>
 		<<set $activeSlave.skill.combat = 0>>
 		<<set $activeSlave.pubicHStyle = "waxed">>
@@ -2256,7 +2256,7 @@
 		<<set $activeSlave.skill.vaginal = 0>>
 		<<set $activeSlave.skill.oral = 0>>
 		<<set $activeSlave.skill.anal = 0>>
-		<<set $activeSlave.skill.whore = 0>>
+		<<set $activeSlaveing = 0>>
 		<<set $activeSlave.skill.entertainment = 0>>
 		<<set $activeSlave.skill.combat = 0>>
 		<<set $activeSlave.pubicHStyle = "waxed">>
@@ -2310,7 +2310,7 @@
 		<<set $activeSlave.skill.vaginal = 0>>
 		<<set $activeSlave.skill.oral = 0>>
 		<<set $activeSlave.skill.anal = 0>>
-		<<set $activeSlave.skill.whore = 0>>
+		<<set $activeSlave.skill.whoring = 0>>
 		<<set $activeSlave.skill.entertainment = 0>>
 		<<set $activeSlave.skill.combat = 0>>
 		<<set $activeSlave.pubicHStyle = "waxed">>
@@ -2544,7 +2544,7 @@
 	<<set $activeSlave.skill.vaginal = 100>>
 	<<set $activeSlave.skill.oral = 100>>
 	<<set $activeSlave.skill.anal = 100>>
-	<<set $activeSlave.skill.whore = 15>>
+	<<set $activeSlave.skill.whoring = 15>>
 	<<set $activeSlave.skill.entertainment = 100>>
 	<<set $activeSlave.skill.combat = 0>>
 	<<set $activeSlave.pubicHStyle = "waxed">>
@@ -2612,14 +2612,14 @@
 		<<set $activeSlave.skill.vaginal = either(20,20,40)>>
 		<<set $activeSlave.skill.oral = either(20,20,40)>>
 		<<set $activeSlave.skill.anal = either(20,20,40)>>
-		<<set $activeSlave.skill.whore = either(20,20,40)>>
+		<<set $activeSlave.skill.whoring = either(20,20,40)>>
 		<<set $activeSlave.skill.entertainment = either(60,80,80,100)>>
 	<<else>>
 		<<set $activeSlave.intelligence = random(0,20)>>
 		<<set $activeSlave.skill.vaginal = 10>>
 		<<set $activeSlave.skill.oral = 10>>
 		<<set $activeSlave.skill.anal = 10>>
-		<<set $activeSlave.skill.whore = 10>>
+		<<set $activeSlave.skill.whoring = 10>>
 		<<set $activeSlave.skill.entertainment = either(20,40,40,60)>>
 	<</if>>
 	<<set $activeSlave.skill.combat = 1>>
@@ -3581,7 +3581,7 @@
 	/* Closes Security */
 	/* Opens management */
 		<<case "Headgirl">>
-			<<set $activeSlave.devotion = 90, $activeSlave.trust = 100, $activeSlave.fetish = "dom", $activeSlave.fetishStrength = 100, $activeSlave.energy = random(70,90), $activeSlave.intelligence = random(60,100), $activeSlave.skill.entertainment = 100, $activeSlave.skill.whore = 100, $activeSlave.skill.anal = 100, $activeSlave.skill.oral = 100, $activeSlave.skill.vaginal = 100, $activeSlave.career = either("a lawyer", "a military officer", "a politician")>>
+			<<set $activeSlave.devotion = 90, $activeSlave.trust = 100, $activeSlave.fetish = "dom", $activeSlave.fetishStrength = 100, $activeSlave.energy = random(70,90), $activeSlave.intelligence = random(60,100), $activeSlave.skill.entertainment = 100, $activeSlave.skill.whoring = 100, $activeSlave.skill.anal = 100, $activeSlave.skill.oral = 100, $activeSlave.skill.vaginal = 100, $activeSlave.career = either("a lawyer", "a military officer", "a politician")>>
 			<<if $seeDicks > 0>>
 				<<set $activeSlave.dick = random(3,5), $activeSlave.balls = random(3,6), $activeSlave.scrotum = $activeSlave.balls, $activeSlave.prostate = either(1,1,2)>>
 			<</if>>
@@ -3593,7 +3593,7 @@
 			<</if>>
 			<<set $activeSlave.physicalAge = $activeSlave.actualAge, $activeSlave.visualAge = $activeSlave.actualAge, $activeSlave.ovaryAge = $activeSlave.actualAge>>
 		<<case "Teacher">>
-			<<set $activeSlave.fetish = "dom", $activeSlave.fetishStrength = 100, $activeSlave.energy = random(70,90), $activeSlave.intelligence = 100, $activeSlave.skill.entertainment = 100, $activeSlave.skill.whore = 100, $activeSlave.skill.anal = 100, $activeSlave.skill.oral = 100, $activeSlave.skill.vaginal = 100, $activeSlave.face = random(41,90), $activeSlave.career = either("a librarian", "a principal", "a private instructor", "a professor", "a scholar", "a scientist", "a teacher", "a teaching assistant")>>
+			<<set $activeSlave.fetish = "dom", $activeSlave.fetishStrength = 100, $activeSlave.energy = random(70,90), $activeSlave.intelligence = 100, $activeSlave.skill.entertainment = 100, $activeSlave.skill.whoring = 100, $activeSlave.skill.anal = 100, $activeSlave.skill.oral = 100, $activeSlave.skill.vaginal = 100, $activeSlave.face = random(41,90), $activeSlave.career = either("a librarian", "a principal", "a private instructor", "a professor", "a scholar", "a scientist", "a teacher", "a teaching assistant")>>
 			<<if $seeDicks > 0>>
 				<<set $activeSlave.dick = random(3,5), $activeSlave.balls = random(3,6), $activeSlave.scrotum = $activeSlave.balls, $activeSlave.prostate = either(1,1,1,2,2,3)>>
 			<</if>>
@@ -3646,7 +3646,7 @@
 		<<case "DJ">>
 			<<set $activeSlave.skill.entertainment = 100, $activeSlave.muscles = random(6,30), $activeSlave.face = random(80,100), $activeSlave.career = either("a classical dancer", "a classical musician", "a dancer", "a house DJ", "a musician", "an aspiring pop star")>>
 		<<case "Madam">>
-			<<set $activeSlave.skill.whore = 100, $activeSlave.career = either("a business owner", "a manager", "a pimp", "a procuress", "an innkeeper")>>
+			<<set $activeSlave.skill.whoring = 100, $activeSlave.career = either("a business owner", "a manager", "a pimp", "a procuress", "an innkeeper")>>
 			<<if $seeDicks > 0>>
 				<<set $activeSlave.dick = random(3,5), $activeSlave.balls = random(3,5), $activeSlave.scrotum = $activeSlave.balls, $activeSlave.prostate = either(1,1,1,2)>>
 			<</if>>
@@ -3657,7 +3657,7 @@
 			<</if>>
 			<<set $activeSlave.physicalAge = $activeSlave.actualAge, $activeSlave.visualAge = $activeSlave.actualAge, $activeSlave.ovaryAge = $activeSlave.actualAge>>
 		<<case "Concubine">>
-			<<set $activeSlave.prestige = 3, $activeSlave.energy = random(80,100), $activeSlave.skill.entertainment = 100, $activeSlave.skill.whore = 100, $activeSlave.skill.anal = 100, $activeSlave.skill.oral = 100, $activeSlave.skill.vaginal = 100, $activeSlave.face = 100, $activeSlave.devotion = random(90,95), $activeSlave.trust = random(90,100)>>
+			<<set $activeSlave.prestige = 3, $activeSlave.energy = random(80,100), $activeSlave.skill.entertainment = 100, $activeSlave.skill.whoring = 100, $activeSlave.skill.anal = 100, $activeSlave.skill.oral = 100, $activeSlave.skill.vaginal = 100, $activeSlave.face = 100, $activeSlave.devotion = random(90,95), $activeSlave.trust = random(90,100)>>
 		/* Closes Entertain */
 		<</switch>>
 <</widget>>