diff --git a/src/npc/databases/dSlavesDatabase.tw b/src/npc/databases/dSlavesDatabase.tw
index 0487486e3701796379cd151f66450a71bf9cbaef..67da41eee1298c87de2aec1dce5de23f198ad096 100644
--- a/src/npc/databases/dSlavesDatabase.tw
+++ b/src/npc/databases/dSlavesDatabase.tw
@@ -66,7 +66,7 @@
 /% corrected skin to fair?, changed markings to 'freckled' Bane70 %/
 
 <<set _HS = {}>>
-<<set _HS.slaveName = "Sylvia", _HS.birthName = "Sylvia", _HS.origin = "She was born a slave and knows no other life.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 26, _HS.physicalAge = 26, _HS.visualAge = 26, _HS.health = -10, _HS.devotion = 10, _HS.hColor = "black", _HS.hLength = 10, _HS.pubicHColor = "black", _HS.skin = "tanned", _HS.pubicHStyle = "waxed", _HS.boobs = 500, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "submissive", _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 35, _HS.attrXY = 40, _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Sylvia", _HS.birthName = "Sylvia", _HS.origin = "She was born a slave and knows no other life.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 26, _HS.physicalAge = 26, _HS.visualAge = 26, _HS.nationality = "Stateless", _HS.health = -10, _HS.devotion = 10, _HS.hColor = "black", _HS.hLength = 10, _HS.pubicHColor = "black", _HS.skin = "tanned", _HS.pubicHStyle = "waxed", _HS.boobs = 500, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "submissive", _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 35, _HS.attrXY = 40, _HS.fetishKnown = 1>>
 <<set $heroSlaves.push(_HS)>>
 /*Added origin, tweaked skills, added smart piercing set to submissive, removed buttslut -BoneyM*/
 
@@ -88,7 +88,7 @@
 /*Corrected tattoo syntax, added nympho and arrogant -BoneyM*/
 
 <<set _HS = {}>>
-<<set _HS.slaveName = "Kiki", _HS.birthName = "Kiki", _HS.origin = "She is a shinobi, and fanatically loyal to her master.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.health = 20, _HS.devotion = 100, _HS.weight = -20, _HS.height = 175, _HS.race = "asian", _HS.hColor = "light purple", _HS.pubicHColor = "light purple", _HS.hLength = 10, _HS.hStyle = "short", _HS.pubicHStyle = "waxed", _HS.boobs = 500, _HS.butt = 3, _HS.buttTat = "tribal patterns", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.whoreSkill = 35, _HS.entertainSkill = 35, _HS.combatSkill = 1, _HS.intelligence = 1, _HS.intelligenceImplant = 1, _HS.attrXY = 40, _HS.behavioralFlaw = "odd", _HS.customTat = "She has Yakuza-style tattoos across her back.">>
+<<set _HS.slaveName = "Kiki", _HS.birthName = "Kiki", _HS.origin = "She is a shinobi, and fanatically loyal to her master.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.health = 20, _HS.devotion = 100, _HS.weight = -20, _HS.height = 175, _HS.nationality = "Japanese", _HS.race = "asian", _HS.hColor = "light purple", _HS.pubicHColor = "light purple", _HS.hLength = 10, _HS.hStyle = "short", _HS.pubicHStyle = "waxed", _HS.boobs = 500, _HS.butt = 3, _HS.buttTat = "tribal patterns", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.whoreSkill = 35, _HS.entertainSkill = 35, _HS.combatSkill = 1, _HS.intelligence = 1, _HS.intelligenceImplant = 1, _HS.attrXY = 40, _HS.behavioralFlaw = "odd", _HS.customTat = "She has Yakuza-style tattoos across her back.">>
 <<set $heroSlaves.push(_HS)>>
 /*shinobi*/
 /*Tweaked devotion upwards, added origin, corrected tattoo syntax, added odd quirk, added whoring and entertaining skill -BoneyM*/
@@ -112,7 +112,7 @@
 /*Added ‘submissive’ and ‘bitchy’ -BoneyM*/
 
 <<set _HS = {}>>
