diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index eabbe801fc77140bd94c81fb153d3a2ad0c7de5f..2f440a2b8e484e47cf2293f54051bf579f554339 100644
--- a/slave variables documentation - Pregmod.txt	
+++ b/slave variables documentation - Pregmod.txt	
@@ -1599,8 +1599,8 @@ accepts int
 150	 - calf-length
 149-100 - ass-length
 99-30   - long
-29-10   - shoulder-length
-9-0	 - short
+29-15   - shoulder-length
+14-0	- short
 
 hStyle:
 
diff --git a/src/npc/databases/cheatmodeDatabase.tw b/src/npc/databases/cheatmodeDatabase.tw
index d550222a3d2ab5a45f2c6519b252caae54372760..fd3571b09d0151f82f39af59a847d8fe044c9f62 100644
--- a/src/npc/databases/cheatmodeDatabase.tw
+++ b/src/npc/databases/cheatmodeDatabase.tw
@@ -19,7 +19,9 @@
 	_HS.ageImplant = 1,
 	setHealth(_HS, 50),
 	_HS.devotion = 100,
+	_HS.nationality = "Stateless",
 	_HS.height = 175,
+	_HS.race = "white",
 	_HS.eye.origColor = "green",
 	_HS.origHColor = "honey blonde",
 	_HS.origSkin = "pale",
@@ -60,7 +62,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.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.">>
+<<set _HS.slaveName = "Cornelia", _HS.birthName = "Cora", _HS.ID = 990001, _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.nationality = "Stateless", _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>>
@@ -70,7 +72,7 @@
 //_HS.slaveName,//
 
 <<set _HS = clone($activeSlave)>>
-<<set _HS.slaveName = "Sheba", _HS.birthName = "Shaneequa", _HS.ID = 990002, _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>>
+<<set _HS.slaveName = "Sheba", _HS.birthName = "Shaneequa", _HS.ID = 990002, _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 = 60, _HS.nationality = "Stateless", _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>>
@@ -80,7 +82,7 @@
 //_HS.slaveName,//
 
 <<set _HS = clone($activeSlave)>>
-<<set _HS.slaveName = "Cornflower", _HS.birthName = "Alysa", _HS.ID = 990003, _HS.relationship = 3, _HS.relationshipTarget = 990005, _HS.assignment = "get milked", _HS.birthWeek = random(0,51), setHealth(_HS, 20), _HS.devotion = 12, _HS.muscles = 50, _HS.height = 190, _HS.race = "black", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "brown", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.pubicHStyle = "waxed", _HS.waist = -100, _HS.heels = 1, _HS.voice = 0, _HS.boobs = 6000, _HS.nipples = "huge", _HS.areolae = 2, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 3, _HS.buttTat = "bovine patterns", _HS.face = 15, _HS.lips = 35, _HS.lipsTat = "bovine patterns", _HS.anus = 3, _HS.anusTat = "bovine patterns", _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.nosePiercing = 2, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.skill.oral = 15, _HS.skill.anal = 35, _HS.energy = 65, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1, _HS.custom.tattoo = "A pretty blue cornflower is tattooed on each of $his cheeks.", _HS.custom.desc = "$He once spoke with the demeaning accent of slaves from the Old South.", _HS.mother = 990005>>
+<<set _HS.slaveName = "Cornflower", _HS.birthName = "Alysa", _HS.ID = 990003, _HS.relationship = 3, _HS.relationshipTarget = 990005, _HS.assignment = "get milked", _HS.birthWeek = random(0,51), setHealth(_HS, 20), _HS.devotion = 60, _HS.nationality = "Stateless", _HS.muscles = 50, _HS.height = 190, _HS.race = "black", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "brown", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.pubicHStyle = "waxed", _HS.waist = -100, _HS.heels = 1, _HS.voice = 0, _HS.boobs = 6000, _HS.nipples = "huge", _HS.areolae = 2, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 3, _HS.buttTat = "bovine patterns", _HS.face = 15, _HS.lips = 35, _HS.lipsTat = "bovine patterns", _HS.anus = 3, _HS.anusTat = "bovine patterns", _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.nosePiercing = 2, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.skill.oral = 15, _HS.skill.anal = 35, _HS.energy = 65, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1, _HS.custom.tattoo = "A pretty blue cornflower is tattooed on each of $his cheeks.", _HS.custom.desc = "$He once spoke with the demeaning accent of slaves from the Old South.", _HS.mother = 990005>>
 <<if $seeDicks != 100>>
 	<<set _HS.genes = "XX", _HS.vagina = 1, _HS.vaginaTat = "bovine patterns", _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.pubertyXX = 1>>
 <<else>>
@@ -90,7 +92,7 @@
 //_HS.slaveName,//
 
 <<set _HS = clone($activeSlave)>>
-<<set _HS.slaveName = "Miss Lily", _HS.birthName = "Lillian", _HS.ID = 990004, _HS.assignment = "guard you", _HS.birthWeek = random(0,51), setHealth(_HS, 20), _HS.devotion = 30, _HS.muscles = 50, _HS.height = 175, _HS.eye.origColor = "green", _HS.origHColor = "straw blonde", _HS.origSkin = "pale", _HS.hLength = 40, _HS.hStyle = "in a short ponytail", _HS.waist = -55, _HS.boobs = 600, _HS.butt = 3, _HS.face = 15, _HS.lips = 35, _HS.preg = -2, _HS.anus = 2, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.anal = 35, _HS.skill.combat = 1, _HS.energy = 65, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.custom.tattoo = "'Miss Lily' is tattooed in lovely flowing script over $his collarbone.", _HS.custom.desc = "$He once spoke with the rich accent of the Old South.", _HS.mother = 990000>>
+<<set _HS.slaveName = "Miss Lily", _HS.birthName = "Lillian", _HS.ID = 990004, _HS.assignment = "guard you", _HS.birthWeek = random(0,51), setHealth(_HS, 20), _HS.devotion = 30, _HS.nationality = "Stateless", _HS.muscles = 50, _HS.height = 175, _HS.race = "white", _HS.eye.origColor = "green", _HS.origHColor = "straw blonde", _HS.origSkin = "pale", _HS.hLength = 40, _HS.hStyle = "in a short ponytail", _HS.waist = -55, _HS.boobs = 600, _HS.butt = 3, _HS.face = 15, _HS.lips = 35, _HS.preg = -2, _HS.anus = 2, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.anal = 35, _HS.skill.combat = 1, _HS.energy = 65, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.custom.tattoo = "'Miss Lily' is tattooed in lovely flowing script over $his collarbone.", _HS.custom.desc = "$He once spoke with the rich accent of the Old South.", _HS.mother = 990000>>
 <<if $seeDicks != 100>>
 	<<set _HS.genes = "XX", _HS.ovaries = 1, _HS.pubertyXX = 1>>
 <<else>>
@@ -101,7 +103,7 @@
 //_HS.slaveName,//
 
 <<set _HS = clone($activeSlave)>>
-<<set _HS.slaveName = "Lilac", _HS.birthName = "Lillian", _HS.ID = 990005, _HS.relationship = 3, _HS.relationshipTarget = 990003, _HS.assignment = "get milked", _HS.birthWeek = random(0,51), _HS.actualAge = 36, _HS.physicalAge = 36, _HS.visualAge = 36, _HS.ovaryAge = 36, setHealth(_HS, 20), _HS.devotion = 12, _HS.muscles = 50, _HS.height = 190, _HS.race = "black", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "brown", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.heels = 1, _HS.boobs = 8000, _HS.nipples = "huge", _HS.areolae = 2, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 4, _HS.buttTat = "bovine patterns", _HS.face = 15, _HS.lips = 35, _HS.lipsTat = "bovine patterns", _HS.anus = 3, _HS.anusTat = "bovine patterns", _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.nosePiercing = 2, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.skill.oral = 15, _HS.skill.anal = 35, _HS.energy = 65, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1, _HS.custom.tattoo = "A pretty purple lilac is tattooed on each of $his cheeks.", _HS.custom.desc = "$He once spoke with the demeaning accent of slaves from the Old South.">>
+<<set _HS.slaveName = "Lilac", _HS.birthName = "Lillian", _HS.ID = 990005, _HS.relationship = 3, _HS.relationshipTarget = 990003, _HS.assignment = "get milked", _HS.birthWeek = random(0,51), _HS.actualAge = 36, _HS.physicalAge = 36, _HS.visualAge = 36, _HS.ovaryAge = 36, setHealth(_HS, 20), _HS.devotion = 60, _HS.nationality = "Stateless", _HS.muscles = 50, _HS.height = 190, _HS.race = "black", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "brown", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.heels = 1, _HS.boobs = 8000, _HS.nipples = "huge", _HS.areolae = 2, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 4, _HS.buttTat = "bovine patterns", _HS.face = 15, _HS.lips = 35, _HS.lipsTat = "bovine patterns", _HS.anus = 3, _HS.anusTat = "bovine patterns", _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.nosePiercing = 2, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.skill.oral = 15, _HS.skill.anal = 35, _HS.energy = 65, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1, _HS.custom.tattoo = "A pretty purple lilac is tattooed on each of $his cheeks.", _HS.custom.desc = "$He once spoke with the demeaning accent of slaves from the Old South.">>
 <<if $seeDicks != 100>>
 	<<set _HS.genes = "XX", _HS.vagina = 1, _HS.vaginaTat = "bovine patterns", _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.pubertyXX = 1>>
 <<else>>
