diff --git a/Changelog.txt b/Changelog.txt
index 82706bacd691dc355c8f588bfccb26c9d9aec9e1..3051f5acc0ca5c09b93664cecd22f36b62f74a28 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,22 +1,26 @@
 Pregmod
 
-0.10.7.1-3.2.x
+0.10.7.1-3.3.x
 
-	2
-	-tiredness overhauled
+	0
+	-tiredness overhauled (temp disabled)
 	-illness tweaked
 	-slave performance listing
 	-debug beauty/FResult listing
 	-reminder system
 	-engineering & warfare personal attention options
+	-better defined breast and butt implant types
 	-porn/ads code optimization
 	-arcology structure optimization
 	-expanded racial eye, hair and skin color ranges
 	-royal blood event can now use real dynasties
 	-CSS replacing SC formatting
 	-code consolidation
+	-major code structure improvements
 	-various fixes and balance changes
 
+0.10.7.1-3.2.x
+
 	12/26/2019
 
 	1
diff --git a/player variables documentation - Pregmod.txt b/player variables documentation - Pregmod.txt
index 89c7f7bbecddcde19bff0f01d1a50018de364a0d..3fa9a587f2fdb8fcbdeb2d556f8b196d20732380 100644
--- a/player variables documentation - Pregmod.txt	
+++ b/player variables documentation - Pregmod.txt	
@@ -135,6 +135,16 @@ Size, if any, of breast implants
 0 - none
 1+ - yes
 
+boobsImplantType:
+
+Implant type
+"none"
+"normal"
+"string"
+"fillable"
+"advanced fillable"
+"hyper fillable"
+
 lactation:
 
 is player lactating
@@ -160,6 +170,16 @@ do you have butt implants
 0 - no
 1+ - size
 
+buttImplantType:
+
+Implant type
+"none"
+"normal"
+"string"
+"fillable"
+"advanced fillable"
+"hyper fillable"
+
 vagina:
 
 (common in events)
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index f714f85bc48bf50093ea454ffe8f8833a6415b55..081f212b6c9b503f638223cd4f7c1702bda69a41 100644
--- a/slave variables documentation - Pregmod.txt	
+++ b/slave variables documentation - Pregmod.txt	
@@ -1771,16 +1771,23 @@ accepts int
 boobsImplant:
 
 slave implant size
-0	  - no implants
-1-199	 - small implants
+0	      - no implants
+1-199	  - small implants
 200-399   - normal implants
 400-599   - large implants
-600+	  - boobsImplant size fillable implants
+600-799	  - huge implants
+800-999	  - giant implants
+1000+     - massive implants
 
 boobsImplantType:
 
-0 - normal/none
-1 - string
+Implant type
+"none"
+"normal"
+"string"
+"fillable"
+"advanced fillable"
+"hyper fillable"
 
 boobShape:
 
@@ -1922,18 +1929,21 @@ butt size
 
 buttImplant:
 
-butt implant type and size
-0 - none
-1 - butt implant
-2 - big butt implant
-3 - fillable butt implants
-5 - 8  - advanced fillable implants
-9+ - hyper fillable implants
+butt implant size
+0  - none
+1  - butt implant
+2  - big butt implant
+3+ - massive butt implant
 
 buttImplantType:
 
-0 - normal/none
-1 - string
+Implant type
+"none"
+"normal"
+"string"
+"fillable"
+"advanced fillable"
+"hyper fillable"
 
 buttTat:
 
diff --git a/src/002-config/fc-version.js b/src/002-config/fc-version.js
index bb79320be10be5d2a1d797c482f81d03a7e7a3d6..49ba560ab0b5c183dc660c6f5cf75c352183ac11 100644
--- a/src/002-config/fc-version.js
+++ b/src/002-config/fc-version.js
@@ -1,7 +1,7 @@
 App.Version = {
 	base: "0.10.7.1", // The vanilla version the mod is based off of, this should never be changed.
-	pmod: "3.2.0",
-	release: 1060,
+	pmod: "3.3.0",
+	release: 1061,
 };
 
 /* Use release as save version */
diff --git a/src/cheats/mod_EditChildCheatNew.tw b/src/cheats/mod_EditChildCheatNew.tw
index 39d5f8b6b3461a8b2694d87f04a1fc4ca4af26ef..059fbb45d59dedd646770e861904e0eb61bafc8e 100644
--- a/src/cheats/mod_EditChildCheatNew.tw
+++ b/src/cheats/mod_EditChildCheatNew.tw
@@ -1610,11 +1610,13 @@
 	''Breast Implants:''
 	<<textbox "$tempSlave.boobsImplant" $tempSlave.boobsImplant>>
 	<br>
-	''Breast String Implants:''
-	<<if $tempSlave.boobsImplantType == 0>>@@.yellow;No@@ |
-	<<else>>@@.yellow;Yes@@ | <</if>>
-	<<radiobutton "$tempSlave.boobsImplantType" 0>> No
-	<<radiobutton "$tempSlave.boobsImplantType" 1>> Yes
+	''Breast Implant Type: @@.yellow;$tempSlave.boobsImplantType@@''
+	<<radiobutton "$tempSlave.boobsImplantType" "None">> None
+	<<radiobutton "$tempSlave.boobsImplantType" "normal">> Normal
+	<<radiobutton "$tempSlave.boobsImplantType" "string">> String
+	<<radiobutton "$tempSlave.boobsImplantType" "fillable">> Fillable
+	<<radiobutton "$tempSlave.boobsImplantType" "advanced fillable">> Advanced Fillable
+	<<radiobutton "$tempSlave.boobsImplantType" "hyper fillable">> Hyper Fillable
 	<br>
 
 	''Lactation (none:0 | natural:1 | artificial:2):''
@@ -1696,14 +1698,13 @@
 	<<radiobutton "$tempSlave.buttImplant" 2>> Large
 	<<radiobutton "$tempSlave.buttImplant" 3>> Huge
 	<br>
-	''Butt String Implants: ''
-	<<if $tempSlave.buttImplantType == 0>>
-		@@.yellow;No@@
-		<<checkbox "$tempSlave.buttImplantType" 0 1>>
-	<<else>>
-		@@.yellow;Yes@@
-		<<checkbox "$tempSlave.buttImplantType" 0 1 checked>>
-	<</if>>
+	''Butt Implant Type: @@.yellow;$tempSlave.buttImplantType@@''
+	<<radiobutton "$tempSlave.buttImplantType" "None">> None
+	<<radiobutton "$tempSlave.buttImplantType" "normal">> Normal
+	<<radiobutton "$tempSlave.buttImplantType" "string">> String
+	<<radiobutton "$tempSlave.buttImplantType" "fillable">> Fillable
+	<<radiobutton "$tempSlave.buttImplantType" "advanced fillable">> Advanced Fillable
+	<<radiobutton "$tempSlave.buttImplantType" "hyper fillable">> Hyper Fillable
 	<br><br>
 	''Anus Size:''
 	<<if $tempSlave.anus == 0>>@@.lime;Virgin.@@
diff --git a/src/cheats/mod_EditInfantCheatNew.tw b/src/cheats/mod_EditInfantCheatNew.tw
index dc00e4f574874c2edfcdb872a999850050b1ac35..fe012915cc413912e29be414083d7c86d54ca944 100644
--- a/src/cheats/mod_EditInfantCheatNew.tw
+++ b/src/cheats/mod_EditInfantCheatNew.tw
@@ -1612,11 +1612,13 @@
 	''Breast Implants:''
 	<<textbox "$tempSlave.boobsImplant" $tempSlave.boobsImplant>>
 	<br>
-	''Breast String Implants:''
-	<<if $tempSlave.boobsImplantType == 0>>@@.yellow;No@@ |
-	<<else>>@@.yellow;Yes@@ | <</if>>
-	<<radiobutton "$tempSlave.boobsImplantType" 0>> No
-	<<radiobutton "$tempSlave.boobsImplantType" 1>> Yes
+	''Breast Implant Type: @@.yellow;$tempSlave.boobsImplantType@@''
+	<<radiobutton "$tempSlave.boobsImplantType" "None">> None
+	<<radiobutton "$tempSlave.boobsImplantType" "normal">> Normal
+	<<radiobutton "$tempSlave.boobsImplantType" "string">> String
+	<<radiobutton "$tempSlave.boobsImplantType" "fillable">> Fillable
+	<<radiobutton "$tempSlave.boobsImplantType" "advanced fillable">> Advanced Fillable
+	<<radiobutton "$tempSlave.boobsImplantType" "hyper fillable">> Hyper Fillable
 	<br>
 
 	''Lactation (none:0 | natural:1 | artificial:2):''
@@ -1698,14 +1700,13 @@
 	<<radiobutton "$tempSlave.buttImplant" 2>> Large
 	<<radiobutton "$tempSlave.buttImplant" 3>> Huge
 	<br>
-	''Butt String Implants: ''
-	<<if $tempSlave.buttImplantType == 0>>
-		@@.yellow;No@@
-		<<checkbox "$tempSlave.buttImplantType" 0 1>>
-	<<else>>
-		@@.yellow;Yes@@
-		<<checkbox "$tempSlave.buttImplantType" 0 1 checked>>
-	<</if>>
+	''Butt Implant Type: @@.yellow;$tempSlave.buttImplantType@@''
+	<<radiobutton "$tempSlave.buttImplantType" "None">> None
+	<<radiobutton "$tempSlave.buttImplantType" "normal">> Normal
+	<<radiobutton "$tempSlave.buttImplantType" "string">> String
+	<<radiobutton "$tempSlave.buttImplantType" "fillable">> Fillable
+	<<radiobutton "$tempSlave.buttImplantType" "advanced fillable">> Advanced Fillable
+	<<radiobutton "$tempSlave.buttImplantType" "hyper fillable">> Hyper Fillable
 	<br><br>
 	''Anus Size:''
 	<<if $tempSlave.anus == 0>>@@.lime;Virgin.@@
diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw
index 5acd2d2ede9717ed6f815a76e84ac905343d8231..df6bb7a69131890b3e1b6c3b9d92bd0b9b7797f3 100644
--- a/src/cheats/mod_EditSlaveCheat.tw
+++ b/src/cheats/mod_EditSlaveCheat.tw
@@ -687,10 +687,13 @@ Custom sclera color: <<textbox "$tempSlave.sclerae" $tempSlave.sclerae>>
 ''Breast Implants:''
 <<textbox "$tempSlave.boobsImplant" $tempSlave.boobsImplant>>
 <br>
-''Breast String Implants (no:0 | yes:1):''
-<<textbox "$tempSlave.boobsImplantType" $tempSlave.boobsImplantType>>
-<<radiobutton "$tempSlave.boobsImplantType" 0>> No
-<<radiobutton "$tempSlave.boobsImplantType" 1>> Yes
+''Breast Implant Type:'' // Nonsensical things will be corrected. //
+<<radiobutton "$tempSlave.boobsImplantType" "None">> None
+<<radiobutton "$tempSlave.boobsImplantType" "normal">> Normal
+<<radiobutton "$tempSlave.boobsImplantType" "string">> String
+<<radiobutton "$tempSlave.boobsImplantType" "fillable">> Fillable
+<<radiobutton "$tempSlave.boobsImplantType" "advanced fillable">> Advanced Fillable
+<<radiobutton "$tempSlave.boobsImplantType" "hyper fillable">> Hyper Fillable
 <br>
 
 ''Lactation (none:0 | natural:1 | artificial:2): $tempSlave.lactation |''
@@ -748,10 +751,13 @@ Custom sclera color: <<textbox "$tempSlave.sclerae" $tempSlave.sclerae>>
 <<radiobutton "$tempSlave.buttImplant" 2>> Large
 <<radiobutton "$tempSlave.buttImplant" 3>> Huge
 <br>
-''Butt String Implants (no:0 | yes:1):''
-<<textbox "$tempSlave.buttImplantType" $tempSlave.boobsImplantType>>
-<<radiobutton "$tempSlave.buttImplantType" 0>> No
-<<radiobutton "$tempSlave.buttImplantType" 1>> Yes
+''Butt Implant Type: @@.yellow;$tempSlave.buttImplantType@@''
+<<radiobutton "$tempSlave.buttImplantType" "None">> None
+<<radiobutton "$tempSlave.buttImplantType" "normal">> Normal
+<<radiobutton "$tempSlave.buttImplantType" "string">> String
+<<radiobutton "$tempSlave.buttImplantType" "fillable">> Fillable
+<<radiobutton "$tempSlave.buttImplantType" "advanced fillable">> Advanced Fillable
+<<radiobutton "$tempSlave.buttImplantType" "hyper fillable">> Hyper Fillable
 
 <br><br>
 
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index 9ad7ace8779fb903bf41c753ebe9d708dde0b5d3..79c5440dc48524fdf72fc1ef68ec29edfaca7e6c 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -2746,11 +2746,13 @@
 	''Breast Implants:''
 	<<textbox "$tempSlave.boobsImplant" $tempSlave.boobsImplant>>
 	<br>
-	''Breast String Implants:''
-	<<if $tempSlave.boobsImplantType == 0>>@@.yellow;No@@ |
-	<<else>>@@.yellow;Yes@@ | <</if>>
-	<<radiobutton "$tempSlave.boobsImplantType" 0>> No
-	<<radiobutton "$tempSlave.boobsImplantType" 1>> Yes
+	''Breast Implant Type: @@.yellow;$tempSlave.boobsImplantType@@''
+	<<radiobutton "$tempSlave.boobsImplantType" "None">> None
+	<<radiobutton "$tempSlave.boobsImplantType" "normal">> Normal
+	<<radiobutton "$tempSlave.boobsImplantType" "string">> String
+	<<radiobutton "$tempSlave.boobsImplantType" "fillable">> Fillable
+	<<radiobutton "$tempSlave.boobsImplantType" "advanced fillable">> Advanced Fillable
+	<<radiobutton "$tempSlave.boobsImplantType" "hyper fillable">> Hyper Fillable
 	<br>
 
 	''Lactation (none:0 | natural:1 | artificial:2):''
@@ -2832,14 +2834,13 @@
 	<<radiobutton "$tempSlave.buttImplant" 2>> Large
 	<<radiobutton "$tempSlave.buttImplant" 3>> Huge
 	<br>
-	''Butt String Implants: ''
-	<<if $tempSlave.buttImplantType == 0>>
-		@@.yellow;No@@
-		<<checkbox "$tempSlave.buttImplantType" 0 1>>
-	<<else>>
-		@@.yellow;Yes@@
-		<<checkbox "$tempSlave.buttImplantType" 0 1 checked>>
-	<</if>>
+	''Butt Implant Type: @@.yellow;$tempSlave.buttImplantType@@''
+	<<radiobutton "$tempSlave.buttImplantType" "None">> None
+	<<radiobutton "$tempSlave.buttImplantType" "normal">> Normal
+	<<radiobutton "$tempSlave.buttImplantType" "string">> String
+	<<radiobutton "$tempSlave.buttImplantType" "fillable">> Fillable
+	<<radiobutton "$tempSlave.buttImplantType" "advanced fillable">> Advanced Fillable
+	<<radiobutton "$tempSlave.buttImplantType" "hyper fillable">> Hyper Fillable
 	<br><br>
 	''Anus Size:''
 	<<if $tempSlave.anus == 0>>@@.lime;Virgin.@@
diff --git a/src/data/backwardsCompatibility/updateSlaveObject.js b/src/data/backwardsCompatibility/updateSlaveObject.js
index ec551c5664c60d3d97f017e63c73ef9bd940d2a9..6c98695e4ce036159e9337c18e60012e1ea593e2 100644
--- a/src/data/backwardsCompatibility/updateSlaveObject.js
+++ b/src/data/backwardsCompatibility/updateSlaveObject.js
@@ -440,6 +440,35 @@ App.Update.Slave = function(slave) {
 		}
 	}
 
+	if (V.releaseID < 1061) {
+		if (slave.boobsImplantType == 1) {
+			slave.boobsImplantType = "string";
+		} else if (slave.boobsImplant >= 10000) {
+			slave.boobsImplantType = "hyper fillable";
+		} else if (slave.boobsImplant >= 2000) {
+			slave.boobsImplantType = "advanced fillable";
+		} else if (slave.boobsImplant >= 800) {
+			slave.boobsImplantType = "fillable";
+		} else if (slave.boobsImplant > 0) {
+			slave.boobsImplantType = "normal";
+		} else {
+			slave.boobsImplantType = "none";
+		}
+		if (slave.buttImplantType == 1) {
+			slave.buttImplantType = "string";
+		} else if (slave.buttImplant > 7) {
+			slave.buttImplantType = "hyper fillable";
+		} else if (slave.buttImplant >= 5) {
+			slave.buttImplantType = "advanced fillable";
+		} else if (slave.buttImplant >= 3) {
+			slave.buttImplantType = "fillable";
+		} else if (slave.buttImplant > 0) {
+			slave.buttImplantType = "normal";
+		} else {
+			slave.buttImplantType = "none";
+		}
+	}
+
 	if (V.releaseID < 1059) {
 		if (slave.eyeColor === undefined) {
 			slave.eyeColor = slave.eyes;
diff --git a/src/facilities/nursery/nurseryDatatypeCleanup.js b/src/facilities/nursery/nurseryDatatypeCleanup.js
index ece181ed0016d9cea67e1bf657642be4ca86a2fc..8ee275de29dae105a706e42987bac75f87beefae 100644
--- a/src/facilities/nursery/nurseryDatatypeCleanup.js
+++ b/src/facilities/nursery/nurseryDatatypeCleanup.js
@@ -205,10 +205,18 @@ App.Facilities.Nursery.ChildDatatypeCleanup = function(child) {
 		child.lipsImplant = Math.clamp(+child.lipsImplant, 0, 100) || 0;
 		child.voiceImplant = Math.clamp(+child.voiceImplant, -1, 1) || 0;
 		child.boobsImplant = Math.max(+child.boobsImplant, 0) || 0;
-		child.boobsImplantType = Math.clamp(+child.boobsImplantType, 0, 1) || 0;
+		if (child.boobsImplant === 0) {
+			child.boobsImplantType = "none";
+		} else if (child.boobsImplantType === "none") {
+			child.boobsImplantType = "normal";
+		}
 		child.breastMesh = Math.clamp(+child.breastMesh, 0, 1) || 0;
 		child.buttImplant = Math.clamp(+child.buttImplant, 0, 3) || 0;
-		child.buttImplantType = Math.clamp(+child.buttImplantType, 0, 1) || 0;
+		if (child.buttImplant === 0) {
+			child.buttImplantType = "none";
+		} else if (child.buttImplantType === "none") {
+			child.buttImplantType = "normal";
+		}
 		child.earImplant = Math.clamp(+child.earImplant, 0, 1) || 0;
 	}
 
diff --git a/src/facilities/nursery/nurseryWidgets.js b/src/facilities/nursery/nurseryWidgets.js
index 9bfded0a9fe9fc138f632cda744c1e1c3ade2f41..24b26a21c59a8669c9d50dfc6c32fe244f69cbcd 100644
--- a/src/facilities/nursery/nurseryWidgets.js
+++ b/src/facilities/nursery/nurseryWidgets.js
@@ -7486,13 +7486,13 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
 			} else if (child.buttImplant === 2) {
 				r += `${His} big butt implants make ${his} ass jut out curvaceously whatever pose ${he}'s in. `;
 			} else if (child.buttImplant > 17) {
-				r += `${He} has oversized ${child.buttImplantType === 1 ? `engorged string` : `fillable butt`} implants, and it is completely obvious. Whatever ${his} position, ${his} immense ass dominates ${his} surroundings with its unyielding mass. `;
+				r += `${He} has oversized ${child.buttImplantType === "string" ? `engorged string` : `fillable butt`} implants, and it is completely obvious. Whatever ${his} position, ${his} immense ass dominates ${his} surroundings with its unyielding mass. `;
 			} else if (child.buttImplant > 12) {
-				r += `${He} has oversized ${child.buttImplantType === 1 ? `engorged string` : `fillable butt`} implants, and it is completely obvious. Whatever ${his} position, ${his} ass looks like someone shoved a pair of ready to burst weather balloons in ${his} buttcheeks. `;
+				r += `${He} has oversized ${child.buttImplantType === "string" ? `engorged string` : `fillable butt`} implants, and it is completely obvious. Whatever ${his} position, ${his} ass looks like someone shoved a pair of ready to burst weather balloons in ${his} buttcheeks. `;
 			} else if (child.buttImplant > 7) {
-				r += `${He} has oversized ${child.buttImplantType === 1 ? `engorged string` : `fillable butt`} implants, and it is completely obvious. Whatever ${his} position, ${his} ass looks like someone shoved a pair of overinflated beachballs in ${his} buttcheeks. `;
+				r += `${He} has oversized ${child.buttImplantType === "string" ? `engorged string` : `fillable butt`} implants, and it is completely obvious. Whatever ${his} position, ${his} ass looks like someone shoved a pair of overinflated beachballs in ${his} buttcheeks. `;
 			} else if (child.buttImplant > 2) {
-				r += `${He} has ${child.buttImplantType === 1 ? `engorged string` : `fillable butt`} implants, and it shows. Whatever ${his} position, ${his} ass looks just as artificially enticing. `;
+				r += `${He} has ${child.buttImplantType === "string" ? `engorged string` : `fillable butt`} implants, and it shows. Whatever ${his} position, ${his} ass looks just as artificially enticing. `;
 			}
 		}
 