-<<set _HS.slaveName = "Valentina", _HS.birthName = "Valentina", _HS.origin = "She was once the bodyguard to a Russian drug lord, and was sold into slavery after his death by cocaine overdose.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 29, _HS.physicalAge = 29, _HS.visualAge = 29, _HS.health = 100, _HS.devotion = 100, _HS.muscles = 100, _HS.height = 175, _HS.eyeColor = "green", _HS.skin = "tanned", _HS.hLength = 30, _HS.hStyle = "shoulder length", _HS.pubicHStyle = "waxed", _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.oralSkill = 15, _HS.analSkill = 35, _HS.combatSkill = 1, _HS.intelligence = 1, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customTat = "She has a red star tattoo on her back, and a hammer and sickle on her right buttock.", _HS.customDesc = "She has a Slavic face with high cheekbones and a strong, pointed jaw. She is a skilled martial artist.">>
+<<set _HS.slaveName = "Valentina", _HS.birthName = "Valentina", _HS.origin = "She 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.health = 100, _HS.devotion = 100, _HS.muscles = 100, _HS.height = 175, _HS.eyeColor = "green", _HS.skin = "tanned", _HS.hLength = 30, _HS.hStyle = "shoulder length", _HS.pubicHStyle = "waxed", _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.oralSkill = 15, _HS.analSkill = 35, _HS.combatSkill = 1, _HS.intelligence = 1, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customTat = "She has a red star tattoo on her back, and a hammer and sickle on her right buttock.", _HS.customDesc = "She has a Slavic face with high cheekbones and a strong, pointed jaw. She is a skilled martial artist.">>
 <<set $heroSlaves.push(_HS)>>
 /*Tweaked devotion up, changed eyes to green, corrected tattoo syntax, added combat skill -BoneyM*/
 
@@ -191,7 +191,7 @@
 /*Changed her to Arabic, corrected tattoo syntax, added entertain skill -BoneyM*/
 
 <<set _HS = {}>>
-<<set _HS.slaveName = "Riya", _HS.birthName = "Riya", _HS.origin = "She grew up in a well-to-do family and discovered her fetish for servitude in college, and she decided to become the world’s best slave and slave trainer in one.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.health = 20, _HS.devotion = 40, _HS.weight = -20, _HS.height = 155, _HS.race = "Indo-aryan", _HS.eyeColor = "grey", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "light brown", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.boobs = 500, _HS.butt = 3, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.oralSkill = 15, _HS.whoreSkill = 15, _HS.entertainSkill = 15, _HS.intelligence = 1, _HS.intelligenceImplant = 1, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has a barcode of her identifying information tattooed on her left shoulder.">>
+<<set _HS.slaveName = "Riya", _HS.birthName = "Riya", _HS.origin = "She grew up in a well-to-do family and discovered her fetish for servitude in college, and she decided to become the world’s best slave and slave trainer in one.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.health = 20, _HS.devotion = 40, _HS.weight = -20, _HS.height = 155, _HS.race = "indo-aryan", _HS.eyeColor = "grey", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "light brown", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.boobs = 500, _HS.butt = 3, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.oralSkill = 15, _HS.whoreSkill = 15, _HS.entertainSkill = 15, _HS.intelligence = 1, _HS.intelligenceImplant = 1, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has a barcode of her identifying information tattooed on her left shoulder.">>
 <<set $heroSlaves.push(_HS)>>
 /*Changed eyes to grey, reduced height and weight, added origin, smart piercing, entertain and whore skill (representing theoretical knowledge from being a trainer), added ear piercings -BoneyM*/
 
@@ -235,7 +235,7 @@
 /% Corrected skin to light?, and changed markings to freckled Bane70 %/
 
 <<set _HS = {}>>
-<<set _HS.slaveName = "Alexis", _HS.birthName = "Alexis", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 25, _HS.physicalAge = 25, _HS.visualAge = 25, _HS.health = 20, _HS.devotion = 60, _HS.muscles = 20, _HS.height = 155, _HS.race = "French Creole", _HS.eyeColor = "hazel", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "ebony", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.boobs = 800, _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.lips = 35, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.clit = 1, _HS.clitPiercing = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 2, _HS.nosePiercing = 1, _HS.eyebrowPiercing = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.intelligence = -1, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "She has a feminine personality despite her high testosterone.">>
+<<set _HS.slaveName = "Alexis", _HS.birthName = "Alexis", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 25, _HS.physicalAge = 25, _HS.visualAge = 25, _HS.health = 20, _HS.devotion = 60, _HS.muscles = 20, _HS.height = 155, _HS.race = "mixed race", _HS.eyeColor = "hazel", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "ebony", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.boobs = 800, _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.lips = 35, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.clit = 1, _HS.clitPiercing = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 2, _HS.nosePiercing = 1, _HS.eyebrowPiercing = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.intelligence = -1, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "She has a feminine personality despite her high testosterone.">>
 <<set $heroSlaves.push(_HS)>>
 /*big clit*/
 /*Changed eyes to hazel, increased clit, added a lot of piercings, changed fetish to nympho, fixed customdesc syntax -BoneyM*/