diff --git a/src/npc/databases/dSlavesDatabase.js b/src/npc/databases/dSlavesDatabase.js
index 4fdc9a9cde1fc55fc4593645b2c88f3a674400d3..9fe6b3e5c7f092181899a347e3a52c5eb6b346c0 100644
--- a/src/npc/databases/dSlavesDatabase.js
+++ b/src/npc/databases/dSlavesDatabase.js
@@ -16,7 +16,7 @@ App.Data.HeroSlaves.D = [
 		origHColor: "chestnut",
 		pubicHColor: "chestnut",
 		hLength: 30,
-		hStyle: "shoulder-length and in a bun",
+		hStyle: "bun",
 		boobs: 700,
 		butt: 3,
 		vagina: 1,
@@ -46,7 +46,7 @@ App.Data.HeroSlaves.D = [
 		}
 	},
 	/* maid dress, Excellent house slave, Will return if sold*/
-	/* Added origin, tweaked stats, made $him Submissive -BoneyM*/
+	/* Added origin, tweaked stats, made her Submissive -BoneyM*/
 	{
 		ID: 900002,
 		slaveName: "Red",
@@ -57,11 +57,13 @@ App.Data.HeroSlaves.D = [
 		ovaryAge: 22,
 		health: {condition: 20},
 		devotion: 100,
+		race: "white",
 		eye: {origColor: "blue"},
 		origHColor: "red",
 		pubicHColor: "red",
 		origSkin: "light",
-		hStyle: "long and tied back",
+		hLength: 60,
+		hStyle: "ponytail",
 		boobs: 400,
 		butt: 2,
 		vaginaLube: 1,
@@ -79,10 +81,12 @@ App.Data.HeroSlaves.D = [
 		origin: "$He grew up sheltered and submissive, making $him an easy target for enslavement.",
 		health: {condition: 20},
 		devotion: -25,
+		race: "white",
 		origHColor: "light brown",
 		pubicHColor: "light brown",
 		origSkin: "pale",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		boobs: 650,
 		butt: 3,
 		vaginaLube: 1,
@@ -109,7 +113,8 @@ App.Data.HeroSlaves.D = [
 		muscles: 20,
 		race: "white",
 		origHColor: "red",
-		hStyle: "long and wild",
+		hLength: 60,
+		hStyle: "wild",
 		boobs: 500,
 		butt: 2,
 		vagina: 1,
@@ -137,11 +142,12 @@ App.Data.HeroSlaves.D = [
 		birthName: "Luna",
 		health: {condition: 20},
 		height: 157,
+		race: "white",
 		origHColor: "black",
 		pubicHColor: "black",
 		origSkin: "pale",
 		hLength: 20,
-		hStyle: "chin-length with bangs over one eye",
+		hStyle: "styled with $his bangs covering one eye",
 		boobs: 650,
 		boobsImplant: 600,
 		boobsImplantType: "normal",
@@ -177,11 +183,12 @@ App.Data.HeroSlaves.D = [
 		devotion: 20,
 		weight: -20,
 		height: 155,
+		race: "white",
 		origHColor: "black",
 		pubicHColor: "black",
 		origSkin: "pale",
 		hLength: 40,
-		hStyle: "chest-length",
+		hStyle: "neat",
 		boobs: 500,
 		butt: 2,
 		vagina: 1,
@@ -207,6 +214,7 @@ App.Data.HeroSlaves.D = [
 		health: {condition: 20},
 		devotion: -75,
 		weight: -20,
+		race: "white",
 		eye: {origColor: "green"},
 		origHColor: "dirty blonde",
 		pubicHColor: "dirty blonde",
@@ -238,6 +246,7 @@ App.Data.HeroSlaves.D = [
 		health: {condition: 20},
 		devotion: 20,
 		height: 175,
+		race: "white",
 		eye: {origColor: "grey"},
 		origHColor: "dirty blonde",
 		pubicHColor: "dirty blonde",
@@ -281,7 +290,8 @@ App.Data.HeroSlaves.D = [
 		origHColor: "black",
 		pubicHColor: "black",
 		origSkin: "black",
-		hStyle: "long and curly",
+		hLength: 60,
+		hStyle: "curly",
 		boobs: 1400,
 		boobsImplant: 800,
 		boobsImplantType: "normal",
@@ -334,7 +344,7 @@ App.Data.HeroSlaves.D = [
 		pubicHColor: "red",
 		race: "white",
 		hLength: 25,
-		hStyle: "short and in a ponytail",
+		hStyle: "ponytail",
 		boobs: 800,
 		butt: 3,
 		vagina: 1,
@@ -377,11 +387,13 @@ App.Data.HeroSlaves.D = [
 		health: {condition: 20},
 		devotion: 30,
 		height: 155,
+		race: "white",
 		eye: {origColor: "green"},
 		origHColor: "black",
 		pubicHColor: "black",
 		origSkin: "extremely pale",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		boobs: 300,
 		nipplesPiercing: 1,
 		butt: 3,
@@ -412,13 +424,14 @@ App.Data.HeroSlaves.D = [
 		devotion: 15,
 		weight: -20,
 		height: 152,
+		race: "white",
 		markings: "freckled",
 		eye: {origColor: "blue"},
 		origHColor: "blonde",
 		pubicHColor: "blonde",
 		origSkin: "fair",
 		hLength: 30,
-		hStyle: "shoulder length",
+		hStyle: "neat",
 		boobs: 300,
 		nipplesPiercing: 1,
 		butt: 1,
@@ -492,19 +505,20 @@ App.Data.HeroSlaves.D = [
 		pubicHColor: "blonde",
 		override_Skin: 1,
 		origSkin: "sun tanned",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		boobs: 500,
 		butt: 2,
 		vaginaLube: 1,
 		ovaries: 1,
 		skill: {
 			combat: 1,
-			intelligence: 20,
-			intelligenceImplant: 30,
-			attrXY: 40,
-			fetish: "humiliation",
-			behavioralFlaw: "arrogant"
 		},
+		intelligence: 20,
+		intelligenceImplant: 30,
+		attrXY: 40,
+		fetish: "humiliation",
+		behavioralFlaw: "arrogant"
 		/* fighter*/
 		/* Added combat skill, changed eye color and rules, added origin, added arrogant -BoneyM*/
 	},
@@ -520,11 +534,13 @@ App.Data.HeroSlaves.D = [
 		health: {condition: 20},
 		devotion: -100,
 		weight: 40,
+		race: "white",
 		eye: {origColor: "blue"},
 		origHColor: "red",
 		pubicHColor: "red",
 		origSkin: "pale",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "messy",
 		boobs: 800,
 		face: 15,
 		vaginaLube: 1,
@@ -593,7 +609,7 @@ App.Data.HeroSlaves.D = [
 		hColor: "light purple",
 		pubicHColor: "light purple",
 		hLength: 10,
-		hStyle: "short",
+		hStyle: "messy bun",
 		boobs: 500,
 		butt: 3,
 		buttTat: "tribal patterns",
@@ -657,6 +673,7 @@ App.Data.HeroSlaves.D = [
 		health: {condition: 20},
 		devotion: -50,
 		weight: -20,
+		race: "white",
 		eye: {origColor: "amber"},
 		origHColor: "brown",
 		override_H_Color: 1,
@@ -664,7 +681,8 @@ App.Data.HeroSlaves.D = [
 		hColor: "purple",
 		pubicHColor: "purple",
 		origSkin: "pale",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		boobs: 400,
 		butt: 3,
 		vaginaLube: 1,
@@ -688,7 +706,9 @@ App.Data.HeroSlaves.D = [
 		health: {condition: 20},
 		devotion: -75,
 		height: 175,
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
+		race: "white",
 		origHColor: "brown",
 		pubicHColor: "brown",
 		origSkin: "pale",
@@ -725,11 +745,12 @@ App.Data.HeroSlaves.D = [
 		devotion: 100,
 		muscles: 100,
 		height: 175,
+		race: "white",
 		eye: {origColor: "green"},
 		override_Skin: 1,
 		origSkin: "sun tanned",
 		hLength: 30,
-		hStyle: "shoulder length",
+		hStyle: "neat",
 		boobs: 650,
 		boobsImplant: 600,
 		boobsImplantType: "normal",
@@ -812,6 +833,7 @@ App.Data.HeroSlaves.D = [
 		health: {condition: 20},
 		devotion: 100,
 		height: 178,
+		race: "white",
 		origHColor: "brown",
 		pubicHColor: "brown",
 		origSkin: "white",
@@ -885,7 +907,8 @@ App.Data.HeroSlaves.D = [
 		origHColor: "strawberry blonde",
 		pubicHColor: "strawberry blonde",
 		origSkin: "white",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "luxurious",
 		boobs: 650,
 		butt: 3,
 		vagina: 1,
@@ -914,10 +937,12 @@ App.Data.HeroSlaves.D = [
 		health: {condition: 20},
 		devotion: 15,
 		height: 175,
+		race: "white",
 		eye: {origColor: "blue"},
 		origHColor: "brown",
 		pubicHColor: "brown",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		boobs: 1000,
 		boobsImplant: 600,
 		boobsImplantType: "normal",
@@ -938,7 +963,10 @@ App.Data.HeroSlaves.D = [
 		intelligence: 30,
 		attrXX: 80,
 		attrXY: 80,
-		fetishKnown: 1
+		fetishKnown: 1,
+		geneticQuirks: {
+			heterochromia: "green"
+		}
 	},
 	/* heterochromia*/
 	/* Tweaked face upwards, changed eye color, changed health from 20 to 6 -BoneyM*/
@@ -991,11 +1019,12 @@ App.Data.HeroSlaves.D = [
 		health: {condition: 20},
 		devotion: 25,
 		height: 175,
+		race: "white",
 		origHColor: "brown",
 		pubicHColor: "brown",
 		origSkin: "white",
 		hLength: 35,
-		hStyle: "shoulder length",
+		hStyle: "neat",
 		boobs: 1000,
 		butt: 4,
 		vagina: 2,
@@ -1033,7 +1062,7 @@ App.Data.HeroSlaves.D = [
 		origSkin: "ebony",
 		race: "black",
 		hLength: 10,
-		hStyle: "short afro",
+		hStyle: "afro",
 		boobs: 1000,
 		nipplesPiercing: 2,
 		butt: 4,
@@ -1066,8 +1095,8 @@ App.Data.HeroSlaves.D = [
 		origHColor: "blonde",
 		pubicHColor: "blonde",
 		origSkin: "white",
-		hLength: 40,
-		hStyle: "long curls back in a ponytail",
+		hLength: 60,
+		hStyle: "curly and tied back in a ponytail",
 		boobs: 400,
 		butt: 1,
 		vagina: 2,
@@ -1099,9 +1128,11 @@ App.Data.HeroSlaves.D = [
 		health: {condition: 20},
 		devotion: -75,
 		height: 157,
+		race: "white",
 		eye: {origColor: "blue"},
 		origSkin: "pale",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		waist: -55,
 		boobs: 1200,
 		butt: 3,
@@ -1129,10 +1160,11 @@ App.Data.HeroSlaves.D = [
 		devotion: 60,
 		weight: -20,
 		height: 155,
+		race: "white",
 		eye: {origColor: "blue"},
 		origSkin: "pale",
 		hLength: 30,
-		hStyle: "shoulder length",
+		hStyle: "neat",
 		boobs: 400,
 		butt: 4,
 		vagina: 1,
@@ -1164,10 +1196,11 @@ App.Data.HeroSlaves.D = [
 		health: {condition: 20},
 		devotion: 60,
 		race: "white",
-		origHColor: "brunette",
-		pubicHColor: "brunette",
+		origHColor: "brown",
+		pubicHColor: "brown",
 		origSkin: "fair",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		boobs: 500,
 		butt: 3,
 		vagina: 2,
@@ -1201,7 +1234,7 @@ App.Data.HeroSlaves.D = [
 		pubicHColor: "black",
 		origSkin: "light olive",
 		hLength: 80,
-		hStyle: "very long",
+		hStyle: "neat",
 		boobs: 650,
 		boobsImplant: 600,
 		boobsImplantType: "normal",
@@ -1273,10 +1306,12 @@ App.Data.HeroSlaves.D = [
 		health: {condition: 20},
 		devotion: 60,
 		height: 155,
+		race: "white",
 		origHColor: "black",
 		pubicHColor: "black",
 		origSkin: "white",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		boobs: 300,
 		vagina: 1,
 		vaginaLube: 1,
@@ -1290,7 +1325,19 @@ App.Data.HeroSlaves.D = [
 		attrXY: 40,
 		fetishKnown: 1,
 		custom: {desc: "$He has a scar on $his abdomen from kidney surgery in $his youth."},
-		sexualFlaw: "crude"
+		sexualFlaw: "crude",
+		scar: {
+			"stomach": {
+				burn: 0,
+				chain: 0,
+				cutting: 0,
+				exotic: 0,
+				generic: 0,
+				surgical: 1,
+				menacing: 0,
+				whip: 0
+			}
+		}
 	},
 	/* sexual one-upper*/
 	/* Changed eyes, added scar -BoneyM*/
@@ -1311,7 +1358,8 @@ App.Data.HeroSlaves.D = [
 		origHColor: "black",
 		hColor: "black with blue highlights",
 		origSkin: "white",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		boobs: 400,
 		butt: 2,
 		lipsPiercing: 1,
@@ -1347,8 +1395,8 @@ App.Data.HeroSlaves.D = [
 		pubicHColor: "blue",
 		override_Skin: 1,
 		origSkin: "spray tanned",
-		hLength: 30,
-		hStyle: "short, spiky, with a long shoulder-length lock leading from $his temples down, one on each side",
+		hLength: 10,
+		hStyle: "short, spiky, and with a long shoulder-length lock leading from $his temples down, one on each side",
 		boobs: 650,
 		vagina: 1,
 		vaginaLube: 1,
@@ -1369,11 +1417,23 @@ App.Data.HeroSlaves.D = [
 		eye: {
 			origColor: "blue-green",
 			left: {
-				vision: 0
+				vision: 2
 			},
 			right: {
 				vision: 0
 			}
+		},
+		scar: {
+			"right eye": {
+				burn: 0,
+				chain: 0,
+				cutting: 0,
+				exotic: 0,
+				generic: 2,
+				surgical: 0,
+				menacing: 0,
+				whip: 0
+			}
 		}
 	},
 	/* Added combat skill, increased health, added origin -BoneyM*/
@@ -1393,7 +1453,8 @@ App.Data.HeroSlaves.D = [
 		origHColor: "red",
 		pubicHColor: "red",
 		origSkin: "white",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		boobs: 400,
 		butt: 3,
 		vagina: 1,
@@ -1416,6 +1477,38 @@ App.Data.HeroSlaves.D = [
 			left: {
 				type: 2
 			}
+		},
+		scar: {
+			"temple": {
+				burn: 1,
+				chain: 0,
+				cutting: 0,
+				exotic: 0,
+				generic: 0,
+				surgical: 0,
+				menacing: 0,
+				whip: 0
+			},
+			"right thigh": {
+				burn: 0,
+				chain: 0,
+				cutting: 0,
+				exotic: 0,
+				generic: 2,
+				surgical: 0,
+				menacing: 0,
+				whip: 0
+			},
+			"left shoulder": {
+				burn: 0,
+				chain: 0,
+				cutting: 0,
+				exotic: 0,
+				generic: 2,
+				surgical: 0,
+				menacing: 0,
+				whip: 0
+			}
 		}
 	},
 	/* missing left leg, burn scar, low sex drive, fighter*/
@@ -1436,7 +1529,8 @@ App.Data.HeroSlaves.D = [
 		eye: {origColor: "blue"},
 		origHColor: "bleached blonde",
 		pubicHColor: "bleached blonde",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		boobs: 400,
 		butt: 2,
 		vagina: 1,
@@ -1461,10 +1555,12 @@ App.Data.HeroSlaves.D = [
 		devotion: 35,
 		height: 165,
 		muscles: 20,
+		race: "white",
 		origHColor: "black",
 		pubicHColor: "black",
 		origSkin: "white",
-		hStyle: "short",
+		hLength: 10,
+		hStyle: "neat",
 		pubicHStyle: "bushy",
 		boobs: 400,
 		butt: 3,
@@ -1498,6 +1594,7 @@ App.Data.HeroSlaves.D = [
 		health: {condition: 40},
 		devotion: 100,
 		height: 190,
+		nationality: "Irish",
 		markings: "freckled",
 		race: "white",
 		eye: {origColor: "green"},
@@ -1541,7 +1638,8 @@ App.Data.HeroSlaves.D = [
 		origHColor: "black",
 		pubicHColor: "black",
 		origSkin: "ebony",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "cornrows",
 		boobs: 800,
 		nipplesPiercing: 1,
 		butt: 4,
@@ -1591,7 +1689,8 @@ App.Data.HeroSlaves.D = [
 		origHColor: "golden",
 		pubicHColor: "golden",
 		origSkin: "pale",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "luxurious",
 		boobs: 800,
 		nipplesPiercing: 1,
 		butt: 4,
@@ -1624,6 +1723,7 @@ App.Data.HeroSlaves.D = [
 		devotion: 75,
 		weight: -20,
 		height: 180,
+		race: "white",
 		origHColor: "black",
 		pubicHStyle: "black",
 		origSkin: "pale",
@@ -1706,6 +1806,7 @@ App.Data.HeroSlaves.D = [
 		ovaryAge: 34,
 		health: {condition: 20},
 		devotion: -75,
+		race: "amerindian",
 		override_Skin: 1,
 		origSkin: "sun tanned",
 		hLength: 25,
@@ -1736,7 +1837,8 @@ App.Data.HeroSlaves.D = [
 		origHColor: "strawberry blonde",
 		pubicHColor: "strawberry blonde",
 		origSkin: "white",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		boobs: 650,
 		butt: 5,
 		vagina: 1,
@@ -1770,10 +1872,12 @@ App.Data.HeroSlaves.D = [
 		health: {condition: 20},
 		devotion: 40,
 		weight: 20,
+		reace: "white",
 		origHColor: "black",
 		pubicHColor: "black",
 		origSkin: "light",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		boobs: 800,
 		vagina: 2,
 		vaginaLube: 1,
@@ -1822,6 +1926,23 @@ App.Data.HeroSlaves.D = [
 		custom: {
 			desc: "$He has many scars, including one over $his blind left eye."
 		},
+		eye: {
+			left: {
+				vision: 0
+			}
+		},
+		scar: {
+			"left eye": {
+				burn: 0,
+				chain: 0,
+				cutting: 0,
+				exotic: 0,
+				generic: 2,
+				surgical: 0,
+				menacing: 0,
+				whip: 0
+			}
+		}
 	},
 	/* Increased health, added origin, fixed customdesc syntax -BoneyM*/
 	{
@@ -1838,7 +1959,7 @@ App.Data.HeroSlaves.D = [
 		origHColor: "black",
 		pubicHColor: "black",
 		hLength: 15,
-		hStyle: "short, with the left side shaved",
+		hStyle: "shaved on the left",
 		boobs: 500,
 		butt: 4,
 		buttImplant: 1,
@@ -1875,8 +1996,8 @@ App.Data.HeroSlaves.D = [
 		origHColor: "blonde",
 		pubicHColor: "blonde",
 		origSkin: "pale",
-		hLength: 80,
-		hStyle: "ass-length",
+		hLength: 100,
+		hStyle: "neat",
 		boobs: 300,
 		butt: 1,
 		vagina: 1,
@@ -1915,7 +2036,8 @@ App.Data.HeroSlaves.D = [
 		race: "white",
 		eye: {origColor: "blue"},
 		origSkin: "fair",
-		hStyle: "long and braided",
+		hLength: 60,
+		hStyle: "braided",
 		boobs: 800,
 		butt: 4,
 		vagina: 2,
@@ -1953,7 +2075,7 @@ App.Data.HeroSlaves.D = [
 		origHColor: "brown",
 		hColor: "pale blonde",
 		hLength: 95,
-		hStyle: "ass length",
+		hStyle: "neat",
 		boobs: 300,
 		butt: 3,
 		buttTat: "degradation",
@@ -1979,7 +2101,7 @@ App.Data.HeroSlaves.D = [
 		ovaryAge: 21,
 		health: {condition: 20},
 		devotion: 60,
-		hStyle: "long",
+		hStyle: "neat",
 		boobs: 500,
 		nipplesPiercing: 1,
 		butt: 3,
@@ -2014,7 +2136,8 @@ App.Data.HeroSlaves.D = [
 		origHColor: "dark brown",
 		pubicHColor: "dark brown",
 		origSkin: "pale",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		waist: -55,
 		boobs: 500,
 		butt: 3,
@@ -2055,7 +2178,8 @@ App.Data.HeroSlaves.D = [
 		origHColor: "red",
 		hColor: "bright red",
 		origSkin: "white",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		boobs: 400,
 		butt: 3,
 		vagina: 1,
@@ -2093,8 +2217,10 @@ App.Data.HeroSlaves.D = [
 		devotion: -25,
 		weight: 20,
 		height: 157,
+		reace: "white",
 		origSkin: "white",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		boobs: 500,
 		nipplesPiercing: 1,
 		butt: 3,
@@ -2145,7 +2271,8 @@ App.Data.HeroSlaves.D = [
 		override_H_Color: 1,
 		origHColor: "white",
 		origSkin: "dark",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "messy",
 		boobs: 500,
 		butt: 3,
 		lips: 35,
@@ -2186,8 +2313,9 @@ App.Data.HeroSlaves.D = [
 		race: "asian",
 		origHColor: "dark",
 		pubicHColor: "dark",
-		origSkin: "white",
-		hStyle: "long",
+		origSkin: "light",
+		hLength: 60,
+		hStyle: "neat",
 		boobs: 300,
 		nipplesPiercing: 1,
 		butt: 1,
@@ -2355,7 +2483,8 @@ App.Data.HeroSlaves.D = [
 		muscles: 20,
 		height: 180,
 		origHColor: "black",
-		hStyle: "long and in a ponytail",
+		hLength: 60,
+		hStyle: "ponytail",
 		boobs: 500,
 		butt: 3,
 		vagina: 1,
@@ -2385,11 +2514,12 @@ App.Data.HeroSlaves.D = [
 		devotion: 100,
 		height: 178,
 		override_H_Color: 1,
+		race: "middle eastern",
 		origHColor: "white",
 		pubicHColor: "white",
 		origSkin: "bronze",
 		hLength: 25,
-		hStyle: "chin length",
+		hStyle: "neat",
 		boobs: 500,
 		nipples: "inverted",
 		nipplesPiercing: 1,
@@ -2464,7 +2594,8 @@ App.Data.HeroSlaves.D = [
 		pubicHColor: "blonde",
 		underArmHColor: "blonde",
 		origSkin: "brown",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		boobs: 400,
 		butt: 2,
 		vagina: 1,
@@ -2489,7 +2620,8 @@ App.Data.HeroSlaves.D = [
 		origHColor: "pink",
 		pubicHColor: "pink",
 		origSkin: "white",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		boobs: 1400,
 		nipplesPiercing: 1,
 		butt: 4,
@@ -2527,7 +2659,8 @@ App.Data.HeroSlaves.D = [
 		pubicHColor: "black",
 		underArmHColor: "black",
 		origSkin: "brown",
-		hStyle: "long, but shaved on the left side",
+		hLength: 60,
+		hStyle: "shaved on the left side",
 		boobs: 1200,
 		butt: 4,
 		vaginaLube: 1,
@@ -2568,7 +2701,8 @@ App.Data.HeroSlaves.D = [
 		origHColor: "blonde",
 		pubicHColor: "blonde",
 		origSkin: "white",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		pubicHStyle: "neat",
 		boobs: 300,
 		nipplesPiercing: 1,
@@ -2616,7 +2750,8 @@ App.Data.HeroSlaves.D = [
 		pubicHColor: "red",
 		underArmHColor: "red",
 		origSkin: "white",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		boobs: 400,
 		butt: 2,
 		vagina: 1,
@@ -2655,7 +2790,8 @@ App.Data.HeroSlaves.D = [
 		origHColor: "blonde",
 		pubicHColor: "blonde",
 		origSkin: "white",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		boobs: 400,
 		butt: 3,
 		lips: 35,
@@ -2694,8 +2830,8 @@ App.Data.HeroSlaves.D = [
 		origHColor: "red",
 		hColor: "bright red",
 		origSkin: "pure white",
-		hLength: 80,
-		hStyle: "long and wavy, and down past $his ass",
+		hLength: 1200,
+		hStyle: "wavy",
 		waist: -55,
 		boobs: 800,
 		butt: 4,
@@ -2735,13 +2871,15 @@ App.Data.HeroSlaves.D = [
 		devotion: 45,
 		height: 145,
 		race: "asian",
+		nationality: "Japanese",
 		override_Eye_Color: 1,
 		override_H_Color: 1,
 		eye: {origColor: "blue"},
 		origHColor: "blonde",
 		pubicHColor: "blonde",
 		origSkin: "fair",
-		hStyle: "long and curly",
+		hLength: 60,
+		hStyle: "curly",
 		waist: -55,
 		boobs: 1000,
 		butt: 5,
@@ -2772,7 +2910,8 @@ App.Data.HeroSlaves.D = [
 		origHColor: "white-blonde",
 		pubicHColor: "white-blonde",
 		origSkin: "extremely pale",
-		hStyle: "in a long braid",
+		hLength: 60,
+		hStyle: "braided",
 		waist: -55,
 		boobs: 500,
 		butt: 4,
@@ -2805,11 +2944,13 @@ App.Data.HeroSlaves.D = [
 		health: {condition: 20},
 		devotion: 100,
 		height: 190,
+		race: "white",
 		eye: {origColor: "hazel"},
 		origHColor: "blonde",
 		pubicHColor: "blonde",
 		origSkin: "light",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		waist: -55,
 		boobs: 700,
 		nipplesPiercing: 1,
@@ -2840,7 +2981,7 @@ App.Data.HeroSlaves.D = [
 		pubicHColor: "brown",
 		origSkin: "black",
 		hLength: 5,
-		hStyle: "very short and a poor emulation of a military cut",
+		hStyle: "a poor emulation of a military cut",
 		boobs: 250,
 		nipplesPiercing: 1,
 		butt: 5,
@@ -2881,6 +3022,18 @@ App.Data.HeroSlaves.D = [
 		custom: {
 			desc: "Amongst the scars that decorate $his body, one in the shape of a heart can be made out on the top of $his right hand."
 		},
+		scar: {
+			"right hand": {
+				burn: 0,
+				chain: 0,
+				cutting: 0,
+				exotic: 1,
+				generic: 0,
+				menacing: 0,
+				surgical: 0,
+				whip: 0
+			}
+		}
 	},
 	{
 		ID: 900079,
@@ -2894,6 +3047,8 @@ App.Data.HeroSlaves.D = [
 		devotion: 100,
 		muscles: 100,
 		height: 190,
+		nationality: "Slovak",
+		race: "white",
 		override_H_Color: 1,
 		override_Brow_H_Color: 1,
 		override_Arm_H_Color: 1,
@@ -2905,7 +3060,7 @@ App.Data.HeroSlaves.D = [
 		override_Skin: 1,
 		origSkin: "sun tanned",
 		hLength: 100,
-		hStyle: "back in a large ass length braid",
+		hStyle: "braided",
 		pubicHStyle: "bushy",
 		waist: -55,
 		boobs: 400,
@@ -2960,11 +3115,13 @@ App.Data.HeroSlaves.D = [
 		health: {condition: 30},
 		devotion: 60,
 		height: 145,
+		race: "white",
 		origSkin: "pale",
 		eye: {origColor: "violet"},
 		origHColor: "red-blonde",
 		pubicHColor: "red-blonde",
-		hStyle: "waist-length",
+		hLength: 70,
+		hStyle: "neat",
 		waist: -55,
 		boobs: 650,
 		butt: 6,
@@ -2996,7 +3153,7 @@ App.Data.HeroSlaves.D = [
 		health: {condition: 70},
 		devotion: 100,
 		height: 155,
-		markings: "none",
+		race: "white",
 		eye: {origColor: "blue"},
 		origHColor: "blonde",
 		pubicHColor: "blonde",
@@ -3035,6 +3192,7 @@ App.Data.HeroSlaves.D = [
 		attrXY: 40,
 		fetish: "buttslut",
 		fetishKnown: 1,
+		markings: "freckles",
 		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."
 		},
@@ -3113,13 +3271,14 @@ App.Data.HeroSlaves.D = [
 		devotion: 100,
 		muscles: 20,
 		height: 190,
+		race: "white",
 		eye: {origColor: "green"},
 		origHColor: "red",
 		override_H_Color: 1,
 		hColor: "deep red",
 		origSkin: "fair",
-		hLength: 20,
-		hStyle: "short and pleasantly frames $his face",
+		hLength: 10,
+		hStyle: "pleasantly frames $his face",
 		waist: -55,
 		boobs: 900,
 		butt: 4,
@@ -3146,6 +3305,18 @@ App.Data.HeroSlaves.D = [
 		custom: {
 			tattoo: "$He has a small, grinning harlequin tattoo on $his inner thigh.",
 			desc: "In place of $his left hand's pinkie finger is a large pink scar that crosses the entire back of $his hand."
+		},
+		scar: {
+			"left hand": {
+				burn: 0,
+				chain: 0,
+				cutting: 0,
+				exotic: 0,
+				generic: 2,
+				menacing: 0,
+				surgical: 0,
+				whip: 0
+			}
 		}
 	},
 	{
@@ -3161,11 +3332,13 @@ App.Data.HeroSlaves.D = [
 		muscles: 75,
 		height: 145,
 		race: "white",
+		nationality: "Russian",
 		eye: {origColor: "blue"},
 		origHColor: "blonde",
 		pubicHColor: "blonde",
 		origSkin: "pale",
-		hStyle: "tied back into two long braids",
+		hLength: 60,
+		hStyle: "tied back into two braids",
 		boobs: 800,
 		butt: 2.5,
 		face: 15,
@@ -3184,7 +3357,19 @@ App.Data.HeroSlaves.D = [
 		shoes: "heels",
 		attrXY: 40,
 		fetish: "cumslut",
-		custom: {desc: "$He has a long horizontal scar on $his left cheek."}
+		custom: {desc: "$He has a long horizontal scar on $his left cheek."},
+		scar: {
+			"left cheek": {
+				burn: 0,
+				chain: 0,
+				cutting: 0,
+				exotic: 0,
+				generic: 1,
+				menacing: 0,
+				surgical: 0,
+				whip: 0
+			}
+		}
 	},
 	{
 		ID: 900085,
@@ -3197,6 +3382,7 @@ App.Data.HeroSlaves.D = [
 		health: {condition: 80},
 		devotion: 90,
 		height: 155,
+		race: "white",
 		override_H_Color: 1,
 		override_Brow_H_Color: 1,
 		override_Arm_H_Color: 1,
@@ -3206,7 +3392,8 @@ App.Data.HeroSlaves.D = [
 		pubicHColor: "red",
 		underArmHColor: "red",
 		origSkin: "pale",
-		hStyle: "long and disheveled",
+		hLength: 60,
+		hStyle: "disheveled",
 		waist: -55,
 		boobs: 500,
 		nipplesPiercing: 1,
@@ -3291,10 +3478,11 @@ App.Data.HeroSlaves.D = [
 		health: {condition: 100},
 		devotion: 100,
 		muscles: 20,
+		nationality: "Japanese",
 		race: "asian",
 		origSkin: "dark",
-		hLength: 25,
-		hStyle: "short and held back by a white bandana",
+		hLength: 10,
+		hStyle: "held back by a white bandana",
 		boobs: 600,
 		butt: 4,
 		faceImplant: 15,
@@ -3334,11 +3522,13 @@ App.Data.HeroSlaves.D = [
 		weight: 20,
 		height: 155,
 		nationality: "American",
+		race: "white",
 		eye: {origColor: "green"},
 		origHColor: "red",
 		pubicHColor: "red",
 		origSkin: "pale",
-		hStyle: "in a large bun",
+		hLength: 60,
+		hStyle: "bun",
 		pubicHStyle: "in a strip",
 		waist: -55,
 		boobs: 1500,
@@ -3382,8 +3572,10 @@ App.Data.HeroSlaves.D = [
 		health: {condition: 100},
 		devotion: 100,
 		nationality: "American",
+		race: "white",
 		origSkin: "light",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		pubicHStyle: "bushy",
 		waist: -55,
 		boobs: 1350,
@@ -3483,7 +3675,8 @@ App.Data.HeroSlaves.D = [
 		nationality: "Japanese",
 		race: "asian",
 		origHColor: "black",
-		hStyle: "long, tied into a neat ponytail",
+		hLength: 60,
+		hStyle: "tied into a neat ponytail",
 		boobs: 300,
 		butt: 1,
 		face: 15,
@@ -3505,8 +3698,8 @@ App.Data.HeroSlaves.D = [
 		fetishKnown: 1,
 		custom: {
 			tattoo: "$He has a tattoo of falling cherry petals on $his back, starting at $his shoulder blades, down to $his butt.",
-		desc: "$He has a small scar on the back of $his right hand. $He was injured while participating in the finals of a national kendo tournament, and decided to keep the scar to remind $him of $his achievements."
-	},
+			desc: "$He has a small scar on the back of $his right hand. $He was injured while participating in the finals of a national kendo tournament, and decided to keep the scar to remind $him of $his achievements."
+		},
 		career: "a kunoichi"
 	},
 	{
@@ -3525,7 +3718,8 @@ App.Data.HeroSlaves.D = [
 		race: "asian",
 		pubicHColor: "black",
 		origSkin: "pale",
-		hStyle: "long, but tied into Chinese buns.",
+		hLength: 60,
+		hStyle: "tied into Chinese buns.",
 		pubicHStyle: "in a strip",
 		boobs: 755,
 		butt: 4,
@@ -3570,8 +3764,8 @@ App.Data.HeroSlaves.D = [
 		height: 190,
 		nationality: "Ugandan",
 		race: "black",
-		hLength: 100,
-		hStyle: "extremely long and bushy",
+		hLength: 150,
+		hStyle: "bushy",
 		pubicHStyle: "bushy",
 		waist: -55,
 		boobs: 600,
@@ -3634,6 +3828,7 @@ App.Data.HeroSlaves.D = [
 		pubicHColor: "blonde",
 		override_Skin: 1,
 		origSkin: "sun tanned",
+		hLength: 20,
 		hStyle: "braided into pigtails",
 		pubicHStyle: "bushy",
 		waist: -55,
@@ -3672,8 +3867,8 @@ App.Data.HeroSlaves.D = [
 		pubicHColor: "red",
 		override_Skin: 1,
 		origSkin: "sun tanned",
-		hLength: 85,
-		hStyle: "ass-length",
+		hLength: 140,
+		hStyle: "neat",
 		waist: -55,
 		boobs: 650,
 		boobsImplant: 200,
@@ -3727,7 +3922,8 @@ App.Data.HeroSlaves.D = [
 		origHColor: "black",
 		pubicHColor: "black",
 		origSkin: "pale",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		waist: -55,
 		boobs: 7500,
 		nipples: "huge",
@@ -3865,6 +4061,7 @@ App.Data.HeroSlaves.D = [
 		health: {condition: 20},
 		devotion: 60,
 		height: 175,
+		race: "white",
 		origSkin: "white",
 		hLength: 10,
 		boobs: 800,
@@ -3890,6 +4087,7 @@ App.Data.HeroSlaves.Dextreme = [
 		devotion: -50,
 		weight: 20,
 		height: 152,
+		race: "white",
 		override_H_Color: 1,
 		pubicHColor: "purple",
 		origSkin: "pale",
@@ -3923,6 +4121,7 @@ App.Data.HeroSlaves.Dextreme = [
 		ovaryAge: 21,
 		devotion: -75,
 		weight: 20,
+		race: "white",
 		override_Brow_H_Color: 1,
 		override_Arm_H_Color: 1,
 		override_Pubic_H_Color: 1,
@@ -3931,7 +4130,8 @@ App.Data.HeroSlaves.Dextreme = [
 		underArmHColor: "blonde",
 		origSkin: "pale",
 		origHColor: "golden blonde",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		boobs: 400,
 		butt: 2,
 		vagina: 1,
@@ -3970,10 +4170,12 @@ App.Data.HeroSlaves.Dextreme = [
 		devotion: 100,
 		weight: -20,
 		race: "asian",
+		nationality: "Japanese",
 		origHColor: "black",
 		pubicHColor: "black",
 		origSkin: "very fair",
-		hStyle: "long, and in a hime cut",
+		hLength: 60,
+		hStyle: "in a hime cut",
 		boobs: 500,
 		butt: 3,
 		vaginaLube: 1,
@@ -4008,7 +4210,8 @@ App.Data.HeroSlaves.Dextreme = [
 		eye: {origColor: "blue"},
 		origHColor: "red",
 		pubicHColor: "red",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		waist: -100,
 		boobs: 6260,
 		boobsImplant: 4200,
@@ -4184,10 +4387,12 @@ App.Data.HeroSlaves.Dextreme = [
 		health: {condition: -20},
 		devotion: -100,
 		height: 145,
+		race: "white",
 		origHColor: "brown",
 		pubicHColor: "brown",
 		origSkin: "white",
-		hStyle: "long and disheveled",
+		hLength: 60,
+		hStyle: "disheveled",
 		boobs: 400,
 		butt: 2,
 		vaginaLube: 1,
@@ -4212,10 +4417,12 @@ App.Data.HeroSlaves.Dextreme = [
 		devotion: 25,
 		weight: -20,
 		height: 155,
+		race: "white",
 		origHColor: "blonde",
 		pubicHColor: "blonde",
 		origSkin: "white",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		boobs: 300,
 		butt: 1,
 		vagina: 1,
@@ -4251,7 +4458,7 @@ App.Data.HeroSlaves.Dextreme = [
 		pubicHColor: "blonde",
 		origSkin: "white",
 		hLength: 30,
-		hStyle: "shoulder length",
+		hStyle: "neat",
 		heels: 1,
 		boobs: 800,
 		boobsImplant: 600,
@@ -4296,7 +4503,8 @@ App.Data.HeroSlaves.Dextreme = [
 		pubicHColor: "blonde",
 		override_Skin: 1,
 		origSkin: "spray tanned",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		waist: -55,
 		boobs: 800,
 		boobsImplant: 600,
@@ -4379,8 +4587,10 @@ App.Data.HeroSlaves.Dextreme = [
 		health: {condition: 20},
 		devotion: 100,
 		height: 155,
+		race: "white",
 		origSkin: "white",
-		hStyle: "long and in a braid",
+		hLength: 60,
+		hStyle: "braided",
 		boobs: 400,
 		butt: 2,
 		vagina: 1,
@@ -4423,7 +4633,7 @@ App.Data.HeroSlaves.Dextreme = [
 		origHColor: "blonde",
 		origSkin: "pale",
 		hLength: 60,
-		hStyle: "neat, with thick luxurious bangs.",
+		hStyle: "neat, with thick luxurious bangs,",
 		waist: -55,
 		voice: 2,
 		boobs: 300,
@@ -4469,7 +4679,7 @@ App.Data.HeroSlaves.Dextreme = [
 		origHColor: "blonde",
 		origSkin: "pale",
 		hLength: 60,
-		hStyle: "neat, with thick luxurious bangs.",
+		hStyle: "neat, with thick luxurious bangs,",
 		waist: -55,
 		voice: 2,
 		boobs: 500,
diff --git a/src/npc/databases/ddSlavesDatabase.js b/src/npc/databases/ddSlavesDatabase.js
index 2505e1f2846df59b69ce6ca352e07ac98ff3a4d9..4659e96168274e491a8f9f0add374f102aede5e1 100644
--- a/src/npc/databases/ddSlavesDatabase.js
+++ b/src/npc/databases/ddSlavesDatabase.js
@@ -14,8 +14,10 @@ App.Data.HeroSlaves.DD = [
 		ovaryAge: 34,
 		health: {condition: 20},
 		devotion: 100,
+		race: "white",
 		origSkin: "white",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		waist: -55,
 		boobs: 1000,
 		areolae: 1,
@@ -55,7 +57,7 @@ App.Data.HeroSlaves.DD = [
 		pubicHColor: "blonde",
 		origSkin: "pale",
 		hLength: 10,
-		hStyle: "short",
+		hStyle: "neat",
 		boobs: 300,
 		butt: 1,
 		vagina: -1,
@@ -81,7 +83,8 @@ App.Data.HeroSlaves.DD = [
 		ovaryAge: 21,
 		health: {condition: 20, tired: 10},
 		devotion: 75,
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		boobs: 400,
 		butt: 2,
 		vagina: -1,
@@ -110,8 +113,10 @@ App.Data.HeroSlaves.DD = [
 		health: {condition: 20},
 		devotion: 35,
 		height: 175,
+		race: "white",
 		origSkin: "white",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		boobs: 1000,
 		boobsImplant: 600,
 		boobsImplantType: "normal",
@@ -147,7 +152,8 @@ App.Data.HeroSlaves.DD = [
 		health: {condition: 20},
 		height: 152,
 		origHColor: "black",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		boobs: 500,
 		butt: 3,
 		vagina: -1,
@@ -177,6 +183,7 @@ App.Data.HeroSlaves.DD = [
 		devotion: 75,
 		muscles: 20,
 		height: 175,
+		race: "white",
 		origHColor: "blonde",
 		pubicHColor: "blonde",
 		override_Skin: 1,
@@ -218,10 +225,12 @@ App.Data.HeroSlaves.DD = [
 		ovaryAge: 24,
 		health: {condition: 20},
 		height: 175,
+		race: "white",
 		eye: {origColor: "blue"},
 		origHColor: "platinum blonde",
 		origSkin: "pale",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		waist: -55,
 		boobs: 1400,
 		boobsImplant: 1200,
@@ -260,6 +269,7 @@ App.Data.HeroSlaves.DD = [
 		ovaryAge: 19,
 		health: {condition: 20},
 		devotion: 10,
+		race: "white",
 		origHColor: "blonde",
 		pubicHColor: "blonde",
 		origSkin: "white",
@@ -288,9 +298,10 @@ App.Data.HeroSlaves.DD = [
 		origin: "$He was homeless and willing to do anything for food, which in the end resulted in $him becoming a slave.",
 		health: {condition: 20},
 		devotion: 30,
+		race: "white",
 		origSkin: "white",
 		hLength: 10,
-		hStyle: "short",
+		hStyle: "messy",
 		boobs: 300,
 		butt: 1,
 		vagina: -1,
@@ -306,7 +317,47 @@ App.Data.HeroSlaves.DD = [
 		attrXX: 40,
 		attrXY: 40,
 		fetishKnown: 1,
-		custom: {desc: "$He has beautiful eyes and some scars."}
+		custom: {desc: "$He has beautiful eyes and some scars."},
+		scar: {
+			"right arm": {
+				burn: 0,
+				chain: 0,
+				cutting: 0,
+				exotic: 0,
+				generic: 1,
+				menacing: 0,
+				whip: 0
+			},
+			"right breast": {
+				burn: 0,
+				chain: 0,
+				cutting: 0,
+				exotic: 0,
+				generic: 1,
+				menacing: 0,
+				whip: 0
+			},
+			"left buttock": {
+				burn: 0,
+				chain: 0,
+				cutting: 0,
+				exotic: 0,
+				generic: 1,
+				menacing: 0,
+				surgical: 0,
+				whip: 0
+			},
+			"left thigh": {
+				burn: 0,
+				chain: 0,
+				cutting: 0,
+				exotic: 0,
+				generic: 1,
+				menacing: 0,
+				surgical: 0,
+				whip: 0
+			},
+		}
 	},
 	{
 		ID: 800010,
@@ -319,11 +370,12 @@ App.Data.HeroSlaves.DD = [
 		ovaryAge: 20,
 		health: {condition: 20},
 		devotion: -60,
+		race: "white",
 		origHColor: "black",
 		pubicHColor: "black",
 		origSkin: "white",
 		hLength: 10,
-		hStyle: "short",
+		hStyle: "neat",
 		boobs: 300,
 		butt: 1,
 		vagina: -1,
@@ -351,11 +403,13 @@ App.Data.HeroSlaves.DD = [
 		devotion: 25,
 		height: 175,
 		heightImplant: 1,
+		race: "white",
 		eye: {origColor: "blue"},
 		origHColor: "blonde",
 		pubicHColor: "blonde",
 		origSkin: "white",
-		hStyle: "a medium length",
+		hLength: 25,
+		hStyle: "neat",
 		boobs: 300,
 		butt: 5,
 		face: 15,
@@ -388,11 +442,12 @@ App.Data.HeroSlaves.DD = [
 		health: {condition: 20},
 		devotion: 40,
 		height: 175,
+		race: "white",
 		origHColor: "dark brown",
 		pubicHColor: "dark brown",
 		origSkin: "white",
 		hLength: 40,
-		hStyle: "up in a bun",
+		hStyle: "bun",
 		boobs: 300,
 		butt: 5,
 		vagina: -1,
@@ -428,7 +483,7 @@ App.Data.HeroSlaves.DD = [
 		pubicHColor: "black",
 		origSkin: "white",
 		hLength: 140,
-		hStyle: "knee length",
+		hStyle: "luxurious",
 		waist: -55,
 		heels: 1,
 		boobs: 1000,
@@ -471,6 +526,8 @@ App.Data.HeroSlaves.DD = [
 		ovaryAge: 21,
 		health: {condition: 40},
 		devotion: 60,
+		race: "white",
+		nationality: "Irish",
 		markings: "freckled",
 		eye: {origColor: "blue"},
 		origHColor: "red",
@@ -479,6 +536,9 @@ App.Data.HeroSlaves.DD = [
 		hStyle: "long",
 		boobs: 1800,
 		nipplesPiercing: 1,
+		shoulders: -1,
+		waist: -20,
+		hips: 1,
 		butt: 4,
 		lips: 35,
 		vagina: -1,
@@ -506,11 +566,12 @@ App.Data.HeroSlaves.DD = [
 		health: {condition: 20},
 		devotion: 100,
 		height: 155,
+		race: "white",
 		origHColor: "blonde",
 		pubicHColor: "blonde",
 		origSkin: "pale",
-		hLength: 60,
-		hStyle: "shoulder length",
+		hLength: 25,
+		hStyle: "neat",
 		waist: -55,
 		boobs: 600,
 		butt: 2,
@@ -539,6 +600,7 @@ App.Data.HeroSlaves.DD = [
 		ovaryAge: 19,
 		health: {condition: 80},
 		devotion: 100,
+		nationality: "Irish",
 		race: "white",
 		markings: "freckled",
 		eye: {origColor: "green"},
@@ -546,7 +608,7 @@ App.Data.HeroSlaves.DD = [
 		pubicHColor: "red",
 		origSkin: "pale",
 		hLength: 60,
-		hStyle: "long and in a ponytail",
+		hStyle: "ponytail",
 		boobs: 200,
 		butt: 5,
 		lips: 35,
@@ -577,12 +639,13 @@ App.Data.HeroSlaves.DD = [
 		devotion: 60,
 		muscles: 20,
 		height: 190,
+		race: "white",
 		eye: {origColor: "brown"},
 		origHColor: "blonde",
 		pubicHColor: "blonde",
 		origSkin: "white",
 		hLength: 15,
-		hStyle: "short, and in a boyish cut",
+		hStyle: "in a boyish cut",
 		boobs: 300,
 		butt: 1,
 		vagina: -1,
@@ -596,7 +659,9 @@ App.Data.HeroSlaves.DD = [
 		attrXX: 40,
 		attrXY: 40,
 		fetishKnown: 1,
-		custom: {tattoo: "$He has a raised circuitry pattern on the nape of $his neck.", sexualFlaw: "shamefast", career: "a businessman"}
+		sexualFlaw: "shamefast",
+		career: "a businessman",
+		custom: {tattoo: "$He has a raised circuitry pattern on the nape of $his neck."}
 	},
 	{
 		ID: 800018,
@@ -611,12 +676,13 @@ App.Data.HeroSlaves.DD = [
 		devotion: -55,
 		muscles: 20,
 		height: 190,
+		race: "white",
 		eye: {origColor: "bright blue"},
 		origHColor: "white",
 		pubicHColor: "white",
 		origSkin: "extremely pale",
 		hLength: 15,
-		hStyle: "short and in a boyish cut",
+		hStyle: "in a boyish cut",
 		waist: -55,
 		boobs: 100,
 		butt: 4,
@@ -694,7 +760,7 @@ App.Data.HeroSlaves.DD = [
 		pubicHColor: "ashen",
 		origSkin: "brown",
 		hLength: 30,
-		hStyle: "shoulder length",
+		hStyle: "neat",
 		waist: -55,
 		boobs: 1400,
 		butt: 1,
@@ -737,7 +803,7 @@ App.Data.HeroSlaves.DD = [
 		override_Skin: 1,
 		origSkin: "spray tanned",
 		hLength: 60,
-		hStyle: "long and braided into a ponytail",
+		hStyle: "in a braided ponytail",
 		waist: -55,
 		boobs: 200,
 		butt: 8,
@@ -774,13 +840,14 @@ App.Data.HeroSlaves.DD = [
 		genes: "XY",
 		health: {condition: 70},
 		devotion: 100,
+		race: "white",
 		eye: {origColor: "black"},
 		origHColor: "sparkling and shiny golden red",
 		pubicHColor: "blonde",
 		override_Skin: 1,
 		origSkin: "sun tanned",
 		hLength: 60,
-		hStyle: "in thick long heavy braids",
+		hStyle: "in thick, heavy braids",
 		waist: -100,
 		boobs: 9200,
 		boobsImplant: 6000,
@@ -857,11 +924,12 @@ App.Data.HeroSlaves.DD = [
 		devotion: 25,
 		weight: 20,
 		height: 175,
+		race: "white",
 		origHColor: "dark brown",
 		pubicHColor: "brown",
 		origSkin: "pale",
 		hLength: 30,
-		hStyle: "shoulder-length, done up in a ponytail",
+		hStyle: "ponytail",
 		pubicHStyle: "bushy",
 		boobs: 650,
 		nipplesPiercing: 1,
@@ -916,7 +984,7 @@ App.Data.HeroSlaves.DD = [
 		underArmHColor: "red",
 		origSkin: "light",
 		hLength: 30,
-		hStyle: "shoulder-length in a hime cut",
+		hStyle: "in a hime cut",
 		waist: -55,
 		boobs: 250,
 		butt: 3.5,
@@ -963,7 +1031,7 @@ App.Data.HeroSlaves.DD = [
 		pubicHColor: "white",
 		origSkin: "dark",
 		hLength: 60,
-		hStyle: "long and tied in a bun using a pearl chain",
+		hStyle: "tied in a bun using a pearl chain",
 		heels: 1,
 		boobs: 200,
 		butt: 2,
@@ -1068,7 +1136,7 @@ App.Data.HeroSlaves.DD = [
 		pubicHColor: "black",
 		origSkin: "fair",
 		hLength: 50,
-		hStyle: "chest-length, styled up in schoolgirl pigtails with bangs",
+		hStyle: "styled up in schoolgirl pigtails with bangs",
 		boobs: 700,
 		boobsImplant: 400,
 		boobsImplantType: "normal",
@@ -1113,8 +1181,8 @@ App.Data.HeroSlaves.DD = [
 		origHColor: "black",
 		hColor: "onyx black",
 		origSkin: "pale",
-		hLength: 90,
-		hStyle: "ass-length with Nordic braids throughout",
+		hLength: 110,
+		hStyle: "neat with Nordic braids throughout",
 		waist: -55,
 		boobs: 800,
 		butt: 5,
@@ -1168,7 +1236,8 @@ App.Data.HeroSlaves.DD = [
 		origHColor: "black",
 		pubicHColor: "black",
 		origSkin: "pale",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		pubicHStyle: "in a strip",
 		waist: -100,
 		boobs: 10000,
@@ -1295,8 +1364,8 @@ App.Data.HeroSlaves.DD = [
 		pubicHColor: "blonde",
 		override_Skin: 1,
 		origSkin: "spray tanned",
-		hLength: 70,
-		hStyle: "ass-length",
+		hLength: 90,
+		hStyle: "neat",
 		waist: -55,
 		heels: 1,
 		boobs: 1100,
@@ -1357,6 +1426,7 @@ App.Data.HeroSlaves.DDextreme = [
 		devotion: 10,
 		weight: 20,
 		height: 160,
+		race: "white",
 		eye: {
 			origColor: "grey"
 		},
@@ -1364,7 +1434,7 @@ App.Data.HeroSlaves.DDextreme = [
 		pubicHColor: "black",
 		origSkin: "pale",
 		hLength: 30,
-		hStyle: "curly and shoulder length",
+		hStyle: "curly",
 		boobs: 1000,
 		butt: 3,
 		vagina: 1,
@@ -1381,7 +1451,29 @@ App.Data.HeroSlaves.DDextreme = [
 		attrXY: 40,
 		fetish: "submissive",
 		fetishKnown: 1,
-		custom: {desc: "$He has a small scar on $his cheek, and many larger ones on $his back."}
+		custom: {desc: "$He has a small scar on $his cheek, and many larger ones on $his back."},
+		scar: {
+			"left cheek": {
+				burn: 0,
+				chain: 0,
+				cutting: 0,
+				exotic: 0,
+				generic: 1,
+				menacing: 0,
+				surgical: 0,
+				whip: 0
+			},
+			"back": {
+				burn: 0,
+				chain: 0,
+				cutting: 0,
+				exotic: 0,
+				generic: 2,
+				menacing: 0,
+				surgical: 0,
+				whip: 0
+			},
+		}
 	},
 
 	/* tsundere, grey eyes, unhappy to be herm*/
@@ -1395,8 +1487,10 @@ App.Data.HeroSlaves.DDextreme = [
 		origin: "$He was given a sex change in a freak laboratory mix-up, and sold $himself into slavery out of desperation due to a lack of any way to prove $his identity.",
 		health: {condition: 20},
 		height: 175,
+		race: "white",
 		origSkin: "pale",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		boobs: 400,
 		preg: -2,
 		attrXX: 40,
@@ -1426,7 +1520,7 @@ App.Data.HeroSlaves.DDextreme = [
 		pubicHColor: "blonde",
 		origSkin: "pale",
 		hLength: 10,
-		hStyle: "flowing gently just past $his cheek, framing $his face beautifully",
+		hStyle: "beautifully framing $his face",
 		waist: -55,
 		boobs: 500,
 		butt: 3.5,
@@ -1444,6 +1538,7 @@ App.Data.HeroSlaves.DDextreme = [
 		attrXY: 40,
 		fetish: "submissive",
 		fetishKnown: 1,
+		markings: "beauty mark",
 		custom: {desc: "$He has a beauty mark just above $his lip, on an otherwise flawless face."}
 	},
 
@@ -1461,6 +1556,7 @@ App.Data.HeroSlaves.DDextreme = [
 		devotion: -100,
 		muscles: 50,
 		height: 190,
+		race: "white",
 		eye: {origColor: "blue"},
 		origHColor: "black",
 		pubicHColor: "black",
@@ -1507,9 +1603,11 @@ App.Data.HeroSlaves.DDextreme = [
 		health: {condition: 90},
 		devotion: 55,
 		height: 145,
+		race: "white",
 		eye: {origColor: "blue"},
 		origSkin: "fair",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		pubicHStyle: "in a strip",
 		boobs: 1250,
 		areolae: 2,
@@ -1542,6 +1640,7 @@ App.Data.HeroSlaves.DDextreme = [
 		attrXY: 40,
 		fetish: "boobs",
 		fetishKnown: 1,
+		voice: 0,
 		custom: {desc: "Though $his vocal cords have been altered to keep $him from speaking, $he is still capable of the occasional moo."}
 	},
 
@@ -1561,13 +1660,14 @@ App.Data.HeroSlaves.DDextreme = [
 		devotion: 100,
 		muscles: 50,
 		height: 94,
+		race: "white",
 		eye: {origColor: "blue"},
 		origHColor: "black",
 		pubicHColor: "black",
 		override_Skin: 1,
 		origSkin: "spray tanned",
 		hLength: 10,
-		hStyle: "short",
+		hStyle: "neat",
 		waist: 55,
 		boobs: 50,
 		hips: -1,
diff --git a/src/npc/databases/dfSlavesDatabase.js b/src/npc/databases/dfSlavesDatabase.js
index 4f0afee9ea19933639cd286594a11da6741c7e6b..290c8c7cf435833dbe612ba371975bf81f86ccde 100644
--- a/src/npc/databases/dfSlavesDatabase.js
+++ b/src/npc/databases/dfSlavesDatabase.js
@@ -8,6 +8,7 @@ App.Data.HeroSlaves.DF = [
 		birthName: "Cherry",
 		health: {condition: 20},
 		devotion: 75,
+		race: "white",
 		actualAge: 18,
 		physicalAge: 18,
 		visualAge: 18,
@@ -16,7 +17,8 @@ App.Data.HeroSlaves.DF = [
 		pubicHColor: "black",
 		origSkin: "white",
 		origHColor: "black",
-		hStyle: "long",
+		hStyle: "neat",
+		hLength: 60,
 		pubicHStyle: "waxed",
 		boobs: 500,
 		nipplesPiercing: 1,
@@ -47,13 +49,15 @@ App.Data.HeroSlaves.DF = [
 		ovaryAge: 30,
 		health: {condition: 20},
 		devotion: 40,
+		race: "white",
 		height: 175,
 		eye: {origColor: "dark brown"},
 		origHColor: "blonde",
 		pubicHColor: "blonde",
 		override_Skin: 1,
 		origSkin: "sun tanned",
-		hStyle: "long",
+		hStyle: "neat",
+		hLength: 60,
 		pubicHStyle: "waxed",
 		waist: -55,
 		boobs: 1000,
@@ -92,13 +96,14 @@ App.Data.HeroSlaves.DF = [
 		health: {condition: 20},
 		devotion: 50,
 		height: 175,
+		race: "white",
 		eye: {origColor: "blue"},
 		origHColor: "red",
 		pubicHColor: "red",
 		override_Skin: 1,
 		origSkin: "sun tanned",
 		hLength: 10,
-		hStyle: "short",
+		hStyle: "neat",
 		pubicHStyle: "waxed",
 		boobs: 1800,
 		boobsImplant: 800,
@@ -135,6 +140,7 @@ App.Data.HeroSlaves.DF = [
 		ovaryAge: 25,
 		health: {condition: 20},
 		devotion: 90,
+		race: "white",
 		height: 175,
 		eye: {origColor: "light green"},
 		origHColor: "dark blonde",
@@ -142,7 +148,7 @@ App.Data.HeroSlaves.DF = [
 		override_Skin: 1,
 		origSkin: "sun tanned",
 		hLength: 60,
-		hStyle: "curly and long, and in pigtails",
+		hStyle: "in curly pigtails",
 		pubicHStyle: "waxed",
 		boobs: 650,
 		nipplesPiercing: 1,
@@ -182,7 +188,6 @@ App.Data.HeroSlaves.DF = [
 		origHColor: "black",
 		pubicHColor: "black",
 		origSkin: "brown",
-		hLength: 0,
 		boobs: 400,
 		nipplesPiercing: 1,
 		butt: 5,
@@ -205,6 +210,7 @@ App.Data.HeroSlaves.DF = [
 		labia: 2,
 		clit: 1,
 		bald: 1,
+		hLength: 0,
 		hStyle: "bald",
 		pubicHStyle: "bald",
 		underArmHStyle: "bald",
@@ -226,7 +232,8 @@ App.Data.HeroSlaves.DF = [
 		origHColor: "black",
 		pubicHColor: "black",
 		origSkin: "pale",
-		hStyle: "long",
+		hLength: 60,
+		hStyle: "neat",
 		pubicHStyle: "waxed",
 		boobs: 650,
 		nipplesPiercing: 1,
@@ -265,7 +272,7 @@ App.Data.HeroSlaves.DF = [
 		pubicHColor: "black",
 		origSkin: "brown",
 		hLength: 60,
-		hStyle: "long",
+		hStyle: "neat",
 		pubicHStyle: "waxed",
 		boobs: 650,
 		nipplesPiercing: 1,
@@ -287,9 +294,48 @@ App.Data.HeroSlaves.DF = [
 		clitPiercing: 2,
 		intelligence: -60
 	},
-	/* vibe nips, implant link to sister
-	{slaveName: "Apple", birthName: "Apple", ID: 700008, actualAge: 28, physicalAge: 28, visualAge: 28, ovaryAge: 28, health: {condition: 20}, devotion: 75, muscles: 20, eye.origColor: "dark brown", pubicHColor: "black", origSkin: "pale", origHColor: "black", hStyle: "long", pubicHStyle: "waxed", boobs: 500, nipplesPiercing: 1, butt: 3, lips: 55, lipsTat: "permanent makeup", vagina: 3, vaginaLube: 1, vaginaPiercing: 2, preg: -2, ovaries: 1, skill.vaginal: 15, skill.oral: 35, vaginalAccessory: "large dildo", buttplug: "large plug", attrXY: 40, fetish: "submissive", fetishKnown: 1, lipsTat: "Cored apples are tattooed on $his face.", buttTat: "Cored apples are tattooed $his on buttocks.", intelligence: -60, clitPiercing: 2},
-	/*vibe nips, stupid, sensitive, no masturb implant*/
+	/* vibe nips, implant link to sister */
+	{
+		ID: 700008,
+		slaveName: "Apple",
+		birthName: "Apple",
+		actualAge: 28,
+		physicalAge: 28,
+		visualAge: 28,
+		ovaryAge: 28,
+		health: {condition: 20},
+		devotion: 75,
+		muscles: 20,
+		race: "white",
+		eye: {origColor: "dark brown"},
+		pubicHColor: "black",
+		origSkin: "pale",
+		origHColor: "black",
+		hLength: 60,
+		hStyle: "neat",
+		pubicHStyle: "waxed",
+		boobs: 500,
+		nipplesPiercing: 1,
+		butt: 3,
+		lips: 55,
+		lipsTat: "permanent makeup",
+		vagina: 3,
+		vaginaLube: 1,
+		vaginaPiercing: 2,
+		preg: -2,
+		ovaries: 1,
+		skill: {vaginal: 15, oral: 35},
+		vaginalAccessory: "large dildo",
+		buttplug: "large plug",
+		attrXY: 40,
+		fetish: "submissive",
+		fetishKnown: 1,
+		custom: {tattoo: "Cored apples are tattooed on $his face."},
+		buttTat: "Cored apples are tattooed on $his buttocks.",
+		intelligence: -60,
+		clitPiercing: 2
+	},
+	/* vibe nips, stupid, sensitive, no masturb implant*/
 ];
 
 App.Data.HeroSlaves.DFextreme = [
@@ -305,17 +351,18 @@ App.Data.HeroSlaves.DFextreme = [
 		devotion: 75,
 		muscles: 30,
 		weight: 20,
+		race: "white",
 		eye: {origColor: "brown"},
 		origHColor: "brown",
 		origSkin: "pale",
-		hLength: 20,
-		hStyle: "short and wavy",
+		hLength: 10,
+		hStyle: "wavy",
 		pubicHStyle: "waxed",
 		boobs: 400,
 		nipplesPiercing: 1,
 		butt: 2,
 		lips: 35,
-		vagina: 4,
+		vagina: 5,
 		vaginaLube: 1,
 		vaginaPiercing: 2,
 		preg: -2,
diff --git a/src/npc/descriptions/style/hair.js b/src/npc/descriptions/style/hair.js
index 86f18eb74e619c8227761e5b2bdf2e5a9b97bb1b..088fbeb551a3587edc6ee29afa2bc504bde16eb9 100644
--- a/src/npc/descriptions/style/hair.js
+++ b/src/npc/descriptions/style/hair.js
@@ -107,7 +107,24 @@ App.Desc.hair = function(slave) {
 				r.push(App.Desc.hairClothing(slave));
 				break;
 			default:
-				r.push(`${slave.hColor} hair is ${slave.hStyle}.`);
+				r.push(`${slave.hColor} hair is ${slave.hStyle} and`);
+				if (hairLength > 0.9) {
+					r.push(`floor-length.`);
+				} else if (hairLength > 0.8) {
+					r.push(`calf-length.`);
+				} else if (hairLength > 0.7) {
+					r.push(`knee-length.`);
+				} else if (hairLength >= 0.6) {
+					r.push(`thigh-length.`);
+				} else if (hairLength >= 0.4) {
+					r.push(`ass-length.`);
+				} else if (hairLength >= 0.2) {
+					r.push(`long.`);
+				} else if (hairLength >= 15) {
+					r.push(`shoulder-length.`);
+				} else {
+					r.push(`short.`);
+				}
 		}
 		r.push(`${His}`);
 		if (slave.eyebrowHStyle === "bald") {