@@ -15500,14 +15500,14 @@ App.Facilities.Nursery.infantToChild = function infantToChild(child) {
 	child.boobShape = "normal",
 	child.boobs = jsRandom(200, 500),
 	child.boobsImplant = 0,
-	child.boobsImplantType = 0,
+	child.boobsImplantType = "none",
 	child.boobsTat = 0,
 	child.brand = {},
 	child.breastMesh = 0,
 	child.breedingMark = 0,
 	child.butt = jsRandom(0, 3),
 	child.buttImplant = 0,
-	child.buttImplantType = 0,
+	child.buttImplantType = "none",
 	child.buttTat = 0,
 	child.buttplug = "none",
 	child.buttplugAttachment = "none",
@@ -16993,8 +16993,16 @@ App.Facilities.Nursery.ChildState = class ChildState {
 		* * 600+: boobsImplant size fillable implants
 		*/
 		this.boobsImplant = 0;
-		/** Implants type. 0: normal/none; 1: string */
-		this.boobsImplantType = 0;
+		/**
+		 * Implant type
+		 * * "none"
+		 * * "normal"
+		 * * "string"
+		 * * "fillable"
+		 * * "advanced fillable"
+		 * * "hyper fillable"
+		 */
+		this.boobsImplantType = "none";
 		/**
 		* breast shape
 		* * "normal"
@@ -17109,10 +17117,16 @@ App.Facilities.Nursery.ChildState = class ChildState {
 		* * 9+: hyper fillable implants
 		*/
 		this.buttImplant = 0;
-		/** Butt implant type
-		*
-		* 0: normal/none; 1: string */
-		this.buttImplantType = 0;
+		/**
+		 * Implant type
+		 * * "none"
+		 * * "normal"
+		 * * "string"
+		 * * "fillable"
+		 * * "advanced fillable"
+		 * * "hyper fillable"
+		 */
+		this.buttImplantType = "none";
 		/**
 		* butt tattoo
 		*
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 3b696a5e9b640f992ffc8aa0084bd3df31e69284..bd00ec9721f7374c62d00fd98eb1c16bb6bd7ebf 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -2628,7 +2628,7 @@ LORE: INTERVIEWS
 	<br>''hexall90'' for height growth drugs, incubator organ farm support and detailing, the dispensary cleanup, the joint Eugenics bad end rework with ''SFanon (blank)'', the Hippolyta Academy, and the Security Expansion Mod.
 	<br>''sensei'' for coding in support for commas and an excellent family tree rework.
 	<br>''laziestman'' for sexy spats.
-	<br>''SFanon (blank)'' for SF related work, passive player skill gain, fulfillment order, player into summary and options rewriting, general fixes, storyCaption overhauling, updating and re-organizing the in-game wiki in addition to the joint Eugenics bad end rework with ''hexall90''. Cleaned up the sidebar, now maintaining and expanding secEx.
+	<br>''SFanon (blank)'' for SF related work, passive player skill gain, fulfillment order, player into summary and options rewriting, general fixes, storyCaption overhauling, updating and re-organizing the in-game wiki in addition to the joint Eugenics bad end rework with ''hexall90''. Cleaned up the sidebar, now maintaining and expanding secEx. Added reminder system and warfare/engineering personal attention targets.
 	<br>''anon'' for extending FCGudder's economy reports to the other facilities.
 	<br>''MilkAnon'' for his contributions to FCTV and the FC world in general.
 	<br>''valen102938'' for dealing with vector art, both creating new art and utilizing unused art.
@@ -2655,9 +2655,9 @@ LORE: INTERVIEWS
 	<br>''ezsh'' for bugfixing and creating a tool to build twineJS and twineCSS for me. Set up a revised SC update process as well. Has contributed massive revisions to the game's structure. Keeps the RA in line.
 	<br>''Sonofrevvan'' for making slaves beg and dance.
 	<br>''skriv'' for fixes and endless code cleaning.
-	<br>''Arkerthan'' for various additions including merging cybermod and vanilla prosthetics. Java sanity check. Limbs and reworked amputation. Eye rework.
+	<br>''Arkerthan'' for various additions including merging cybermod and vanilla prosthetics. Java sanity check. Limbs and reworked amputation. Eye rework. Has begun overhauling various systems including surgery and the building layout.
 	<br>''MouseOfLight'' for overhauling the corporation. V proxy, nuff said. Added better safeguards to the RA.
-	<br>''svornost'': A great asset. Various fixes and tools, including FCHost. Gave players the ability to find that one slave they are looking for. The 'Scope' macro. Optimized porn so beautifully I can't even think.
+	<br>''svornost'': A great asset. Various fixes and tools, including FCHost. Gave players the ability to find that one slave they are looking for. The 'Scope' macro. Optimized porn so beautifully I can't even think. Has continued his reign of optimization.
 	<br>''Trashman1138'' for various tweaks and fixes.
 	<br>''maxd569'' for adding .mp4 and .webm support to custom images.
 	<br>''Anu'' for various fixes.
@@ -2685,7 +2685,7 @@ LORE: INTERVIEWS
 	<br>''DrNoOne'' wrote the bulk slave purchase and persistent summary code.
 	<br>''Mauve'' provided vector art for chastity belts and limp dicks.
 	<br>''Klorpa'' for dozens of new nationalities and boundless new names and nicknames. Also monokinis, middle eastern clothing, overalls and aprons. Also the hearing, taste, and smell overhauls. Added basic support for waterpsorts. Has declared war on bad spelling, grammar and formatting. Added eyebrows too. Dug up ancient abandoned vanilla vignettes and implemented them. Toiled in the depths to extend limb support.
-	<br>''lowercasedonkey'' for various additions, not limited to the budget overhauls. Set up all the tabs too. Gave events dynamic vector art. Hammered the scarring and branding systems into place. Been a real boon writing events and other things as well. Used ezsh's facility framework to enhance slave summaries. Set up a system to recall where slaves were serving.
+	<br>''lowercasedonkey'' for various additions, not limited to the budget overhauls. Set up all the tabs too. Gave events dynamic vector art. Hammered the scarring and branding systems into place. Been a real boon writing events and other things as well. Used ezsh's facility framework to enhance slave summaries. Set up a system to recall where slaves were serving. Striving to master DOM with great gains.
 	<br>''amomynous0'' for bug reports and testing in addition to SFmod unit descriptions.
 	<br>''wepsrd'' for QOL (hormonal balance cheat and lactation adaptation to new menu) fixes.
 
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index 156751c2bd96283114a28d0d3b6f61a7ced34658..ca28c7c518f6b38af75054bf48c65dc332570fcf 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -881,8 +881,16 @@ App.Entity.SlaveState = class SlaveState {
 		 * * 600+: boobsImplant size fillable implants
 		 */
 		this.boobsImplant = 0;
-		/** Implants type. 0: normal/none; 1: string */
-		this.boobsImplantType = 0;
+		/**
+		 * Implant type
+		 * * "none"
+		 * * "normal"
+		 * * "string"
+		 * * "fillable"
+		 * * "advanced fillable"
+		 * * "hyper fillable"
+		 */
+		this.boobsImplantType = "none";
 		/**
 		 * breast shape
 		 * * "normal"
@@ -997,10 +1005,16 @@ App.Entity.SlaveState = class SlaveState {
 		 * * 9+: hyper fillable implants
 		 */
 		this.buttImplant = 0;
-		/** butt implant type
-		 *
-		 * 0: normal/none; 1: string */
-		this.buttImplantType = 0;
+		/**
+		 * Implant type
+		 * * "none"
+		 * * "normal"
+		 * * "string"
+		 * * "fillable"
+		 * * "advanced fillable"
+		 * * "hyper fillable"
+		 */
+		this.buttImplantType = "none";
 		/**
 		 * butt tattoo
 		 *
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index 0e7768d253f8b21ae0e73bd18a7d16adf0c55349..448d27fe8c5c63dcd63e301ebed4ec183fcced21 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -740,14 +740,23 @@ window.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() {
 		slave.lipsImplant = Math.clamp(+slave.lipsImplant, 0, 100) || 0;
 		slave.voiceImplant = Math.clamp(+slave.voiceImplant, -1, 1) || 0;
 		slave.boobsImplant = Math.max(+slave.boobsImplant, 0) || 0;
-		slave.boobsImplantType = Math.clamp(+slave.boobsImplantType, 0, 1) || 0;
+		if (slave.boobsImplant === 0) {
+			slave.boobsImplantType = "none";
+		} else if (slave.boobsImplantType === "none") {
+			slave.boobsImplantType = "normal";
+		}
 		slave.breastMesh = Math.clamp(+slave.breastMesh, 0, 1) || 0;
 		slave.buttImplant = Math.clamp(+slave.buttImplant, 0, 3) || 0;
-		slave.buttImplantType = Math.clamp(+slave.buttImplantType, 0, 1) || 0;
+		if (slave.buttImplant === 0) {
+			slave.buttImplantType = "none";
+		} else if (slave.buttImplantType === "none") {
+			slave.buttImplantType = "normal";
+		}
 		slave.heightImplant = Math.clamp(+slave.heightImplant, -1, 1) || 0;
 		slave.earImplant = Math.clamp(+slave.earImplant, 0, 1) || 0;
 		slave.shouldersImplant = Math.clamp(+slave.shouldersImplant, -1, 1) || 0;
 		slave.hipsImplant = Math.clamp(+slave.hipsImplant, -1, 1) || 0;
+
 	}
 
 	/**
@@ -1313,10 +1322,18 @@ window.childImplantsDatatypeCleanup = function childImplantsDatatypeCleanup(chil
 	child.lipsImplant = Math.clamp(+child.lipsImplant, 0, 100) || 0;
 	child.voiceImplant = Math.clamp(+child.voiceImplant, -1, 1) || 0;
 	child.boobsImplant = Math.max(+child.boobsImplant, 0) || 0;
-	child.boobsImplantType = Math.clamp(+child.boobsImplantType, 0, 1) || 0;
+	if (child.boobsImplant === 0) {
+		child.boobsImplantType = "none";
+	} else if (child.boobsImplantType === "none") {
+		child.boobsImplantType = "normal";
+	}
 	child.breastMesh = Math.clamp(+child.breastMesh, 0, 1) || 0;
 	child.buttImplant = Math.clamp(+child.buttImplant, 0, 3) || 0;
-	child.buttImplantType = Math.clamp(+child.buttImplantType, 0, 1) || 0;
+	if (child.buttImplant === 0) {
+		child.buttImplantType = "none";
+	} else if (child.buttImplantType === "none") {
+		child.buttImplantType = "normal";
+	}
 	child.earImplant = Math.clamp(+child.earImplant, 0, 1) || 0;
 };
 
@@ -1726,6 +1743,16 @@ window.PCDatatypeCleanup = function PCDatatypeCleanup() {
 	if (PC.indentureRestrictions !== undefined) {
 		delete PC.indentureRestrictions;
 	}
+	if (PC.boobsImplant > 0) {
+		PC.boobsImplantType = "normal";
+	} else {
+		PC.boobsImplantType = "none";
+	}
+	if (PC.buttImplant > 0) {
+		PC.buttImplantType = "normal";
+	} else {
+		PC.buttImplantType = "none";
+	}
 
 	/* None of these are in use */
 	PC.bellyPreg = PC.belly;
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index ac4f31c0c7935d367602be016da6132068116141..d82ab5d21dc5a69bd9c92a67aa43b80295fda7de 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -871,10 +871,10 @@ window.getSlaveCostArray = function(s) {
 	}
 
 	// Maintenance
-	if (s.boobs > 10000 && s.boobsImplantType === 1) {
+	if (s.boobsImplant > 10000 && s.boobsImplantType === "string") {
 		retval.push({text: "Maintenance cost for oversized string implants", value: 50});
 	}
-	if (s.butt > 10 && s.buttImplantType === 1) {
+	if (s.buttImplant > 5 && s.buttImplantType === "string") {
 		retval.push({text: "Maintenance cost for oversized string implants", value: 50});
 	}
 	if ((s.assignment !== Job.DAIRY || State.variables.dairyRestraintsSetting < 2) && (s.assignment !== Job.ARCADE)) {
diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index 548d119fb77dd6a6e779fdefc0974dda29ee7e32..07ed18740f38850d2b6789fe376eaeed27089e5b 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -1759,13 +1759,13 @@ window.generateChild = function(mother, ova, destination) {
 		child.areolaePiercing = 0;
 		child.corsetPiercing = 0;
 		child.boobsImplant = 0;
-		child.boobsImplantType = 0;
+		child.boobsImplantType = "none";
 		child.nipplesPiercing = 0;
 		child.areolaePiercing = 0;
 		child.lactation = 0;
 		child.hipsImplant = 0;
 		child.buttImplant = 0;
-		child.buttImplantType = 0;
+		child.buttImplantType = "none";
 		child.lipsImplant = 0;
 		child.lipsPiercing = 0;
 		child.tonguePiercing = 0;
diff --git a/src/js/generateMarketSlave.js b/src/js/generateMarketSlave.js
index c7d852c1e832dc2c3e7a042b689d1a26661813e6..a12ffb24da8432455eb7bf9b3e1d68260e80bdcc 100644
--- a/src/js/generateMarketSlave.js
+++ b/src/js/generateMarketSlave.js
@@ -414,15 +414,19 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
 				r += `Slaves are given tasteful breast, butt, and lip implants. `;
 				V.activeSlave.buttImplant = 1;
 				V.activeSlave.butt = Math.clamp(V.activeSlave.butt+V.activeSlave.buttImplant, 0, 10);
+				V.activeSlave.buttImplantType = "normal";
 				V.activeSlave.boobsImplant = 600;
 				V.activeSlave.boobs = Math.clamp(V.activeSlave.boobs+V.activeSlave.boobsImplant, 0, 10000);
+				V.activeSlave.boobsImplantType = "normal";
 				V.activeSlave.lipsImplant = 20;
 				V.activeSlave.lips = Math.clamp(V.activeSlave.lips+V.activeSlave.lipsImplant, 0, 55);
 			} else if (V.corpSpecImplants === 2) {
 				r += `Slaves are given absurd breast, butt, and lip implants. `;
 				V.activeSlave.buttImplant = 4;
+				V.activeSlave.buttImplantType = "fillable";
 				V.activeSlave.butt = Math.clamp(V.activeSlave.butt+V.activeSlave.buttImplant, 0, 10);
 				V.activeSlave.boobsImplant = 2400;
+				V.activeSlave.boobsImplantType = "advanced fillable";
 				V.activeSlave.boobs = Math.clamp(V.activeSlave.boobs+V.activeSlave.boobsImplant, 0, 10000);
 				V.activeSlave.lipsImplant = 60;
 				V.activeSlave.lips = Math.clamp(V.activeSlave.lipsImplant+V.activeSlave.buttImplant, 0, 100);
@@ -772,8 +776,22 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
 				r += `They vary in terms of what size their implants are, not whether they have them. `;
 				V.activeSlave.chem += jsRandom(10, 100);
 				V.activeSlave.boobsImplant = 200*jsRandom(2, 20);
+				if (V.activeSlave.boobsImplant > 10000) {
+					V.activeSlave.boobsImplantType = "hyper fillable";
+				} else if (V.activeSlave.boobsImplant > 2200) {
+					V.activeSlave.boobsImplantType = jsEither(["advanced fillable", "advanced fillable", "advanced fillable", "string"]);
+				} else if (V.activeSlave.boobsImplant > 1000) {
+					V.activeSlave.boobsImplantType = jsEither(["fillable", "fillable", "normal", "string"]);
+				} else {
+					V.activeSlave.boobsImplantType = jsEither(["normal", "normal", "normal", "string"]);
+				}
 				V.activeSlave.boobs += V.activeSlave.boobsImplant;
 				V.activeSlave.buttImplant = jsRandom(2, 5);
+				if (V.activeSlave.buttImplant > 4) {
+					V.activeSlave.buttImplantType = jsEither(["fillable", "fillable", "normal", "string"]);
+				} else {
+					V.activeSlave.buttImplantType = jsEither(["normal", "normal", "normal", "string"]);
+				}
 				V.activeSlave.butt += V.activeSlave.buttImplant;
 				V.activeSlave.lipsImplant = jsEither([10, 20]);
 				V.activeSlave.lips += V.activeSlave.lipsImplant;
@@ -781,8 +799,10 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
 					r += `This one's implants are unusually large; a showcase of what ${pronoun.possessive} home arcology is capable of. `;
 					V.activeSlave.boobsImplant += 200*jsRandom(100, 200);
 					V.activeSlave.boobs += V.activeSlave.boobsImplant;
+					V.activeSlave.boobsImplantType = "hyper fillable";
 					V.activeSlave.buttImplant += jsRandom(7, 12);
 					V.activeSlave.butt += V.activeSlave.buttImplant;
+					V.activeSlave.buttImplantType = "hyper fillable";
 				}
 			}
 			if (V.arcologies[market].FSYouthPreferentialist > 20) {
@@ -1296,9 +1316,15 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
 				let slaveGen = jsRandom(2, 8)*200;
 				V.activeSlave.boobs += slaveGen;
 				V.activeSlave.boobsImplant += slaveGen;
+				if (V.activeSlave.boobsImplant > 1000) {
+					V.activeSlave.boobsImplantType = jsEither(["fillable", "fillable", "normal", "string"]);
+				} else {
+					V.activeSlave.boobsImplantType = jsEither(["normal", "normal", "normal", "string"]);
+				}
 				slaveGen = jsRandom(1, 3);
 				V.activeSlave.butt += slaveGen;
 				V.activeSlave.buttImplant += slaveGen;
+				V.activeSlave.buttImplantType = "normal";
 				slaveGen = jsEither([10, 20]);
 				V.activeSlave.lips += slaveGen;
 				V.activeSlave.lipsImplant += slaveGen;
@@ -1533,9 +1559,11 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
 			V.activeSlave.heightImplant = 1;
 			V.activeSlave.height += 10;
 			V.activeSlave.buttImplant = (4-V.activeSlave.butt);
+			V.activeSlave.buttImplantType = "normal";
 			V.activeSlave.butt += V.activeSlave.buttImplant;
 			V.activeSlave.boobsImplant = (2000-V.activeSlave.boobs);
 			V.activeSlave.boobs += V.activeSlave.boobsImplant;
+			V.activeSlave.boobsImplantType = "fillable";
 			V.activeSlave.nipples = "tiny";
 			V.activeSlave.areolae = 0;
 			V.activeSlave.clit = 0;
diff --git a/src/js/rulesAutosurgery.js b/src/js/rulesAutosurgery.js
index fb9d7170fe60285c4c1b66393fbc4610cd7ada2d..08b8f256dc03af8762c657fd27bcbe06ce83254c 100644
--- a/src/js/rulesAutosurgery.js
+++ b/src/js/rulesAutosurgery.js
@@ -170,7 +170,7 @@ window.rulesAutosurgery = (function() {
 					commitProcedure(`surgery to remove ${his} ${bodyPart} implants`, slave => {
 						slave[bodyPart] -= slave[`${bodyPart}Implant`];
 						slave[`${bodyPart}Implant`] = 0;
-						slave[`${bodyPart}ImplantType`] = 0;
+						slave[`${bodyPart}ImplantType`] = "none";
 					});
 					return;
 				}
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index 9c284ff67bc1b2d71c68383ae4590406fa23faab..28c146729dccf70cad52765a3f428c8d7de52b34 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -356,8 +356,10 @@ The previous owner seems to have left in something of a hurry.
 			<<set $activeSlave.face = Math.trunc($activeSlave.face+$activeSlave.faceImplant/2,-100,100)>>
 			<<set $activeSlave.boobsImplant = 200*random(4,8)>>
 			<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+			<<set $activeSlave.boobsImplantType = "normal">>
 			<<set $activeSlave.buttImplant = random(2,4)>>
 			<<set $activeSlave.butt += $activeSlave.buttImplant>>
+			<<set $activeSlave.buttImplant = "normal">>
 			<<set $activeSlave.lipsImplant = random(1,2)>>
 			<<set $activeSlave.lips = Math.trunc($activeSlave.lipsImplant+2,-3,3)>>
 			<<set $activeSlave.weight = random(-25,-15)>>
diff --git a/src/npc/databases/cheatmodeDatabase.tw b/src/npc/databases/cheatmodeDatabase.tw
index 49d4fc2a92b05772bf6b5c229a9e4213e7589e82..ec3c192f3e3df0623119475b8ccaba29074854a4 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, setHealth(_HS, 50), _HS.devotion = 100, _HS.height = 175, _HS.eye.origColor = "green", _HS.origHColor = "honey blonde", _HS.origSkin = "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 $his collarbone.", _HS.custom.desc = "$He 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, setHealth(_HS, 50), _HS.devotion = 100, _HS.height = 175, _HS.eye.origColor = "green", _HS.origHColor = "honey blonde", _HS.origSkin = "pale", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.areolae = 1, _HS.butt = 4, _HS.buttImplant = 2, _HS.buttImplantType = "normal", _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 $his collarbone.", _HS.custom.desc = "$He 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, setHealth(_HS, 10), _HS.devotion = 100, _HS.muscles = 20, _HS.height = 190, _HS.race = "black", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "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.brand["left hand"] = "a large letter 'S'", _HS.custom.desc = "$He 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, setHealth(_HS, 10), _HS.devotion = 100, _HS.muscles = 20, _HS.height = 190, _HS.race = "black", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "dark", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 1200, _HS.boobsImplant = 1000, _HS.boobsImplantType = "fillable", _HS.areolae = 2, _HS.butt = 5, _HS.buttImplant = 3, _HS.buttImplantType = "fillable", _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.brand["left hand"] = "a large letter 'S'", _HS.custom.desc = "$He 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, setHealth(_HS, 10), _HS.devotion = 12, _HS.height = 175, _HS.race = "black", _HS.pubicHColor = "black", _HS.origSkin = "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.brand["left hand"] = "a large letter 'S'", _HS.custom.desc = "$He 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, setHealth(_HS, 10), _HS.devotion = 12, _HS.height = 175, _HS.race = "black", _HS.pubicHColor = "black", _HS.origSkin = "brown", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 1600, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.nipplesPiercing = 1, _HS.areolae = 1, _HS.butt = 6, _HS.buttImplant = 2, _HS.buttImplantType = "normal", _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.brand["left hand"] = "a large letter 'S'", _HS.custom.desc = "$He 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 718be20791d288f9cecdcbce74514a3f43e2c968..3635ebfaf5c678d031238b1d6e51aa8b83a8139a 100644
--- a/src/npc/databases/dSlavesDatabase.tw
+++ b/src/npc/databases/dSlavesDatabase.tw
@@ -25,7 +25,7 @@
 /*Added origin, made some assumptions about $his background, changed fetish to submissive, added arrogant flaw -BoneyM*/
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Luna", _HS.birthName = "Luna", _HS.ID = _i++, _HS.birthWeek = random(0,51), setHealth(_HS, 20), _HS.height = 157, _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "pale", _HS.hLength = 20, _HS.hStyle = "chin-length with bangs over one eye", _HS.boobs = 650, _HS.boobsImplant = 600, _HS.butt = 3, _HS.buttTat = "tribal patterns", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.nosePiercing = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.clothes = "uncomfortable straps", _HS.attrXY = 40>>
+<<set _HS.slaveName = "Luna", _HS.birthName = "Luna", _HS.ID = _i++, _HS.birthWeek = random(0,51), setHealth(_HS, 20), _HS.height = 157, _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "pale", _HS.hLength = 20, _HS.hStyle = "chin-length with bangs over one eye", _HS.boobs = 650, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.butt = 3, _HS.buttTat = "tribal patterns", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.nosePiercing = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.clothes = "uncomfortable straps", _HS.attrXY = 40>>
 <<set $heroSlaves.push(_HS)>>
 /*Tat should be lower back, "Wears a leather collar, a Scarab clitoris g-string, Tortoise shell leather harness, and a pair of black thigh high boots"*/
 /*Corrected piercings -BoneyM*/
@@ -47,7 +47,7 @@
 /*Corrected eyes, added combat skill, bisexual and odd, tweaked face -BoneyM*/
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Cuntbitch", _HS.birthName = "", _HS.birthSurname = "", _HS.origin = "$He was a slave trader until $he was betrayed by ambitious underlings and sold into enslavement.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 31, _HS.physicalAge = 31, _HS.visualAge = 31, _HS.ovaryAge = 31, setHealth(_HS, 40), _HS.devotion = -100, _HS.muscles = 20, _HS.height = 183, _HS.race = "black", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "black", _HS.hStyle = "long and curly", _HS.boobs = 1400, _HS.boobsImplant = 800, _HS.nipplesPiercing = 2, _HS.boobsTat = "degradation", _HS.butt = 6, _HS.buttImplant = 3, _HS.buttTat = "degradation", _HS.lips = 35, _HS.lipsPiercing = 2, _HS.lipsTat = "degradation", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.vaginaTat = "degradation", _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "degradation", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.combat = 1, _HS.clothes = "restrictive latex", _HS.shoes = "heels", _HS.intelligence = -20, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.custom.tattoo = "$He has several 'tribal' style tattoos on $his arms from before $his enslavement.", _HS.career = "a slaver">>
+<<set _HS.slaveName = "Cuntbitch", _HS.birthName = "", _HS.birthSurname = "", _HS.origin = "$He was a slave trader until $he was betrayed by ambitious underlings and sold into enslavement.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 31, _HS.physicalAge = 31, _HS.visualAge = 31, _HS.ovaryAge = 31, setHealth(_HS, 40), _HS.devotion = -100, _HS.muscles = 20, _HS.height = 183, _HS.race = "black", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "black", _HS.hStyle = "long and curly", _HS.boobs = 1400, _HS.boobsImplant = 800, _HS.boobsImplantType = "normal", _HS.nipplesPiercing = 2, _HS.boobsTat = "degradation", _HS.butt = 6, _HS.buttImplant = 3, _HS.buttImplantType = "normal", _HS.buttTat = "degradation", _HS.lips = 35, _HS.lipsPiercing = 2, _HS.lipsTat = "degradation", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.vaginaTat = "degradation", _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "degradation", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.combat = 1, _HS.clothes = "restrictive latex", _HS.shoes = "heels", _HS.intelligence = -20, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.custom.tattoo = "$He has several 'tribal' style tattoos on $his arms from before $his enslavement.", _HS.career = "a slaver">>
 <<set $heroSlaves.push(_HS)>>
 /*Set birth name to 'unknown', tweaked obedience downwards, corrected tattoo's, added combat skill, clothes and shoes, arrogant -BoneyM*/
 
@@ -114,12 +114,12 @@
 /*Added 'submissive' and 'bitchy' -BoneyM*/
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Valentina", _HS.birthName = "Valentina", _HS.origin = "$He was once the bodyguard to a Russian drug lord, and was sold into slavery after his death by cocaine overdose.", _HS.ID = _i++, _HS.nationality = "Russian", _HS.birthWeek = random(0,51), _HS.actualAge = 29, _HS.physicalAge = 29, _HS.visualAge = 29, _HS.ovaryAge = 29, setHealth(_HS, 100, 0, 0, 0, 0), _HS.devotion = 100, _HS.muscles = 100, _HS.height = 175, _HS.eye.origColor = "green", _HS.override_Skin = 1, _HS.origSkin = "sun tanned", _HS.hLength = 30, _HS.hStyle = "shoulder length", _HS.boobs = 650, _HS.boobsImplant = 600, _HS.butt = 2, _HS.lips = 25, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.oral = 15, _HS.skill.anal = 35, _HS.skill.combat = 1, _HS.intelligence = 30, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.custom.tattoo = "$He has a red star tattoo on $his back, and a hammer and sickle on $his right buttock.", _HS.custom.desc = "$He has a Slavic face with high cheekbones and a strong, pointed jaw. $He is a skilled martial artist.", _HS.faceShape = "masculine", _HS.career = "a bodyguard">>
+<<set _HS.slaveName = "Valentina", _HS.birthName = "Valentina", _HS.origin = "$He was once the bodyguard to a Russian drug lord, and was sold into slavery after his death by cocaine overdose.", _HS.ID = _i++, _HS.nationality = "Russian", _HS.birthWeek = random(0,51), _HS.actualAge = 29, _HS.physicalAge = 29, _HS.visualAge = 29, _HS.ovaryAge = 29, setHealth(_HS, 100, 0, 0, 0, 0), _HS.devotion = 100, _HS.muscles = 100, _HS.height = 175, _HS.eye.origColor = "green", _HS.override_Skin = 1, _HS.origSkin = "sun tanned", _HS.hLength = 30, _HS.hStyle = "shoulder length", _HS.boobs = 650, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.butt = 2, _HS.lips = 25, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.oral = 15, _HS.skill.anal = 35, _HS.skill.combat = 1, _HS.intelligence = 30, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.custom.tattoo = "$He has a red star tattoo on $his back, and a hammer and sickle on $his right buttock.", _HS.custom.desc = "$He has a Slavic face with high cheekbones and a strong, pointed jaw. $He is a skilled martial artist.", _HS.faceShape = "masculine", _HS.career = "a bodyguard">>
 <<set $heroSlaves.push(_HS)>>
 /*Tweaked devotion up, changed eyes to green, corrected tattoo syntax, added combat skill -BoneyM*/
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Maria", _HS.birthName = "Maria", _HS.origin = "$He was sold into slavery on a legal technicality.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.ovaryAge = 28, setHealth(_HS, 40), _HS.devotion = 15, _HS.height = 155, _HS.race = "latina", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "brown", _HS.hLength = 25, _HS.hStyle = "in a bob", _HS.boobs = 650, _HS.boobsImplant = 600, _HS.nipplesPiercing = 1, _HS.butt = 2, _HS.buttTat = "tribal patterns", _HS.face = -15, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.anus = 1, _HS.analArea = 1, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.skill.combat = 1, _HS.clothes = "attractive lingerie", _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.sexualFlaw = "hates penetration">>
+<<set _HS.slaveName = "Maria", _HS.birthName = "Maria", _HS.origin = "$He was sold into slavery on a legal technicality.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.ovaryAge = 28, setHealth(_HS, 40), _HS.devotion = 15, _HS.height = 155, _HS.race = "latina", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "brown", _HS.hLength = 25, _HS.hStyle = "in a bob", _HS.boobs = 650, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.nipplesPiercing = 1, _HS.butt = 2, _HS.buttTat = "tribal patterns", _HS.face = -15, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.anus = 1, _HS.analArea = 1, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.skill.combat = 1, _HS.clothes = "attractive lingerie", _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.sexualFlaw = "hates penetration">>
 <<set $heroSlaves.push(_HS)>>
 /*fighter*/
 /*Tweaked face down, added 'hates penetration' and combat skill -BoneyM*/
@@ -141,13 +141,13 @@
 /*Changed eye color, added odd, tweaked vaginalSkill, added origin -BoneyM*/
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Joan", _HS.birthName = "Joan", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, setHealth(_HS, 20), _HS.devotion = 15, _HS.height = 175, _HS.eye.origColor = "blue", _HS.origHColor = "brown", _HS.pubicHColor = "brown", _HS.hStyle = "long", _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.butt = 4, _HS.face = 15, _HS.lips = 35, _HS.lipsImplant = 10, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.anusTat = "tribal patterns", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.intelligence = 30, _HS.attrXX = 80, _HS.attrXY = 80, _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Joan", _HS.birthName = "Joan", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, setHealth(_HS, 20), _HS.devotion = 15, _HS.height = 175, _HS.eye.origColor = "blue", _HS.origHColor = "brown", _HS.pubicHColor = "brown", _HS.hStyle = "long", _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.butt = 4, _HS.face = 15, _HS.lips = 35, _HS.lipsImplant = 10, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.anusTat = "tribal patterns", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.intelligence = 30, _HS.attrXX = 80, _HS.attrXY = 80, _HS.fetishKnown = 1>>
 <<set $heroSlaves.push(_HS)>>
 /*heterochromia*/
 /*Tweaked face upwards, changed eye color, changed health from 20 to 6 -BoneyM*/
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Belle", _HS.birthName = "Belle", _HS.origin = "Formerly used solely for titfucking, $he quickly became a nymphomaniac after experiencing 'proper' sex.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, setHealth(_HS, 20), _HS.devotion = -75, _HS.height = 155, _HS.boobs = 1200, _HS.boobsImplant = 1000, _HS.butt = 4, _HS.buttImplant = 3, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.anus = 3, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.intelligence = -30, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd", _HS.custom.tattoo = "$His breasts are tattooed with $his implant history, showing repeated additions.", _HS.sexualFlaw = "crude">>
+<<set _HS.slaveName = "Belle", _HS.birthName = "Belle", _HS.origin = "Formerly used solely for titfucking, $he quickly became a nymphomaniac after experiencing 'proper' sex.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, setHealth(_HS, 20), _HS.devotion = -75, _HS.height = 155, _HS.boobs = 1200, _HS.boobsImplant = 1000, _HS.boobsImplantType = "normal", _HS.butt = 4, _HS.buttImplant = 3, _HS.buttImplantType = "normal", _HS.vagina = 3, _HS.vaginaLube = 1, _HS.anus = 3, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.intelligence = -30, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd", _HS.custom.tattoo = "$His breasts are tattooed with $his implant history, showing repeated additions.", _HS.sexualFlaw = "crude">>
 <<set $heroSlaves.push(_HS)>>
 /*rapey implant addict*/
 /*Is 'rapey' a quirk? Guess so. Added odd. Changed eye color, added nympho, added origin. -BoneyM*/
@@ -188,7 +188,7 @@
 /*Added entertain skill -BoneyM*/
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Charity", _HS.birthName = "Charity", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 29, _HS.physicalAge = 29, _HS.visualAge = 29, _HS.ovaryAge = 29, setHealth(_HS, 20), _HS.devotion = 90, _HS.race = "middle eastern", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "light olive", _HS.hLength = 80, _HS.hStyle = "very long", _HS.boobs = 650, _HS.boobsImplant = 600, _HS.nipplesPiercing = 1, _HS.butt = 5, _HS.lipsPiercing = 1, _HS.tonguePiercing = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.entertainment = 35, _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "$He has 'Charity' tattooed in cursive across the back of $his neck.">>
+<<set _HS.slaveName = "Charity", _HS.birthName = "Charity", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 29, _HS.physicalAge = 29, _HS.visualAge = 29, _HS.ovaryAge = 29, setHealth(_HS, 20), _HS.devotion = 90, _HS.race = "middle eastern", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "light olive", _HS.hLength = 80, _HS.hStyle = "very long", _HS.boobs = 650, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.nipplesPiercing = 1, _HS.butt = 5, _HS.lipsPiercing = 1, _HS.tonguePiercing = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.entertainment = 35, _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "$He has 'Charity' tattooed in cursive across the back of $his neck.">>
 <<set $heroSlaves.push(_HS)>>
 /*Changed $him to Arabic, corrected tattoo syntax, added entertain skill -BoneyM*/
 
@@ -282,7 +282,7 @@
 /*Increased health, added origin, fixed customdesc syntax -BoneyM*/
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Kinsey", _HS.birthName = "Kinsey", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 27, _HS.physicalAge = 27, _HS.visualAge = 27, _HS.ovaryAge = 27, setHealth(_HS, 20), _HS.devotion = 10, _HS.height = 145, _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.hLength = 15, _HS.hStyle = "short, with the left side shaved", _HS.boobs = 500, _HS.butt = 4, _HS.buttImplant = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 2, _HS.nosePiercing = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 100, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Kinsey", _HS.birthName = "Kinsey", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 27, _HS.physicalAge = 27, _HS.visualAge = 27, _HS.ovaryAge = 27, setHealth(_HS, 20), _HS.devotion = 10, _HS.height = 145, _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.hLength = 15, _HS.hStyle = "short, with the left side shaved", _HS.boobs = 500, _HS.butt = 4, _HS.buttImplant = 1, _HS.buttImplantType = "normal", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 2, _HS.nosePiercing = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 100, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1>>
 <<set $heroSlaves.push(_HS)>>
 /*Added nose piercing, reduced height, changed fetish to bisexual -BoneyM*/
 
@@ -338,7 +338,7 @@
 /* set nipples to pierced, changed fetish from bisexual to submissive, increased anal skill, dunno how to handle all the techno-implants $his tits etc. have as they don't seem to be size-increasing-focused, lowered health */
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Asha", _HS.birthName = "Asha", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, setHealth(_HS, 20), _HS.devotion = 60, _HS.weight = -20, _HS.nationality = "Russian", _HS.race = "white", _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.origSkin = "white", _HS.hLength = 170, _HS.hStyle = "floor length", _HS.waist = -55, _HS.heels = 1, _HS.boobs = 1200, _HS.boobsImplant = 800, _HS.nipplesPiercing = 2, _HS.lactation = 1, _HS.lactationDuration = 2, _HS.butt = 6, _HS.buttImplant = 3, _HS.face = 15, _HS.faceImplant = 15, _HS.lips = 35, _HS.lipsImplant = 10, _HS.lipsPiercing = 1, _HS.tonguePiercing = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clitPiercing = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 2, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 15, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "$He has many girly tattoos.", _HS.custom.desc = "$He loves hair play.", _HS.navelPiercing = 1>>
+<<set _HS.slaveName = "Asha", _HS.birthName = "Asha", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, setHealth(_HS, 20), _HS.devotion = 60, _HS.weight = -20, _HS.nationality = "Russian", _HS.race = "white", _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.origSkin = "white", _HS.hLength = 170, _HS.hStyle = "neat", _HS.waist = -55, _HS.heels = 1, _HS.boobs = 1200, _HS.boobsImplant = 800, _HS.boobsImplantType = "fillable", _HS.nipplesPiercing = 2, _HS.lactation = 1, _HS.lactationDuration = 2, _HS.butt = 6, _HS.buttImplant = 3, _HS.buttImplantType = "fillable", _HS.face = 15, _HS.faceImplant = 15, _HS.lips = 35, _HS.lipsImplant = 10, _HS.lipsPiercing = 1, _HS.tonguePiercing = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clitPiercing = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 2, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 15, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "$He has many girly tattoos.", _HS.custom.desc = "$He loves hair play.", _HS.navelPiercing = 1>>
 <<set $heroSlaves.push(_HS)>>
 /*Reduced weight, increased face and faceimplant, added piercings, corrected tattoo and customdesc syntax -BoneyM*/
 
@@ -442,7 +442,7 @@
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Asspussy' Miss Julie O", _HS.birthName = "Leah", _HS.origin = "$He was sentenced to enslavement as a punishment for fraud and theft.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, setHealth(_HS, 70), _HS.devotion = 100, _HS.height = 155, _HS.markings = "none", _HS.eye.origColor = "blue", _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.origSkin = "pale", _HS.hLength = 40, _HS.hStyle = "fashionable for a Free Cities 3rd Grade Teacher, up in a tight bun", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.clit = 1, _HS.clitPiercing = 3, _HS.clitSetting = "anal", _HS.boobs = 650, _HS.boobsImplant = 200, _HS.nipples = "huge", _HS.butt = 3, _HS.face = 15, _HS.faceImplant = 65, _HS.anus = 1, _HS.ovaries = 1, _HS.anusPiercing = 2, _HS.anusTat = "bleached", _HS.makeup = 2, _HS.nails = 2, _HS.earPiercing = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.clothes = "nice business attire", _HS.collar = "heavy gold", _HS.shoes = "heels", _HS.intelligence = -40, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.custom.desc = "$His pale skin is lightly freckled, and $his nipples are dark tan. $He used to be sexually repressed, and used to hate anal sex.">>
+<<set _HS.slaveName = "'Asspussy' Miss Julie O", _HS.birthName = "Leah", _HS.origin = "$He was sentenced to enslavement as a punishment for fraud and theft.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, setHealth(_HS, 70), _HS.devotion = 100, _HS.height = 155, _HS.markings = "none", _HS.eye.origColor = "blue", _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.origSkin = "pale", _HS.hLength = 40, _HS.hStyle = "fashionable for a Free Cities 3rd Grade Teacher, up in a tight bun", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.clit = 1, _HS.clitPiercing = 3, _HS.clitSetting = "anal", _HS.boobs = 650, _HS.boobsImplant = 200, _HS.boobsImplantType = "normal", _HS.nipples = "huge", _HS.butt = 3, _HS.face = 15, _HS.faceImplant = 65, _HS.anus = 1, _HS.ovaries = 1, _HS.anusPiercing = 2, _HS.anusTat = "bleached", _HS.makeup = 2, _HS.nails = 2, _HS.earPiercing = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.clothes = "nice business attire", _HS.collar = "heavy gold", _HS.shoes = "heels", _HS.intelligence = -40, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.custom.desc = "$His pale skin is lightly freckled, and $his nipples are dark tan. $He used to be sexually repressed, and used to hate anal sex.">>
 <<set $heroSlaves.push(_HS)>>
 /*huge nips*/
 
@@ -463,7 +463,7 @@
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Funbags' Young", _HS.birthName = "Young", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, setHealth(_HS, -10), _HS.devotion = 90, _HS.height = 175, _HS.nationality = "Korean", _HS.race = "asian", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "pale", _HS.hLength = 10, _HS.waist = -55, _HS.boobs = 3550, _HS.boobsImplant = 3000, _HS.nipplesPiercing = 1, _HS.areolae = 3, _HS.boobsTat = "degradation", _HS.butt = 2, _HS.face = 15, _HS.lipsPiercing = 2, _HS.lipsTat = "degradation", _HS.tonguePiercing = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.brand["chest"] = "SLUT", _HS.skill.oral = 100, _HS.aphrodisiacs = 1, _HS.addict = 22, _HS.collar = "shock punishment", _HS.shoes = "heels", _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "'Funbags' Young", _HS.birthName = "Young", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, setHealth(_HS, -10), _HS.devotion = 90, _HS.height = 175, _HS.nationality = "Korean", _HS.race = "asian", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "pale", _HS.hLength = 10, _HS.waist = -55, _HS.boobs = 3550, _HS.boobsImplant = 3000, _HS.boobsImplantType = "advanced fillable", _HS.nipplesPiercing = 1, _HS.areolae = 3, _HS.boobsTat = "degradation", _HS.butt = 2, _HS.face = 15, _HS.lipsPiercing = 2, _HS.lipsTat = "degradation", _HS.tonguePiercing = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.brand["chest"] = "SLUT", _HS.skill.oral = 100, _HS.aphrodisiacs = 1, _HS.addict = 22, _HS.collar = "shock punishment", _HS.shoes = "heels", _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1>>
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
@@ -474,10 +474,6 @@
 <<set _HS.slaveName = "Miss Maree", _HS.birthName = "Tina", _HS.origin = "A former headmistress, $he was sentenced to slavery after $he was caught training $his students to be lesbian trophy slaves.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, setHealth(_HS, 100, 0, 0, 0, 0), _HS.devotion = -50, _HS.weight = 20, _HS.height = 155, _HS.nationality = "American", _HS.eye.origColor = "green", _HS.origHColor = "red", _HS.pubicHColor = "red", _HS.origSkin = "pale", _HS.hStyle = "in a large bun", _HS.pubicHStyle = "in a strip", _HS.waist = -55, _HS.boobs = 1500, _HS.areolae = 3, _HS.boobsTat = "advertisements", _HS.butt = 6, _HS.face = 15, _HS.lips = 35, _HS.lipsTat = "permanent makeup", _HS.vaginaLube = 1, _HS.bellyAccessory = "a corset", _HS.ovaries = 1, _HS.anusTat = "flowers", _HS.earPiercing = 1, _HS.stampTat = "scenes", _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.collar = "leather with cowbell", _HS.shoes = "heels", _HS.intelligence = 100, _HS.intelligenceImplant = 30, _HS.attrXX = 80, _HS.attrXY = 0, _HS.fetishKnown = 1, _HS.behavioralFlaw = "bitchy", _HS.sexualFlaw = "hates men", _HS.custom.desc = "$He absolutely detests men.", _HS.career = "a principal">>
 <<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 = "$He was once a rising Free Cities politician who argued for compulsory female enslavement, but $he 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, setHealth(_HS, 60), _HS.devotion = 90, _HS.height = 145, _HS.heightImplant = -1, _HS.race = "white", _HS.nationality = "French", _HS.eye.origColor = "blue", _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.origSkin = "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 = "$He has a tattoo down $his left arm, which reads 'Once a tall, muscular, handsome man with a big dick and big balls.'", _HS.custom.desc = "Since becoming a slave $he 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 = "$He 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, setHealth(_HS, 100, 0, 0, 0, 0), _HS.devotion = 100, _HS.nationality = "American", _HS.origSkin = "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["right buttock"] = "SLAVE", _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>>
@@ -505,7 +501,7 @@
 <<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, setHealth(_HS, 90, 0, 0, 0), _HS.devotion = 100, _HS.height = 145, _HS.nationality = "Swedish", _HS.race = "white", _HS.eye.origColor = "blue", _HS.origHColor = "red", _HS.pubicHColor = "red", _HS.override_Skin = 1, _HS.origSkin = "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["right buttock"] = "your initials", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring =100, _HS.skill.entertainment = 15, _HS.rules.living = "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, setHealth(_HS, 90, 0, 0, 0), _HS.devotion = 100, _HS.height = 145, _HS.nationality = "Swedish", _HS.race = "white", _HS.eye.origColor = "blue", _HS.origHColor = "red", _HS.pubicHColor = "red", _HS.override_Skin = 1, _HS.origSkin = "sun tanned", _HS.hLength = 85, _HS.hStyle = "ass-length", _HS.waist = -55, _HS.boobs = 650, _HS.boobsImplant = 200, _HS.boobsImplantType = "normal", _HS.nipplesPiercing = 2, _HS.butt = 3, _HS.buttImplant = 1, _HS.buttImplantType = "normal", _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["right buttock"] = "your initials", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring =100, _HS.skill.entertainment = 15, _HS.rules.living = "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()>>
@@ -543,7 +539,7 @@
 
 <<if $seePreg != 0>>
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Fucknugget' Pillow", _HS.birthName = "Anika", _HS.origin = "$He sold $himself 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, setHealth(_HS, 80, 0, 0, 0), _HS.devotion = 100, _HS.weight = 40, _HS.origRace = "white", _HS.override_Race = 1, _HS.race = "latina", _HS.eye.origColor = "blue", _HS.origHColor = "red", _HS.pubicHColor = "red", _HS.hStyle = "long", _HS.waist = -100, _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 _HS.slaveName = "'Fucknugget' Pillow", _HS.birthName = "Anika", _HS.origin = "$He sold $himself 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, setHealth(_HS, 80, 0, 0, 0), _HS.devotion = 100, _HS.weight = 40, _HS.origRace = "white", _HS.override_Race = 1, _HS.race = "latina", _HS.eye.origColor = "blue", _HS.origHColor = "red", _HS.pubicHColor = "red", _HS.hStyle = "long", _HS.waist = -100, _HS.boobs = 6260, _HS.boobsImplant = 4200, _HS.boobsImplantType = "string", _HS.nipplesPiercing = 2, _HS.areolae = 3, _HS.boobsTat = "flowers", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 12, _HS.buttImplant = 1, _HS.buttImplantType = "normal", _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>>
 <<run App.Utils.removeHeroLimbs(_HS, "all")>>
 <<set $heroSlaves.push(_HS)>>
 <</if>>
@@ -553,7 +549,7 @@
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Onahole' Lian the Liberty Whore", _HS.birthName = "Lian", _HS.origin = "$He 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, setHealth(_HS, -50, 10, 10), _HS.devotion = 100, _HS.muscles = 20, _HS.nationality = "Chinese", _HS.race = "asian", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "pale", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.waist = -100, _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 _HS.slaveName = "'Onahole' Lian the Liberty Whore", _HS.birthName = "Lian", _HS.origin = "$He 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, setHealth(_HS, -50, 10, 10), _HS.devotion = 100, _HS.muscles = 20, _HS.nationality = "Chinese", _HS.race = "asian", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "pale", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.waist = -100, _HS.boobs = 2000, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _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>>
 <<run App.Utils.removeHeroLimbs(_HS, "all")>>
 <<set $heroSlaves.push(_HS)>>
 
@@ -569,13 +565,13 @@
 /*Added 'bitchy' quirk, reduced height and weight, added customdesc -BoneyM*/
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Cunt", _HS.birthName = "Cunt", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, setHealth(_HS, -10), _HS.devotion = 10, _HS.race = "white", _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.origSkin = "white", _HS.hLength = 30, _HS.hStyle = "shoulder length", _HS.heels = 1, _HS.boobs = 800, _HS.boobsImplant = 600, _HS.butt = 4, _HS.buttImplant = 2, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.clitPiercing = 1, _HS.anus = 2, _HS.anusTat = "tribal patterns", _HS.nosePiercing = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 35, _HS.intelligence = -70, _HS.attrXY = 40, _HS.attrKnown = 0, _HS.fetish = "mindbroken", _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Cunt", _HS.birthName = "Cunt", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, setHealth(_HS, -10), _HS.devotion = 10, _HS.race = "white", _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.origSkin = "white", _HS.hLength = 30, _HS.hStyle = "shoulder length", _HS.heels = 1, _HS.boobs = 800, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.butt = 4, _HS.buttImplant = 2, _HS.buttImplantType = "normal", _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.clitPiercing = 1, _HS.anus = 2, _HS.anusTat = "tribal patterns", _HS.nosePiercing = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 35, _HS.intelligence = -70, _HS.attrXY = 40, _HS.attrKnown = 0, _HS.fetish = "mindbroken", _HS.fetishKnown = 1>>
 <<set $heroSlaves.push(_HS)>>
 /*mindbroken*/
 /*Tweaked smart piercing setting, corrected piercings -BoneyM*/
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Fleshlight", _HS.birthName = "Fleshlight", _HS.origin = "Nothing remains of the person $he originally was, either mentally or physically.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, setHealth(_HS, 20), _HS.devotion = 60, _HS.race = "white", _HS.eye.origColor = "blue", _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.origSkin = "spray tanned", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 800, _HS.boobsImplant = 600, _HS.butt = 5, _HS.buttImplant = 2, _HS.lips = 55, _HS.lipsImplant = 2, _HS.lipsTat = "permanent makeup", _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.makeup = 3, _HS.nails = 3, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.shoes = "heels", _HS.attrXY = 40, _HS.fetish = "mindbroken", _HS.fetishKnown = 1, _HS.custom.desc = "$He has many surgical scars and something seems off about $him.">>
+<<set _HS.slaveName = "Fleshlight", _HS.birthName = "Fleshlight", _HS.origin = "Nothing remains of the person $he originally was, either mentally or physically.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, setHealth(_HS, 20), _HS.devotion = 60, _HS.race = "white", _HS.eye.origColor = "blue", _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.origSkin = "spray tanned", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 800, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.butt = 5, _HS.buttImplant = 2, _HS.buttImplantType = "normal", _HS.lips = 55, _HS.lipsImplant = 2, _HS.lipsTat = "permanent makeup", _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.makeup = 3, _HS.nails = 3, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.shoes = "heels", _HS.attrXY = 40, _HS.fetish = "mindbroken", _HS.fetishKnown = 1, _HS.custom.desc = "$He has many surgical scars and something seems off about $him.">>
 <<run App.Medicine.Modification.addScar(_HS, "left breast", "surgical", 2)>>
 <<run App.Medicine.Modification.addScar(_HS, "right breast", "surgical", 2)>>
 <<run App.Medicine.Modification.addScar(_HS, "left buttock", "surgical", 2)>>
diff --git a/src/npc/databases/ddSlavesDatabase.tw b/src/npc/databases/ddSlavesDatabase.tw
index 5bb5da0afd731b6267a52ce39352d1e20f430dbe..b80534089743ac7b223cdb67cee38a0746066096 100644
--- a/src/npc/databases/ddSlavesDatabase.tw
+++ b/src/npc/databases/ddSlavesDatabase.tw
@@ -18,7 +18,7 @@
 /*Added odd as a stand-in for the multiple personalities -BoneyM*/
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Lola", _HS.birthName = "Lola", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 27, _HS.physicalAge = 27, _HS.visualAge = 27, _HS.ovaryAge = 27, setHealth(_HS, 20), _HS.devotion = 35, _HS.height = 175, _HS.origSkin = "white", _HS.hStyle = "long", _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.butt = 4, _HS.buttImplant = 2, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 3, _HS.anus = 3, _HS.prostate = 1, _HS.balls = 1, _HS.scrotum = 1, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.aphrodisiacs = 1, _HS.addict = 10, _HS.intelligence = -30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Lola", _HS.birthName = "Lola", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 27, _HS.physicalAge = 27, _HS.visualAge = 27, _HS.ovaryAge = 27, setHealth(_HS, 20), _HS.devotion = 35, _HS.height = 175, _HS.origSkin = "white", _HS.hStyle = "long", _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.butt = 4, _HS.buttImplant = 2, _HS.buttImplantType = "normal", _HS.vagina = -1, _HS.preg = -2, _HS.dick = 3, _HS.anus = 3, _HS.prostate = 1, _HS.balls = 1, _HS.scrotum = 1, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.aphrodisiacs = 1, _HS.addict = 10, _HS.intelligence = -30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1>>
 <<set $heroSlaves.push(_HS)>>
 /*Second slave to not need changes -BoneyM*/
 
@@ -28,13 +28,13 @@
 /*Added origin, removed anal virginity -BoneyM*/
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Mrs.' Maria", _HS.birthName = "Maria", _HS.genes = "XY", _HS.origin = "$He was once a successful drug lord, but was turned into $his current self after making too many enemies.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.ovaryAge = 28, setHealth(_HS, 100, 0, 0, 0, 0), _HS.devotion = 75, _HS.muscles = 20, _HS.height = 175, _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.origSkin = "spray tanned", _HS.hLength = 10, _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.nipplesPiercing = 1, _HS.lips = 55, _HS.lipsImplant = 10, _HS.vagina = -1, _HS.preg = -2, _HS.clitPiercing = 3, _HS.clitSetting = "anal", _HS.dick = 5, _HS.anus = 2, _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.intelligence = 100, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.brand["left testicle"] = "a brand of a former master", _HS.stampTat = "$He has a fairly generic tramp stamp.", _HS.career = "a gang leader">>
+<<set _HS.slaveName = "'Mrs.' Maria", _HS.birthName = "Maria", _HS.genes = "XY", _HS.origin = "$He was once a successful drug lord, but was turned into $his current self after making too many enemies.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.ovaryAge = 28, setHealth(_HS, 100, 0, 0, 0, 0), _HS.devotion = 75, _HS.muscles = 20, _HS.height = 175, _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.origSkin = "spray tanned", _HS.hLength = 10, _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.nipplesPiercing = 1, _HS.lips = 55, _HS.lipsImplant = 10, _HS.vagina = -1, _HS.preg = -2, _HS.clitPiercing = 3, _HS.clitSetting = "anal", _HS.dick = 5, _HS.anus = 2, _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.intelligence = 100, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.brand["left testicle"] = "a brand of a former master", _HS.stampTat = "$He has a fairly generic tramp stamp.", _HS.career = "a gang leader">>
 <<set $heroSlaves.push(_HS)>>
 /*branded nut*/
 /*Added brand to customtat, added origin -BoneyM*/
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Sugar", _HS.birthName = "Sugar", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 24, _HS.physicalAge = 24, _HS.visualAge = 24, _HS.ovaryAge = 24, setHealth(_HS, 20), _HS.height = 175, _HS.eye.origColor = "blue", _HS.origHColor = "platinum blonde", _HS.origSkin = "pale", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 1400, _HS.boobsImplant = 1200, _HS.butt = 5, _HS.buttImplant = 4, _HS.lips = 55, _HS.lipsImplant = 2, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 5, _HS.anus = 1, _HS.prostate = 1, _HS.balls = 1, _HS.scrotum = 1, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.clothes = "slutty jewelry", _HS.intelligence = -90, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1, _HS.custom.desc = "$He is as dumb as a bag of hammers.">>
+<<set _HS.slaveName = "Sugar", _HS.birthName = "Sugar", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 24, _HS.physicalAge = 24, _HS.visualAge = 24, _HS.ovaryAge = 24, setHealth(_HS, 20), _HS.height = 175, _HS.eye.origColor = "blue", _HS.origHColor = "platinum blonde", _HS.origSkin = "pale", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 1400, _HS.boobsImplant = 1200, _HS.boobsImplantType = "fillable", _HS.butt = 5, _HS.buttImplant = 4, _HS.buttImplantType = "fillable", _HS.lips = 55, _HS.lipsImplant = 2, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 5, _HS.anus = 1, _HS.prostate = 1, _HS.balls = 1, _HS.scrotum = 1, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.clothes = "slutty jewelry", _HS.intelligence = -90, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1, _HS.custom.desc = "$He is as dumb as a bag of hammers.">>
 <<set $heroSlaves.push(_HS)>>
 /*also buttslut*/
 /*Added customdesc, changed eye color -BoneyM*/
@@ -69,7 +69,7 @@
 /*Removed customdesc copied over from previous slave -BoneyM*/
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Kai", _HS.birthName = "Mordecai", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, setHealth(_HS, 20), _HS.devotion = 60, _HS.height = 191, _HS.nationality = "Russian", _HS.race = "white", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "white", _HS.hLength = 140, _HS.hStyle = "knee length", _HS.waist = -55, _HS.heels = 1, _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.nipplesPiercing = 2, _HS.lactation = 1, _HS.lactationDuration = 2, _HS.butt = 5, _HS.buttImplant = 3, _HS.lips = 35, _HS.lipsImplant = 10, _HS.lipsPiercing = 1, _HS.vagina = 1, _HS.preg = -2, _HS.dick = 5, _HS.anus = 1, _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.skill.oral = 35, _HS.skill.anal = 15, _HS.clothes = "restrictive latex", _HS.intelligence = 25, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "$He has many girly tattoos.", _HS.custom.desc = "$He likes hair play.", _HS.navelPiercing = 1>>
+<<set _HS.slaveName = "Kai", _HS.birthName = "Mordecai", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, setHealth(_HS, 20), _HS.devotion = 60, _HS.height = 191, _HS.nationality = "Russian", _HS.race = "white", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "white", _HS.hLength = 140, _HS.hStyle = "knee length", _HS.waist = -55, _HS.heels = 1, _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.nipplesPiercing = 2, _HS.lactation = 1, _HS.lactationDuration = 2, _HS.butt = 5, _HS.buttImplant = 3, _HS.buttImplantType = "normal", _HS.lips = 35, _HS.lipsImplant = 10, _HS.lipsPiercing = 1, _HS.vagina = 1, _HS.preg = -2, _HS.dick = 5, _HS.anus = 1, _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.skill.oral = 35, _HS.skill.anal = 15, _HS.clothes = "restrictive latex", _HS.intelligence = 25, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "$He has many girly tattoos.", _HS.custom.desc = "$He likes hair play.", _HS.navelPiercing = 1>>
 <<set $heroSlaves.push(_HS)>>
 /*Increased height and balls size -BoneyM*/
 
@@ -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), setHealth(_HS, 70), _HS.devotion = 100, _HS.eye.origColor = "black", _HS.origHColor = "sparkling and shiny golden red", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.origSkin = "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["right buttock"] = "SLUT",_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 = "$He has tattoos of teasing, enticing messages begging others to come taste $his addictive milk.", _HS.custom.desc = "$His musky milky aura drives men and women around $him giggly and dumb with lust.", _HS.horn = "cow horns">>
+<<set _HS.slaveName = "Mistress Izzy", _HS.birthName = "Isabella", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), setHealth(_HS, 70), _HS.devotion = 100, _HS.eye.origColor = "black", _HS.origHColor = "sparkling and shiny golden red", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.origSkin = "sun tanned", _HS.hLength = 60, _HS.hStyle = "in thick long heavy braids", _HS.waist = -100, _HS.boobs = 9200, _HS.boobsImplant = 6000, _HS.boobsImplantType = "advanced fillable", _HS.nipplesPiercing = 2, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.counter.milk = 3010, _HS.butt = 8, _HS.buttImplant = 1, _HS.buttImplantType = "normal", _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["right buttock"] = "SLUT",_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 = "$He has tattoos of teasing, enticing messages begging others to come taste $his addictive milk.", _HS.custom.desc = "$His musky milky aura drives men and women around $him giggly and dumb with lust.", _HS.horn = "cow horns">>
 <<set $heroSlaves.push(_HS)>>
 /*Dropped desc = $He has two cute horns protruding from $his forehead. A few addicted milkslaves of $his own tag along behind $him. */
 
@@ -133,11 +133,11 @@
 <<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 = "$He is a former Kkangpae gang member who was sold into slavery by $his former boss as a punishment.", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "$He 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, setHealth(_HS, 50), _HS.devotion = 31, _HS.muscles = 50, _HS.height = 155, _HS.nationality = "Korean", _HS.race = "asian", _HS.override_H_Color = 1, _HS.origHColor = "black", _HS.hColor = "onyx black and rainbow-streaked", _HS.override_Skin = 1, _HS.origSkin = "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 = "$He has two neon-blue butterflies tattooed on $his right temple and one more right above $his right eyebrow; a bright blue, luminescent tattoo of an oriental dragon is intertwining with floral tattoos on $his right leg.", _HS.custom.desc = "$He is almost never seen without $his long, thin, lavishly decorated smoking pipe, either holding it in hand, or carrying it tucked in $his chignon.", _HS.career = "a gang member">>
+<<set _HS.slaveName = "'Dragon Goddess' Chae-won", _HS.genes = "XY", _HS.birthName = "Chae-won", _HS.origin = "$He is a former Kkangpae gang member who was sold into slavery by $his former boss as a punishment.", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "$He 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, setHealth(_HS, 50), _HS.devotion = 31, _HS.muscles = 50, _HS.height = 155, _HS.nationality = "Korean", _HS.race = "asian", _HS.override_H_Color = 1, _HS.origHColor = "black", _HS.hColor = "onyx black and rainbow-streaked", _HS.override_Skin = 1, _HS.origSkin = "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.boobsImplantType = "advanced fillable", _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 = "$He has two neon-blue butterflies tattooed on $his right temple and one more right above $his right eyebrow; a bright blue, luminescent tattoo of an oriental dragon is intertwining with floral tattoos on $his right leg.", _HS.custom.desc = "$He is almost never seen without $his long, thin, lavishly decorated smoking pipe, either holding it in hand, or carrying it tucked in $his chignon.", _HS.career = "a gang member">>
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Bailey", _HS.birthName = "Bryan", _HS.genes = "XY", _HS.origin = "$He was sold to your predecessor by $his husband to pay off his extreme debt.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 22, _HS.physicalAge = 22, _HS.visualAge = 22, _HS.ovaryAge = 22, setHealth(_HS, 50), _HS.devotion = -50, _HS.nationality = "American", _HS.race = "white", _HS.eye.origColor = "blue", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "fair", _HS.hLength = 50, _HS.hStyle = "chest-length, styled up in schoolgirl pigtails with bangs", _HS.boobs = 700, _HS.boobsImplant = 400, _HS.butt = 2, _HS.lips = 35, _HS.vagina = -1, _HS.preg = -2, _HS.anus = 1, _HS.dick = 2, _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.oral = 15, _HS.clothes = "a slutty maid outfit", _HS.shoes = "heels", _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Bailey", _HS.birthName = "Bryan", _HS.genes = "XY", _HS.origin = "$He was sold to your predecessor by $his husband to pay off his extreme debt.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 22, _HS.physicalAge = 22, _HS.visualAge = 22, _HS.ovaryAge = 22, setHealth(_HS, 50), _HS.devotion = -50, _HS.nationality = "American", _HS.race = "white", _HS.eye.origColor = "blue", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "fair", _HS.hLength = 50, _HS.hStyle = "chest-length, styled up in schoolgirl pigtails with bangs", _HS.boobs = 700, _HS.boobsImplant = 400, _HS.boobsImplantType = "normal", _HS.butt = 2, _HS.lips = 35, _HS.vagina = -1, _HS.preg = -2, _HS.anus = 1, _HS.dick = 2, _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.oral = 15, _HS.clothes = "a slutty maid outfit", _HS.shoes = "heels", _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1>>
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
@@ -145,7 +145,7 @@
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Demon Whore' Yuzuki", _HS.birthName = "Yuri", _HS.genes = "XY", _HS.origin = "$His origins are unknown, but rumor has it that $he is a literal demon.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, setHealth(_HS, 60), _HS.devotion = 90.4, _HS.muscles = 20, _HS.height = 190, _HS.nationality = "Japanese", _HS.race = "asian", _HS.eye.origColor = "green", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "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>>
+<<set _HS.slaveName = "'Demon Whore' Yuzuki", _HS.birthName = "Yuri", _HS.genes = "XY", _HS.origin = "$His origins are unknown, but rumor has it that $he is a literal demon.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, setHealth(_HS, 60), _HS.devotion = 90.4, _HS.muscles = 20, _HS.height = 190, _HS.nationality = "Japanese", _HS.race = "asian", _HS.eye.origColor = "green", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "pale", _HS.hStyle = "long", _HS.pubicHStyle = "in a strip", _HS.waist = -100, _HS.boobs = 10000, _HS.boobsImplant = 4800, _HS.boobsImplantType = "advanced fillable", _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>>
 <<run setEyeColorFull(_HS, "", "demonic", "", "both")>>
 <<set $heroSlaves.push(_HS)>>
 
@@ -153,6 +153,10 @@
 <<set _HS.slaveName = "Fuckmeat", _HS.birthName = "Alva", _HS.genes = "XY", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "$He 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, setHealth(_HS, 100, 0, 0, 0, 0), _HS.devotion = 100, _HS.muscles = 20, _HS.height = 145, _HS.race = "white", _HS.nationality = "Swedish", _HS.eye.origColor = "blue", _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.origSkin = "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["cheek"] = "a penis symbol",_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 = "$He has a swastika tattooed on $his ballsack.">>
 <<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 = "$He was once a rising Free Cities politician who argued for compulsory female enslavement, but $he 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, setHealth(_HS, 60), _HS.devotion = 90, _HS.height = 145, _HS.heightImplant = -1, _HS.race = "white", _HS.nationality = "French", _HS.eye.origColor = "blue", _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.origSkin = "spray tanned", _HS.hLength = 70, _HS.hStyle = "ass-length", _HS.waist = -55, _HS.heels = 1, _HS.boobs = 1100, _HS.boobsImplant = 400, _HS.boobsImplantType = "normal", _HS.nipplesPiercing = 1, _HS.areolae = 1, _HS.butt = 4, _HS.buttImplant = 2, _HS.buttImplantType = "normal", _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 = "$He has a tattoo down $his left arm, which reads 'Once a tall, muscular, handsome man with a big dick and big balls.'", _HS.custom.desc = "Since becoming a slave $he has been turned into a little bimbo.">>
+<<set $heroSlaves.push(_HS)>>
+
 <<if $seeExtreme == 1>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
diff --git a/src/npc/databases/dfSlavesDatabase.tw b/src/npc/databases/dfSlavesDatabase.tw
index cbd3291ad2e774fd2b09c3838b6c1538f4b35a94..4e1cf89141dde26486cf9d86e062fd2bffc19ab6 100644
--- a/src/npc/databases/dfSlavesDatabase.tw
+++ b/src/npc/databases/dfSlavesDatabase.tw
@@ -7,17 +7,17 @@
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Strawberry", _HS.birthName = "Strawberry", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 30, _HS.physicalAge = 30, _HS.visualAge = 30, _HS.ovaryAge = 30, setHealth(_HS, 20), _HS.devotion = 40, _HS.height = 175, _HS.eye.origColor = "dark brown", _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.origSkin = "sun tanned", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 1000, _HS.boobsImplant = 400, _HS.nipplesPiercing = 1, _HS.butt = 5, _HS.buttImplant = 2, _HS.lips = 35, _HS.lipsImplant = 10, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 2, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.fetishKnown = 1, _HS.lipsTat = "Strawberries are tattooed on $his left cheek.", _HS.buttTat = "Strawberries are tattooed on $his right buttock.", _HS.clitPiercing = 2, _HS.counter.birthsTotal = 2>>
+<<set _HS.slaveName = "Strawberry", _HS.birthName = "Strawberry", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 30, _HS.physicalAge = 30, _HS.visualAge = 30, _HS.ovaryAge = 30, setHealth(_HS, 20), _HS.devotion = 40, _HS.height = 175, _HS.eye.origColor = "dark brown", _HS.origHColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.origSkin = "sun tanned", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 1000, _HS.boobsImplant = 400, _HS.boobsImplantType = "normal", _HS.nipplesPiercing = 1, _HS.butt = 5, _HS.buttImplant = 2, _HS.buttImplantType = "normal", _HS.lips = 35, _HS.lipsImplant = 10, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 2, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.fetishKnown = 1, _HS.lipsTat = "Strawberries are tattooed on $his left cheek.", _HS.buttTat = "Strawberries are tattooed on $his right buttock.", _HS.clitPiercing = 2, _HS.counter.birthsTotal = 2>>
 /*vibe nips, muscles*/
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Melon", _HS.birthName = "Melon", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, setHealth(_HS, 20), _HS.devotion = 50, _HS.height = 175, _HS.eye.origColor = "blue", _HS.origHColor = "red", _HS.pubicHColor = "red", _HS.override_Skin = 1, _HS.origSkin = "sun tanned", _HS.hLength = 10, _HS.hStyle = "short", _HS.pubicHStyle = "waxed", _HS.boobs = 1800, _HS.boobsImplant = 800, _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.lips = 35, _HS.lipsImplant = 10, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 2, _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 100, _HS.skill.anal = 15, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.lipsTat = "Watermelons are tattooed on $his face.", _HS.buttTat = "Watermelons are tattooed on $his buttocks.", _HS.teeth = "removable", _HS.clitPiercing = 2, _HS.lipsPiercing = 2, _HS.counter.birthsTotal = 1>>
+<<set _HS.slaveName = "Melon", _HS.birthName = "Melon", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, setHealth(_HS, 20), _HS.devotion = 50, _HS.height = 175, _HS.eye.origColor = "blue", _HS.origHColor = "red", _HS.pubicHColor = "red", _HS.override_Skin = 1, _HS.origSkin = "sun tanned", _HS.hLength = 10, _HS.hStyle = "short", _HS.pubicHStyle = "waxed", _HS.boobs = 1800, _HS.boobsImplant = 800, _HS.boobsImplantType = "fillable", _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.lips = 35, _HS.lipsImplant = 10, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 2, _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 100, _HS.skill.anal = 15, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.lipsTat = "Watermelons are tattooed on $his face.", _HS.buttTat = "Watermelons are tattooed on $his buttocks.", _HS.teeth = "removable", _HS.clitPiercing = 2, _HS.lipsPiercing = 2, _HS.counter.birthsTotal = 1>>
 /*vibe nips, saliva implant*/
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Carambola", _HS.birthName = "Carambola", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 25, _HS.physicalAge = 25, _HS.visualAge = 25, _HS.ovaryAge = 25, setHealth(_HS, 20), _HS.devotion = 90, _HS.height = 175, _HS.eye.origColor = "light green", _HS.origHColor = "dark blonde", _HS.pubicHColor = "dark blonde", _HS.override_Skin = 1, _HS.origSkin = "sun tanned", _HS.hLength = 60, _HS.hStyle = "curly and long, and in pigtails", _HS.pubicHStyle = "waxed", _HS.boobs = 650, _HS.nipplesPiercing = 1, _HS.butt = 8, _HS.buttImplant = 4, _HS.lips = 35, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 3, _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 100, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.lipsTat = "Carambolas — starfruits — are tattooed on $his face.", _HS.buttTat = "Carambolas — starfruits — are tattooed on $his buttocks.", _HS.clitPiercing = 2, _HS.tonguePiercing = 1, _HS.clothes = "no clothing", _HS.collar = "bell collar", _HS.heels = 1>>
+<<set _HS.slaveName = "Carambola", _HS.birthName = "Carambola", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 25, _HS.physicalAge = 25, _HS.visualAge = 25, _HS.ovaryAge = 25, setHealth(_HS, 20), _HS.devotion = 90, _HS.height = 175, _HS.eye.origColor = "light green", _HS.origHColor = "dark blonde", _HS.pubicHColor = "dark blonde", _HS.override_Skin = 1, _HS.origSkin = "sun tanned", _HS.hLength = 60, _HS.hStyle = "curly and long, and in pigtails", _HS.pubicHStyle = "waxed", _HS.boobs = 650, _HS.nipplesPiercing = 1, _HS.butt = 8, _HS.buttImplant = 4, _HS.buttImplantType = "fillable", _HS.lips = 35, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 3, _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 100, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.lipsTat = "Carambolas — starfruits — are tattooed on $his face.", _HS.buttTat = "Carambolas — starfruits — are tattooed on $his buttocks.", _HS.clitPiercing = 2, _HS.tonguePiercing = 1, _HS.clothes = "no clothing", _HS.collar = "bell collar", _HS.heels = 1>>
 /*vibe nips, saliva implant lube*/
 <<set $heroSlaves.push(_HS)>>
 
diff --git a/src/npc/rgASDump.tw b/src/npc/rgASDump.tw
index fa63877df97b3da88466b20eb3226f59231d9398..bfd0c1e6fec6480d94077447e7194c0cae827855 100644
--- a/src/npc/rgASDump.tw
+++ b/src/npc/rgASDump.tw
@@ -47,7 +47,7 @@
 	<<elseif $PC.career == "slaver">>
 		<<set $activeSlave.devotion += 10>>
 	<<elseif $PC.career == "medicine">>
-		<<set $activeSlave.boobs += 600, $activeSlave.boobsImplant += 600, $activeSlave.butt += 2, $activeSlave.buttImplant += 2, $activeSlave.lips += 10, $activeSlave.lipsImplant += 10, $activeSlave.waist = -55>>
+		<<set $activeSlave.boobs += 600, $activeSlave.boobsImplant += 600, $activeSlave.boobsImplantType = "normal", $activeSlave.butt += 2, $activeSlave.buttImplant += 2, $activeSlave.buttImplantType = "normal", $activeSlave.lips += 10, $activeSlave.lipsImplant += 10, $activeSlave.waist = -55>>
 	<<elseif $PC.career == "celebrity">>
 		<<if $activeSlave.skill.entertainment < 60>><<set $activeSlave.skill.entertainment += 20>><</if>>
 	<<elseif $PC.career == "servant">>
diff --git a/src/npc/slaveStats.tw b/src/npc/slaveStats.tw
index 3dca1aae144a9f395d5797d3cfa80014c213bbbf..d00675a2c70aa7cde569ec021371b12f85bc3df0 100644
--- a/src/npc/slaveStats.tw
+++ b/src/npc/slaveStats.tw
@@ -259,8 +259,9 @@ Income: <<= num($activeSlave.lastWeeksRepIncome)>>
 		<br>Nails: $activeSlave.nails
 
 		<br><br>Boobs: $activeSlave.boobs,
+		Implant Type: $activeSlave.boobsImplantType,
+		Implant Volume: $activeSlave.boobsImplant
 		<br>Milk: $activeSlave.boobsMilk,
-		Type: $activeSlave.boobsImplantType,
 		Qunantity: $activeSlave.counter.milk
 		<br>Shape: $activeSlave.boobShape
 		<br>nipples: $activeSlave.nipples,
@@ -301,7 +302,8 @@ Income: <<= num($activeSlave.lastWeeksRepIncome)>>
 		Area: $activeSlave.analArea,
 		Count: $activeSlave.counter.anal
 		<br>Butt: $activeSlave.butt,
-		Type: $activeSlave.buttImplantType,
+		Implant Type: $activeSlave.buttImplantType,
+		Implant Volume: $activeSlave.buttImplant,
 		Plug: $activeSlave.buttplug,
 		PlugAttachment: $activeSlave.buttplugAttachment
 		<br>Mpreg: $activeSlave.mpreg
@@ -398,7 +400,7 @@ Income: <<= num($activeSlave.lastWeeksRepIncome)>>
 <div id="Impants_Piercings_Tattoos" class="tabcontent">
 	<div class="content">
 
-		<h2>Impants</h2>
+		<h2>Implants</h2>
 		Height: $activeSlave.heightImplant
 		<br>Ears: $activeSlave.earImplant
 		<br>Face: $activeSlave.faceImplant
diff --git a/src/js/surgery.js b/src/npc/surgery/surgery.js
similarity index 79%
rename from src/js/surgery.js
rename to src/npc/surgery/surgery.js
index 98b802e27ed61bde64b54f41f2f086eb05ff04c6..09909e85aa88081e8dbe45be022a9361cc009f32 100644
--- a/src/js/surgery.js
+++ b/src/npc/surgery/surgery.js
@@ -138,7 +138,7 @@ App.Medicine.Surgery.ListHelpers = class {
 
 	/**
 	 * @param {string} name
-	 * @param {number} implantType
+	 * @param {string} implantType
 	 * @param {number} size
 	 * @returns {App.Medicine.Surgery.Procedure}
 	 */
@@ -160,7 +160,7 @@ App.Medicine.Surgery.ListHelpers = class {
 			slave => {
 				slave[`${this._bodyPart}`] -= slave[`${this._bodyPart}Implant`];
 				slave[`${this._bodyPart}Implant`] = 0;
-				slave[`${this._bodyPart}ImplantType`] = 0;
+				slave[`${this._bodyPart}ImplantType`] = "none";
 			}, this._V.surgeryCost, 5, `${this._bodyPart}Loss`
 		);
 	}
@@ -294,72 +294,84 @@ App.Medicine.Surgery.sizingProcedures = function() {
 		const thisArcology = V.arcologies[0];
 		const largeImplantsAvailable = thisArcology.FSTransformationFetishistResearch === 1;
 		const advancedFillableImplantsAvailable = V.ImplantProductionUpgrade === 1;
+		const advancedSurgeryAvailable = V.ImplantProductionUpgrade === 1;
 		const pronouns = getPronouns(slave);
 		const {he, His} = pronouns;
 
 		const types = App.Medicine.Keys.Surgery.Target.breast; // shortcuts
 		const helper = new App.Medicine.Surgery.ListHelpers(slave, "boobs", types, pronouns, V.showBoobCCs);
 
-		const areStringsInstalled = slave.boobsImplantType === 1;
+		const areStringsInstalled = slave.boobsImplantType === "string";
+		const areFillablesInstalled = ["fillable", "advanced fillable", "hyper fillable"].includes(slave.boobsImplantType);
 		const curSize = slave.boobsImplant;
+		const implantType = slave.boobsImplantType;
 
 		let r = [];
 		if (options.augmentation) {
-			if (slave.boobs > 50000) {
-				r.push(App.Medicine.Surgery.makeImpossibleOption(types.fillUp, "Increase boobs", `<em>${His} breasts are as large as ${he} can physically support</em>`));
-			} else if (curSize > 10000 && !largeImplantsAvailable && !areStringsInstalled) {
-				r.push(App.Medicine.Surgery.makeImpossibleOption(types.fillUp, "Increase boobs", `<em>${His} implants are filled to capacity</em>`));
-			} else if (slave.indentureRestrictions >= 2) {
+			if (slave.indentureRestrictions >= 2) {
 				r.push(App.Medicine.Surgery.makeImpossibleOption(types.installImplant, "Change boob size", `<em>${His} indenture forbids elective surgery</em>`));
 			} else if (slave.breastMesh === 1) {
 				r.push(App.Medicine.Surgery.makeImpossibleOption(types.installImplant, "Put implants", `<em>${His} supportive mesh implant blocks implantation</em>`));
 			} else if (curSize === 0) {
 				if (options.strings) {
-					r.push(helper.installImplants("string", 1, 400));
+					r.push(helper.installImplants("string", "string", 400));
 				}
-				if (V.surgeryUpgrade === 1) {
-					r.push(helper.installImplants("large", 0, 600));
+				if (advancedSurgeryAvailable) {
+					r.push(helper.installImplants("large", "normal", 600));
+				}
+				r.push(helper.installImplants("standard", "normal", 400));
+				r.push(helper.installImplants("small", "normal", 200));
+			} else if (implantType === "normal") {
+				if (curSize > 400) {
+					r.push(helper.replaceImplants("fillable", "fillable", 800));
+				} else if (curSize > 200) {
+					r.push(helper.replaceImplants("large", "normal", 600));
+				} else {
+					r.push(helper.replaceImplants("standard", "normal", 400));
+					r.push(helper.replaceImplants("large", "normal", 600));
+				}
+			} else if (implantType === "hyper fillable") {
+				if (slave.boobs >= 50000) {
+					r.push(App.Medicine.Surgery.makeImpossibleOption(types.fillUp, "Increase boobs", `<em>${His} breasts are as large as ${he} can physically support</em>`));
+				} else {
+					r.push(helper.fillUp(1000));
+				}
+			} else if (implantType === "advanced fillable") {
+				if (curSize >= 10000) {
+					r.push(App.Medicine.Surgery.makeImpossibleOption(types.fillUp, "Increase boobs", `<em>${His} implants are filled to capacity</em>`));
+					if (largeImplantsAvailable) {
+						r.push(helper.replaceImplants("hyper fillable", "hyper fillable", 11000));
+					}
+				} else {
+					r.push(helper.fillUp(400));
+				}
+			} else if (implantType === "fillable") {
+				if (curSize >= 1800) {
+					r.push(App.Medicine.Surgery.makeImpossibleOption(types.fillUp, "Add inert filler", `<em>${His} implants are filled to capacity</em>`));
+					r.push(_advFillablePriceModifier(helper.replaceImplants("advanced fillable", "advanced fillable", 2200)));
+				} else {
+					r.push(helper.fillUp(200));
 				}
-				r.push(helper.installImplants("standard", 0, 400));
-				r.push(helper.installImplants("small", 0, 200));
-			} else if (curSize > 10000 && !areStringsInstalled && advancedFillableImplantsAvailable) {
-				r.push(helper.fillUp(1000));
-			} else if (curSize > 9800 && !areStringsInstalled && advancedFillableImplantsAvailable) {
-				r.push(helper.replaceImplants("hyper fillable", 0, 11000));
-			} else if (curSize > 2000 && !areStringsInstalled) {
-				r.push(helper.fillUp(400));
-			} else if (curSize > 1800 && !areStringsInstalled) {
-				r.push(App.Medicine.Surgery.makeImpossibleOption(types.fillUp, "Add inert filler", `<em>${His} implants are filled to capacity</em>`));
-				r.push(_advFillablePriceModifier(helper.replaceImplants("advanced fillable", 0, 2200)));
-			} else if (curSize > 600 && !areStringsInstalled) {
-				r.push(helper.fillUp(200));
-			} else if (curSize > 400 && !areStringsInstalled) {
-				r.push(helper.replaceImplants("fillable", 0, 800));
-			} else if (curSize > 200 && !areStringsInstalled) {
-				r.push(helper.replaceImplants("large", 0, 600));
-			} else if (curSize > 0 && !areStringsInstalled) {
-				r.push(helper.replaceImplants("standard", 0, 400));
-				r.push(helper.replaceImplants("large", 0, 600));
 			}
 		}
 
 		if (options.replace && slave.indentureRestrictions < 2 && curSize > 0) {
 			if (!areStringsInstalled && curSize < 600) {
-				r.push(helper.replaceImplants("string", 1, 400));
+				r.push(helper.replaceImplants("string", "string", 400));
 			} else if (areStringsInstalled){
 				// we have engorged string implants, suggest replacing with normal implants of similar size
 				if (curSize > 10000) {
 					if (largeImplantsAvailable) {
 						if (slave.boobs < 50000) {
-							r.push(helper.replaceImplants("hyper fillable", 0, Math.round(curSize / 1000) * 1000));
+							r.push(helper.replaceImplants("hyper fillable", "hyper fillable", Math.round(curSize / 1000) * 1000));
 						}
 					}
 				} else if (curSize > 2200) {
-					r.push(_advFillablePriceModifier(helper.replaceImplants("advanced fillable", 0, Math.round(curSize / 400) * 400)));
+					r.push(_advFillablePriceModifier(helper.replaceImplants("advanced fillable", "advanced fillable", Math.round(curSize / 400) * 400)));
 				} else if (curSize > 400) {
-					r.push(helper.replaceImplants("fillable", 0, Math.round(curSize / 200) * 200));
+					r.push(helper.replaceImplants("fillable", "fillable", Math.round(curSize / 200) * 200));
 				} else {
-					r.push(helper.replaceImplants("standard", 0, 400));
+					r.push(helper.replaceImplants("standard", "normal", 400));
 				}
 			}
 		}
@@ -378,8 +390,30 @@ App.Medicine.Surgery.sizingProcedures = function() {
 					} else if (curSize > 500) {
 						r.push(helper.drain(100));
 					}
+				} else if (areFillablesInstalled) {
+					if (implantType === "hyper fillable") {
+						if (curSize <= 10000) {
+							r.push(App.Medicine.Surgery.makeImpossibleOption(types.drain, "Remove filler", `<em>${His} implants are empty</em>`));
+						} else {
+							r.push(helper.drain(1000));
+						}
+					} else if (implantType === "advanced fillable") {
+						if (curSize <= 1000) {
+							r.push(App.Medicine.Surgery.makeImpossibleOption(types.drain, "Remove filler", `<em>${His} implants are empty</em>`));
+						} else {
+							r.push(helper.drain(500));
+						}
+					} else if (implantType === "fillable") {
+						if (curSize <= 500) {
+							r.push(App.Medicine.Surgery.makeImpossibleOption(types.drain, "Remove filler", `<em>${His} implants are empty</em>`));
+						} else {
+							r.push(helper.drain(100));
+						}
+					}
+				}
+				if (slave.indentureRestrictions < 2) {
+					r.push(helper.removeImplants());
 				}
-				r.push(helper.removeImplants());
 			}
 			if ((slave.boobs > 300) && (curSize === 0) && slave.indentureRestrictions < 2) {
 				r.push(helper.reduce("reduce", 200));
@@ -419,78 +453,113 @@ App.Medicine.Surgery.sizingProcedures = function() {
 		const thisArcology = V.arcologies[0];
 		const largeImplantsAvailable = thisArcology.FSTransformationFetishistResearch === 1;
 		const advancedFillableImplantsAvailable = V.ImplantProductionUpgrade === 1;
+		const advancedSurgeryAvailable = V.ImplantProductionUpgrade === 1;
 		const pronouns = getPronouns(slave);
 		const {he, His} = pronouns;
 
 		const types = App.Medicine.Keys.Surgery.Target.butt; // shortcuts
 		const helper = new App.Medicine.Surgery.ListHelpers(slave, "butt", types, pronouns, false);
 
-		const areStringsInstalled = slave.buttImplantType === 1;
+		const areStringsInstalled = slave.buttImplantType === "string";
+		const areFillablesInstalled = ["fillable", "advanced fillable", "hyper fillable"].includes(slave.buttImplantType);
 		const curSize = slave.buttImplant;
+		const implantType = slave.buttImplantType;
 
 		let r = [];
 
 		if (options.augmentation) {
 			if (slave.indentureRestrictions >= 2) {
 				r.push(App.Medicine.Surgery.makeImpossibleOption(types.installImplant, "Change butt size", `<em>${His} indenture forbids elective surgery</em>`));
-			} else if (slave.butt > 19) {
+			} else if (slave.butt > 19 && areFillablesInstalled) {
 				r.push(App.Medicine.Surgery.makeImpossibleOption(types.fillUp, "Increase butt", `<em>${His} butt is as large as it can possibly get</em>`));
-			} else if (slave.butt > 7 && !largeImplantsAvailable && thisArcology.FSAssetExpansionist === "unset" && !areStringsInstalled) {
-				r.push(App.Medicine.Surgery.makeImpossibleOption(types.installImplant, "Increase butt", `<em>${His} butt is as large as ${he} can physically support</em>`));
-			} else if (curSize > 7 && !largeImplantsAvailable && !areStringsInstalled) {
-				r.push(App.Medicine.Surgery.makeImpossibleOption(types.installImplant, "Increase butt", `<em>${His} butt implants are filled to capacity</em>`));
 			} else if (curSize === 0) {
-				r.push(helper.installImplants("standard", 0, 1));
 				if (options.strings) {
-					r.push(helper.installImplants("string", 1, 1));
+					r.push(helper.installImplants("string", "string", 1));
+				}
+				if (advancedSurgeryAvailable) {
+					r.push(helper.installImplants("big", "normal", 2));
 				}
-			} else if (curSize === 1 && !areStringsInstalled) {
-				r.push(helper.replaceImplants("bigger", 0, 2));
-			} else if (curSize === 2 && !areStringsInstalled) {
-				r.push(helper.replaceImplants("fillable", 0, 3));
-			} else if (curSize === 4 && !areStringsInstalled) {
-				r.push(App.Medicine.Surgery.makeImpossibleOption(types.fillUp, "Increase size", `<em>${His} implants are filled to capacity</em>`));
-				const advancedFillable = helper.replaceImplants("advanced fillable", 0, 5);
-				if (!advancedFillableImplantsAvailable) {
-					advancedFillable.costs += 10000;
-					advancedFillable.label += " (special order)";
-					advancedFillable.description += " (special order)";
+				r.push(helper.installImplants("standard", "normal", 1));
+			} else if (implantType === "normal") {
+				if (curSize >= 5) {
+					r.push(_advFillablePriceModifier(helper.replaceImplants("advanced fillable", "advanced fillable", curSize)));
+				} else if (curSize >= 2) {
+					r.push(helper.replaceImplants("fillable", "fillable", 3));
+				} else if (curSize === 1) {
+					r.push(helper.replaceImplants("bigger", "normal", 2));
+				}
+			} else if (implantType === "hyper fillable") {
+				if (curSize > 19) {
+					r.push(App.Medicine.Surgery.makeImpossibleOption(types.fillUp, "Increase butt", `<em>${His} butt implants are filled to capacity</em>`));
+				} else {
+					r.push(helper.fillUp(1));
+				}
+			} else if (implantType === "advanced fillable") {
+				if (curSize > 7) {
+					r.push(App.Medicine.Surgery.makeImpossibleOption(types.fillUp, "Increase butt", `<em>${His} butt implants are filled to capacity</em>`));
+					if (largeImplantsAvailable) {
+						r.push(helper.replaceImplants("hyper fillable", "hyper fillable", 9));
+					}
+				} else {
+					r.push(helper.fillUp(1));
+				}
+			} else if (implantType === "fillable") {
+				if (curSize >= 4) {
+					r.push(App.Medicine.Surgery.makeImpossibleOption(types.fillUp, "Increase size", `<em>${His} implants are filled to capacity</em>`));
+					r.push(_advFillablePriceModifier(helper.replaceImplants("advanced fillable", "advanced fillable", 5)));
+				} else {
+					r.push(helper.fillUp(1));
 				}
-				r.push(advancedFillable);
-			} else if (curSize === 8 && !areStringsInstalled && largeImplantsAvailable) {
-				r.push(helper.replaceImplants("hyper fillable", 0, 9));
-			} else if (curSize > 2 && !areStringsInstalled) {
-				r.push(helper.fillUp(1));
 			}
 		}
 
 		if (options.replace && slave.indentureRestrictions < 2 && curSize > 0) {
 			if (!areStringsInstalled && curSize === 1) {
-				r.push(helper.replaceImplants("string", 1, 1));
+				r.push(helper.replaceImplants("string", "string", 1));
 			} else if (areStringsInstalled) {
 				// we have engorged string implants, suggest replacing with normal implants of similar size
 				if (curSize >= 9) {
 					if (largeImplantsAvailable) {
-						r.push(helper.replaceImplants("hyper fillable", 0, curSize));
+						r.push(helper.replaceImplants("hyper fillable", "hyper fillable", curSize));
 					}
 				} else if (curSize >= 5) {
-					r.push(_advFillablePriceModifier(helper.replaceImplants("advanced fillable", 0, curSize)));
+					r.push(_advFillablePriceModifier(helper.replaceImplants("advanced fillable", "advanced fillable", curSize)));
 				} else if (curSize >= 3) {
-					r.push(helper.replaceImplants("fillable", 0, curSize));
+					r.push(helper.replaceImplants("fillable", "fillable", curSize));
 				} else if (curSize === 2) {
-					r.push(helper.replaceImplants("big", 0, curSize));
+					r.push(helper.replaceImplants("big", "normal", curSize));
 				} else {
-					r.push(helper.replaceImplants("standard", 0, curSize));
+					r.push(helper.replaceImplants("standard", "normal", curSize));
 				}
 			}
 		}
 
 		if (options.reduction) {
 			if (curSize > 0) {
-				if (slave.indentureRestrictions < 2) {
-					if (areStringsInstalled && curSize > 1) {
-						r.push(helper.drain(1));
+				if (areStringsInstalled && curSize > 1) {
+					r.push(helper.drain(1));
+				} else if (areFillablesInstalled) {
+					if (implantType === "hyper fillable") {
+						if (curSize <= 5) {
+							r.push(App.Medicine.Surgery.makeImpossibleOption(types.drain, "Remove filler", `<em>${His} implants are empty</em>`));
+						} else {
+							r.push(helper.drain(1));
+						}
+					} else if (implantType === "advanced fillable") {
+						if (curSize <= 3) {
+							r.push(App.Medicine.Surgery.makeImpossibleOption(types.drain, "Remove filler", `<em>${His} implants are empty</em>`));
+						} else {
+							r.push(helper.drain(1));
+						}
+					} else if (implantType === "fillable") {
+						if (curSize <= 1) {
+							r.push(App.Medicine.Surgery.makeImpossibleOption(types.drain, "Remove filler", `<em>${His} implants are empty</em>`));
+						} else {
+							r.push(helper.drain(1));
+						}
 					}
+				}
+				if (slave.indentureRestrictions < 2) {
 					r.push(helper.removeImplants());
 				}
 			}
diff --git a/src/player/electiveSurgery.tw b/src/player/electiveSurgery.tw
index 696abc429d6a89afbf7bf6cc913c9f093225014e..fec3355f03106561d74d93b5d65372dd52e84eab 100644
--- a/src/player/electiveSurgery.tw
+++ b/src/player/electiveSurgery.tw
@@ -148,7 +148,7 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
 <<if $PC.boobs >= 1400>>
 	<<if $PC.boobsImplant > 0>>
 		You have a @@.orange;pair of round H-cup breasts;@@ they are very obviously implants.
-		<br>//You are starting to experience back pain; any bigger and they might seriously impede your ability to run your arcology.// | [[Have your implants removed|PC Surgery Degradation][$PC.boobs -= $PC.boobsImplant, $PC.boobsImplant = 0, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "breastReductionImplant"]]
+		<br>//You are starting to experience back pain; any bigger and they might seriously impede your ability to run your arcology.// | [[Have your implants removed|PC Surgery Degradation][$PC.boobs -= $PC.boobsImplant, $PC.boobsImplant = 0, $PC.boobsImplantType = "none", cashX(forceNeg(5000), "PCmedical"), $surgeryType = "breastReductionImplant"]]
 	<<else>>
 		You have a @@.orange;heavy H-cup bust.@@ They tend to sag a little when you free them from your top, though they have some perk to them.
 		<br>//You are starting to experience back pain; any bigger and they might seriously impede your ability to run your arcology.// | [[Have tissue removed|PC Surgery Degradation][$PC.boobs = 1300, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "breastShrinkage"]]
@@ -156,7 +156,7 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
 <<elseif $PC.boobs >= 1200>>
 	<<if $PC.boobsImplant > 0>>
 		You have a @@.orange;pair of rounded G-cup breasts;@@ they are a little too perky for their size to pass as natural.
-		<br>[[Have your implants removed|PC Surgery Degradation][$PC.boobs -= $PC.boobsImplant, $PC.boobsImplant = 0, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "breastReductionImplant"]] | [[Get the next size up|PC Surgery Degradation][$PC.boobs += 200, $PC.boobsImplant += 200, cashX(forceNeg(10000), "PCmedical"), $surgeryType = "breastEnlargementImplant"]]
+		<br>[[Have your implants removed|PC Surgery Degradation][$PC.boobs -= $PC.boobsImplant, $PC.boobsImplant = 0, $PC.boobsImplantType = "none", cashX(forceNeg(5000), "PCmedical"), $surgeryType = "breastReductionImplant"]] | [[Get the next size up|PC Surgery Degradation][$PC.boobs += 200, $PC.boobsImplant += 200, cashX(forceNeg(10000), "PCmedical"), $surgeryType = "breastEnlargementImplant"]]
 	<<else>>
 		You have a @@.orange;huge G-cup bust.@@
 		<br>[[Add additional breast tissue|PC Surgery Degradation][$PC.boobs += 200, cashX(forceNeg(15000), "PCmedical"), $surgeryType = "breastEnlargement"]] | [[Have tissue removed|PC Surgery Degradation][$PC.boobs -= 200, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "breastShrinkage"]]
@@ -164,14 +164,14 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
 <<elseif $PC.boobs >= 1000>>
 	<<if $PC.boobsImplant > 0>>
 		You have a @@.orange;pair of perky F-cup breasts;@@ you can barely tell they are implanted.
-		<br>[[Have your implants removed|PC Surgery Degradation][$PC.boobs -= $PC.boobsImplant, $PC.boobsImplant = 0, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "breastReductionImplant"]] | [[Get the next size up|PC Surgery Degradation][$PC.boobs += 200, $PC.boobsImplant += 200, cashX(forceNeg(10000), "PCmedical"), $surgeryType = "breastEnlargementImplant"]]
+		<br>[[Have your implants removed|PC Surgery Degradation][$PC.boobs -= $PC.boobsImplant, $PC.boobsImplant = 0, $PC.boobsImplantType = "none", cashX(forceNeg(5000), "PCmedical"), $surgeryType = "breastReductionImplant"]] | [[Get the next size up|PC Surgery Degradation][$PC.boobs += 200, $PC.boobsImplant += 200, cashX(forceNeg(10000), "PCmedical"), $surgeryType = "breastEnlargementImplant"]]
 	<<else>>
 		You have a @@.orange;hefty F-cup bust.@@
 		<br>[[Add additional breast tissue|PC Surgery Degradation][$PC.boobs += 200, cashX(forceNeg(15000), "PCmedical"), $surgeryType = "breastEnlargement"]] | [[Have tissue removed|PC Surgery Degradation][$PC.boobs -= 200, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "breastShrinkage"]]
 	<</if>>
 <<elseif $PC.boobs >= 800>>
 	You have a @@.orange;big pair of DD-cup breasts.@@
-	<br>[[Get a pair of breast implants|PC Surgery Degradation][$PC.boobs += 200, $PC.boobsImplant += 200, cashX(forceNeg(10000), "PCmedical"), $surgeryType = "breastEnlargementImplant"]] | [[Add additional breast tissue|PC Surgery Degradation][$PC.boobs += 200, cashX(forceNeg(15000), "PCmedical"), $surgeryType = "breastEnlargement"]] | [[Have fatty tissue removed|PC Surgery Degradation][$PC.boobs = 700, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "breastShrinkage"]] | [[Have them removed|PC Surgery Degradation][$PC.boobs = 100, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "flatChest"]]
+	<br>[[Get a pair of breast implants|PC Surgery Degradation][$PC.boobs += 200, $PC.boobsImplant += 200, $PC.boobsImplantType = "normal", cashX(forceNeg(10000), "PCmedical"), $surgeryType = "breastEnlargementImplant"]] | [[Add additional breast tissue|PC Surgery Degradation][$PC.boobs += 200, cashX(forceNeg(15000), "PCmedical"), $surgeryType = "breastEnlargement"]] | [[Have fatty tissue removed|PC Surgery Degradation][$PC.boobs = 700, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "breastShrinkage"]] | [[Have them removed|PC Surgery Degradation][$PC.boobs = 100, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "flatChest"]]
 <<elseif $PC.boobs >= 650>>
 	You have a @@.orange;pair of D-cup breasts.@@
 	<br>[[Add additional fatty tissue|PC Surgery Degradation][$PC.boobs += 200, cashX(forceNeg(15000), "PCmedical"), $surgeryType = "breastEnlargement"]] | [[Have fatty tissue removed|PC Surgery Degradation][$PC.boobs = 600, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "breastShrinkage"]] | [[Have them removed|PC Surgery Degradation][$PC.boobs = 100, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "flatChest"]]
@@ -272,7 +272,7 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
 <<if $PC.butt >= 5>>
 	<<if $PC.buttImplant >= 1>>
 		You have an @@.orange;enormous, round, hard butt;@@ it is very obviously a pair of huge implants.
-		<br>//You can barely squeeze your rear into your clothes and are starting to get stuck in chairs; any bigger and it might seriously impede your ability to run your arcology.// | [[Have your implants removed|PC Surgery Degradation][$PC.butt -= $PC.buttImplant, $PC.buttImplant = 0, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "buttReductionImplant"]]
+		<br>//You can barely squeeze your rear into your clothes and are starting to get stuck in chairs; any bigger and it might seriously impede your ability to run your arcology.// | [[Have your implants removed|PC Surgery Degradation][$PC.butt -= $PC.buttImplant, $PC.buttImplant = 0, $PC.buttImplantType = "none", cashX(forceNeg(5000), "PCmedical"), $surgeryType = "buttReductionImplant"]]
 	<<else>>
 		You have an @@.orange;enormous, jiggly butt.@@
 		<br>//You can barely squeeze your rear into your clothes and are starting to get stuck in chairs; any bigger and it might seriously impede your ability to run your arcology.// | [[Have fat removed|PC Surgery Degradation][$PC.butt -= 1, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "buttShrinkage"]]
@@ -280,7 +280,7 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
 <<elseif $PC.butt >= 4>>
 	<<if $PC.buttImplant >= 1>>
 		You have a @@.orange;huge, round, firm butt;@@ it's easily identifiable as fake.
-		<br>[[Have your implants removed|PC Surgery Degradation][$PC.butt -= $PC.buttImplant, $PC.buttImplant = 0, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "buttReductionImplant"]] | [[Get the next size up|PC Surgery Degradation][$PC.butt += 1, $PC.buttImplant += 1, cashX(forceNeg(10000), "PCmedical"), $surgeryType = "buttEnlargementImplant"]]
+		<br>[[Have your implants removed|PC Surgery Degradation][$PC.butt -= $PC.buttImplant, $PC.buttImplant = 0, $PC.buttImplantType = "none", cashX(forceNeg(5000), "PCmedical"), $surgeryType = "buttReductionImplant"]] | [[Get the next size up|PC Surgery Degradation][$PC.butt += 1, $PC.buttImplant += 1, cashX(forceNeg(10000), "PCmedical"), $surgeryType = "buttEnlargementImplant"]]
 	<<else>>
 		You have a @@.orange;huge, soft butt.@@
 		<br>[[Add additional fatty tissue|PC Surgery Degradation][$PC.butt += 1, cashX(forceNeg(15000), "PCmedical"), $surgeryType = "buttEnlargement"]] | [[Have fat removed|PC Surgery Degradation][$PC.butt -= 1, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "buttShrinkage"]]
@@ -288,14 +288,14 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
 <<elseif $PC.butt >= 3>>
 	<<if $PC.buttImplant >= 1>>
 		You have a @@.orange;big firm butt;@@ anyone that feels it can tell it's fake, but at a glance you can't tell otherwise.
-		<br>[[Have your implants removed|PC Surgery Degradation][$PC.butt -= $PC.buttImplant, $PC.buttImplant = 0, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "buttReductionImplant"]] | [[Get the next size up|PC Surgery Degradation][$PC.butt += 1, $PC.buttImplant += 1, cashX(forceNeg(10000), "PCmedical"), $surgeryType = "buttEnlargementImplant"]]
+		<br>[[Have your implants removed|PC Surgery Degradation][$PC.butt -= $PC.buttImplant, $PC.buttImplant = 0, $PC.buttImplantType = "none", cashX(forceNeg(5000), "PCmedical"), $surgeryType = "buttReductionImplant"]] | [[Get the next size up|PC Surgery Degradation][$PC.butt += 1, $PC.buttImplant += 1, cashX(forceNeg(10000), "PCmedical"), $surgeryType = "buttEnlargementImplant"]]
 	<<else>>
 		You have a @@.orange;big butt.@@
 		<br>[[Add additional fatty tissue|PC Surgery Degradation][$PC.butt += 1, cashX(forceNeg(15000), "PCmedical"), $surgeryType = "buttEnlargement"]] | [[Have fat removed|PC Surgery Degradation][$PC.butt -= 1, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "buttShrinkage"]]
 	<</if>>
 <<else>>
 	You have a @@.orange;cute, but normal butt.@@ At your request, fat could be added until you have a healthy rear; alternatively, a pair of implants could be inserted instead.
-	<br>[[Get a pair of butt implants|PC Surgery Degradation][$PC.butt += 1, $PC.buttImplant += 1, cashX(forceNeg(10000), "PCmedical"), $surgeryType = "buttEnlargementImplant"]] | [[Add additional fatty tissue|PC Surgery Degradation][$PC.butt += 1, cashX(forceNeg(15000), "PCmedical"), $surgeryType = "buttEnlargement"]]
+	<br>[[Get a pair of butt implants|PC Surgery Degradation][$PC.butt += 1, $PC.buttImplant += 1, $PC.buttImplantType = "normal", cashX(forceNeg(10000), "PCmedical"), $surgeryType = "buttEnlargementImplant"]] | [[Add additional fatty tissue|PC Surgery Degradation][$PC.butt += 1, cashX(forceNeg(15000), "PCmedical"), $surgeryType = "buttEnlargement"]]
 <</if>>
 
 <<if $PC.balls != 0 && $PC.scrotum != 0>>
diff --git a/src/player/js/PlayerState.js b/src/player/js/PlayerState.js
index 137e80a63ec4375f815aa4232b8bf7b2c9d22f35..11e573a70df25ae3ffd1dcd4c89fc6f9e1e51d9c 100644
--- a/src/player/js/PlayerState.js
+++ b/src/player/js/PlayerState.js
@@ -648,8 +648,16 @@ App.Entity.PlayerState = class PlayerState {
 		 * * 600+: boobsImplant size fillable implants
 		 */
 		this.boobsImplant = 0;
-		/** Implants type. 0: normal/none; 1: string */
-		this.boobsImplantType = 0;
+		/**
+		 * Implant type
+		 * * "none"
+		 * * "normal"
+		 * * "string"
+		 * * "fillable"
+		 * * "advanced fillable"
+		 * * "hyper fillable"
+		 */
+		this.boobsImplantType = "none";
 		/**
 		 * breast shape
 		 * * "normal"
@@ -764,10 +772,16 @@ App.Entity.PlayerState = class PlayerState {
 		 * * 9+: hyper fillable implants
 		 */
 		this.buttImplant = 0;
-		/** butt implant type
-		 *
-		 * 0: normal/none; 1: string */
-		this.buttImplantType = 0;
+		/**
+		 * Implant type
+		 * * "none"
+		 * * "normal"
+		 * * "string"
+		 * * "fillable"
+		 * * "advanced fillable"
+		 * * "hyper fillable"
+		 */
+		this.buttImplantType = "none";
 		/**
 		 * butt tattoo
 		 *
diff --git a/src/pregmod/eliteSlave.tw b/src/pregmod/eliteSlave.tw
index 816c9ebe7dff0b7f788c0ba32b6f97f45c6add7a..ab45de311dcae639aee0fd2a870d3ad18c2df26b 100644
--- a/src/pregmod/eliteSlave.tw
+++ b/src/pregmod/eliteSlave.tw
@@ -118,15 +118,27 @@ You check to see if any potential breeding slaves are on auction. <<if $eliteAuc
 	<<set $activeSlave.butt = random(6,20)>>
 	<<if $arcologies[0].FSTransformationFetishist > 20>>
 		<<set $activeSlave.boobsImplant = $activeSlave.boobs-200>>
+		<<if $activeSlave.boobsImplant > 10000>>
+			<<set $activeSlave.boobsImplantType = "hyper fillable">>
+		<<else>>
+			<<set $activeSlave.boobsImplantType = "advanced fillable">>
+		<</if>>
 		<<set $activeSlave.buttImplant = $activeSlave.butt-1>>
+		<<if $activeSlave.buttImplant > 9>>
+			<<set $activeSlave.buttImplantType = "hyper fillable">>
+		<<else>>
+			<<set $activeSlave.buttImplantType = "advanced fillable">>
+		<</if>>
 	<</if>>
 <<elseif $arcologies[0].FSSlimnessEnthusiast > 20>>
 	<<set $activeSlave.boobs = (random(3,5) * 100)>>
 	<<set $activeSlave.butt = random(0,2)>>
 	<<if $arcologies[0].FSTransformationFetishist > 20>>
 		<<set $activeSlave.boobsImplant = $activeSlave.boobs-50>>
+		<<set $activeSlave.boobsImplantType = "normal">>
 		<<if $activeSlave.butt > 1>>
 			<<set $activeSlave.buttImplant = 1>>
+			<<set $activeSlave.buttImplantType = "normal">>
 		<</if>>
 	<</if>>
 <<else>>
@@ -134,7 +146,9 @@ You check to see if any potential breeding slaves are on auction. <<if $eliteAuc
 	<<set $activeSlave.butt = random(3,7)>>
 	<<if $arcologies[0].FSTransformationFetishist > 20>>
 		<<set $activeSlave.boobsImplant = $activeSlave.boobs-200>>
+		<<set $activeSlave.boobsImplantType = "normal">>
 		<<set $activeSlave.buttImplant = $activeSlave.butt-1>>
+		<<set $activeSlave.buttImplantType = "normal">>
 	<</if>>
 <</if>>
 <<if $arcologies[0].FSTransformationFetishist > 20>>
diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw
index ca5307df6a9c5c750140c92cfc3112dceba954d6..d9a4db1abe44b648c3a5f59886355695a5c05964 100644
--- a/src/pregmod/newChildIntro.tw
+++ b/src/pregmod/newChildIntro.tw
@@ -1294,6 +1294,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
 		<<set $activeSlave.trust += 20>>
 		<<set $activeSlave.boobs += 4000>>
 		<<set $activeSlave.boobsImplant += 4000>>
+		<<set $activeSlave.boobsImplantType = "advanced fillable">>
 		<<run cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)>>
 		<<run surgeryDamage($activeSlave, 10)>>
 		<<set $activeSlave.boobShape = "normal">>
@@ -1306,7 +1307,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
 		<<set $activeSlave.trust += 25>>
 		<<set $activeSlave.boobs += 7500>>
 		<<set $activeSlave.boobsImplant += 7500>>
-		<<set $activeSlave.boobsImplantType = 1>>
+		<<set $activeSlave.boobsImplantType = "string">>
 		<<run cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)>>
 		<<run surgeryDamage($activeSlave, 10)>>
 		<<set $activeSlave.boobShape = "normal">>
@@ -1320,6 +1321,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
 		<<set $activeSlave.trust += 10>>
 		<<set $activeSlave.boobs += 1000>>
 		<<set $activeSlave.boobsImplant += 1000>>
+		<<set $activeSlave.boobsImplantType = "fillable">>
 		<<run cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)>>
 		<<run surgeryDamage($activeSlave, 10)>>
 		<<set $activeSlave.boobShape = "normal">>
@@ -1332,7 +1334,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
 		<<set $activeSlave.trust += 15>>
 		<<set $activeSlave.boobs += 1500>>
 		<<set $activeSlave.boobsImplant += 1500>>
-		<<set $activeSlave.boobsImplantType = 1>>
+		<<set $activeSlave.boobsImplantType = "string">>
 		<<run cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)>>
 		<<run surgeryDamage($activeSlave, 10)>>
 		<<set $activeSlave.boobShape = "normal">>
@@ -1501,6 +1503,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
 		<<set $activeSlave.trust += 20>>
 		<<set $activeSlave.butt += 8>>
 		<<set $activeSlave.buttImplant += 8>>
+		<<set $activeSlave.buttImplantType = "advanced fillable">>
 		<<run cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)>>
 		<<run surgeryDamage($activeSlave, 10)>>
 		<<replace "#result">>
@@ -1513,6 +1516,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
 		<<set $activeSlave.trust += 10>>
 		<<set $activeSlave.butt += 2>>
 		<<set $activeSlave.buttImplant += 2>>
+		<<set $activeSlave.buttImplantType = "fillable">>
 		<<run cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)>>
 		<<run surgeryDamage($activeSlave, 10)>>
 		<<replace "#result">>
@@ -1524,7 +1528,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
 		<<set $activeSlave.trust += 15>>
 		<<set $activeSlave.butt += 3>>
 		<<set $activeSlave.buttImplant += 3>>
-		<<set $activeSlave.buttImplantType = 1>>
+		<<set $activeSlave.buttImplantType = "string">>
 		<<run cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)>>
 		<<run surgeryDamage($activeSlave, 10)>>
 		<<replace "#result">>
diff --git a/src/pregmod/saAgent.tw b/src/pregmod/saAgent.tw
index 3e3ebaec4421c01bf2b62a5e41a96fe6bf39c993..1f8b5723f51ff8ef25a7778aaacfc4bec3616661 100644
--- a/src/pregmod/saAgent.tw
+++ b/src/pregmod/saAgent.tw
@@ -2,7 +2,7 @@
 
 <<set _gigantomastiaMod = $slaves[$i].geneticQuirks.gigantomastia == 2 ? ($slaves[$i].geneticQuirks.macromastia == 2 ? 3 : 2) : 1>>
 
-<<if $slaves[$i].boobsImplantType == 1>>
+<<if $slaves[$i].boobsImplantType == "string">>
 	<<set $slaves[$i].boobsImplant += 50, $slaves[$i].boobs += 50>>
 	<<if ($slaves[$i].boobs > 50000)>>
 		<<set $slaves[$i].boobs -= 100, $slaves[$i].boobsImplant -= 100>>
@@ -39,7 +39,7 @@
 		<<set $slaves[$i].boobs += 10>>
 	<</if>>
 <</if>>
-<<if $slaves[$i].buttImplantType == 1>>
+<<if $slaves[$i].buttImplantType == "string">>
 	<<set $slaves[$i].buttImplant += .25, $slaves[$i].butt += .25>>
 	<<if ($slaves[$i].butt > 10)>>
 		<<set $slaves[$i].butt -= 1, $slaves[$i].buttImplant -= 1>>
diff --git a/src/pregmod/seHuskSlaveDelivery.tw b/src/pregmod/seHuskSlaveDelivery.tw
index 376c21d52c5ebf10f186460647dff1091bc3be4a..1f25c11f6f740648d251e8d1cc3e110df38eebb1 100644
--- a/src/pregmod/seHuskSlaveDelivery.tw
+++ b/src/pregmod/seHuskSlaveDelivery.tw
@@ -12,8 +12,9 @@
 <</if>>
 <<if $huskSlave.sex == 2>>
 	<<set $activeSlave = GenerateNewSlave("XY")>>
-	<<set $activeSlave.boobs = 0>>
+	<<set $activeSlave.boobs = 50>>
 	<<set $activeSlave.boobsImplant = 0>>
+	<<set $activeSlave.boobsImplantType = "none">>
 <<else>>
 	<<set $activeSlave = GenerateNewSlave("XX")>>
 <</if>>
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index 1afe67e53607ecbabb0d75afe0a365952a4aacee..69b1bcaf75cfcefe4ba9c55b724182553f41a748 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -271,10 +271,16 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 			<<if $slaves[$i].boobs < 400>>
 				<<set $slaves[$i].boobs += 200>>
 				<<set $slaves[$i].boobsImplant += 200>>
+				<<if $slaves[$i].boobsImplantType == "none">>
+					<<set $slaves[$i].boobsImplantType = "normal">>
+				<</if>>
 				<<run cashX(forceNeg(Math.trunc(200*$upgradeMultiplierMedicine)), "slaveSurgery", $activeSlave)>>
 			<<elseif $slaves[$i].butt < 3>>
 				<<set $slaves[$i].butt += 1>>
 				<<set $slaves[$i].buttImplant += 1>>
+				<<if $slaves[$i].buttImplantType == "none">>
+					<<set $slaves[$i].buttImplantType = "normal">>
+				<</if>>
 				<<run cashX(forceNeg(Math.trunc(200*$upgradeMultiplierMedicine)), "slaveSurgery", $activeSlave)>>
 			<<elseif $slaves[$i].face < 95 && $slaves[$i].faceImplant <= 10>>
 				<<set $slaves[$i].face = Math.clamp($slaves[$i].face+20,-100,100)>>
diff --git a/src/uncategorized/REFS.tw b/src/uncategorized/REFS.tw
index cf44241fc842e0aadd290dd85c58f2e04a96fa6c..806bc5f646fde91ebc00edd8aa9eec997985aea2 100644
--- a/src/uncategorized/REFS.tw
+++ b/src/uncategorized/REFS.tw
@@ -126,8 +126,10 @@
 	<<run setHealth($activeSlave, jsRandom(10, 20), jsRandom(10, 20))>>
 	<<set $activeSlave.boobs += 600>>
 	<<set $activeSlave.boobsImplant = 600>>
+	<<set $activeSlave.boobsImplantType = "normal">>
 	<<set $activeSlave.butt += 1>>
 	<<set $activeSlave.buttImplant = 1>>
+	<<set $activeSlave.buttImplantType = "normal">>
 	<<set $activeSlave.lips += 10>>
 	<<set $activeSlave.lipsImplant = 10>>
 	<<set $activeSlave.clothes = "conservative clothing">>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 816bbad6d09d8e52be60e0a499ebf56a0bc30edb..28468dd97991a8f7f1170756e93c893cee78390a 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -106,8 +106,10 @@
 		<<set _meanGirl.muscles = random(0,15)>>
 		<<set _meanGirl.boobsImplant = 200*random(0,3)>>
 		<<set _meanGirl.boobs += _meanGirl.boobsImplant>>
+		<<set _meanGirl.boobsImplantType = "normal">>
 		<<set _meanGirl.buttImplant = random(0,2)>>
 		<<set _meanGirl.butt += _meanGirl.buttImplant>>
+		<<set _meanGirl.buttImplantType = "normal">>
 		<<set _meanGirl.butt += 1>>
 		<<set _meanGirl.vagina = random(1,2)>>
 		<<set _meanGirl.anus = 1>>
@@ -3862,7 +3864,7 @@ Your slaves get dressed in a large wardrobe area adjacent to the dormitory, room
 	apparently bigger today than it was yesterday. Pregnancy often causes minor redistributions of weight like this.
 <<elseif $activeSlave.hormoneBalance >= 200>>
 	apparently bigger today than it was yesterday. Intensive female hormone regimens like $hers sometimes cause minor ass expansion.
-<<elseif $activeSlave.buttImplantType == 1>>
+<<elseif $activeSlave.buttImplantType == "string">>
 	apparently a little bigger today than it was yesterday. String implants like $hers steadily grow if not regularly drained.
 <<elseif $geneticMappingUpgrade >= 1 && $activeSlave.geneticQuirks.rearLipedema == 2>>
 	apparently a little bigger today than it was yesterday. $His body is constantly laying fat on $his ass and thighs, so this isn't really unexpected.
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index 6f1b0fdcab8dc6ec3e0e5d59979765ceb7507abe..592a0da8e3da5e8dddcd24fd39aa7831dd041578 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -730,15 +730,15 @@ $researchLab.level > 0>>
 			<<set _individualCosts += $rulesCost>>
 		<</if>>
 	<</if>>
-	<<if $slaves[$i].boobs > 10000>>
-		<<if $slaves[$i].boobsImplantType == 1>>
+	<<if $slaves[$i].boobsImplant > 10000>>
+		<<if $slaves[$i].boobsImplantType == "string">>
 			<br>&nbsp;&nbsp;&nbsp;&nbsp;<i>Maintenance cost for oversized string implants:</i>
 			@@.yellowgreen;<<print cashFormat(50)>>@@
 			<<set _individualCosts += 50>>
 		<</if>>
 	<</if>>
-	<<if $slaves[$i].butt > 10>>
-		<<if $slaves[$i].buttImplantType == 1>>
+	<<if $slaves[$i].buttImplant > 5>>
+		<<if $slaves[$i].buttImplantType == "string">>
 			<br>&nbsp;&nbsp;&nbsp;&nbsp;<i>Maintenance cost for oversized string implants:</i>
 			@@.yellowgreen;<<print cashFormat(50)>>@@
 			<<set _individualCosts += 50>>
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index 3553703c7a99519911c14ee6b987a679c41923dc..23f73d85b12a076643d98ba44e95f7faad888de0 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -99,7 +99,7 @@ As you step off the elevator, you hear several <<if $seeDicks != 100>>female <</
 	<<set $activeSlave.skill.whoring = 35>>
 	<<set $activeSlave.boobs += 600>>
 	<<set $activeSlave.boobsImplant = 600>>
-	<<set $activeSlave.boobsImplantType = 1>>
+	<<set $activeSlave.boobsImplantType = "string">>
 	<<set $activeSlave.lipsPiercing = 1>>
 	<<set $activeSlave.earPiercing = 1>>
 	<<set $activeSlave.nosePiercing = 1>>
diff --git a/src/uncategorized/jeSlaveDispute.tw b/src/uncategorized/jeSlaveDispute.tw
index 1ca2f96ae081e68846e72e064dd907b9cd807c89..0803d07d9e0fcfbbe9c610aeb80d5f319ab63462 100644
--- a/src/uncategorized/jeSlaveDispute.tw
+++ b/src/uncategorized/jeSlaveDispute.tw
@@ -125,8 +125,10 @@
 	<<set $activeSlave.skill.entertainment = 15>>
 	<<set $activeSlave.boobs += 600>>
 	<<set $activeSlave.boobsImplant = 600>>
+	<<set $activeSlave.boobsImplantType = "normal">>
 	<<set $activeSlave.butt += 1>>
 	<<set $activeSlave.buttImplant = 1>>
+	<<set $activeSlave.buttImplantType = "normal">>
 	<<set $activeSlave.lips += 10>>
 	<<set $activeSlave.lipsImplant = 10>>
 	<<set $activeSlave.lipsPiercing = 1>>
diff --git a/src/uncategorized/lawCompliance.tw b/src/uncategorized/lawCompliance.tw
index 754f33e4b55b194a806e3147a8e4f26db075d440..7495980d049cb0db26702d79c10ac0b4072cd6c4 100644
--- a/src/uncategorized/lawCompliance.tw
+++ b/src/uncategorized/lawCompliance.tw
@@ -179,10 +179,12 @@
 	<<if $activeSlave.boobsImplant > 0>>
 		<<set $activeSlave.boobs -= $activeSlave.boobsImplant>>
 		<<set $activeSlave.boobsImplant = 0>>
+		<<set $activeSlave.boobsImplantType = "none">>
 	<</if>>
 	<<if $activeSlave.buttImplant > 0>>
 		<<set $activeSlave.butt -= $activeSlave.buttImplant>>
 		<<set $activeSlave.buttImplant = 0>>
+		<<set $activeSlave.buttImplantType = "none">>
 	<</if>>
 	<<if $activeSlave.lipsImplant > 0>>
 		<<set $activeSlave.lips -= $activeSlave.lipsImplant>>
@@ -199,10 +201,12 @@
 	<<if $activeSlave.boobsImplant == 0>>
 		<<set $activeSlave.boobsImplant = 400>>
 		<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+		<<set $activeSlave.boobsImplantType = "normal">>
 	<</if>>
 	<<if $activeSlave.buttImplant == 0>>
 		<<set $activeSlave.buttImplant = 1>>
 		<<set $activeSlave.butt += $activeSlave.buttImplant>>
+		<<set $activeSlave.buttImplantType = "normal">>
 	<</if>>
 	<<if $activeSlave.lipsImplant == 0>>
 		<<set $activeSlave.lipsImplant = 10>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 19a2711b0a8ad5c1f08038359ea49d7dc185a721..020304cd7120194490b9ad62885a84a08f60b45b 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -929,10 +929,12 @@ The legalities completed, <span class='slave-name'><<= SlaveFullName($activeSlav
 		<<set $activeSlave.devotion += 4>>
 		<<set $activeSlave.boobs -= $activeSlave.boobsImplant>>
 		<<set $activeSlave.boobsImplant = 0>>
+		<<set $activeSlave.boobsImplantType = "none">>
 		<<set $activeSlave.lips -= $activeSlave.lipsImplant>>
 		<<set $activeSlave.lipsImplant = 0>>
 		<<set $activeSlave.butt -= $activeSlave.buttImplant>>
 		<<set $activeSlave.buttImplant = 0>>
+		<<set $activeSlave.buttImplantType = "none">>
 		<<set $activeSlave.lipsPiercing = 0>>
 		<<set $activeSlave.tonguePiercing = 0>>
 		<<set $activeSlave.nosePiercing = 0>>
diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw
index 8a4ce82adf268f8d9b482d734a579677b8c841cc..cf9ce0a3770427b224d01412591461764f89445f 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -148,6 +148,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 		<<set $hostage.devotion -= 5>>
 		<<set $hostage.boobs += 2000>>
 		<<set $hostage.boobsImplant += 2000>>
+		<<set $hostage.boobsImplantType = "advanced fillable">>
 		<<set $hostage.behavioralFlaw = "anorexic">>
 		<<set $hostage.sexualFlaw = "shamefast">>
 		struggling against $his restraints on the operating table as a pair of 2000cc implants are forced into $his chest.
@@ -409,6 +410,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 		<<set $hostage.devotion -= 5>>
 		<<set $hostage.boobs += 2000>>
 		<<set $hostage.boobsImplant += 2000>>
+		<<if $hostage.boobsImplant > 10000>>
+			<<set $hostage.boobsImplantType = "hyper fillable">>
+		<</if>>
 		<<set $hostage.fetish = "boobs">>
 		<<set $hostage.fetishStrength = 10>>
 		blushing as $he attempts to get dressed with $his massive <<print $hostage.boobs>>cc fake tits getting in the way.
@@ -537,6 +541,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 			get a big pair of fillable implants in you right away."
 			<<set $hostage.boobs += 1000>>
 			<<set $hostage.boobsImplant += 1000>>
+			<<set $hostage.boobsImplantType = "fillable">>
 		<<case "sadist">>
 			have a sissy little bitch in reach for you to torment as you please."
 		<<case "masochist">>
@@ -805,8 +810,12 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 		<<set $hostage.devotion -= 5>>
 		<<set $hostage.boobs += 2000>>
 		<<set $hostage.boobsImplant += 2000>>
+		<<if $hostage.boobsImplant > 10000>>
+			<<set $hostage.boobsImplantType = "hyper fillable">>
+		<</if>>
 		<<set $hostage.butt = 7>>
 		<<set $hostage.buttImplant = 4>>
+		<<set $hostage.buttImplantType = "fillable">>
 		<<set $hostage.behavioralFlaw = "none">>
 		<<set $hostage.behavioralQuirk = "insecure">>
 		<<set $hostage.sexualFlaw = "crude">>
@@ -909,6 +918,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 		<<case "boobs">>
 			<<set $hostage.boobs += 100>>
 			<<set $hostage.boobsImplant += 100>>
+			<<if $hostage.boobsImplant > 2000>>
+				<<set $hostage.boobsImplantType = "advanced fillable">>
+			<</if>>
 		<<case "pregnancy">>
 			<<set $hostage.preg++>>
 			<<set $hostage.pregKnown = 1>>
@@ -1187,6 +1199,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 		<<set $hostage.devotion -= 5>>
 		<<set $hostage.boobs += 2000>>
 		<<set $hostage.boobsImplant += 2000>>
+		<<if $hostage.boobsImplant > 10000>>
+			<<set $hostage.boobsImplantType = "hyper fillable">>
+		<</if>>
 		<<set $hostage.fetishStrength = 100>>
 		<<set $hostage.sexualFlaw = "breast growth">>
 		getting $his taut <<print $hostage.boobs>>cc tits massaged by a pair of flat slaves. $He is rambling on about how much happier $he is with $his massive implants than when $he was flat like them.
@@ -1263,6 +1278,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 		<<case "boobs">>
 			<<set $hostage.boobs += 100>>
 			<<set $hostage.boobsImplant += 100>>
+			<<if $hostage.boobsImplant > 2000>>
+				<<set $hostage.boobsImplantType = "advanced fillable">>
+			<</if>>
 		<<case "pregnancy">>
 			<<set $hostage.preg++>>
 			<<set $hostage.pregKnown = 1>>
@@ -1498,7 +1516,8 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 		<</if>>
 	<<case "Body Purism">>
 		<<set $hostage.boobs = 50000>>
-		<<set $hostage.boobsImplant 45000>>
+		<<set $hostage.boobsImplant = 45000>>
+		<<set $hostage.boobsImplantType = "hyper fillable">>
 		giving an interview. $He gushes over how great it feels being more silicone than $girl and how terrible it is that some people want to deny girls this pleasure.
 	<<case "Transformation Fetishism">>
 		<<set $hostage.counter.vaginal += 1>>
@@ -1557,6 +1576,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 			"I love my big boobs and get off watching them get bigger!"
 			<<set $hostage.boobs += 100>>
 			<<set $hostage.boobsImplant += 100>>
+			<<if $hostage.boobsImplant > 2000>>
+				<<set $hostage.boobsImplantType = "advanced fillable">>
+			<</if>>
 			<<set $hostage.sexualFlaw = "breast growth">>
 		<<case "sadist">>
 			"Nothing turns me on more than crushing my lovers' nuts! That or maybe whipping or cutting them... Or anything that makes them bleed..."
@@ -2160,6 +2182,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 			<<set $hostage.devotion -= 5>>
 			<<set $hostage.boobs += 2000>>
 			<<set $hostage.boobsImplant += 2000>>
+			<<if $hostage.boobsImplant > 10000>>
+				<<set $hostage.boobsImplantType = "hyper fillable">>
+			<</if>>
 			<<set _hostageAction.push("trying desperately to stand despite $his massive <<print $hostage.boobs>>cc fake tits.")>>
 			<<set _hostageAction.push("crying while trying to get comfortable with $his <<print $hostage.boobs>>cc fake tits.")>>
 			<<set _hostageAction.push("sobbing as an autosurgery reads out how much $his <<print $hostage.boobs>>cc implants can be expanded this week.")>>
@@ -2169,6 +2194,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 			<<set $hostage.fetishStrength += 5>>
 			<<set $hostage.boobs += 1000>>
 			<<set $hostage.boobsImplant += 1000>>
+			<<if $hostage.boobsImplant > 10000>>
+				<<set $hostage.boobsImplantType = "hyper fillable">>
+			<</if>>
 			<<set _hostageAction.push("reluctantly exploring $his new massive <<print $hostage.boobs>>cc implants.")>>
 			<<set _hostageAction.push("reluctantly exploring new resting positions due to $his <<print $hostage.boobs>>cc implants.")>>
 			<<set _hostageAction.push("crying as an autosurgery reads out how much $his <<print $hostage.boobs>>cc implants can be expanded this week.")>>
@@ -2178,6 +2206,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 			<<set $hostage.fetishStrength += 5>>
 			<<set $hostage.boobs += 1000>>
 			<<set $hostage.boobsImplant += 1000>>
+			<<if $hostage.boobsImplant > 10000>>
+				<<set $hostage.boobsImplantType = "hyper fillable">>
+			<</if>>
 			<<set _hostageAction.push("happily playing with $his truly immense <<print $hostage.boobs>>cc breast implants and huge butt implants.")>>
 			<<set _hostageAction.push("happily resting $his head on $his <<print $hostage.boobs>>cc breast implants.")>>
 			<<set _hostageAction.push("blushing as an autosurgery reads out how much $his <<print $hostage.boobs>>cc implants can be expanded this week.")>>
@@ -2186,6 +2217,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 			<<set $hostage.devotion -= 5>>
 			<<set $hostage.boobs += 1000>>
 			<<set $hostage.boobsImplant += 1000>>
+			<<if $hostage.boobsImplant > 10000>>
+				<<set $hostage.boobsImplantType = "hyper fillable">>
+			<</if>>
 			<<set _hostageAction.push("happily getting titfucked against $his anchoring <<print $hostage.boobs>>cc fake tits.")>>
 			<<set _hostageAction.push("contently resting against $his <<print $hostage.boobs>>cc fake tits.")>>
 			<<set _hostageAction.push("getting excited as an autosurgery reads out how much $his <<print $hostage.boobs>>cc implants can be expanded this week.")>>
@@ -2520,6 +2554,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 			<<case "boobs">>
 				<<set $hostage.boobs += 100>>
 				<<set $hostage.boobsImplant += 100>>
+				<<if $hostage.boobsImplant > 2000>>
+					<<set $hostage.boobsImplantType = "advanced fillable">>
+				<</if>>
 			<<case "pregnancy">>
 				<<set $hostage.preg++>>
 				<<set $hostage.pregKnown = 1>>
@@ -2564,6 +2601,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 			<<case "boobs">>
 				<<set $hostage.boobs += 100>>
 				<<set $hostage.boobsImplant += 100>>
+				<<if $hostage.boobsImplant > 2000>>
+					<<set $hostage.boobsImplantType = "advanced fillable">>
+				<</if>>
 			<<case "pregnancy">>
 				<<set $hostage.preg++>>
 				<<set $hostage.pregKnown = 1>>
@@ -2607,6 +2647,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 			<<case "boobs">>
 				<<set $hostage.boobs += 100>>
 				<<set $hostage.boobsImplant += 100>>
+				<<if $hostage.boobsImplant > 2000>>
+					<<set $hostage.boobsImplantType = "advanced fillable">>
+				<</if>>
 			<<case "pregnancy">>
 				<<set $hostage.preg++>>
 				<<set $hostage.pregKnown = 1>>
@@ -2647,6 +2690,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 			<<case "boobs">>
 				<<set $hostage.boobs += 100>>
 				<<set $hostage.boobsImplant += 100>>
+				<<if $hostage.boobsImplant > 2000>>
+					<<set $hostage.boobsImplantType = "advanced fillable">>
+				<</if>>
 			<<case "pregnancy">>
 				<<set $hostage.preg++>>
 				<<set $hostage.pregKnown = 1>>
diff --git a/src/uncategorized/pRivalryCapture.tw b/src/uncategorized/pRivalryCapture.tw
index 8eb1226e6527704f56ff0f1b453bdeb4c6c85796..d60af8487137f13d5ab1ef303a47277ac55b565d 100644
--- a/src/uncategorized/pRivalryCapture.tw
+++ b/src/uncategorized/pRivalryCapture.tw
@@ -196,9 +196,11 @@
 	<<set $activeSlave.lips = 35>>
 	<<set $activeSlave.buttImplant = 1>>
 	<<set $activeSlave.butt += $activeSlave.buttImplant>>
+	<<set $activeSlave.buttImplantType = "normal">>
 	<<set $activeSlave.boobs -= 100>>
 	<<set $activeSlave.boobsImplant = either(400, 600, 800)>>
 	<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+	<<set $activeSlave.boobsImplantType = "normal">>
 	<<set $activeSlave.clit = 2>>
 	<<set $activeSlave.anus = 1>>
 	<<set $activeSlave.vagina = 1>>
@@ -343,8 +345,10 @@
 	<<set $activeSlave.lips = random(25,55)>>
 	<<set $activeSlave.buttImplant = 2>>
 	<<set $activeSlave.butt += $activeSlave.buttImplant>>
+	<<set $activeSlave.buttImplantType = "normal">>
 	<<set $activeSlave.boobsImplant = either(600, 800, 1000)>>
 	<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+	<<set $activeSlave.boobsImplantType = "normal">>
 	<<set $activeSlave.anus = 2>>
 	<<set $activeSlave.vagina = 1>>
 	<<set $activeSlave.preg = -1>>
diff --git a/src/uncategorized/prestigiousSlave.tw b/src/uncategorized/prestigiousSlave.tw
index 1e4a8425c762c230ea23d3cf3f4ebd764e4aca24..34687388376a3ca281eefa311fd9e5af16ba71b1 100644
--- a/src/uncategorized/prestigiousSlave.tw
+++ b/src/uncategorized/prestigiousSlave.tw
@@ -51,10 +51,12 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.career = "a porn star">>
 	<<set $activeSlave.boobsImplant += random(4,6)*200>>
 	<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+	<<set $activeSlave.boobsImplantType = "string">>
 	<<set $activeSlave.nipples = either("cute", "huge", "puffy")>>
 	<<set $activeSlave.areolae = 1>>
 	<<set $activeSlave.butt += 1>>
 	<<set $activeSlave.buttImplant += 1>>
+	<<set $activeSlave.buttImplantType = "normal">>
 	<<set $activeSlave.lips += 10>>
 	<<set $activeSlave.lipsImplant += 10>>
 	<<set $activeSlave.face = Math.clamp($activeSlave.face+20,-100,100)>>
@@ -94,8 +96,10 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.career = "a trophy wife">>
 	<<set $activeSlave.boobsImplant += random(1,3)*200>>
 	<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+	<<set $activeSlave.boobsImplantType = "normal">>
 	<<set $activeSlave.butt += 1>>
 	<<set $activeSlave.buttImplant += 1>>
+	<<set $activeSlave.buttImplantType = "normal">>
 	<<set $activeSlave.lips += 10>>
 	<<set $activeSlave.lipsImplant += 10>>
 	<<set $activeSlave.face = Math.clamp($activeSlave.face+20,-100,100)>>
@@ -214,10 +218,12 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.career = "a slave">>
 	<<set $activeSlave.boobsImplant += random(10,15)*200>>
 	<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+	<<set $activeSlave.boobsImplantType = "fillable">>
 	<<set $activeSlave.nipples = either("cute", "huge", "puffy")>>
 	<<set $activeSlave.areolae = 2>>
 	<<set $activeSlave.butt += 4>>
 	<<set $activeSlave.buttImplant += 4>>
+	<<set $activeSlave.buttImplantType = "fillable">>
 	<<set $activeSlave.lips = random(75,85)>>
 	<<set $activeSlave.lipsImplant = 3>>
 	<<set $activeSlave.face = 55>>
@@ -266,8 +272,10 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.career = "an actress">>
 	<<set $activeSlave.boobs += 200>>
 	<<set $activeSlave.boobsImplant += 200>>
+	<<set $activeSlave.boobsImplantType = "normal">>
 	<<set $activeSlave.butt += 1>>
 	<<set $activeSlave.buttImplant += 1>>
+	<<set $activeSlave.buttImplantType = "normal">>
 	<<set $activeSlave.lips += 10>>
 	<<set $activeSlave.lipsImplant += 10>>
 	<<set $activeSlave.face = 55>>
@@ -366,11 +374,13 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.career = "an arcology owner">>
 	<<set $activeSlave.boobsImplant += random(20,40)*200>>
 	<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+	<<set $activeSlave.boobsImplantType = "advanced fillable">>
 	<<set $activeSlave.boobs += 1000>>
 	<<set $activeSlave.nipples = either("cute", "huge", "puffy")>>
 	<<set $activeSlave.areolae = 2>>
 	<<set $activeSlave.buttImplant += random(6,8)>>
 	<<set $activeSlave.butt += $activeSlave.buttImplant>>
+	<<set $activeSlave.buttImplantType = "advanced fillable">>
 	<<set $activeSlave.heels = 1>>
 	<<set $activeSlave.voice = 0>>
 	<<set $activeSlave.lips = random(75,85)>>
@@ -527,10 +537,12 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.career = "a porn star">>
 	<<set $activeSlave.boobsImplant += random(4,6)*200>>
 	<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+	<<set $activeSlave.boobsImplantType = "fillable">>
 	<<set $activeSlave.nipples = either("cute", "huge", "puffy")>>
 	<<set $activeSlave.areolae = 1>>
 	<<set $activeSlave.butt += 1>>
 	<<set $activeSlave.buttImplant += 1>>
+	<<set $activeSlave.buttImplantType = "normal">>
 	<<set $activeSlave.lips += 10>>
 	<<set $activeSlave.lipsImplant += 10>>
 	<<set $activeSlave.face = Math.clamp($activeSlave.face+20,-100,100)>>
@@ -682,10 +694,12 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.career = "a prostitute">>
 	<<set $activeSlave.boobsImplant += random(10,15)*200>>
 	<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+	<<set $activeSlave.boobsImplantType = "advanced fillable">>
 	<<set $activeSlave.nipples = either("cute", "huge", "puffy")>>
 	<<set $activeSlave.areolae = 2>>
 	<<set $activeSlave.butt += 4>>
 	<<set $activeSlave.buttImplant += 4>>
+	<<set $activeSlave.buttImplantType = "fillable">>
 	<<set $activeSlave.lips = random(25,55)>>
 	<<set $activeSlave.lipsImplant = 2>>
 	<<set $activeSlave.face = 55>>
@@ -736,8 +750,10 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
 	<<set $activeSlave.career = "an actress">>
 	<<set $activeSlave.boobs += 200>>
 	<<set $activeSlave.boobsImplant += 200>>
+	<<set $activeSlave.boobsImplantType = "normal">>
 	<<set $activeSlave.butt += 1>>
 	<<set $activeSlave.buttImplant += 1>>
+	<<set $activeSlave.buttImplantType = "normal">>
 	<<set $activeSlave.lips += 10>>
 	<<set $activeSlave.lipsImplant += 10>>
 	<<set $activeSlave.face = 55>>
diff --git a/src/uncategorized/reBoomerang.tw b/src/uncategorized/reBoomerang.tw
index b078353ab7fe371ba96b5eeb2714760766f196f1..d1eab1b80378cfd00738bdaef33abb59bbaaa8b9 100644
--- a/src/uncategorized/reBoomerang.tw
+++ b/src/uncategorized/reBoomerang.tw
@@ -178,8 +178,8 @@ brings up the relevant feeds. There's a naked body crumpled pathetically against
 	<<set $activeSlave.behavioralFlaw = "odd", $activeSlave.sexualFlaw = "hates men">>
 <<case "slimness enthusiast arcology">>
 	"It wa<<s>> horrible." You sold $him to a pleasant Slimness Enthusiast arcology, but somehow $he's acquired grotesque implants. "The arcology got a new owner." $He shudders. "I gue<<ss>> the ni<<c>>e one wa<<s>> weak, and, and the new one i<<s>> changing thing<<s>>. <<Sh>>-<<sh>>e l-like<<s>> t-to ruin the <<s>>lim one<<s>>." It's nothing short of incredible that $he managed to get back here. $He must have sold and traded $himself without hesitation.
-	<<set $activeSlave.boobsImplant = 200*random(2,4), $activeSlave.boobs += $activeSlave.boobsImplant>>
-	<<set $activeSlave.buttImplant = random(2,4), $activeSlave.butt = Math.clamp($activeSlave.butt+$activeSlave.buttImplant,0,10)>>
+	<<set $activeSlave.boobsImplant = 200*random(2,4), $activeSlave.boobs += $activeSlave.boobsImplant, $activeSlave.boobsImplantType = "normal">>
+	<<set $activeSlave.buttImplant = random(2,4), $activeSlave.butt = Math.clamp($activeSlave.butt+$activeSlave.buttImplant,0,10), $activeSlave.buttImplantType = "normal">>
 	<<set $activeSlave.lipsImplant = 10*random(1,3), $activeSlave.lips = Math.clamp($activeSlave.lips+$activeSlave.lipsImplant,0,100)>>
 <<case "asset expansionist arcology">>
 	"It wa<<s>> horrible." You sold $him to an Asset Expansionist arcology; it's nothing short of incredible that $he managed to get back here. $He must have sold and traded $himself without hesitation.
@@ -194,7 +194,7 @@ brings up the relevant feeds. There's a naked body crumpled pathetically against
 	<<set $activeSlave.behavioralFlaw = "anorexic">>
 <<case "transformation fetishist arcology">>
 	"It wa<<s>> horrible." You sold $him to a Transformation Fetishist arcology; it's nothing short of incredible that $he managed to get back here. $He must have sold and traded $himself without hesitation. "They were giving me new boob implant<<s>> every two week<<s>>. I ran away before another <<s>>et. I c-couldn't take any more <<s>>-<<s>>urgery."
-	<<set $activeSlave.boobsImplant = 200*random(9,12), $activeSlave.boobs += $activeSlave.boobsImplant>>
+	<<set $activeSlave.boobsImplant = 200*random(9,12), $activeSlave.boobs += $activeSlave.boobsImplant, $activeSlave.boobsImplantType = "normal">>
 <<case "physical idealist arcology">>
 	"It wa<<s>> horrible." You sold $him to a Physical Idealist arcology; it's nothing short of incredible that $he managed to get back here. $He must have sold and traded $himself without hesitation. "It should have been called a <<S>>teroid Enthu<<s>>ia<<s>>t arcology." $He shivers. "The <<s>>ide effect<<s>> are terrible. I can't <<s>>leep. I can barely eat. They had to feed me with a tube."
 	<<set $activeSlave.muscles = 100, $activeSlave.weight = random(-85,-75)>>
@@ -212,8 +212,8 @@ brings up the relevant feeds. There's a naked body crumpled pathetically against
 	"It wa<<s>> horrible." You sold $him to an Egyptian Revivalist arcology; it's nothing short of incredible that $he managed to get back here. $He must have sold and traded $himself without hesitation. "My new owner wa<<s>> old, and he wa<<s>> really into <<s>>ome of the tomb <<s>>tuff. If he died, I'd have been buried with him."
 <<case "body purist arcology">>
 	"It wa<<s>> horrible." You sold $him to a pleasant Body Purist arcology, but somehow $he's acquired grotesque implants. "The arcology got a new owner." $He shudders. "I gue<<ss>> the ni<<c>>e one wa<<s>> weak, and, and the new one i<<s>> changing thing<<s>>. <<Sh>>-<<sh>>e l-like<<s>> t-to ruin the pure one<<s>>." It's nothing short of incredible that $he managed to get back here. $He must have sold and traded $himself without hesitation.
-	<<set $activeSlave.boobsImplant = 200*random(2,4), $activeSlave.boobs += $activeSlave.boobsImplant>>
-	<<set $activeSlave.buttImplant = random(2,4), $activeSlave.butt = Math.clamp($activeSlave.butt+$activeSlave.buttImplant,0,10)>>
+	<<set $activeSlave.boobsImplant = 200*random(2,4), $activeSlave.boobs += $activeSlave.boobsImplant, $activeSlave.boobsImplantType = "normal">>
+	<<set $activeSlave.buttImplant = random(2,4), $activeSlave.butt = Math.clamp($activeSlave.butt+$activeSlave.buttImplant,0,10), $activeSlave.buttImplantType = "normal">>
 	<<set $activeSlave.lipsImplant = 10*random(1,3), $activeSlave.lips = Math.clamp($activeSlave.lips+$activeSlave.lipsImplant,0,100)>>
 <<case "D milf staffing" "trainer staffing">>
 	<<setNonlocalPronouns $seeDicks>>
@@ -226,13 +226,13 @@ brings up the relevant feeds. There's a naked body crumpled pathetically against
 	<<set $activeSlave.behavioralFlaw = "hates penetration", $activeSlave.sexualFlaw = "apathetic">>
 <<case "implanting trainer">>
 	"I d-don't want to be c-cut again," $he <<say>>s hollowly. $His buyer planned to use $him as a surgical teaching tool. "E-every time I'm healed, they implant me again. B-bigger."
-	<<set $activeSlave.boobsImplant = 200*random(8,12), $activeSlave.boobs += $activeSlave.boobsImplant>>
-	<<set $activeSlave.buttImplant = random(2,4), $activeSlave.butt = Math.clamp($activeSlave.butt+$activeSlave.buttImplant,0,10)>>
+	<<set $activeSlave.boobsImplant = 200*random(8,12), $activeSlave.boobs += $activeSlave.boobsImplant, $activeSlave.boobsImplantType = "advanced fillable">>
+	<<set $activeSlave.buttImplant = random(2,4), $activeSlave.butt = Math.clamp($activeSlave.butt+$activeSlave.buttImplant,0,10), $activeSlave.buttImplantType = "normal">>
 	<<set $activeSlave.lipsImplant = 10*random(1,3), $activeSlave.lips = Math.clamp($activeSlave.lips+$activeSlave.lipsImplant,0,100)>>
 <<case "purifying trainer">>
 	"It w-wa<<s>>n't like I thought it would be," $he <<say>>s. "The trainer you <<s>>old me to took out my implant<<s>>. B-but then they <<s>>aid my boob<<s>> had to be rebuilt, only with drug<<s>> thi<<s>> time." $He shivers. "The <<s>>ide effect<<s>> are terrible. I can't <<s>>leep. I can barely eat. They had to feed me with a tube."
-	<<set $activeSlave.boobs -= $activeSlave.boobsImplant, $activeSlave.boobsImplant = 0>>
-	<<set $activeSlave.butt -= $activeSlave.buttImplant, $activeSlave.buttImplant = 0>>
+	<<set $activeSlave.boobs -= $activeSlave.boobsImplant, $activeSlave.boobsImplant = 0, $activeSlave.boobsImplantType = "none">>
+	<<set $activeSlave.butt -= $activeSlave.buttImplant, $activeSlave.buttImplant = 0, $activeSlave.buttImplantType = "none">>
 	<<set $activeSlave.lips -= $activeSlave.lipsImplant, $activeSlave.lipsImplant = 0>>
 	<<set $activeSlave.boobs = Math.clamp($activeSlave.boobs+50*random(20,40),0,10000)>>
 <<case "D startled the witch">>
@@ -259,8 +259,8 @@ brings up the relevant feeds. There's a naked body crumpled pathetically against
 	<<set $activeSlave.weight = Math.clamp($activeSlave.weight+random(50,100),-100,200)>>
 <<case "clipping trainer">>
 	"All I do i<<s>> <<s>>uck dick<<s>> and get fucked in the butt." You sold $him to a trainer who specializes in clipping and improving overly masculine slaves, and $he's definitely more feminine, if bitterly unhappy. "They're going to <<s>>ell me to a bitch brothel <<s>>oon, I know it. Plea<<s>>e, nobody'<<s>> even <<s>>aid anything to me other than '<<s>>uck my cock' or 'bend over bitch' in week<<s>>."
-	<<set $activeSlave.boobsImplant = 200*random(2,4), $activeSlave.boobs += $activeSlave.boobsImplant>>
-	<<set $activeSlave.buttImplant = random(1,2), $activeSlave.butt = Math.clamp($activeSlave.butt+$activeSlave.buttImplant,0,10)>>
+	<<set $activeSlave.boobsImplant = 200*random(2,4), $activeSlave.boobs += $activeSlave.boobsImplant, $activeSlave.boobsImplantType = "normal">>
+	<<set $activeSlave.buttImplant = random(1,2), $activeSlave.butt = Math.clamp($activeSlave.butt+$activeSlave.buttImplant,0,10), $activeSlave.buttImplantType = "normal">>
 	<<set $activeSlave.lipsImplant = 10*random(1,2), $activeSlave.lips = Math.clamp($activeSlave.lips+$activeSlave.lipsImplant,0,100)>>
 	<<set $activeSlave.waist = Math.clamp($activeSlave.waist+random(20,50),-100,100)>>
 	<<set $activeSlave.balls = 0, $activeSlave.scrotum = 0, $activeSlave.dick = Math.clamp($activeSlave.dick-random(1,2),0,10)>>
@@ -268,8 +268,8 @@ brings up the relevant feeds. There's a naked body crumpled pathetically against
 	<<if $activeSlave.faceShape == "masculine">><<set $activeSlave.faceShape = "androgynous">><</if>>
 <<case "reassignment trainer">>
 	"I m-mi<<ss>> my dick." You sold $him to a trainer who specializes in gender reassignment, and $he's definitely more feminine, if bitterly unhappy. "P-plea<<s>>e, even if you won't f-fi<<x>> me, plea<<s>>e take me back. I'll b-be a <<s>>e<<x>> <<s>>lave, I ju<<s>>t don't want to be a woman."
-	<<set $activeSlave.boobsImplant = 200*random(2,4), $activeSlave.boobs += $activeSlave.boobsImplant>>
-	<<set $activeSlave.buttImplant = random(1,2), $activeSlave.butt = Math.clamp($activeSlave.butt+$activeSlave.buttImplant,0,10)>>
+	<<set $activeSlave.boobsImplant = 200*random(2,4), $activeSlave.boobs += $activeSlave.boobsImplant, $activeSlave.boobsImplantType = "normal">>
+	<<set $activeSlave.buttImplant = random(1,2), $activeSlave.butt = Math.clamp($activeSlave.butt+$activeSlave.buttImplant,0,10), $activeSlave.buttImplantType = "normal">>
 	<<set $activeSlave.lipsImplant = 10*random(1,2), $activeSlave.lips = Math.clamp($activeSlave.lips+$activeSlave.lipsImplant,0,100)>>
 	<<set $activeSlave.waist = Math.clamp($activeSlave.waist+random(20,50),-100,100)>>
 	<<set $activeSlave.balls = 0, $activeSlave.scrotum = 0, $activeSlave.dick = 0, $activeSlave.vagina = 3>>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index bc12b1b9acdfba3992dc97a071fb5274770ce707..721271841063d14bc4a0ac7742c478a9e2778ec1 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -251,10 +251,12 @@
 <<set $activeSlave.origin = "$He was sold to you by an anonymous person who wanted $him to suffer.">>
 <<set $activeSlave.boobsImplant += random(4,6)*200>>
 <<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+<<set $activeSlave.boobsImplantType = "normal">>
 <<set $activeSlave.nipples = "huge">>
 <<set $activeSlave.areolae = 1>>
 <<set $activeSlave.butt += 1>>
 <<set $activeSlave.buttImplant += 1>>
+<<set $activeSlave.buttImplantType = "normal">>
 <<set $activeSlave.lips += 10>>
 <<set $activeSlave.lipsImplant += 10>>
 <<set $activeSlave.face = Math.clamp($activeSlave.face+20,-100,100)>>
@@ -292,9 +294,11 @@
 <<set $activeSlave.origin = "$He was sold to you by an anonymous slave breaking group.">>
 <<set $activeSlave.boobsImplant += random(3,6)*200>>
 <<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+<<set $activeSlave.boobsImplantType = "normal">>
 <<set $activeSlave.areolae = 1>>
 <<set $activeSlave.butt += 1>>
 <<set $activeSlave.buttImplant += 1>>
+<<set $activeSlave.buttImplantType = "normal">>
 <<set $activeSlave.lips += 10>>
 <<set $activeSlave.lipsImplant += 10>>
 <<set $activeSlave.face = Math.clamp($activeSlave.face+20,-100,100)>>
@@ -376,6 +380,7 @@
 <<set $activeSlave.origin = "$He offered $himself for voluntary enslavement after realizing $his career was over.">>
 <<set $activeSlave.boobsImplant += random(4,6)*200>>
 <<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+<<set $activeSlave.boobsImplantType = "fillable">>
 <<set $activeSlave.lips = 60>>
 <<set $activeSlave.face = Math.clamp($activeSlave.face+20,-100,100)>>
 <<set $activeSlave.devotion = random(20,45)>>
@@ -611,8 +616,10 @@
 <<set $activeSlave.geneticQuirks.dwarfism = 2>>
 <<set $activeSlave.boobsImplant += random(4,6)*200>>
 <<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+<<set $activeSlave.boobsImplantType = "string">>
 <<set $activeSlave.buttImplant += 2>>
 <<set $activeSlave.butt += $activeSlave.buttImplant>>
+<<set $activeSlave.buttImplantType = "normal">>
 <<set $activeSlave.hips = 2>>
 <<set $activeSlave.lips = 60>>
 <<set $activeSlave.lipsImplant = 10>>
@@ -680,9 +687,11 @@
 <<set $activeSlave.origin = "You received $him from a surgeon who botched an implant operation on $him and needed to get $him out of sight.">>
 <<set $activeSlave.boobsImplant += random(10,20)*200>>
 <<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+<<set $activeSlave.boobsImplantType = "advanced fillable">>
 <<set $activeSlave.nipples = "tiny">>
 <<set $activeSlave.areolae = 2>>
 <<set $activeSlave.buttImplant += random(2,4)>>
+<<set $activeSlave.buttImplantType = "fillable">>
 <<set $activeSlave.butt += $activeSlave.buttImplant>>
 <<set $activeSlave.lipsImplant += random(15,25)>>
 <<set $activeSlave.lips += $activeSlave.lipsImplant>>
@@ -709,10 +718,12 @@
 <<set $activeSlave.career = "a trophy wife">>
 <<set $activeSlave.boobsImplant += random(5,10)*200>>
 <<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+<<set $activeSlave.boobsImplantType = "fillable">>
 <<set $activeSlave.nipples = "tiny">>
 <<set $activeSlave.areolae = 2>>
 <<set $activeSlave.buttImplant += random(2,4)>>
 <<set $activeSlave.butt += $activeSlave.buttImplant>>
+<<set $activeSlave.buttImplantType = "normal">>
 <<set $activeSlave.lipsImplant += random(15,25)>>
 <<set $activeSlave.lips += $activeSlave.lipsImplant>>
 <<set $activeSlave.face = Math.clamp($activeSlave.face+20,-100,100)>>
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index 68df0769421f32f41ec8b3079daf044dc2ce94b0..8d7215312f246d6947a65ab825e65fdd3a0f79f2 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -152,8 +152,10 @@
 <<set $activeSlave.anus = 0>>
 <<set $activeSlave.boobs += 400>>
 <<set $activeSlave.boobsImplant = 400>>
+<<set $activeSlave.boobsImplantType = "normal">>
 <<set $activeSlave.butt += 2>>
 <<set $activeSlave.buttImplant = 2>>
+<<set $activeSlave.buttImplantType = "normal">>
 <<run setHealth($activeSlave, jsRandom(20, 40))>>
 <<set $activeSlave.sexualFlaw = "hates oral">>
 <<set $activeSlave.behavioralFlaw = "arrogant">>
@@ -187,8 +189,10 @@
 <<set $activeSlave.skill.whoring = 35>>
 <<set $activeSlave.boobs += 400>>
 <<set $activeSlave.boobsImplant = 400>>
+<<set $activeSlave.boobsImplantType = "normal">>
 <<set $activeSlave.butt += 1>>
 <<set $activeSlave.buttImplant = 1>>
+<<set $activeSlave.buttImplantType = "normal">>
 <<set $activeSlave.lips += 10>>
 <<set $activeSlave.lipsImplant = 10>>
 <<set $activeSlave.lipsPiercing = 1>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index d1f4f9575c9efe53eaededc494eab95b7283ba66..44961a2c8b5b1765e8ff82176128e382f711346e 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -114,8 +114,10 @@
 <<set $activeSlave.skill.whoring = 35>>
 <<set $activeSlave.boobs += 600>>
 <<set $activeSlave.boobsImplant = 600>>
+<<set $activeSlave.boobsImplantType = "normal">>
 <<set $activeSlave.butt += 1>>
 <<set $activeSlave.buttImplant = 1>>
+<<set $activeSlave.buttImplantType = "normal">>
 <<set $activeSlave.lips += 10>>
 <<set $activeSlave.lipsImplant = 10>>
 <<set $activeSlave.lipsPiercing = 1>>
@@ -342,7 +344,9 @@
 <<set $activeSlave.face = 15>>
 <<set $activeSlave.butt = random(4,5)>>
 <<set $activeSlave.buttImplant = 1>>
+<<set $activeSlave.buttImplantType = "normal">>
 <<set $activeSlave.boobsImplant = 400>>
+<<set $activeSlave.boobsImplantType = "normal">>
 <<set $activeSlave.boobs = random(8,10)*100>>
 <<set $activeSlave.lipsImplant = 10>>
 <<set $activeSlave.anus = 0>>
@@ -372,8 +376,10 @@
 <<set $activeSlave.face = 15>>
 <<set $activeSlave.boobs = random(5,6)*100>>
 <<set $activeSlave.boobsImplant = 400>>
+<<set $activeSlave.boobsImplantType = "normal">>
 <<set $activeSlave.butt = random(2,3)>>
 <<set $activeSlave.buttImplant = 1>>
+<<set $activeSlave.buttImplantType = "normal">>
 <<set $activeSlave.dick = 1>>
 <<if $activeSlave.foreskin > 0>><<set $activeSlave.foreskin = $activeSlave.dick>><</if>>
 <<if $activeSlave.balls > 0>><<set $activeSlave.scrotum = $activeSlave.balls>><</if>>
@@ -470,8 +476,10 @@
 <<set $activeSlave.skill.oral = 15>>
 <<set $activeSlave.boobs += 400>>
 <<set $activeSlave.boobsImplant = 400>>
+<<set $activeSlave.boobsImplantType = "normal">>
 <<set $activeSlave.butt += 1>>
 <<set $activeSlave.buttImplant = 1>>
+<<set $activeSlave.buttImplantType = "normal">>
 <<set $activeSlave.lips += 10>>
 <<set $activeSlave.lipsImplant = 10>>
 <<set $activeSlave.face = Math.clamp($activeSlave.face+20,-100,100)>>
@@ -676,6 +684,7 @@
 <<set $activeSlave.skill.oral = random(15,40)>>
 <<set $activeSlave.skill.whoring = 0>>
 <<set $activeSlave.boobsImplant = random(3,6)*100>>
+<<set $activeSlave.boobsImplantType = "normal">>
 <<set $activeSlave.boobs = $activeSlave.boobsImplant+150>>
 <<set $activeSlave.vagina = 0>>
 <<set $activeSlave.skill.vaginal = 0>>
@@ -716,8 +725,9 @@
 <<set $activeSlave.skill.anal = 0>>
 <<set $activeSlave.skill.oral = 35>>
 <<set $activeSlave.skill.whoring = 0>>
-<<set $activeSlave.boobs = 150>>
 <<set $activeSlave.boobsImplant = random(2,6)*100>>
+<<set $activeSlave.boobs = 150 + $activeSlave.boobsImplant>>
+<<set $activeSlave.boobsImplantType = "normal">>
 <<set $activeSlave.vagina = -1>>
 <<set $activeSlave.ovaries = 0>>
 <<set $activeSlave.preg = -1>>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index 875814f49bae9e8f5d00d81803188a6f0b0f5c48..62fafa143b7a1d998209d3fc988449ec419dabeb 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -95,7 +95,7 @@
 		<<set $activeSlave.muscles = 0>>
 		<<set $activeSlave.corsetPiercing = 0>>
 		<<set $activeSlave.boobsImplant = 0>>
-		<<set $activeSlave.boobsImplantType = 0>>
+		<<set $activeSlave.boobsImplantType = "none">>
 		<<set $activeSlave.nipplesPiercing = 0>>
 		<<set $activeSlave.areolae = 0>>
 		<<set $activeSlave.areolaePiercing = 0>>
@@ -103,7 +103,7 @@
 		<<set $activeSlave.lactation = 0>>
 		<<set $activeSlave.hipsImplant = 0>>
 		<<set $activeSlave.buttImplant = 0>>
-		<<set $activeSlave.buttImplantType = 0>>
+		<<set $activeSlave.buttImplantType = "none">>
 		<<set $activeSlave.lipsImplant = 0>>
 		<<set $activeSlave.lipsPiercing = 0>>
 		<<set $activeSlave.tonguePiercing = 0>>
@@ -205,7 +205,7 @@
 	<<set $activeSlave.vagina = -1>>
 	<<set $activeSlave.boobs = (random(5,6)*100)>>
 	<<set $activeSlave.boobsImplant = 0>>
-	<<set $activeSlave.boobsImplantType = 0>>
+	<<set $activeSlave.boobsImplantType = "none">>
 	<<set $activeSlave.butt = random(4,6)>>
 	<<set $activeSlave.actualAge = ($eventSlave.actualAge+random(15,20))>>
 
@@ -216,6 +216,7 @@
 	<<set $activeSlave.preg = -1>>
 	<<set $activeSlave.boobs = (random(8,10)*100)>>
 	<<set $activeSlave.boobsImplant = 600>>
+	<<set $activeSlave.boobsImplantType = "normal">>
 	<<set $activeSlave.skill.oral += random(0,20)>>
 	<<set $activeSlave.skill.vaginal += random(0,20)>>
 	<<set $activeSlave.skill.anal += random(0,20)>>
@@ -243,6 +244,7 @@
 	<<set $activeSlave.prostate = 1>>
 	<<set $activeSlave.boobs = (random(6,8)*100)>>
 	<<set $activeSlave.boobsImplant = 600>>
+	<<set $activeSlave.boobsImplantType = "normal">>
 	<<set $activeSlave.skill.oral += random(0,20)>>
 	<<set $activeSlave.skill.anal += random(0,20)>>
 	<<set $activeSlave.skill.entertainment += random(0,20)>>
@@ -298,7 +300,7 @@
 	<<set $activeSlave.dick = 5>>
 	<<set $activeSlave.boobs = 50>>
 	<<set $activeSlave.boobsImplant = 0>>
-	<<set $activeSlave.boobsImplantType = 0>>
+	<<set $activeSlave.boobsImplantType = "none">>
 	<<set $activeSlave.balls = 4>>
 	<<set $activeSlave.prostate = 1>>
 	<<set $activeSlave.actualAge = Math.clamp($eventSlave.actualAge, $retirementAge, $eventSlave.actualAge + _siblingGap)>>
@@ -317,10 +319,10 @@
 	<<set $activeSlave.genes = "XY">>
 	<<set $activeSlave.boobs = (random(20,40)*100)>>
 	<<set $activeSlave.boobsImplant = $activeSlave.boobs - 100>>
-	<<set $activeSlave.boobsImplantType = 1>>
+	<<set $activeSlave.boobsImplantType = "string">>
 	<<set $activeSlave.butt = random(7,8)>>
 	<<set $activeSlave.buttImplant = $activeSlave.butt-1>>
-	<<set $activeSlave.buttImplantType = 1>>
+	<<set $activeSlave.buttImplantType = "string">>
 	<<set $activeSlave.lips = random(70,90)>>
 	<<set $activeSlave.lipsImplant = $activeSlave.lips-10>>
 	<<set $activeSlave.nipplesPiercing = 2>>
@@ -542,7 +544,7 @@
 	<<s>>welling with life
 <<elseif $eventSlave.anus > 2>>
 	getting <<his 2>> butt <<s>>tretched out
-<<elseif $eventSlave.boobsImplant > 20>>
+<<elseif $eventSlave.boobsImplant > 500>>
 	getting turned into a bimbo <<s>>lut
 <<else>>
 	the feeling of your cock in _him2
@@ -1067,7 +1069,7 @@ $eventSlave.slaveName requests an interview with you. $He's a devoted slave, and
 	<<s>>welling with life
 <<elseif $eventSlave.anus > 2>>
 	getting <<his 2>> butt <<s>>tretched out
-<<elseif $eventSlave.boobsImplant > 20>>
+<<elseif $eventSlave.boobsImplant > 500>>
 	getting turned into a bimbo <<s>>lut
 <<else>>
 	the feeling of your cock in _him2
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index 3ef861bbf0f81c851a610f2c4886deea9f19ad8e..97b6d90afe6116ec8a7e2c074ec616b8b409bae2 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -124,8 +124,10 @@
 			<<set $activeSlave.anus = 0>>
 			<<set $activeSlave.boobs += 400>>
 			<<set $activeSlave.boobsImplant = 400>>
+			<<set $activeSlave.boobsImplantType = "normal">>
 			<<set $activeSlave.butt += 1>>
 			<<set $activeSlave.buttImplant = 1>>
+			<<set $activeSlave.buttImplantType = "normal">>
 			<<set $activeSlave.clothes = "nice business attire">>
 			<<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>>
 			<<set $activeSlave.pubicHStyle = "neat">>
@@ -168,8 +170,10 @@
 			<<set $activeSlave.lactation = 1>>
 			<<set $activeSlave.lactationDuration = 2>>
 			<<set $activeSlave.boobsImplant = 0>>
+			<<set $activeSlave.boobsImplantType = "none">>
 			<<set $activeSlave.butt += 2>>
 			<<set $activeSlave.buttImplant = 0>>
+			<<set $activeSlave.buttImplantType = "none">>
 			<<set $activeSlave.clothes = "conservative clothing">>
 			<<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>>
 			<<set $activeSlave.pubicHStyle = "bushy">>
@@ -440,8 +444,10 @@
 			<<set $activeSlave.lactation = 1>>
 			<<set $activeSlave.lactationDuration = 2>>
 			<<set $activeSlave.boobsImplant = 0>>
+			<<set $activeSlave.boobsImplantType = "none">>
 			<<set $activeSlave.butt += 2>>
 			<<set $activeSlave.buttImplant = 0>>
+			<<set $activeSlave.buttImplantType = "none">>
 			<<set $activeSlave.clothes = "conservative clothing">>
 			<<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>>
 			<<set $activeSlave.pubicHStyle = "bushy">>
@@ -517,6 +523,7 @@
 			<<set $activeSlave.skill.anal = 15>>
 			<<set $activeSlave.boobs = 600>>
 			<<set $activeSlave.boobsImplant = 400>>
+			<<set $activeSlave.boobsImplantType = "normal">>
 			<<set $activeSlave.butt = either(1, 2)>>
 			<<set $activeSlave.preg = -2>>
 			<<set $activeSlave.birthWeek = 0>>
@@ -566,8 +573,10 @@
 			<<set $activeSlave.skill.anal = 15>>
 			<<set $activeSlave.boobs = either(500,600)>>
 			<<set $activeSlave.boobsImplant = 400>>
+			<<set $activeSlave.boobsImplantType = "normal">>
 			<<set $activeSlave.butt = either(2, 3)>>
 			<<set $activeSlave.buttImplant = 1>>
+			<<set $activeSlave.buttImplantType = "normal">>
 			<<set $activeSlave.preg = -3>>
 			<<set $activeSlave.hStyle = "in twin tails">>
 			<<set $activeSlave.pubicHStyle = "waxed">>
@@ -622,8 +631,10 @@
 			<<if $activeSlave.physicalAge >= random(13,17)>>
 				<<set $activeSlave.boobs = either(500,600)>>
 				<<set $activeSlave.boobsImplant = 0>>
+				<<set $activeSlave.boobsImplantType = "none">>
 				<<set $activeSlave.butt = either(2, 3)>>
 				<<set $activeSlave.buttImplant = 0>>
+				<<set $activeSlave.buttImplantType = "none">>
 			<</if>>
 			<<set $activeSlave.preg = -1>>
 			<<set $activeSlave.hStyle = "in twin tails">>
@@ -676,8 +687,10 @@
 			<<if $activeSlave.physicalAge >= random(13,17)>>
 				<<set $activeSlave.boobs = either(500,600)>>
 				<<set $activeSlave.boobsImplant = 0>>
+				<<set $activeSlave.boobsImplantType = "none">>
 				<<set $activeSlave.butt = either(2, 3)>>
 				<<set $activeSlave.buttImplant = 0>>
+				<<set $activeSlave.buttImplantType = "none">>
 			<</if>>
 			<<set $activeSlave.preg = 30>>
 			<<set $activeSlave.pregType = 2>>
@@ -812,6 +825,7 @@
 			<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
 			<<set $activeSlave.boobs -= 400>>
 			<<set $activeSlave.boobsImplant = 0>>
+			<<set $activeSlave.boobsImplantType = "none">>
 			<<set $activeSlave.butt -= 1>>
 			<<set $activeSlave.vagina = 1>>
 			<<set $activeSlave.anus = 0>>
@@ -1107,6 +1121,7 @@
 			<<set $activeSlave.lactation = 0>>
 			<<set $activeSlave.lactationDuration = 0>>
 			<<set $activeSlave.boobsImplant = 0>>
+			<<set $activeSlave.boobsImplantType = "none">>
 			<<set $activeSlave.butt -= 2>>
 			<<if $familyTesting == 1>>
 				<<set $activeSlave.mother = $activeSlave.ID - 1000>>
@@ -1179,6 +1194,7 @@
 			<<set $activeSlave.sexualFlaw = "hates penetration">>
 			<<set $activeSlave.boobs = either(400, 500)>>
 			<<set $activeSlave.boobsImplant = 0>>
+			<<set $activeSlave.boobsImplantType = "none">>
 			<<set $activeSlave.butt = either(2, 3)>>
 			<<if $activeSlave.actualAge < 12>>
 				<<set $activeSlave.actualAge = 16>>
@@ -1207,7 +1223,9 @@
 			<<set $activeSlave.balls = 0>>
 			<<set $activeSlave.skill.vaginal = 15>>
 			<<set $activeSlave.boobsImplant = 0>>
+			<<set $activeSlave.boobsImplantType = "none">>
 			<<set $activeSlave.buttImplant = 0>>
+			<<set $activeSlave.buttImplantType = "none">>
 			<<if $familyTesting == 1>>
 			<<else>>
 				<<set $activeSlave.relation = "twin">>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index e76f31c0eea7415e9e44417743e2d5b94aae1f0d..3733a7401867ebcdd7586be0e8ece0c0ce70b3ca 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -645,23 +645,58 @@
 <div>
 	$He has
 	<<if $activeSlave.boobsImplant > 0>>
-		<<if $activeSlave.boobsImplant > 600>>
-			<<print $activeSlave.boobsImplant>>cc
-		<<elseif $activeSlave.boobsImplant > 400>>
-			large, <<print $activeSlave.boobsImplant>>cc
-		<<elseif $activeSlave.boobsImplant > 200>>
-			moderate, <<print $activeSlave.boobsImplant>>cc
-		<<elseif $activeSlave.boobsImplant > 0>>
-			small, <<print $activeSlave.boobsImplant>>cc
-		<</if>>
-		<<if $activeSlave.boobsImplantType == 1>>
-			string
-		<<elseif $activeSlave.boobsImplant >= 800>>
-			fillable
-		<</if>>
-		breast implants.
-		<<if $activeSlave.boobsImplant > 8000 && $activeSlave.boobsImplantType == 1>>
-			<span class="yellow">Large string based implants are a risk to a slave's health.</span>
+		<<if ["fillable", "advanced fillable", "hyper fillable"].includes($activeSlave.boobsImplantType)>>
+			<<if $activeSlave.boobsImplantType == "hyper fillable">>
+				<<if $activeSlave.boobsImplant < 20000>>
+					underfilled,
+				<<else>>
+					enormous,
+				<</if>>
+			<<elseif $activeSlave.boobsImplantType == "advanced fillable">>
+				<<if $activeSlave.boobsImplant <= 1000>>
+					deflated,
+				<<elseif $activeSlave.boobsImplant < 2200>>
+					underfilled,
+				<<elseif $activeSlave.boobsImplant > 10000>>
+					massively overfilled,
+				<<else>>
+					massive,
+				<</if>>
+			<<else>>
+				<<if $activeSlave.boobsImplant <= 500>>
+					deflated,
+				<<elseif $activeSlave.boobsImplant < 800>>
+					underfilled,
+				<<elseif $activeSlave.boobsImplant > 1800>>
+					massively overfilled,
+				<<elseif $activeSlave.boobsImplant > 1000>>
+					massive,
+				<<elseif $activeSlave.boobsImplant >= 800>>
+					giant,
+				<</if>>
+			<</if>>
+			<<print $activeSlave.boobsImplant>>cc $activeSlave.boobsImplantType breast implants.
+		<<else>>
+			<<if $activeSlave.boobsImplant > 1000>>
+				massive, <<print $activeSlave.boobsImplant>>cc
+			<<elseif $activeSlave.boobsImplant > 800>>
+				giant, <<print $activeSlave.boobsImplant>>cc
+			<<elseif $activeSlave.boobsImplant > 600>>
+				huge, <<print $activeSlave.boobsImplant>>cc
+			<<elseif $activeSlave.boobsImplant > 400>>
+				large, <<print $activeSlave.boobsImplant>>cc
+			<<elseif $activeSlave.boobsImplant > 200>>
+				moderate, <<print $activeSlave.boobsImplant>>cc
+			<<elseif $activeSlave.boobsImplant > 0>>
+				small, <<print $activeSlave.boobsImplant>>cc
+			<</if>>
+			<<if $activeSlave.boobsImplantType != "normal">>
+				$activeSlave.boobsImplantType
+			<</if>>
+			breast implants.
+			<<if $activeSlave.boobsImplant > 8000 && $activeSlave.boobsImplantType == "string">>
+				<span class="yellow">Large string based implants are a risk to a slave's health.</span>
+			<</if>>
 		<</if>>
 	<<else>>
 		no implants.
@@ -1024,29 +1059,54 @@
 
 	<<if $activeSlave.buttImplant > 0>>
 		$He has
-		<<if $activeSlave.buttImplant == 1>>
-			moderate
-		<<elseif $activeSlave.buttImplant == 2>>
-			enormous
-		<<elseif $activeSlave.buttImplant > 2>>
-			<<if $activeSlave.buttImplantType == 1>>
+		<<if $activeSlave.buttImplantType == "string">>
+			<<if $activeSlave.buttImplant > 2>>
 				massively engorged
+			<</if>>
+		<<elseif $activeSlave.buttImplantType == "normal">>
+			<<if $activeSlave.buttImplant == 1>>
+				moderate
+			<<elseif $activeSlave.buttImplant == 2>>
+				enormous
 			<<else>>
-				<<if $activeSlave.buttImplant > 8>>
-					hyper
-				<<elseif $activeSlave.buttImplant > 4>>
-					advanced
-				<</if>>
+				absurd
+			<</if>>
+		<<elseif $activeSlave.buttImplantType == "hyper fillable">>
+			<<if $activeSlave.buttImplant > 19>>
+				overfilled
+			<<elseif $activeSlave.buttImplant < 9>>
+				underfilled
+			<<elseif $activeSlave.buttImplant <= 5>>
+				deflated
+			<<else>>
+				absurd
+			<</if>>
+		<<elseif $activeSlave.buttImplantType == "advanced fillable">>
+			<<if $activeSlave.buttImplant > 8>>
+				overfilled
+			<<elseif $activeSlave.buttImplant < 5>>
+				underfilled
+			<<elseif $activeSlave.buttImplant <= 3>>
+				deflated
+			<<else>>
+				massive
+			<</if>>
+		<<elseif $activeSlave.buttImplantType == "fillable">>
+			<<if $activeSlave.buttImplant > 4>>
+				overfilled
+			<<elseif $activeSlave.buttImplant < 3>>
+				underfilled
+			<<elseif $activeSlave.buttImplant == 1>>
+				deflated
+			<<else>>
+				massive
 			<</if>>
 		<</if>>
-		butt
-		<<if $activeSlave.buttImplantType == 1>>
-			string
-		<<elseif $activeSlave.buttImplant >= 3>>
-			fillable
+		<<if $activeSlave.buttImplantType != "normal">>
+			$activeSlave.buttImplantType
 		<</if>>
-		implants.
-		<<if $activeSlave.buttImplant > 3 && $activeSlave.buttImplantType == 1>>
+		butt implants.
+		<<if $activeSlave.buttImplant > 3 && $activeSlave.buttImplantType == "string">>
 			<span class="yellow">Large string based implants are a risk to a slave's health.</span>
 		<</if>>
 	<</if>>
diff --git a/src/uncategorized/resFailure.tw b/src/uncategorized/resFailure.tw
index 9cc44e840550e043540ebae1181f57140b644272..2f8fea7aadfd0654ce278c17875c801c9fa22bdc 100644
--- a/src/uncategorized/resFailure.tw
+++ b/src/uncategorized/resFailure.tw
@@ -239,8 +239,10 @@
 		<<set $activeSlave.height += 10>>
 		<<set $activeSlave.buttImplant = (4-$activeSlave.butt)>>
 		<<set $activeSlave.butt += $activeSlave.buttImplant>>
+		<<set $activeSlave.boobsImplantType = "normal">>
 		<<set $activeSlave.boobsImplant = (2000-$activeSlave.boobs)>>
 		<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+		<<set $activeSlave.boobsImplantType = "fillable">>
 		<<set $activeSlave.nipples = "tiny">>
 		<<set $activeSlave.areolae = 0>>
 		<<set $activeSlave.clit = 0>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 70c2204f58fd1c66b9d18c68b6306552f969845a..80f2249720ec51688242f630a0a5dcd5bc27d035 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -3161,7 +3161,7 @@
 
 /* IMPLANT EFFECTS ON UNDERLYING FLESH */
 
-<<if ($slaves[$i].boobsImplantType == 1)>>
+<<if ($slaves[$i].boobsImplantType == "string")>>
 	$His string implants absorb fluid @@.lime;slowly swelling $his breasts.@@
 	<<set $slaves[$i].boobsImplant += 50, $slaves[$i].boobs += 50>>
 	<<set _effect = random(1,10)>>
@@ -3225,7 +3225,7 @@
 	<</if>>
 <</if>>
 
-<<if ($slaves[$i].buttImplantType == 1)>>
+<<if ($slaves[$i].buttImplantType == "string")>>
 	$His string implants absorb fluid @@.lime;slowly swelling $his ass.@@
 	<<set $slaves[$i].buttImplant += .25, $slaves[$i].butt += .25>>
 	<<if ($slaves[$i].butt+$slaves[$i].buttImplant > 10 && $slaves[$i].buttImplant > 1)>>
diff --git a/src/uncategorized/seCoursing.tw b/src/uncategorized/seCoursing.tw
index 68cebeea596dc1847367ed437b31ce78da295950..9d8f813a6e11b7bf8a4184ed10e6278ca9145ebb 100644
--- a/src/uncategorized/seCoursing.tw
+++ b/src/uncategorized/seCoursing.tw
@@ -140,8 +140,10 @@ You lead your lurcher $activeLurcher.slaveName out on a leash, naked just like t
 	<<set $activeSlave = GenerateNewSlave("XX")>>
 	<<set $activeSlave.boobs += 800>>
 	<<set $activeSlave.boobsImplant += 800>>
+	<<set $activeSlave.boobsImplantType = "normal">>
 	<<set $activeSlave.butt += 1>>
 	<<set $activeSlave.buttImplant += 1>>
+	<<set $activeSlave.buttImplantType = "normal">>
 	<<set $activeSlave.face = 55>>
 	<<set $activeSlave.faceImplant += 20>>
 	<<set $activeSlave.anus = 1>>
@@ -211,8 +213,10 @@ You lead your lurcher $activeLurcher.slaveName out on a leash, naked just like t
 	<<set $activeSlave = GenerateNewSlave("XY")>>
 	<<set $activeSlave.boobs += 800>>
 	<<set $activeSlave.boobsImplant += 800>>
+	<<set $activeSlave.boobsImplantType = "fillable">>
 	<<set $activeSlave.butt += 1>>
 	<<set $activeSlave.buttImplant += 1>>
+	<<set $activeSlave.buttImplantType = "normal">>
 	<<set $activeSlave.face = Math.clamp($activeSlave.face+20,-100,100)>>
 	<<set $activeSlave.faceImplant += 20>>
 	<<set $activeSlave.anus = 3>>
diff --git a/src/uncategorized/seRaiding.tw b/src/uncategorized/seRaiding.tw
index 4620e2caa9353f991d03488e04fa478df8b7d32b..590a995e83d4e1cf270dcc456a7eb37b7df767db 100644
--- a/src/uncategorized/seRaiding.tw
+++ b/src/uncategorized/seRaiding.tw
@@ -79,8 +79,10 @@ target
 	<<set $activeSlave = GenerateNewSlave("XX")>>
 	<<set $activeSlave.boobs += 800>>
 	<<set $activeSlave.boobsImplant += 800>>
+	<<set $activeSlave.boobsImplantType = "normal">>
 	<<set $activeSlave.butt += 1>>
 	<<set $activeSlave.buttImplant += 1>>
+	<<set $activeSlave.buttImplantType = "normal">>
 	<<set $activeSlave.face = 55>>
 	<<set $activeSlave.faceImplant += 20>>
 	<<set $activeSlave.anus = 1>>
@@ -330,8 +332,10 @@ target
 	<<set $activeSlave = GenerateNewSlave("XX")>>
 	<<set $activeSlave.boobs += 800>>
 	<<set $activeSlave.boobsImplant += 800>>
+	<<set $activeSlave.boobsImplantType = "fillable">>
 	<<set $activeSlave.butt += 1>>
 	<<set $activeSlave.buttImplant += 1>>
+	<<set $activeSlave.buttImplantType = "normal">>
 	<<set $activeSlave.face = 55>>
 	<<set $activeSlave.faceImplant += 20>>
 	<<set $activeSlave.anus = 1>>
diff --git a/src/uncategorized/seRecruiterSuccess.tw b/src/uncategorized/seRecruiterSuccess.tw
index ded170cbec90c15182b30db87bf800c99e2b262b..26670aedb3a06af9758a6437b93ba75a9cfbe015 100644
--- a/src/uncategorized/seRecruiterSuccess.tw
+++ b/src/uncategorized/seRecruiterSuccess.tw
@@ -182,8 +182,14 @@
 <<set $activeSlave.skill.whoring = random(15,40)>>
 <<set $activeSlave.boobsImplant = random(0,3)*200>>
 <<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+<<if $activeSlave.boobsImplant > 0>>
+	<<set $activeSlave.boobsImplantType = "normal">>
+<</if>>
 <<set $activeSlave.buttImplant = random(0,2)>>
 <<set $activeSlave.butt = $activeSlave.buttImplant>>
+<<if $activeSlave.buttImplant > 0>>
+	<<set $activeSlave.buttImplantType = "normal">>
+<</if>>
 <<set $activeSlave.lipsImplant = either(0,10)>>
 <<set $activeSlave.lips += $activeSlave.lipsImplant>>
 <<set $activeSlave.lipsPiercing = random(0,1)>>
diff --git a/src/uncategorized/slaveShelter.tw b/src/uncategorized/slaveShelter.tw
index ea9c22f03b05cbdd354acb7ba809024cf58a25b9..718daf2afe00442c0b9262753466854e565dabaa 100644
--- a/src/uncategorized/slaveShelter.tw
+++ b/src/uncategorized/slaveShelter.tw
@@ -170,6 +170,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
 	<<run setHealth($shelterSlave, jsRandom(-60,-40), normalRandInt(10, 3), normalRandInt(20, 3))>>
 	<<set $shelterSlave.boobs = 0>>
 	<<set $shelterSlave.boobsImplant = 0>>
+	<<set $shelterSlave.boobsImplantType = "none">>
 	<<set $shelterSlave.nipples = "tiny">>
 	<<set $shelterSlave.behavioralFlaw = either("anorexic", "anorexic", "anorexic", "odd")>>
 	<<set $shelterSlave.sexualFlaw = either("apathetic", "neglectful", "self hating")>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index f515471455ad1f9bb9b4b5308c06f66e8cd19d40..f8aa30b32a0efd9b98fb84d7e0f01e87463f6a85 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -1264,13 +1264,13 @@ $He's got a
 		<<elseif $activeSlave.buttImplant == 2>>
 			$His big butt implants make $his ass jut out curvaceously whatever pose $he's in.
 		<<elseif $activeSlave.buttImplant > 2>>
-			$He has <<if $activeSlave.buttImplantType == 1>>engorged string<<else>>fillable butt<</if>> implants, and it shows. Whatever $his position, $his ass looks just as artificially enticing.
+			$He has <<if $activeSlave.buttImplantType == "string">>engorged string<<elseif $activeSlave.buttImplantType == "normal">>butt<<else>>fillable butt<</if>> implants, and it shows. Whatever $his position, $his ass looks just as artificially enticing.
 		<<elseif $activeSlave.buttImplant > 7>>
-			$He has oversized <<if $activeSlave.buttImplantType == 1>>engorged string<<else>>fillable butt<</if>> implants, and it is completely obvious. Whatever $his position, $his ass looks like someone shoved a pair of overinflated beachballs in $his buttcheeks.
+			$He has oversized <<if $activeSlave.buttImplantType == "string">>engorged string<<elseif $activeSlave.buttImplantType == "normal">>silicone butt<<else>>fillable butt<</if>> implants, and it is completely obvious. Whatever $his position, $his ass looks like someone shoved a pair of overinflated beachballs in $his buttcheeks.
 		<<elseif $activeSlave.buttImplant > 12>>
-			$He has oversized <<if $activeSlave.buttImplantType == 1>>engorged string<<else>>fillable butt<</if>> implants, and it is completely obvious. Whatever $his position, $his ass looks like someone shoved a pair of ready to burst weather balloons in $his buttcheeks.
+			$He has oversized <<if $activeSlave.buttImplantType == "string">>engorged string<<else>>fillable butt<</if>> implants, and it is completely obvious. Whatever $his position, $his ass looks like someone shoved a pair of ready to burst weather balloons in $his buttcheeks.
 		<<elseif $activeSlave.buttImplant > 17>>
-			$He has oversized <<if $activeSlave.buttImplantType == 1>>engorged string<<else>>fillable butt<</if>> implants, and it is completely obvious. Whatever $his position, $his immense ass dominates $his surroundings with its unyielding mass.
+			$He has oversized <<if $activeSlave.buttImplantType == "string">>engorged string<<else>>fillable butt<</if>> implants, and it is completely obvious. Whatever $his position, $his immense ass dominates $his surroundings with its unyielding mass.
 		<</if>>
 	<</if>>
 	<<if $arcologies[0].FSTransformationFetishist != "unset">>
@@ -17137,6 +17137,8 @@ $His womb contains <<= num(_slaveWD.litters.length)>> separate pregnancies;
 				They're very minimal.
 			<</if>>
 		<</switch>>
+	<<elseif $activeSlave.boobShape == "deflated">>
+		/* WIP */
 	<<elseif ($activeSlave.boobsImplant <= 400)>>
 		<<if ($activeSlave.boobs > 800)>>
 			$He has <<print $activeSlave.boobsImplant>>cc breast implants. $His tits look fairly natural, but defy gravity more than could be expected given their size.
@@ -17163,11 +17165,11 @@ $His womb contains <<= num(_slaveWD.litters.length)>> separate pregnancies;
 		<</if>>
 	<<else>>
 		<<if ($activeSlave.boobs > 2000)>>
-			$He has <<print $activeSlave.boobsImplant>>cc <<if $activeSlave.boobsImplantType == 1>>engorged string<<else>>fillable breast<</if>> implants, which is obvious from the unnatural size of $his boobs.
+			$He has <<print $activeSlave.boobsImplant>>cc <<if $activeSlave.boobsImplantType == "string">>engorged string<<else>>fillable breast<</if>> implants, which is obvious from the unnatural size of $his boobs.
 		<<elseif $activeSlave.boobs - $activeSlave.boobsImplant > 800>>
-			$He has <<print $activeSlave.boobsImplant>>cc <<if $activeSlave.boobsImplantType == 1>>engorged string<<else>>fillable breast<</if>> implants, which is obvious from the roundness of $his fake tits.
+			$He has <<print $activeSlave.boobsImplant>>cc <<if $activeSlave.boobsImplantType == "string">>engorged string<<else>>fillable breast<</if>> implants, which is obvious from the roundness of $his fake tits.
 		<<else>>
-			$He has <<print $activeSlave.boobsImplant>>cc <<if $activeSlave.boobsImplantType == 1>>engorged string<<else>>fillable breast<</if>> implants. They are extremely obvious; with little natural breast tissue to support them, they look like a pair of balloons attached to $his chest.
+			$He has <<print $activeSlave.boobsImplant>>cc <<if $activeSlave.boobsImplantType == "string">>engorged string<<else>>fillable breast<</if>> implants. They are extremely obvious; with little natural breast tissue to support them, they look like a pair of balloons attached to $his chest.
 		<</if>>
 		<<if $arcologies[0].FSTransformationFetishist != "unset">>
 			<<if $activeSlave.boobsImplant > 0>>