@@ -381,7 +381,7 @@
 /*Increased height, reduced weight, reduced butt, fixed customdesc syntax -BoneyM*/
 
 <<set _HS = {}>>
-<<set _HS.slaveName = "no name", _HS.birthName = "no name", _HS.origin = "A previous owner cultivated her desire to escape slavery for his own amusement.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.health = 50, _HS.devotion = -100, _HS.weight = -20, _HS.race = "white-asian", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "white", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.boobs = 300, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "oral", _HS.anus = 2, _HS.ovaries = 1, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.intelligence = 3, _HS.intelligenceImplant = 1, _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1, _HS.customDesc = "She is fit and athletic.">>
+<<set _HS.slaveName = "no name", _HS.birthName = "no name", _HS.origin = "A previous owner cultivated her desire to escape slavery for his own amusement.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.health = 50, _HS.devotion = -100, _HS.weight = -20, _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "white", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.boobs = 300, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "oral", _HS.anus = 2, _HS.ovaries = 1, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.intelligence = 3, _HS.intelligenceImplant = 1, _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1, _HS.customDesc = "She is fit and athletic.">>
 <<set $heroSlaves.push(_HS)>>
 *//*hypno-anal/cum*/
 /*Reduced weight, changed eyes, corrected customdesc syntax, added origin, increased rebelliousness, changed clitsetting to oral. -BoneyM*/
@@ -439,7 +439,7 @@
 /*huge nips*/
 
 <<set _HS = {}>>
-<<set _HS.slaveName = "Golden Cobra", _HS.birthName = "Auyala", _HS.origin = "She was captured from West Central Africa.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.health = 30, _HS.devotion = 100, _HS.muscles = 50, _HS.height = 190, _HS.race = "black", _HS.eyes = 1, _HS.eyeColor = "green", _HS.hColor = "golden blonde with copper streaks", _HS.pubicHColor = "blonde", _HS.skin = "light brown", _HS.hLength = 35, _HS.hStyle = "shoulder-length, plaited in cornrow braids; a single thin braid adorned with several colorful feathers and fearsome fang of unknown origin is hanging aside her left eye", _HS.pubicHStyle = "in a strip", _HS.waist = -55, _HS.boobs = 1450, _HS.nipplesPiercing = 2, _HS.butt = 5, _HS.lips = 55, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.clit = 2, _HS.clitPiercing = 2, _HS.clitSetting = "lesbian", _HS.anus = 2, _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.earPiercing = 1, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.combatSkill = 1, _HS.clothes = "slutty jewelry", _HS.collar = "heavy gold", _HS.shoes = "heels", _HS.intelligence = -1, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.customTat = "She has tattoo of cobra wrapping around her neck, which head with wide open maw and inflated hood tattooed right at her throat.", _HS.customDesc = "She has a streak of ritual scars resembling some very complex snake skin pattern running down her spine from nape to tail-bone.">>
+<<set _HS.slaveName = "Golden Cobra", _HS.birthName = "Auyala", _HS.origin = "She was captured from West Central Africa.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.health = 30, _HS.devotion = 100, _HS.muscles = 50, _HS.height = 190, _HS.nationality = "Central African", _HS.race = "black", _HS.eyes = 1, _HS.eyeColor = "green", _HS.hColor = "golden blonde with copper streaks", _HS.pubicHColor = "blonde", _HS.skin = "light brown", _HS.hLength = 35, _HS.hStyle = "shoulder-length, plaited in cornrow braids; a single thin braid adorned with several colorful feathers and fearsome fang of unknown origin is hanging aside her left eye", _HS.pubicHStyle = "in a strip", _HS.waist = -55, _HS.boobs = 1450, _HS.nipplesPiercing = 2, _HS.butt = 5, _HS.lips = 55, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.clit = 2, _HS.clitPiercing = 2, _HS.clitSetting = "lesbian", _HS.anus = 2, _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.earPiercing = 1, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.combatSkill = 1, _HS.clothes = "slutty jewelry", _HS.collar = "heavy gold", _HS.shoes = "heels", _HS.intelligence = -1, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.customTat = "She has tattoo of cobra wrapping around her neck, which head with wide open maw and inflated hood tattooed right at her throat.", _HS.customDesc = "She has a streak of ritual scars resembling some very complex snake skin pattern running down her spine from nape to tail-bone.">>
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = {}>>
diff --git a/src/npc/databases/ddSlavesDatabase.tw b/src/npc/databases/ddSlavesDatabase.tw
index f6fa2f04c39e40397cef761f9b52c4cb97f3c140..72d3fb2c091cdfedc02c16fff53e7afcb37c9071 100644
--- a/src/npc/databases/ddSlavesDatabase.tw
+++ b/src/npc/databases/ddSlavesDatabase.tw
@@ -125,7 +125,7 @@
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = {}>>
-<<set _HS.slaveName = "Aisha", _HS.birthName = "Aicha", _HS.genes = "XY", _HS.origin = "She sold herself into slavery to escape a life of boredom.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = -20, _HS.devotion = 45, _HS.height = 155, _HS.heightImplant = -1, _HS.nationality = "slave", _HS.race = "middle eastern", _HS.eyeColor = "blue", _HS.hColor = "peachy fading into a red ombre at the bottom", _HS.pubicHColor = "red", _HS.skin = "lightened", _HS.hLength = 30, _HS.hStyle = "shoulder-length in a hime cut", _HS.waist = -55, _HS.boobs = 250, _HS.butt = 3.5, _HS.face = 55, _HS.faceImplant = 2, _HS.vagina = -1, _HS.preg = -2, _HS.clitPiercing = 3, _HS.anus = 1, _HS.dick = 5, _HS.dickTat = "flowers", _HS.prostate = 1, _HS.balls = 2, _HS.anusPiercing = 1, _HS.anusTat = "flowers", _HS.brand = "your initials ", _HS.brandLocation = "back", _HS.earPiercing = 1, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.entertainSkill = 15, _HS.clothes = "a comfortable bodysuit", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = -1, _HS.attrXX = 40, _HS.attrXY = 40, _HS.customTat = "She has tattooed petals trailing from the nape of her neck down her back, ending between her butt cheeks.", _HS.customDesc = "Her red pubic hair is waxed into the shape of a heart. She has bright blue eyeshadow on her bottom lids.">>
+<<set _HS.slaveName = "Aisha", _HS.birthName = "Aicha", _HS.genes = "XY", _HS.origin = "She sold herself into slavery to escape a life of boredom.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = -20, _HS.devotion = 45, _HS.height = 155, _HS.heightImplant = -1, _HS.race = "middle eastern", _HS.eyeColor = "blue", _HS.hColor = "peachy fading into a red ombre at the bottom", _HS.pubicHColor = "red", _HS.skin = "lightened", _HS.hLength = 30, _HS.hStyle = "shoulder-length in a hime cut", _HS.waist = -55, _HS.boobs = 250, _HS.butt = 3.5, _HS.face = 55, _HS.faceImplant = 2, _HS.vagina = -1, _HS.preg = -2, _HS.clitPiercing = 3, _HS.anus = 1, _HS.dick = 5, _HS.dickTat = "flowers", _HS.prostate = 1, _HS.balls = 2, _HS.anusPiercing = 1, _HS.anusTat = "flowers", _HS.brand = "your initials ", _HS.brandLocation = "back", _HS.earPiercing = 1, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.entertainSkill = 15, _HS.clothes = "a comfortable bodysuit", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = -1, _HS.attrXX = 40, _HS.attrXY = 40, _HS.customTat = "She has tattooed petals trailing from the nape of her neck down her back, ending between her butt cheeks.", _HS.customDesc = "Her red pubic hair is waxed into the shape of a heart. She has bright blue eyeshadow on her bottom lids.">>
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = {}>>