diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index c7dbf0d0878f0d3c084753956504c83748bf2f45..63469cc3ab2b8370633167a2ce9c35a777b58364 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -273,11 +273,11 @@
 
 <<set setup.youngCareers = ["a babysitter", "a ballerina", "a barista", "a bartender", "a beggar", "a camgirl", "a cashier", "a cheerleader", "a cocktail waitress", "a cook", "a courier", "a criminal", "a cum dump", "a factory worker", "a farm laborer", "a farm laborer", "a farmer's daughter", "a gang member", "a gang member", "a handmaiden", "a housesitter", "a housewife", "a lifeguard", "a magician's assistant", "a maid", "a meat toilet", "a medical student", "a model", "a nurse", "a paramedic", "a party girl", "a political activist", "a prisoner", "a prostitute", "a racing driver", "a refugee", "a ride attendant", "a saleswoman", "a secretary", "a security guard", "a service worker", "a shrine maiden", "a soldier", "a street performer", "a stripper", "a student", "a student", "a student", "a teaching assistant", "a truck driver", "a waitress", "a yoga instructor", "an air hostess", "an apprentice", "an arcade attendant", "an aspiring pop star", "an assassin", "an escort", "an exotic dancer", "an intern", "an office worker", "homeless", "unemployed", "unemployed", "unemployed", "unemployed", "unemployed"]>>
 
-<<set setup.educatedCareers = ["a ballerina", "a banker", "a business owner", "a child actress", "a classical dancer", "a classical musician", "a college scout", "a coroner", "a corporate executive", "a counselor", "a criminal", "a cult leader", "a dean", "a dentist", "a director", "a dispatch officer", "a doctor", "a historian", "a journalist", "a journalist", "a judge", "a lawyer", "a librarian", "a lobbyist", "a madam", "a manager", "a mechanic", "a mediator", "a medical student", "a mercenary", "a military officer", "a military recruiter", "a nun", "a paramedic", "a pharmacist", "a photographer", "a pilot", "a poet", "a police detective", "a police negotiator", "a political activist", "a politician", "a principal", "a prison warden", "a private detective", "a private instructor", "a procuress", "a producer", "a professional bartender", "a professor", "a programmer", "a prostitute", "a psychologist", "a refugee", "a scholar", "a scientist", "a secretary", "a serial divorcee", "a shut-in", "a surgeon", "a teacher", "a teaching assistant", "a therapist", "a transporter", "a veterinarian", "a wedding planner", "a writer", "a zookeeper", "an actress", "an air hostess", "an archaeologist", "an assassin", "an astronaut", "an engineer", "an escort", "an estate agent", "an investor", "an MS pilot", "an office worker", "unemployed"]>>
+<<set setup.educatedCareers = ["a ballerina", "a banker", "a business owner", "a child actress", "a classical dancer", "a classical musician", "a coach", "a college scout", "a coroner", "a corporate executive", "a counselor", "a criminal", "a cult leader", "a dean", "a dentist", "a director", "a dispatch officer", "a doctor", "a historian", "a journalist", "a journalist", "a judge", "a lawyer", "a librarian", "a lobbyist", "a madam", "a manager", "a mechanic", "a mediator", "a medical student", "a mercenary", "a military officer", "a military recruiter", "a nun", "a painter", "a paramedic", "a pharmacist", "a photographer", "a pilot", "a poet", "a police detective", "a police negotiator", "a political activist", "a politician", "a principal", "a prison warden", "a private detective", "a private instructor", "a procuress", "a producer", "a professional bartender", "a professor", "a programmer", "a prostitute", "a psychologist", "a refugee", "a scholar", "a scientist", "a secretary", "a serial divorcee", "a shut-in", "a surgeon", "a teacher", "a teaching assistant", "a therapist", "a transporter", "a veterinarian", "a wedding planner", "a writer", "a zookeeper", "an actress", "an animator", "an air hostess", "an archaeologist", "an assassin", "an astronaut", "an engineer", "an escort", "an estate agent", "an investor", "an MS pilot", "an office worker", "unemployed"]>>
 
-<<set setup.uneducatedCareers = ["a baker", "a barber", "a barista", "a bartender", "a beggar", "a bodyguard", "a bouncer", "a bounty hunter", "a brewer", "a bus driver", "a butcher", "a butler", "a camgirl", "a camwhore", "a candlestick maker", "a caregiver", "a carpenter", "a cashier", "a charity worker", "a chauffeur", "a cheerleader", "a clown", "a cocktail waitress", "a con artist", "a construction worker", "a cook", "a criminal", "a croupier", "a cum dump", "a dairy worker", "a dancer", "a delivery woman", "a factory worker", "a farm laborer", "a farmer's daughter", "a farmer", "a firefighter", "a fisherwoman", "a florist", "a gardener", "a handmaiden", "a house DJ", "a housewife", "a hunter", "a janitor", "a landlady", "a launderer", "a law enforcement officer", "a lifeguard", "a local news anchor", "a lumberjack", "a magician's assistant", "a maid", "a mail carrier", "a masseuse", "a masseuse", "a meat toilet", "a medic", "a medic", "a messenger", "a milkmaid", "a mime", "a missionary", "a mistress", "a model", "a mortician", "a musician", "a nurse", "a paramedic", "a park ranger", "a party girl", "a peddler", "a pimp", "a pirate", "a plumber", "a political activist", "a prison guard", "a prisoner", "a procuress", "a prostitute", "a racing driver", "a radio show host", "a rancher", "a refugee", "a revolutionary", "a ride attendant", "a sailor", "a saleswoman", "a secretary", "a security guard", "a service worker", "a shrine maiden", "a soldier", "a stage magician", "a street performer", "a stripper", "a student", "a taxi driver", "a teacher", "a trophy wife", "a truck driver", "a waitress", "a weathergirl", "a zookeeper", "an acrobat", "an actress", "an arcade attendant", "an aspiring pop star", "an athlete", "an electrician", "an enforcer", "an enforcer", "an escort", "an exotic dancer", "an innkeeper", "an office worker", "homeless", "in a militia", "unemployed", "unemployed", "unemployed", "unemployed", "unemployed"]>>
+<<set setup.uneducatedCareers = ["a baker", "a barber", "a barista", "a bartender", "a beggar", "a bodyguard", "a bouncer", "a bounty hunter", "a brewer", "a bus driver", "a butcher", "a butler", "a camgirl", "a camwhore", "a candlestick maker", "a caregiver", "a carpenter", "a cashier", "a charity worker", "a chauffeur", "a cheerleader", "a clown", "a cocktail waitress", "a con artist", "a construction worker", "a cook", "a criminal", "a croupier", "a cum dump", "a dairy worker", "a dancer", "a delivery woman", "a factory worker", "a farm laborer", "a farmer's daughter", "a farmer", "a firefighter", "a fisherwoman", "a florist", "a fortune teller", "a gang leader", "a gang member", "a gardener", "a groomer", "a handmaiden", "a house DJ", "a housewife", "a hunter", "a janitor", "a landlady", "a launderer", "a law enforcement officer", "a lifeguard", "a local news anchor", "a lumberjack", "a magician's assistant", "a maid", "a mail carrier", "a masseuse", "a masseuse", "a meat toilet", "a medic", "a medic", "a medium", "a messenger", "a milkmaid", "a mime", "a missionary", "a mistress", "a model", "a mortician", "a musician", "a nurse", "a paramedic", "a park ranger", "a party girl", "a peddler", "a pimp", "a pirate", "a plumber", "a political activist", "a prison guard", "a prisoner", "a procuress", "a prostitute", "a racing driver", "a radio show host", "a rancher", "a refugee", "a revolutionary", "a ride attendant", "a sailor", "a saleswoman", "a secretary", "a security guard", "a service worker", "a shepherd", "a shrine maiden", "a soldier", "a stage magician", "a street performer", "a stripper", "a student", "a talent scout", "a taxi driver", "a teacher", "a trophy wife", "a truck driver", "a waitress", "a weathergirl", "a zookeeper", "an acrobat", "an actress", "an arcade attendant", "an aspiring pop star", "an athlete", "an electrician", "an enforcer", "an enforcer", "an escort", "an exotic dancer", "an innkeeper", "an office worker", "homeless", "in a militia", "unemployed", "unemployed", "unemployed", "unemployed", "unemployed"]>>
 
-<<set setup.gratefulCareers = ["a beggar", "a child soldier", "a peddler", "a pick-pocket", "a prisoner", "a refugee", "a shut-in", "a street urchin", "a student from a boarding school", "a sweatshop worker", "an orphan", "from a lower class family", "homeless", "unemployed"]>>
+<<set setup.gratefulCareers = ["a beggar", "a peddler", "a pick-pocket", "a prisoner", "a refugee", "a shut-in", "a street urchin", "a student from a boarding school", "a sweatshop worker", "an orphan", "from a lower class family", "homeless", "unemployed"]>>
 
 <<set setup.menialCareers = ["a babysitter", "a bus driver", "a butler", "a cashier", "a chauffeur", "a construction worker", "a cook", "a courier", "a delivery woman", "a dropout", "a factory worker", "a farm laborer", "a fisherwoman", "a handmaiden", "a housesitter", "a housewife", "a maid", "a mail carrier", "a mechanic", "a messenger", "a nun", "a paper girl", "a part-time farm laborer", "a pilot", "a producer", "a programmer", "a ride attendant", "a service worker", "a student from a private school", "a student from a public school", "a student", "a taxi driver", "a truck driver", "an apprentice", "an arcade attendant", "an athlete", "an engineer", "an intern", "being homeschooled by her parents", "from a middle class family", "from an upper class family"]>>
 
@@ -285,7 +285,7 @@
 
 <<set setup.whoreCareers = ["a child prostitute", "a criminal", "a cum dump", "a Futanari Sister", "a juvenile delinquent", "a meat toilet", "a mistress", "a model", "a pageant star", "a pirate", "a porn star", "a prostitute", "a saleswoman", "a serial divorcee", "a stripper", "a trophy wife", "an escort", "an exotic dancer"]>>
 
-<<set setup.HGCareers = ["a corporate executive", "a lawyer", "a leading arcology citizen", "a military officer", "a model-UN star", "a politician", "a Queen", "a student council president"]>>
+<<set setup.HGCareers = ["a corporate executive", "a gang leader", "a lawyer", "a leading arcology citizen", "a military officer", "a model-UN star", "a politician", "a Queen", "a student council president"]>>
 
 <<set setup.madamCareers = ["a business owner", "a landlady", "a madam", "a manager", "a pimp", "a procuress", "an innkeeper"]>>
 
@@ -299,13 +299,13 @@
 
 <<set setup.attendantCareers = ["a counselor", "a dispatch officer", "a lifeguard", "a masseuse", "a mediator", "a police negotiator", "a psychologist", "a therapist", "a yoga instructor"]>>
 
-<<set setup.milkmaidCareers = ["a dairy worker", "a farmer's daughter", "a farmer", "a milkmaid", "a rancher", "a veterinarian", "a zookeeper"]>>
+<<set setup.milkmaidCareers = ["a dairy worker", "a farmer's daughter", "a farmer", "a milkmaid", "a rancher", "a shepherd", "a veterinarian", "a zookeeper"]>>
 
 <<set setup.stewardessCareers = ["a barista", "a bartender", "a caregiver", "a charity worker", "a professional bartender", "a secretary", "a wedding planner", "an air hostess", "an estate agent", "an investor", "an office worker"]>>
 
 <<set setup.schoolteacherCareers = ["a dean", "a librarian", "a principal", "a private instructor", "a professor", "a scholar", "a scientist", "a teacher", "a teaching assistant"]>>
 
-<<set setup.recruiterCareers = ["a club recruiter", "a college scout", "a con artist", "a cult leader", "a girl scout", "a military recruiter", "a missionary", "a political activist", "a princess"]>> /* pregmod */
+<<set setup.recruiterCareers = ["a club recruiter", "a college scout", "a con artist", "a cult leader", "a girl scout", "a military recruiter", "a missionary", "a political activist", "a princess", "a talent scout"]>> /* pregmod */
 
 
 <<set setup.baseNationalities = ["Afghan", "Albanian", "Algerian", "American", "Andorran", "Angolan", "Antiguan", "Argentinian", "Armenian", "Aruban", "Australian", "Austrian", "Azerbaijani", "Bahamian", "Bahraini", "Bangladeshi", "Barbadian", "Belarusian", "Belgian", "Belizean", "Beninese", "Bermudian", "Bhutanese", "Bissau-Guinean", "Bolivian", "Bosnian", "Brazilian", "British", "Bruneian", "Bulgarian", "Burkinabé", "Burmese", "Burundian", "Cambodian", "Cameroonian", "Canadian", "Cape Verdean", "Catalan", "Central African", "Chadian", "Chilean", "Chinese", "Colombian", "Comorian", "Congolese", "a Cook Islander", "Costa Rican", "Croatian", "Cuban", "Cypriot", "Czech", "Danish", "Djiboutian", "Dominican", "Dominiquais", "Dutch", "East Timorese", "Ecuadorian", "Egyptian", "Emirati", "Equatoguinean", "Eritrean", "Estonian", "Ethiopian", "Fijian", "Filipina", "Finnish", "French Guianan", "French Polynesian", "French", "Gabonese", "Gambian", "Georgian", "German", "Ghanan", "Greek", "Greenlandic", "Grenadian", "Guatemalan", "Guinean", "Guyanese", "Haitian", "Honduran", "Hungarian", "I-Kiribati", "Icelandic", "Indian", "Indonesian", "Iranian", "Iraqi", "Irish", "Israeli", "Italian", "Ivorian", "Jamaican", "Japanese", "Jordanian", "Kazakh", "Kenyan", "Kittitian", "Korean", "Kosovan", "Kurdish", "Kuwaiti", "Kyrgyz", "Laotian", "Latvian", "Lebanese", "Liberian", "Libyan", "a Liechtensteiner", "Lithuanian", "Luxembourgian", "Macedonian", "Malagasy", "Malawian", "Malaysian", "Maldivian", "Malian", "Maltese", "Marshallese", "Mauritanian", "Mauritian", "Mexican", "Micronesian", "Moldovan", "Monégasque", "Mongolian", "Montenegrin", "Moroccan", "Mosotho", "Motswana", "Mozambican", "Namibian", "Nauruan", "Nepalese", "a New Zealander", "Ni-Vanuatu", "Nicaraguan", "Nigerian", "Nigerien", "Niuean", "Norwegian", "Omani", "Pakistani", "Palauan", "Palestinian", "Panamanian", "Papua New Guinean", "Paraguayan", "Peruvian", "Polish", "Portuguese", "Puerto Rican", "Qatari", "Romanian", "Russian", "Rwandan", "Sahrawi", "Saint Lucian", "Salvadoran", "Sammarinese", "Samoan", "São Toméan", "Saudi", "Scottish", "Senegalese", "Serbian", "Seychellois", "Sierra Leonean", "Singaporean", "Slovak", "Slovene", "a Solomon Islander", "Somali", "South African", "South Sudanese", "Spanish", "Sri Lankan", "Sudanese", "Surinamese", "Swazi", "Swedish", "Swiss", "Syrian", "Taiwanese", "Tajik", "Tanzanian", "Thai", "Tibetan", "Togolese", "Tongan", "Trinidadian", "Tunisian", "Turkish", "Turkmen", "Tuvaluan", "Ugandan", "Ukrainian", "Uruguayan", "Uzbek", "Vatican", "Venezuelan", "Vietnamese", "Vincentian", "Yemeni", "Zairian", "Zambian", "Zimbabwean"]>>
@@ -336,7 +336,7 @@
 
 
 
-<<set setup.whiteAmericanSlaveNames = ["Abigail", "Adalyn", "Addison", "Adeline", "Alaina", "Alexandra", "Alicia", "Allison", "Alyssa", "Amanda", "Amber", "Amelia", "Amy", "Andrea", "Angela", "Anna", "Annabelle", "Anne", "April", "Aria", "Arianna", "Ashley", "Aubrey", "Audrey", "Ava", "Avery", "Bailey", "Bethany", "Brandi", "Brandy", "Brittany", "Brittney", "Brooke", "Brooklyn", "Caitlin", "Callie", "Candice", "Caroline", "Carrie", "Cassandra", "Catherine", "Charlotte", "Chelsea", "Chloe", "Christina", "Christine", "Claire", "Clover", "Courtney", "Crystal", "Cynthia", "Dana", "Danielle", "Diana", "Elena", "Eliana", "Elizabeth", "Ella", "Ellie", "Emily", "Emma", "Erica", "Erika", "Erin", "Eva", "Evelyn", "Gabriella", "Grace", "Hailey", "Hannah", "Harper", "Heather", "Holly", "Isabella", "Isabelle", "Jacqueline", "Jade", "Jamie", "Jane", "Jasmine", "Jenna", "Jennifer", "Jenny", "Jessica", "Joan", "Julia", "Julie", "June", "Kaitlyn", "Karen", "Kate", "Katherine", "Kathleen", "Kathryn", "Katie", "Kayla", "Kaylee", "Keira", "Kelly", "Kennedy", "Kimberly", "Kristen", "Kristin", "Kristina", "Krystal", "Kylie", "Latoya", "Laura", "Lauren", "Laurie", "Layla", "Leah", "Leslie", "Lila", "Liliana", "Lillian", "Lily", "Lindsay", "Lindsey", "Lisa", "Lois", "Lucy", "Mackenzie", "Madelyn", "Madison", "Makayla", "Mandy", "Margaret", "Maria", "Mary", "Maya", "Megan", "Meghan", "Melanie", "Melissa", "Mia", "Michelle", "Mila", "Misty", "Monica", "Natalie", "Natasha", "Nicole", "Nora", "Olivia", "Patricia", "Penelope", "Peyton", "Rachel", "Reagan", "Rebecca", "Riley", "Rose", "Sadie", "Samantha", "Sandra", "Sara", "Sarah", "Savannah", "Scarlett", "Shannon", "Skyler", "Sophia", "Sophie", "Stacey", "Stacy", "Stella", "Stephanie", "Susan", "Tara", "Tiffany", "Tina", "Valerie", "Vanessa", "Veronica", "Victoria", "Violet", "Whitney", "Zoe"]>>
+<<set setup.whiteAmericanSlaveNames = ["Abigail", "Adalyn", "Addison", "Adeline", "Alaina", "Alexandra", "Alicia", "Allison", "Alyssa", "Amanda", "Amber", "Amelia", "Amy", "Andrea", "Angela", "Anna", "Annabelle", "Anne", "April", "Aria", "Arianna", "Ashley", "Aubrey", "Audrey", "Ava", "Avery", "Bailey", "Bethany", "Brandi", "Brandy", "Brittany", "Brittney", "Brooke", "Brooklyn", "Caitlin", "Callie", "Candice", "Caroline", "Carrie", "Cassandra", "Catherine", "Charlotte", "Chelsea", "Chloe", "Christina", "Christine", "Claire", "Clover", "Courtney", "Crystal", "Cynthia", "Dana", "Danielle", "Diana", "Elena", "Eliana", "Elizabeth", "Ella", "Ellen", "Ellie", "Emily", "Emma", "Erica", "Erika", "Erin", "Eva", "Evelyn", "Gabriella", "Gina", "Ginger", "Grace", "Hailey", "Hannah", "Harper", "Heather", "Holly", "Isabella", "Isabelle", "Jacqueline", "Jade", "Jamie", "Jane", "Jasmine", "Jenna", "Jennifer", "Jenny", "Jessica", "Joan", "Julia", "Julie", "June", "Kaitlyn", "Karen", "Kate", "Katherine", "Kathleen", "Kathryn", "Katie", "Kayla", "Kaylee", "Keira", "Kelly", "Kennedy", "Kimberly", "Kristen", "Kristin", "Kristina", "Krystal", "Kylie", "Latoya", "Laura", "Lauren", "Laurie", "Layla", "Leah", "Leslie", "Lila", "Liliana", "Lillian", "Lily", "Lindsay", "Lindsey", "Lisa", "Lois", "Lucy", "Lynch", "Lynette", "Lynn", "Mabel", "Mackenzie", "Madeleine", "Madeline", "Madelyn", "Madison", "Madora", "Mae", "Maeve", "Magdalena", "Magdaline", "Maggie", "Mahala", "Mahaley", "Maisie", "Makayla", "Malak", "Malinda", "Malissa", "Malka", "Malky", "Malvina", "Mamie", "Manda", "Mandy", "Manerva", "Marceline", "Marcia", "Marcy", "Marey", "Margaret", "Margarett", "Margaretta", "Margarette", "Margaux", "Marge", "Margot", "Margret", "Marguerite", "Maria", "Mariah", "Mariam", "Marian", "Maribeth", "Marie", "Marielle", "Marietta", "Marilla", "Marilyn", "Marina", "Marion", "Mariska", "Marissa", "Marjorie", "Marlene", "Martha", "Mary Alice", "Mary Anne", "Mary Jane", "Mary Lou", "Mary", "Maryam", "Matilda", "Mattie", "Maud", "Maude", "Mavis", "Maxine", "May", "Maya", "Medora", "Megan", "Meghan", "Megyn", "Mehitable", "Melanie", "Melinda", "Melissa", "Melvina", "Mena", "Menucha", "Mercy", "Mia", "Michaela", "Michal", "Michele", "Michelle", "Mikayla", "Mila", "Milana", "Mildred", "Milena", "Miley", "Milla", "Miller", "Milly", "Mina", "Mindy", "Minerva", "Minnie", "Mira", "Miranda", "Mirel", "Miri", "Miriam", "Missouri", "Misty", "Mollie", "Molly", "Monica", "Morgan", "Moriah", "Muffy", "Mushka", "Myra", "Myrtle", "Nadia", "Nancy", "Nannie", "Naoma", "Naomi", "Narcissa", "Natalia", "Natalie", "Natasha", "Nazz", "Nechama", "Nellie", "Nettie", "Nevaeh", "Nicole", "Nicolette", "Nicollette", "Nikki", "Nina", "Noa", "Noelle", "Noor", "Nora", "Norah", "Norma", "Octavia", "Olive", "Olivia", "Onza", "Opal", "Orpha", "Orvilla", "Pacifica", "Paige", "Pamela", "Pamelia", "Parker", "Parnethia", "Parthena", "Parthenia", "Pat", "Patience", "Patricia", "Patsey", "Patsy", "Paula", "Pauline", "Pearl", "Peg", "Peggy Sue", "Peggy", "Penelope", "Percilla", "Perel", "Perl", "Permelia", "Perry", "Persis", "Pessy", "Peyton", "Pheba", "Phebe", "Pheby", "Pheobe", "Philena", "Philinda", "Phoebe", "Phyllis", "Pinky", "Piper", "Polina", "Polley", "Polly", "Poppy", "Portia", "Priscilla", "Prudence", "Quinn", "Rachael", "Rachal", "Rachel", "Raina", "Raizel", "Raizy", "Raquel", "Rayleen", "Reagan", "Rebeca", "Rebecca", "Reem", "Reese", "Regina", "Reizy", "Rena", "Renee", "Rhoda", "Rhody", "Rhonda", "Rifka", "Rifky", "Riley", "Rita", "Rivka", "Rivky", "Roberta", "Robin", "Rochel", "Roda", "Roiza", "Roizy", "Romy", "Rosa", "Rosanna", "Rose of Sharon", "Rose", "Roseanne", "Rosella", "Rosemary", "Rosetta", "Rosie", "Rosina", "Rowan", "Roxanne", "Roxy", "Ruby", "Ruchel", "Ruchy", "Ruth", "Rutha", "Ryan", "Sabina", "Sabra", "Sabrina", "Sadie", "Samantha", "Sandra", "Sara", "Sarah", "Savannah", "Scarlett", "Shannon", "Skyler", "Sophia", "Sophie", "Stacey", "Stacy", "Stella", "Stephanie", "Susan", "Tara", "Tiffany", "Tina", "Valerie", "Vanessa", "Veronica", "Victoria", "Violet", "Whitney", "Zoe"]>>
 <<set setup.whiteAmericanSlaveSurnames = ["Adams", "Allen", "Allred", "Anderson", "Avery", "Bailey", "Baker", "Barnes", "Beckstead", "Bell", "Bennett", "Bennion", "Benson", "Bingham", "Bradshaw", "Brooks", "Brown", "Burns", "Butler", "Campbell", "Carr", "Carter", "Christensen", "Clark", "Clooney", "Cole", "Coleman", "Collins", "Cook", "Cooper", "Cox", "Cunningham", "Davis", "DeMille", "Donaldson", "Edwards", "Ellis", "Evans", "Feldsted", "Fisher", "Forbush", "Foster", "Fox", "Frank", "Franklin", "Gardner", "Gibson", "Graham", "Gray", "Green", "Gubler", "Hall", "Hamilton", "Hancock", "Hanks", "Hansen", "Hardward", "Harris", "Hartvigsen", "Hatch", "Hayes", "Hill", "Howard", "Hughes", "Hymas", "Izatt", "Jackson", "Jacobs", "Jacobsen", "Jacobson", "James", "Jensen", "Johnson", "Jones", "Jorgensen", "Kelly", "Kennedy", "Kimball", "King", "Larsen", "Lauritzen", "Lee", "Lewis", "Long", "MacDonald", "Marks", "Martin", "McDonald", "Mecham", "Meyer", "Michaels", "Miller", "Mitchell", "Moore", "Morgan", "Morris", "Murphy", "Murray", "Myers", "Naegle", "Nelson", "Olsen", "Olson", "Orwell", "Parker", "Patterson", "Perry", "Peterson", "Phelps", "Phillips", "Pitt", "Powell", "Price", "Pulsipher", "Rasmussen", "Reed", "Reynolds", "Richardson", "Rigby", "Roberts", "Robinson", "Robison", "Rogers", "Romney", "Ross", "Roth", "Russell", "Sanders", "Schmidt", "Scott", "Shumway", "Smith", "Smoot", "Snyder", "Sorensen", "Spendlove", "Stevens", "Stewart", "Stone", "Sullivan", "Talbot", "Taylor", "Thomas", "Thompson", "Thomson", "Turley", "Turner", "Wagner", "Walker", "Wallace", "Ward", "Watson", "West", "White", "Willem", "Williams", "Wilson", "Wood", "Wright", "Yorgensen", "Young", "Zabriskie", "Zollinger"]>>
 
 <<set setup.africanAmericanSlaveNames = ["Aaliyah", "Abigail", "Aisha", "Alyssa", "Angel", "Aniyah", "Arianna", "Ashley", "Ava", "Ayana", "Brianna", "Chelsea", "Chloe", "Destiny", "Fatoumata", "Gabrielle", "Hannah", "Heaven", "Imani", "Isis", "Ivory", "Jada", "Jade", "Jasmine", "Jayla", "Jordan", "Kayla", "Keisha", "Kennedy", "Kiara", "Kimani", "Kimora", "Laila", "Lakeisha", "Lakeshia", "Lakisha", "Lashawna", "Lashonda", "Latanya", "Latasha", "Latoya", "London", "Madison", "Makayla", "Malia", "Marquita", "Michelle", "Natisha", "Nevaeh", "Nikeisha", "Nyla", "Olivia", "Qiana", "Sarah", "Sasha", "Savannah", "Shanice", "Shanika", "Shaniqua", "Sydney", "Talisha", "Taneka", "Tanesha", "Tanika", "Taniqua", "Tanisha", "Taylor", "Tiana", "Trinity", "Victoria"]>>
@@ -417,8 +417,8 @@
 <<set setup.frenchSlaveNames = ["Aaliyah", "Abigael", "Adèle", "Adriana", "Adrienne", "Agathe", "Aicha", "Albane", "Alessia", "Alexandra", "Alexia", "Aleyna", "Alia", "Alice", "Alicia", "Alienor", "Aline", "Alix", "Aliya", "Aliyah", "Alizee", "Alya", "Alycia", "Alyssa", "Alyssia", "Amandine", "Ambre", "Ambrine", "Amel", "Amelia", "Amélie", "Amina", "Aminata", "Amira", "Amy", "Ana", "Anae", "Anaelle", "Anaïs", "Anastasia", "Andrea", "Angela", "Angèle", "Angelina", "Angeline", "Anissa", "Anna", "Annabelle", "Annaelle", "Anouk", "Apolline", "Ashley", "Asma", "Assia", "Assya", "Astrid", "Athénaïs", "Audrey", "Augustine", "Aurélie", "Aurore", "Ava", "Awa", "Axelle", "Aya", "Berenice", "Bertille", "Blanche", "Cali", "Calie", "Camelia", "Camille", "Candice", "Capucine", "Carla", "Carmen", "Caroline", "Cassandra", "Cassandre", "Cassie", "Cécile", "Cecilia", "Céleste", "Célestine", "Celia", "Céline", "Celya", "Chahinez", "Chaima", "Charlene", "Charlie", "Charline", "Charlotte", "Chayma", "Chiara", "Chloé", "Claire", "Clara", "Clarisse", "Clea", "Clelia", "Clémence", "Clementine", "Cleo", "Cloé", "Clotilde", "Coline", "Constance", "Coralie", "Cyrielle", "Daphné", "Deborah", "Diana", "Diane", "Dina", "Dounia", "Eden", "Ela", "Elea", "Eleana", "Elena", "Eléonore", "Elia", "Elif", "Elina", "Eline", "Elisa", "Élisabeth", "Élise", "Elissa", "Ella", "Eloane", "Élodie", "Éloïse", "Elona", "Elora", "Elsa", "Elya", "Elyna", "Elyne", "Ema", "Emeline", "Emie", "Émilie", "Emily", "Emma", "Emmanuelle", "Emmie", "Emmy", "Emna", "Emy", "Enola", "Enora", "Erine", "Estelle", "Esther", "Eugénie", "Eva", "Eve", "Eya", "Fanny", "Fantine", "Farah", "Fatima", "Fatma", "Fatoumata", "Faustine", "Flavie", "Fleur", "Flora", "Flore", "Florine", "Gabriella", "Gabrielle", "Gaëlle", "Garance", "Genevieve", "Giulia", "Grace", "Gwenaëlle", "Gwendoline", "Hafsa", "Hajar", "Halima", "Hana", "Hanae", "Hanna", "Hannah", "Hawa", "Helena", "Hélène", "Héloïse", "Hermine", "Hiba", "Hind", "Hortense", "Ibtissem", "Ilana", "Iliana", "Ilona", "Ilyana", "Imane", "Imen", "Imene", "Inaya", "Inès", "Irina", "Iris", "Isaure", "Isis", "Isra", "Izia", "Jade", "Jana", "Janelle", "Janna", "Jasmine", "Jeanne", "Jenna", "Jessica", "Jihane", "Joan", "Joana", "Johanna", "Joséphine", "Joy", "Joyce", "Judith", "Julia", "Julie", "Juliette", "Juline", "Justine", "Kahina", "Kaina", "Kamelia", "Kayla", "Kayna", "Kelia", "Kelly", "Kelya", "Kenza", "Kessy", "Khadija", "Kiara", "Kim", "Kimberley", "Kyara", "Laetitia", "Lalie", "Laly", "Lamia", "Lana", "Lara", "Laura", "Laure", "Laurine", "Layana", "Léa", "Leana", "Leane", "Leanne", "Leelou", "Leia", "Leila", "Leina", "Lena", "Leona", "Léonie", "Leyna", "Lia", "Liana", "Lila", "Lilas", "Lili", "Lilia", "Lilie", "LiliRose", "Lilly", "Lilou", "Lilwenn", "Lily", "Lilya", "LilyRose", "Lina", "Linda", "Lindsay", "Line", "Lisa", "Lise", "Lison", "Livia", "Liya", "Loane", "Loanne", "Lois", "Lola", "Lorena", "Lou", "Louane", "Louann", "LouAnn", "Louanne", "LouAnne", "Louisa", "Louise", "Louison", "Louna", "Luce", "Lucia", "Lucie", "Lucile", "Lucille", "Lucy", "Ludivine", "Luna", "Lya", "Lyana", "Lydia", "Lylia", "Lylou", "Lyna", "Madeleine", "Mae", "Maelia", "Maelie", "Maeline", "Maëlle", "Maelly", "Maellys", "Maely", "Maelyne", "Maëlys", "Maelyss", "Maeva", "Maia", "Maily", "Mailys", "Maimouna", "Maina", "Maissa", "Maissane", "Maiwenn", "Malak", "Malia", "Manel", "Manelle", "Manon", "Margaux", "Margot", "Maria", "Mariam", "Marie", "Marilou", "Marina", "Marine", "Marion", "Marwa", "Maryam", "Marylou", "Mathilde", "Maud", "Maya", "Maylis", "Mayssa", "Meissa", "Mélanie", "Melia", "Melina", "Melinda", "Méline", "Mélissa", "Mellina", "Melodie", "Melody", "Melyna", "Melyne", "Meriem", "Meryem", "Mia", "Mila", "Milla", "Mina", "Mona", "Morgane", "Mya", "Myriam", "Nada", "Naelle", "Naia", "Naila", "Naima", "Nais", "Naomi", "Naomie", "Nawel", "Naya", "Nayla", "Neila", "Nelia", "Nell", "Nesrine", "Neyla", "Nina", "Ninon", "Nisa", "Noa", "Noelie", "Noeline", "Noémie", "Nola", "Nora", "Norah", "Nour", "Océane", "Olivia", "Ophélie", "Oriane", "Orlane", "Ornella", "Paloma", "Paola", "Pauline", "Pénélope", "Perrine", "Philippine", "Philomène", "Prune", "Rachel", "Rahma", "Rania", "Raphaëlle", "Rébecca", "Romane", "Romy", "Rosalie", "Rose", "Roxane", "Sabrina", "Sacha", "Safa", "Safia", "Safiya", "Sakina", "Salma", "Salomé", "Samia", "Sana", "Sara", "Sarah", "Sasha", "Savannah", "Selena", "Selene", "Selma", "Serena", "Shaima", "Shaina", "Shana", "Shanna", "Shayna", "Sherine", "Sidonie", "Sirine", "Sixtine", "Sofia", "Solène", "Soline", "Sonia", "Sophia", "Sophie", "Soraya", "Soukaina", "Soumaya", "Stella", "Suzanne", "Suzie", "Syrine", "Taina", "Talia", "Tamara", "Tania", "Tatiana", "Tess", "Tessa", "Thais", "Thalia", "Thea", "Tiffany", "Tina", "Tiphaine", "Valentine", "Vanessa", "Victoire", "Victoria", "Violette", "Wendy", "Yael", "Yaelle", "Yasmina", "Yasmine", "Youna", "Yousra", "Yuna", "Yvette", "Yvonne", "Zahra", "Zelie", "Zia", "Zoé"]>>
 <<set setup.frenchSlaveSurnames = ["Andre", "Arnaud", "Arsenault", "Barbier", "Benoit", "Bernard", "Bertrand", "Blanc", "Blanchard", "Bonnet", "Bouvier", "Boyer", "Brun", "Chevalier", "Clement", "Cohen", "Cousteau", "David", "Denis", "Deschamps", "Dubois", "Dufour", "Dumas", "Dumont", "Dupont", "Durand", "Duval", "Fabre", "Faure", "Favreau", "Fontaine", "Fournier", "Francois", "Gaillard", "Garnier", "Gauthier", "Gautier", "Gerard", "Girard", "Giraud", "Guerin", "Henry", "Jean", "Joly", "Lacroix", "Lambert", "Laurent", "Leclerc", "Lefebvre", "Lefevre", "Legrand", "Lemaire", "Leroux", "Leroy", "Levy", "Lucas", "Marchand", "Marie", "Martin", "Masson", "Mathieu", "Mercier", "Meunier", "Michel", "Moreau", "Morel", "Morin", "Nicolas", "Noel", "Olivier", "Paris", "Perrin", "Petit", "Phillipe", "Picard", "Pierre", "Renaud", "Richard", "Robert", "Robin", "Roche", "Rousseau", "Roussel", "Roux", "Roy", "Simon", "Thomas", "Vidal", "Vincent"]>>
 
-<<set setup.thaiSlaveNames = ["A-Gun", "Amporn", "Aom", "Arisa", "Bam", "Beam", "Benyapa", "Bow", "Buppha", "Bussaba", "Chailai", "Chanchira", "Chimlin", "Chuenchai", "Dao", "Eve", "Fah", "Fai", "Fern", "Fon", "Hom", "Intira", "Jane", "Janjira", "Jenny", "Jira", "June", "Kamlai", "Kanokwan", "Kanya", "Karawek", "Kate", "Kosum", "Kulap", "Kwang", "Lamai", "Lawan", "Malee", "Mali", "May", "Min", "Mild", "Mind", "Mint", "Muk", "Nam", "Nan", "Nat", "Natcha", "Natchaya", "New", "Ngam-Chit", "Nick", "Ning", "Noon", "Nutcha", "Pakpao", "Pam", "Pang", "Pat", "Pen-Chan", "Pensri", "Phailin", "Phairoh", "Phawta", "Phueng", "Pim", "Ploy", "Pop", "Praew", "Ratana", "Saengdao", "Samorn", "Sanoh", "Sinee", "Sirada", "Solada", "Som", "Sroy", "Sudarat", "Sukanya", "Sukhon", "Taeng", "Tangmo", "Thanchanok", "Tidarat", "Toey", "Vanida", "Vipada", "View", "Waan", "Waen", "Wipada", "Yada", "Yanisa"]>>
-<<set setup.thaiSlaveSurnames = ["Aromdee", "Aung", "Bee", "Boon", "Boy", "Bunnag", "Cha", "Chai", "Chang", "Chin", "Fon", "Huang", "Ja", "Jang", "Jung", "Ka", "Kan", "Khan", "Ko", "Kong", "Kung", "Kurusarttra", "Leekpai", "Lek", "Li", "Lim", "Lin", "Liu", "Man", "Metharom", "Mon", "Moo", "Na", "Naka", "Narak", "Ng", "Nong", "Oo", "Ornlamai", "Pan", "Park", "Pattaya", "Pong", "Sa", "Sachdev", "Saenamuang", "Sakda", "Samui", "San", "Shinawatra", "Siri", "Sirisopa", "Som", "Somboon", "Song", "Su", "Sukbunsung", "Suwan", "Tan", "Tang", "Tee", "Thong", "Tong", "Wan", "Wang", "Win", "Yang", "Yuvaves", "Za", "Zaa", "Zhang"]>>
+<<set setup.thaiSlaveNames = ["A-Gun", "Amporn", "Aom", "Arisa", "Bam", "Beam", "Benyapa", "Bow", "Buppha", "Bussaba", "Chailai", "Chanchira", "Chanut", "Chimlin", "Chuenchai", "Dao", "Eve", "Fah", "Fai", "Fern", "Fon", "Hom", "Intira", "Jane", "Janjira", "Jarupan", "Jenny", "Jira", "June", "Kalaya", "Kamlai", "Kanokwan", "Kanya", "Karawek", "Kate", "Kosum", "Kulap", "Kwang", "Lamai", "Lawan", "Lursakdi", "Malee", "Mali", "May", "Mild", "Min", "Mind", "Mint", "Muk", "Nahathai", "Nam", "Nan", "Nat", "Natcha", "Natchaya", "New", "Ngam-Chit", "Nick", "Ning", "Noon", "Nutcha", "Orapin", "Pakpao", "Pam", "Pang", "Pat", "Pen-Chan", "Pensri", "Phailin", "Phairoh", "Phawta", "Phueng", "Pim", "Ploy", "Pop", "Praew", "Prateep", "Ratana", "Saengdao", "Samorn", "Sanoh", "Sinee", "Sirada", "Solada", "Som", "Sroy", "Sudarat", "Sukanya", "Sukhon", "Sukumol", "Taeng", "Tangmo", "Thanchanok", "Thita", "Tidarat", "Toey", "Vanida", "View", "Vipada", "Waan", "Waen", "Wipada", "Yada", "Yanisa", "Yingluck"]>>
+<<set setup.thaiSlaveSurnames = ["Ang", "Ann", "Aromdee", "Art", "Au", "Aung", "Ball", "Bank", "Bee", "Beer", "Bell", "Bird", "Boon", "Boonma", "Boonmee", "Bow", "Boy", "Bunnag", "Cha", "Chai", "Chaichana", "Chaimongkol", "Chaiwong", "Chang", "Charoensuk", "Chawla", "Cheng", "Chiangmai", "Chin", "Cho", "Choi", "Chong", "Chu", "Chung", "Da", "Dang", "Dao", "Dee", "Fon", "Han", "Hansen", "Ho", "Hong", "Hongsakul", "Huang", "Ja", "Jaidee", "Jain", "Jan", "Jang", "Jin", "Jira", "Jong", "Joy", "Jung", "Ka", "Kan", "Kang", "Keyuraphan", "Khan", "Ko", "Kob", "Koh", "Kong", "Korn", "Krishnakumar", "Ku", "Kung", "Kunplome", "Kurusarttra", "Kwan", "Lai", "Lam", "Lay", "Lee", "Leekpai", "Lek", "Li", "Lim", "Lin", "Liu", "Lo", "Lovely", "Lwin", "Ma", "Mai", "Mam", "Man", "Maneerat", "Manitkul", "Mba", "Mee", "Metharom", "Mohammed", "Mon", "Moo", "Myint", "na Nakorn", "Na", "Naja", "Naka", "Nam", "Nan", "Nana", "Narak", "Narula", "New", "Ng", "Ning", "Noi", "Nok", "Nong", "Noom", "Noon", "Nui", "Null", "Oh", "Ong", "Oo", "Ornlamai", "Pa", "Pan", "Pang", "Panich", "Panya", "Park", "Pattaya", "Pee", "Pim", "Piyaoui", "Pom", "Pong", "Poo", "Pop", "Por", "Pu", "Rat", "Rattana", "Rung", "Sa", "Sachdev", "Sae", "Saelee", "Saelim", "Saenamuang", "Saetang", "Sakda", "Sam", "Sampatisri", "Samui", "San", "Sang", "Sangthong", "Sethi", "Shaik", "Shinawatra", "Shrestha", "Siam", "Siri", "Sirisopa", "Smile", "So", "Soe", "Som", "Somboon", "Son", "Song", "Sophonpanich", "Sri", "Srisawat", "Srisuk", "Srisuwan", "Srithong", "Su", "Sukbunsung", "Suksawat", "Sun", "Suriya", "Suwan", "Suwannarat", "Sweet", "Ta", "Tai", "Tam", "Tan", "Tang", "Tee", "Than", "Thong", "Thongsuk", "Tom", "Ton", "Tong", "Top", "Toy", "Tran", "Tu", "Tuk", "Tum", "Tun", "Udom", "Wan", "Wang", "Wat", "Wattana", "Wee", "Win", "Wu", "Ya", "Yang", "Ying", "Yong", "Yu", "Yuvaves", "Za", "Zaa", "Zhang"]>>
 
 <<set setup.britishSlaveNames = ["Abbie", "Alice", "Amber", "Amy", "Anna", "Becky", "Beth", "Bethany", "Caitlin", "Charlie", "Charlotte", "Chloe", "Courtney", "Eleanor", "Ella", "Ellie", "Emily", "Emma", "Erin", "Georgia", "Grace", "Hannah", "Holly", "Jade", "Jasmine", "Jess", "Jessica", "Kate", "Katie", "Laura", "Lauren", "Leah", "Lily", "Louise", "Lucy", "Lydia", "Megan", "Mia", "Molly", "Natalie", "Niamh", "Olivia", "Phoebe", "Rachel", "Rebecca", "Rosie", "Sarah", "Shannon", "Sophie", "Zoe"]>>
 <<set setup.britishSlaveSurnames = ["Adams", "Allen", "Andrews", "Atkinson", "Bailey", "Baker", "Barker", "Barnes", "Bell", "Bennett", "Brown", "Cameron", "Carter", "Chapman", "Clark", "Clarke", "Cleese", "Cole", "Collins", "Cook", "Cooper", "Cox", "Davies", "Dawson", "Day", "Doyle", "Edwards", "Ellis", "Evans", "Fisher", "Foster", "Fox", "Gibson", "Gladstone", "Graham", "Gray", "Green", "Griffiths", "Hall", "Harris", "Harrison", "Harvey", "Hill", "Holmes", "Howard", "Hughes", "Hunter", "Idle", "Jackson", "James", "Johnson", "Jones", "Kelly", "King", "Knight", "Lee", "Lewis", "Lloyd", "Major", "Marshall", "Martin", "Mason", "Matthews", "May", "Mills", "Milne", "Mitchell", "Moore", "Morris", "Palin", "Palmer", "Parker", "Patel", "Pearce", "Pearson", "Powell", "Price", "Richards", "Richardson", "Roberts", "Robinson", "Rogers", "Russell", "Salisbury", "Scott", "Shaw", "Simpson", "Smith", "Stevens", "Stewart", "Taylor", "Thatcher", "Thomas", "Thompson", "Turner", "Walker", "Walpole", "Ward", "Watson", "Webb", "White", "Wilkinson", "Williams", "Wilson", "Wood", "Wright", "Young"]>>
@@ -466,8 +466,8 @@
 <<set setup.greekSlaveNames = ["Aggeliki", "Aiketerine", "Alexandra", "Anastasia", "Anna", "Baslikike", "Calliope", "Demetra", "Despoina", "Dominique", "Eirene", "Eleni", "Evangelia", "Georgia", "Helen", "Ioanna", "Konstantina", "Kyriake", "Maria", "Panagiota", "Paraskevi", "Sofia", "Vasiliki"]>>
 <<set setup.greekSlaveSurnames = ["Adamopoulos", "Alexiou", "Anagnostopoulou", "Anagnostou", "Antoniou", "Antonopoulou", "Apostolopoulos", "Athanasiou", "Athanasopoulos", "Athanasopoulou", "Christodoulou", "Christopoulos", "Christou", "Diamantopoulos", "Dimitrakopoulos", "Dimitriadi", "Dimitriadis", "Dimitriou", "Dimitris", "Dimou", "Doukas", "Efstathiou", "Floros", "Fotiadis", "Galani", "Georgakopoulos", "George", "Georgiadi", "Georgiou", "Georgopoulos", "Georgopoulou", "Giannakopoulos", "Giannakopoulou", "Giannopoulos", "Giannopoulou", "Ioannidis", "Ioannou", "Ionnidi", "Kanellopoulos", "Karagianni", "Karagiiani", "Karras", "Katsaros", "Kollias", "Konstantinidi", "Konstantinidis", "Konstantinidou", "Konstantopoulos", "Kontos", "Kostas", "Kyriakopoulos", "Kyriakou", "Makri", "Makris", "Margaritis", "Maria", "Marinos", "Michalopoulos", "Moraitis", "Mylonas", "Nikolaidi", "Nikolaidis", "Nikolaidou", "Nikolaou", "Oikonomou", "Panagiotidis", "Panagiotopoulos", "Panou", "Pantazis", "Pap", "Papa", "Papadaki", "Papadakis", "Papadimitriou", "Papadopoulou", "Papageorgiou", "Papaioannou", "Papanikolaou", "Papas", "Papatheodorou", "Pappa", "Paraskevopoulos", "Pavlou", "Petrakis", "Petropoulos", "Petrou", "Rapti", "Raptis", "Rigas", "Rizos", "Roussos", "Sakellariou", "Samaras", "Sarris", "Sideri", "Sideris", "Sotiropoulos", "Spanis", "Stamatopoulos", "Stamou", "Stathopoulou", "Stavropoulou", "Stefanidis", "Stefanou", "Stergiou", "Theodoropoulos", "Thodorou", "Triantafillou", "Triantafyllou", "Vasilopoulos", "Vassiliou", "Vlachos", "Vlachou"]>>
 
-<<set setup.israeliSlaveNames = ["Abigail", "Adele", "Adi", "Agam", "Alia", "Alma", "Ariel", "Avigail", "Avigayil", "Aya", "Ayala", "Azubah", "Bathseva", "Batsheba", "Berura", "Carmela", "Chana", "Chasya", "Chaya", "Edel", "Elah", "Ella", "Emily", "Emma", "Esther", "Gal", "Golda", "Hanna", "Hila", "Hodaya", "Iris", "Leaane", "Leah", "Lia", "Lian", "Maayan", "Maya", "Michal", "Minah", "Miriam", "Naavah", "Nediva", "Nitza", "Noa", "Noam", "Noya", "Ora", "Orali", "Orna", "Ornette", "Rachel", "Rebecca", "Rivka", "Romi", "Roni", "Ruth", "Sara", "Sarah", "Shira", "Sima", "Simcha", "Sirka", "Tahel", "Talia", "Talya", "Tamar", "Vered", "Yael", "Yahel", "Yardenah", "Yente", "Zamora", "Zemora"]>>
-<<set setup.israeliSlaveSurnames = ["Abu", "Aharon", "Aharoni", "Almog", "Alon", "Amir", "Amit", "Arbel", "Asher", "Ashkenazi", "Aviv", "Avraham", "Azulay", "Bar", "Barak", "Baron", "ben Ami", "ben Ari", "ben David", "Berger", "Biton", "Caspi", "Chen", "Cohen", "Dagan", "Dahan", "Daniel", "David", "Dayan", "Dekel", "Dvir", "Elbaz", "Erez", "Ezra", "Feldman", "Fisher", "Fishman", "Frenkel", "Friedman", "Gal", "Gil", "Gilad", "Golan", "Gold", "Goldberg", "Goldenberg", "Goldman", "Goldstein", "Gordon", "Goren", "Green", "Greenberg", "Gross", "Grossman", "Gutman", "Hadar", "Haim", "Harel", "Inbar", "Israel", "Kaplan", "Katz", "Kaufman", "Klein", "Kogan", "Koren", "Landau", "Lavi", "Lev", "Levi", "Levin", "Levy", "Liberman", "Manor", "Meir", "Melamed", "Michaeli", "Miller", "Mizrahi", "Mor", "Moran", "Nir", "Ohana", "Ohayon", "Oren", "Ovadia", "Öz", "Paz", "Peer", "Peled", "Peretz", "Perry", "Rabinovich", "Raviv", "Raz", "Regev", "Rosen", "Rosenberg", "Rotem", "Rubin", "Rubinstein", "Schwartz", "Segal", "Sela", "Shachar", "Shaked", "Shaley", "Shapira", "Sharon", "Shemesh", "Sherman", "Shulman", "Solomon", "Stein", "Stern", "Tal", "Tzur", "Vaknin", "Weinstein", "Weiss", "Yosef", "Zamir", "Zilberman", "Ziv"]>>
+<<set setup.israeliSlaveNames = ["Abigail", "Adel", "Adele", "Adi", "Agam", "Alia", "Aline", "Alma", "Amit", "Ariel", "Assil", "Avigail", "Avigayil", "Aya", "Ayala", "Azubah", "Bathseva", "Batsheba", "Berura", "Carmela", "Celine", "Chana", "Chasya", "Chaya", "Daniel", "Edel", "Eden", "Elah", "Ella", "Emily", "Emma", "Esther", "Gal", "Golda", "Hanna", "Hila", "Hodaya", "Iris", "Jana", "Lea", "Leaane", "Leah", "Lia", "Lian", "Lin", "Lior", "Ma'ayan", "Maayan", "Malk", "Maria", "Maryam", "Maya", "Michal", "Minah", "Miral", "Miriam", "Miyar", "Naavah", "Natalie", "Nediva", "Nitza", "Noa", "Noam", "Noor", "Noya", "Nur", "Omer", "Ora", "Orali", "Orna", "Ornette", "Rachel", "Rebecca", "Rivka", "Romi", "Roni", "Ruth", "Sara", "Sarah", "Sha'im", "Shira", "Sillin", "Sima", "Simcha", "Sirka", "Tahel", "Tala", "Talia", "Talya", "Tamar", "Vered", "Yael", "Yahel", "Yahli", "Yardenah", "Yarin", "Yente", "Yuval", "Zamora", "Zemora"]>>
+<<set setup.israeliSlaveSurnames = ["Abu", "Adler", "Aharon", "Aharoni", "Almog", "Alon", "Aloni", "Amar", "Amir", "Amit", "Arad", "Arbel", "Asher", "Ashkenazi", "Assaf", "Avital", "Aviv", "Avni", "Avraham", "Azulay", "Bachar", "Bar", "Barak", "Baron", "Baruch", "ben Ami", "ben Ari", "ben David", "Berger", "Berman", "Biton", "Bitton", "Blum", "Caspi", "Chen", "Cohen", "Dagan", "Dahan", "Daniel", "David", "Dayan", "Dekel", "Dor", "Doron", "Dotan", "Dror", "Dvir", "Edri", "Elbaz", "Eliyahu", "Epstein", "Erez", "Ezra", "Feldman", "Fisher", "Fishman", "Frenkel", "Fridman", "Friedman", "Gabay", "Gal", "Gazit", "Geva", "Gil", "Gilad", "Gilboa", "Golan", "Gold", "Goldberg", "Goldenberg", "Goldman", "Goldstein", "Gönen", "Gordon", "Goren", "Green", "Greenberg", "Grinberg", "Gross", "Grossman", "Gur", "Gutman", "Hadad", "Hadar", "Haim", "Harari", "Harel", "Hazan", "Inbar", "Israel", "Kaplan", "Katz", "Kaufman", "Keren", "Khoury", "Klein", "Kogan", "Koren", "Lahav", "Landau", "Lavi", "Lerner", "Lev", "Levi", "Levin", "Levy", "Liberman", "Maimon", "Malka", "Maman", "Manor", "Maor", "Margalit", "Marom", "Mazor", "Meir", "Melamed", "Michaeli", "Miller", "Mizrachi", "Mizrahi", "Mor", "Moran", "Moshe", "Nahum", "Naor", "Netanyahu", "Nir", "Noy", "Ohana", "Ohayon", "Or", "Oren", "Ovadia", "Öz", "Paz", "Peer", "Peled", "Peleg", "Peretz", "Perez", "Perry", "Porat", "Rabinovich", "Raviv", "Raz", "Regev", "Reshef", "Ron", "Ronen", "Rosen", "Rosenberg", "Rotem", "Roth", "Rozen", "Rubin", "Rubinstein", "Saar", "Sabag", "Sagi", "Salomon", "Sapir", "Sasson", "Schwartz", "Segal", "Segev", "Sela", "Shachar", "Shahar", "Shaked", "Shalev", "Shaley", "Shalom", "Shamir", "Shani", "Shapira", "Shapiro", "Sharabi", "Sharon", "Shavit", "Shemesh", "Sherman", "Shitrit", "Shoham", "Shulman", "Sofer", "Solomon", "Stein", "Stern", "Tal", "Tamir", "Tzur", "Vaknin", "Weinstein", "Weiss", "Yogev", "Yosef", "Zamir", "Zilberman", "Ziv", "Zohar", "Zur"]>>
 
 <<set setup.armenianSlaveNames = ["Anahit", "Angelina", "Anna", "Annie", "Anush", "Arevik", "Armine", "Astghik", "Diana", "Elen", "Elina", "Emma", "Eva", "Gayane", "Gohar", "Hasmik", "Karina", "Karine", "Liana", "Lilit", "Lina", "Lusine", "Mane", "Margarita", "Mari", "Maria", "Mariam", "Marianna", "Marina", "Marina", "Merry", "Milena", "Monika", "Nare", "Narine", "Nataly", "Nelly", "Ruzanna", "Seda", "Sofi", "Sona", "Susanna", "Svetlana", "Syuzana", "Syuzi", "Tamara", "Viktoria", "Yana"]>>
 <<set setup.armenianSlaveSurnames = ["Abrahamyan", "Arakelyan", "Arshakuni", "Asatryan", "Avagyan", "Avetisyan", "Baghasaryan", "Barsamian", "Davtyan", "Eskandarian", "Galstyan", "Gasparyan", "Gevorgyan", "Ghazaryan", "Grigoryan", "Hakobyan", "Harutyunyan", "Hayrapetyan", "Hovhannisyan", "Hovsepyan", "Karapetyan", "Kardashian", "Keshishian", "Khachatryan", "Manukyan", "Margaryan", "Martirosyan", "Melkonyan", "Minasyan", "Mkrtchyan", "Muradyan", "Petrosyan", "Poghosyan", "Sahakyan", "Sarafian", "Sargsyan", "Simonyan", "Stepanyan", "Tumasyan", "Vardanyan"]>>
@@ -494,8 +494,8 @@
 <<set setup.cubanSlaveNames = ["Armena", "Belgis", "Chamayra", "Cheena", "Dayami", "Estelle", "JaJuan", "Javier", "Judith", "Laline", "Maela", "Magalys", "Maria", "Marisa", "Norma", "Vionaika", "Yaineris", "Yanire", "Yelina", "Yonaidys", "Yosdalkis", "Yuricema"]>>
 <<set setup.cubanSlaveSurnames = ["Acosta", "Alfonso", "Alonso", "Alvarez", "Avila", "Batista", "Bermudez", "Blanco", "Borges", "Brito", "Caballero", "Cabrera", "Castellanos", "Castro", "Crespo", "Cruz", "Cuba", "Delgado", "Diaz", "Dominguez", "Espinosa", "Estrada", "Fernandez", "Fonseca", "Fuentes", "Garcia", "Gil", "Gomez", "Gonzales", "Gonzalez", "Guerra", "Gutierrez", "Hernandez", "Herrera", "Hildalgo", "Iglesias", "Jimenez", "Leon", "Lopez", "Martin", "Martinez", "Medina", "Mendez", "Menendez", "Miranda", "Montero", "Morales", "Moreno", "Nuñez", "Oliva", "Ortega", "Ortiz", "Padron", "Pena", "Perez", "Pupo", "Quintana", "Quintero", "Ramirez", "Ramos", "Reyes", "Rivero", "Rodrguez", "Rodriguez", "Rojas", "Romero", "Ruiz", "Sanchez", "Santana", "Santos", "Silva", "Sosa", "Soto", "Suarez", "Torres", "Valdes", "Vazquez", "Vega", "Velazquez"]>>
 
-<<set setup.whiteSouthAfricanSlaveNames = ["Alletta", "Aneke", "Anje", "Behati", "Brunelda", "Charlize", "Corli", "Diani", "Elani", "Elize", "Emmarentia", "Gidea", "Hanneleen", "Hentie", "Imka", "Isabeau", "Kriszanne", "Liani", "Marlize", "Meriska", "Noeline", "Riana", "Saartjie", "Sonique", "Susara", "Tilana", "Trudene", "Wilona", "Yolandi", "Zandre"]>>
-<<set setup.whiteSouthAfricanSlaveSurnames = ["Adriaanse", "Badenhorst", "Barnard", "Bezuidenhout", "Booysen", "Cilliers", "Cronje", "de Beer", "de Jager", "de Klerk", "de Kok", "de Villiers", "de Wet", "du Toit", "Engelbrecht", "Erasmus", "Goosen", "Grobler", "Groenewald", "Harmse", "Jansen", "Johnson", "Jonker", "Kloppers", "Kruger", "Liebenberg", "Louw", "MalherbeKlerk", "Meyer", "Moolman", "Morkel", "Muller", "Naude", "Olivier", "Oosthuizen", "Pieterse", "Plessis", "Pretorius", "Rensburg", "Schoeman", "Smit", "Smith", "Smuts", "Steenkamp", "Steyn", "Strydom", "Swart", "Theron", "Uys", "van Biljon", "van den Berg", "van der Knaap", "van der Merwe", "van der Walt", "van Dyk", "van Niekerk", "van Rensburg", "van Rooyen", "van Schalkywk", "van Staden", "van Tonder", "van Wyk", "van Zyl", "ven Zyl", "Vermaak", "Vlok", "Vorster", "Witbooi"]>>
+<<set setup.whiteSouthAfricanSlaveNames = ["Alida", "Alletta", "Amelia", "Aneke", "Anje", "Barbara", "Beatrice", "Behati", "Betsie", "Brunelda", "Charlize", "Corli", "Cornelia", "Diani", "Dorothea", "Elani", "Elanza", "Elizabeth", "Elize", "Emmarentia", "Gidea", "Hanneleen", "Hentie", "Imka", "Isabeau", "Kriszanne", "Letta", "Liani", "Mabel", "Magdalena", "Marga", "Maria", "Marlize", "Martha", "Meriska", "Noeline", "Riana", "Rozanne", "Saartjie", "Sonique", "Susara", "Tilana", "Trudene", "Wilona", "Yolandi", "Zandre"]>>
+<<set setup.whiteSouthAfricanSlaveSurnames = ["Abrahams", "Adams", "Adriaanse", "Anderson", "Arendse", "Badenhorst", "Baloyi", "Barnard", "Basson", "Bekker", "Bester", "Beukes", "Bezuidenhout", "Booysen", "Boshoff", "Bosman", "Botes", "Botha", "Brink", "Brits", "Brown", "Burger", "Cele", "Chauke", "Chetty", "Cilliers", "Cloete", "Coetzee", "Coetzer", "Conradie", "Cronje", "Daniels", "Davids", "de Beer", "de Jager", "de Klerk", "de Kock", "de Kok", "de Lange", "de Villiers", "de Wet", "Delport", "Diederichs", "Dreyer", "du Plessis", "du Preez", "du Toit", "Dube", "Els", "Engelbrecht", "Erasmus", "Esterhuizen", "Ferreira", "Fouche", "Fouché", "Fourie", "Geldenhuys", "Gerber", "Goosen", "Gouws", "Govender", "Greyling", "Grobler", "Groenewald", "Gumede", "Harmse", "Harris", "Hattingh", "Hendricks", "Human", "Isaacs", "Ismail", "Jacobs", "James", "Janse", "Jansen", "Johnson", "Jones", "Jonker", "Jooste", "Jordaan", "Joubert", "King", "Klerk", "Kloppers", "Kotze", "Kriel", "Kruger", "Labuschagne", "le Roux", "Lewis", "Liebenberg", "Lombard", "Lourens", "Louw", "Lubbe", "Malherbe", "Marais", "Maritz", "Martin", "McDonald", "Meyer", "Miller", "Moodley", "Moolman", "Morkel", "Mostert", "Moyo", "Muller", "Myburgh", "Naicker", "Naidoo", "Naude", "Naudé", "Nel", "Olivier", "Oosthuizen", "Patel", "Petersen", "Phiri", "Pienaar", "Pieterse", "Pillay", "Plessis", "Potgieter", "Pretorius", "Prinsloo", "Reddy", "Rensburg", "Roberts", "Roos", "Rossouw", "Roux", "Scheepers", "Schoeman", "Scholtz", "Scott", "Sibanda", "Sibiya", "Singh", "Smit", "Smith", "Smuts", "Snyman", "Steenkamp", "Steyn", "Strydom", "Swanepoel", "Swart", "Taylor", "Terblanche", "Theron", "Thomas", "Thompson", "Tshabalala", "Uys", "van Biljon", "van den Berg", "van der Knaap", "van der Merwe", "van der Walt", "van der Westhuizen", "van Dyk", "van Heerden", "van Niekerk", "van Rensburg", "van Rooyen", "van Schalkwyk", "van Schalkywk", "van Staden", "van Tonder", "van Vuuren", "van Wyk", "van Zyl", "ven Zyl", "Venter", "Vermaak", "Vermeulen", "Verwoerd", "Viljoen", "Visagie", "Visser", "Vlok", "Vorster", "Wessels", "Williams", "Wilson", "Witbooi"]>>
 
 <<set setup.blackSouthAfricanSlaveNames = ["Amahle", "Amogelang", "Andile", "Ayanda", "Ayize", "Bokamoso", "Busisiwe", "Duduzile", "Dumisile", "Hlengiwe", "Iminathi", "Karabo", "Khethiwe", "Lesedi", "Lindiwe", "Mbali", "Minenhle", "Mlungisi", "Mthandeni", "Nandi", "Nobesuthu", "Nomathemba", "Nomzamo", "Qaqamba", "Rethabile", "Sibongiseni", "Sinenhlanhla", "Siphephelo", "Sisipho", "Thandolwethu", "Thenjiwe", "Thotyelwa", "Thozama", "Thumeka", "Tshegofatso", "Unathi", "Vathiswa", "Veliswa", "Vuyokazi", "Weziwe", "Xolisile", "Yandiswa", "Yonela", "Zandile", "Zanele", "Zimkhitha", "Zintle", "Ziyanda", "Zodwa", "Zukelwa"]>>
 <<set setup.blackSouthAfricanSlaveSurnames = ["Arendse", "Asante", "Bhembe", "Bhengani", "Bhengu", "Bhuyeni", "Biyase", "Biyela", "Blose", "Bophela", "Bukhosini", "Caluza", "Cebekhulu", "Cele", "Chamane", "Chenai", "Chili", "Chonco", "Chulu", "Cibane", "Cindi", "Dimba", "Dlamini", "Dubandlela", "Dube", "Gambushe", "Guliwe", "Hlomuka", "Khan", "Khathini", "Khoza", "Khumalo", "Khumbuza", "Linda", "Mahlaba", "Mahlangu", "Mahomed", "Maseko", "Mashinini", "Mawere", "Mdunge", "Menziwa", "Mguni", "Mkhize", "Molefe", "Moloi", "Mopantokobogo", "Mthembu", "Mthethwa", "Mtshali", "Naidoo", "Naude", "Ndelu", "Ndlovu", "Ndosi", "Nengomasha", "Ngcolosi", "Ngidi", "Ngubane", "Nkosi", "Nsele", "Ntshangase", "Ntuli", "Nxele", "Nyambawu", "Nzama", "Onai", "Ongai", "Phiri", "Shenge", "Shinga", "Shongololo", "Sigwaxa", "Singo", "Sithole", "Sokwalisa", "Tshabalala", "Vongai", "Wosiyane", "Ziqubu", "Zuva"]>>
@@ -519,13 +519,13 @@
 <<set setup.estonianSlaveSurnames = ["Aarma", "Aavik", "Abel", "Adamson", "Anderson", "Annus", "Berg", "Gross", "Ilves", "Ivanova", "Jakobson", "Järv", "Johanson", "Kaasik", "Kala", "Kallas", "Karu", "Kask", "Kivi", "Kõiv", "Koppel", "Kukk", "Kull", "Kuusik", "Kuusk", "Laane", "Lang", "Laur", "Lember", "Lepik", "Lepp", "Liiv", "Lill", "Lõhmus", "Luik", "Maasik", "Magi", "Martin", "Masing", "Mets", "Miller", "Mitt", "Must", "Nõmm", "Nurk", "Oja", "Orav", "Ots", "Ott", "Paju", "Pärn", "Peterson", "Petrova", "Post", "Puusepp", "Rand", "Raud", "Raudsepp", "Rebane", "Roos", "Rummo", "Saar", "Saks", "Sarapuu", "Sarv", "Sepp", "Sibul", "Sikk", "Smirnova", "Soosaar", "Tali", "Tamm", "Tamme", "Teder", "Tomingas", "Toom", "Tooming", "Uustalu", "Vaher"]>>
 
 <<set setup.slovakSlaveNames = ["Alžbeta", "Anna", "Ema", "Eva", "Helena", "Jana", "Katarína", "Kristína", "Laura", "Margita", "Marta", "Michaela", "Mária", "Natália", "Nela", "Nina", "Simona", "Sofia", "Viktória", "Zuzana"]>>
-<<set setup.slovakSlaveSurnames = ["Bachoríková", "Balážová", "Bartošová", "Bednářová", "Chovancová", "Chovanecová", "Danková", "Farkašová", "Farmanová", "Gajdošová", "Horváthová", "Hudáková", "Hudecová", "Ivanová", "Kiššová", "Kollárová", "Kovacikova", "Kováčová", "Kovacsova", "Kovová", "Krajčírová", "Králová", "Kučerová", "Lišková", "Lukacova", "Macková", "Marková", "Michálková", "Molnárová", "Nagyová", "Nečasová", "Němcová", "Némethová", "Nováková", "Oravecová", "Pavlíková", "Petříková", "Poláčková", "Poláková", "Sabová", "Sedláková", "Šimková", "Šoltésová", "Štefanková", "Straková", "Sýkorová", "Szabová", "Tóthová", "Urbanová", "Valentová", "Vargová", "Vodičková"]>>
+<<set setup.slovakSlaveSurnames = ["Antal", "Baca", "Bachoríková", "Balazova", "Balážová", "Balog", "Balogh", "Baran", "Bartko", "Bartošová", "Bednářová", "Benkova", "Beno", "Benova", "Bezak", "Bielik", "Blahová", "Blasko", "Cernak", "Chovancova", "Chovancová", "Chovanecová", "Danis", "Danková", "Daňková", "Durica", "Duris", "Fabian", "Farkasova", "Farkašová", "Farmanová", "Fekete", "Filo", "Gajdosova", "Gajdošová", "Galova", "Gaspar", "Gregor", "Homola", "Hornakova", "Horvathova", "Horváthová", "Horvth", "Hrasko", "Hric", "Hudak", "Hudakova", "Hudáková", "Hudecova", "Hudecová", "Husar", "Ivanova", "Ivanová", "Janik", "Janosik", "Juhas", "Jurik", "Kissova", "Kiššová", "Klein", "Kmetova", "Kohutova", "Kolesar", "Kollarova", "Kollárová", "Konečná", "Kov", "Kovacikova", "Kovacova", "Kováčová", "Kovacsova", "Kovářová", "Kovov", "Kovová", "Krajčírová", "Krajcovicova", "Král", "Kralikova", "Králová", "Krizan", "Kubik", "Kučerová", "Kuruc", "Lacko", "Lesko", "Liptakova", "Lišková", "Luk", "Lukacova", "Luptakova", "Macková", "Majer", "Mala", "Malik", "Marek", "Markova", "Marková", "Masar", "Matus", "Mészáros", "Michalek", "Michálek", "Michálková", "Mihalikova", "Mikulova", "Mikusova", "Minařík", "Molnarova", "Molnárová", "Moravcik", "Mraz", "Murin", "Nagyova", "Nagyová", "Nečasová", "Němcová", "Němec", "Nemethova", "Némethová", "Nováková", "Novk", "Novotná", "Oravcova", "Oravecová", "Pavlíková", "Peter", "Petras", "Petříková", "Poláčková", "Poláková", "Rusnakova", "Rybar", "Sabo", "Sabol", "Sabová", "Sedláková", "Ševčík", "Shaik", "Šimková", "Sipos", "Siskova", "Slavík", "Sloboda", "Slovak", "Sokol", "Šoltésová", "Stano", "Štefanková", "Straková", "Suchá", "Švecová", "Sýkorová", "Szabova", "Szabová", "Takacova", "Tkacova", "Tomko", "Tothova", "Tóthová", "Uhrin", "Urbanová", "Vajda", "Valach", "Valentová", "Valko", "Vargova", "Vargová", "Vaskova", "Viera", "Vodičková", "Vrabel", "Zachar", "Zajac", "Zatko", "Zeman"]>>
 
 <<set setup.kazakhSlaveNames = ["Aisha", "Alina", "Amina", "Aruzhan", "Ayala", "Ayana", "Ayaru", "Ayaulym", "Ayzere", "Darya", "Diana", "Inkar", "Inzhu", "Kausar", "Madina", "Nurai", "Sezim", "Sofia", "Victoria", "Zhanerke"]>>
 <<set setup.kazakhSlaveSurnames = ["Abdrakhmanova", "Abenova", "Abilova", "Adilova", "Ahmetova", "Akhmetova", "Alieva", "Amangeldi", "Amanzholova", "Andreeva", "Askarova", "Aubakirova", "Bolatova", "Ibraeva", "Ibragimova", "Isaeva", "Iskakova", "Ismailova", "Ivanova", "Kalieva", "Karimova", "Kasymova", "Khasenova", "Kolesnikova", "Kozhakhmetova", "Kravchenko", "Kusainova", "Kuznetsova", "Musina", "Mustafina", "Nazarova", "Nikitina", "Novikova", "Nurgalieva", "Nurzhanova", "Omarova", "Ospanova", "Petrova", "Rakhimova", "Rakhmetova", "Sadvakasova", "Sadykova", "Serikbaeva", "Shevchenko", "Smagulova", "Smirnova", "Sokolova", "Suleymenova", "Sultan", "Sultanova", "Ten", "Tsoaya", "Tulegenova", "Umarova", "Volkova", "Zhakupova", "Zhumabekova", "Zhumagulova", "Zhumbabaeva", "Zhunusova"]>>
 
 <<set setup.zimbabweanSlaveNames = ["Aneni", "Anodiwa", "Anokosha", "Batsirai", "Chenesai", "Chiedza", "Chiratidzo", "Chishamiso", "Chivaraidzo", "Dadisai", "Edzai", "Fadzai", "Haruperi", "Hazvinei", "Idai", "Ipaishe", "Kunashe", "Kundai", "Maitaishe", "Mawanda", "Mukudzei", "Mutsa", "Ndafadzwa", "Ngonidzashe", "Nyararai", "Paidamoyo", "Pamhidzai", "Panashe", "Ropafadzo", "Ruponeso", "Ruramisai", "Ruvarashe", "Ruwadzano", "Sarudzai", "Tanatswa", "Tanyaradzwa", "Tapiwanashe", "Timukudzei", "Tinaye", "Tsungirirai", "Varaidzo", "Vhenekerayi", "Vongai", "Wadzanai", "Watinoda", "Yananiso", "Yemurai", "Zviedzo", "Zvinodaishe"]>>
-<<set setup.zimbabweanSlaveSurnames = ["Banda", "Bhebhe", "Chauke", "Chuma", "Dhliwayo", "Dube", "Gumbo", "Hove", "Khumalo", "Makoni", "Mapfumo", "Maphosa", "Maposa", "Marufu", "Masuku", "Mathe", "Mbedzi", "Mhlanga", "Mlambo", "Mlilo", "Moyo", "Mpala", "Mpofu", "Mudenda", "Muleya", "Munsake", "Muyambo", "Ncube", "Ndebele", "Ndhlovu", "Ndlovu", "Ndou", "Ngwenya", "Nkomo", "Nyandoro", "Nyathi", "Nyoni", "Phiri", "Shoko", "Shumba", "Sibanda", "Sigauke", "Simango", "Sithole", "Siziba", "Takawira", "Tembo", "Tshuma", "Zhou", "Zulu"]>>
+<<set setup.zimbabweanSlaveSurnames = ["Asante", "Banda", "Bhebhe", "Chakanyuka", "Chari", "Chauke", "Chibanda", "Chibaya", "Chifamba", "Chikomo", "Chinyama", "Chirume", "Chiwara", "Chiwasa", "Chiweshe", "Chuma", "Dhlamini", "Dhliwayo", "Dlamini", "Dube", "Gatsi", "Gomo", "Gondo", "Goreraza", "Gumbo", "Gumede", "Gwenzi", "Hadebe", "Hove", "Hungwe", "James", "Jimu", "John", "Kamusewu", "Kaseke", "Katiyo", "Katsande", "Khumalo", "Khupe", "Kunaka", "Lunga", "Mabhena", "Mabika", "Machingura", "Madondo", "Madzinga", "Madziva", "Mafukidze", "Mafuta", "Magaya", "Mahachi", "Mahlangu", "Majoni", "Makaza", "Makombe", "Makoni", "Makore", "Makumbe", "Makuyana", "Mamvura", "Mandaza", "Mandizvidza", "Mangena", "Mangwiro", "Manyika", "Mapfumo", "Maphosa", "Maponga", "Maposa", "Mapuranga", "Maraire", "Marange", "Marimo", "Marowa", "Marufu", "Marume", "Masango", "Masawi", "Maseko", "Mashava", "Mashingaidze", "Mashiri", "Mashonganyika", "Masiya", "Masuka", "Masuku", "Masunda", "Matambo", "Matare", "Mathe", "Matsika", "Mawire", "Mbedzi", "Mbewe", "Mguni", "Mhaka", "Mhembere", "Mhlanga", "Mkandla", "Mkwananzi", "Mlalazi", "Mlambo", "Mlilo", "Mlotshwa", "Motsi", "Moyo", "Mpala", "Mphoko", "Mpofu", "Msipa", "Mtetwa", "Mubaiwa", "Muchemwa", "Muchena", "Muchenje", "Mudenda", "Mudimba", "Mudimu", "Mudzingwa", "Mugabe", "Mugadza", "Mugwagwa", "Mujuru", "Muleya", "Mumbengegwi", "Mumpande", "Munemo", "Munetsi", "Munkombwe", "Munkuli", "Munsaka", "Munsake", "Munyoro", "Murwira", "Musariri", "Musarurwa", "Musekiwa", "Mushonga", "Musonza", "Mutale", "Mutandwa", "Mutasa", "Mutema", "Mutero", "Mutize", "Muyambo", "Muza", "Muzamba", "Muzanenhamo", "Muzenda", "Muzondo", "Mwale", "Mwanza", "Mwembe", "Mwinde", "Ncube", "Ndebele", "Ndhlovu", "Ndiweni", "Ndlovu", "Ndoro", "Ndou", "Ngirazi", "Ngorima", "Ngulube", "Ngwenya", "Nhamo", "Nkala", "Nkiwane", "Nkomo", "Nyakudya", "Nyamadzawo", "Nyamande", "Nyandoro", "Nyathi", "Nyika", "Nyikadzino", "Nyoni", "Paradza", "Phiri", "Rusere", "Ruzvidzo", "Sande", "Shava", "Shereni", "Shoko", "Shonhiwa", "Shoniwa", "Shumba", "Sibanda", "Sibindi", "Sigauke", "Simango", "Sithole", "Siwela", "Siziba", "Suluma", "Taderera", "Tafirenyika", "Takawira", "Tapera", "Taruvinga", "Tavengwa", "Tembo", "Tigere", "Tshuma", "Tsuro", "Tungamirai", "Zhou", "Zulu", "Zuze"]>>
 
 <<set setup.ugandanSlaveNames = ["Alice", "Angelline", "Anifa", "Anne", "Annet", "Barbara", "Beatrice", "Betty", "Caroline", "Cecilia", "Christine", "Dorothy", "Emma", "Evelyn", "Femiar", "Flavia", "Florence", "Harriet", "Huda", "Idah", "Jacquiline", "Jalia", "Jesca", "Jessica", "Joy", "Judith", "Juliana", "Justine", "Kyabangi", "Lilly", "Lucy", "Lukia", "Lydia", "Lyndah", "Margaret", "Mary", "Nabilah", "Naome", "Peace", "Rebecca", "Rita", "Rose", "Rosemary", "Ruth", "Sarah", "Susan", "Sylivia", "Tophace", "Veronica", "Victoria"]>>
 <<set setup.ugandanSlaveSurnames = ["Agaba", "Akello", "Arinaitwe", "Asiimwe", "Bagum", "Birungi", "Bukenya", "Byaruhanga", "Godfrey", "Kasozi", "Kato", "Kiwanuka", "Kizito", "Lubega", "Lwanga", "Matovu", "Mbabazi", "Mirembe", "Moses", "Mubiru", "Mugabi", "Mugisha", "Muhumuza", "Mukasa", "Musinguzi", "Musoke", "Mutebi", "Mwesigwa", "Nsubuga", "Okello", "Opio", "Otim", "Ssali", "Tumusiime"]>>
@@ -670,8 +670,8 @@
 <<set setup.laotianSlaveNames = ["Boanam", "Bong", "Boutsaba", "Chanhthuem", "Chaola", "Chimmy", "Chitpasong", "Daraswan", "Hathavan", "Kanthong", "Keosaychay", "Ketsana", "Khamphouang", "Khanhthaly", "Khanthalack", "Khathana", "Lae", "Manivanh", "Meay", "Mithsa", "Moui", "Noi", "Nouanchan", "Onechanh", "Oudomphone", "Outhoumchanh", "Paneda", "Phayvanh", "Phetubon", "Phonemaly", "Phonesvanh", "Phonthong", "Phouang", "Pinmany", "Pothong", "Pouy", "Sakkal", "Sengchanh", "Sibounheuang", "Soudavanh", "Soumly", "Souny", "Souxada", "Sunisa", "Syphay", "Thang", "Thea", "Thiemta", "Thongmanivong", "Thongvankham", "Tukata", "Vassady"]>>
 <<set setup.laotianSlaveSurnames = ["Air", "Boupha", "Bui", "Chanthalangsy", "Chanthavong", "Chounlamany", "Inthasone", "Inthavong", "Keo", "Keomany", "Kham", "La", "Lao", "Lim", "Lor", "Luanglath", "Manivanh", "Manivong", "Moua", "Na", "Nanthavong", "Noy", "Pathammavong", "Phanouvong", "Phanthavong", "Philavong", "Phimmasone", "Pholsena", "Phommachanh", "Phommavong", "Phonesavanh", "Phongsavath", "Rasphone", "Rattanavong", "Say", "Sayasane", "Sayavong", "Seng", "Sengmany", "Siharath", "Sisavath", "Sisouvong", "Sivilay", "Sone", "Souksavath", "Soulivong", "Southammavong", "Souvannavong", "Tan", "Thammavong", "Thammavongsa", "Thao", "Thong", "Tong", "Tran", "Vang", "Vong", "Vongphachanh", "Vongxay", "Xayalath", "Xayavong", "Xiong", "Yang"]>>
 
-<<set setup.mongolianSlaveNames = ["Altantsetseg", "Biambasuren", "Bolormaa", "Enkhjargal", "Enkhtuya", "Enkhtuyaa", "Erdenechimeg", "Gerel", "Khulan", "Lkhagvasüren", "Mönkh-Erdene", "Mönkhtsetseg", "Munkhtsetseg", "Narantsetseg", "Nergüi", "Odtsetseg", "Otgonbayar", "Oyuunchimeg", "Sarnai", "Tsendiin"]>>
-<<set setup.mongolianSlaveSurnames = ["Altangerel", "Baatar", "Bat-Erdene", "Bat", "Bataa", "Batbayar", "Batbold", "Batchuluun", "Batjargal", "Batmunkh", "Batsaikhan", "Batsukh", "Battulga", "Bayar", "Bayaraa", "Bayarsaikhan", "Bold", "Boldbaatar", "Byambaa", "Chinbat", "Chuluunbaatar", "Chuluunbat", "Davaa", "Davaadorj", "Dorj", "Enkhbaatar", "Enkhbat", "Enkhbold", "Erdene", "Erdenebat", "Erdenebileg", "Ganbaatar", "Ganbat", "Ganbold", "Gankhuyag", "Gantumur", "Ganzorig", "Jargal", "Jargalsaikhan", "Lkhagva", "Lkhagvasuren", "Luvsandamdingiin", "Nergui", "Ochirbat", "Otgonbayar", "Purev", "Purevdorj", "Purevsuren", "Sukhbaatar", "Tsend", "Tserendorj", "Tumur", "Tumurbaatar", "Tuya", "Zorigt"]>>
+<<set setup.mongolianSlaveNames = ["Altantsetseg", "Bayarmaa", "Biambasuren", "Bolormaa", "Enkhjargal", "Enkhtuya", "Enkhtuyaa", "Erdenechimeg", "Gerel", "Khongordzol", "Khulan", "Lkhagvasüren", "Mönkh-Erdene", "Mönkhtsetseg", "Munkhtsetseg", "Narantsetseg", "Nergüi", "Odtsetseg", "Odval", "Otgonbayar", "Oyunbileg", "Oyuunchimeg", "Sarnai", "Tsendiin"]>>
+<<set setup.mongolianSlaveSurnames = ["Altangerel", "Altankhuyag", "Altansukh", "Amarjargal", "Amarsaikhan", "Amarsanaa", "Amgalan", "Avirmed", "Baasan", "Baasandorj", "Baasanjav", "Baasankhuu", "Baatar", "Baatarkhuu", "Badarch", "Baldan", "Baljinnyam", "Banzragch", "Bat-Erdene", "Bat-Ochir", "Bat", "Bataa", "Batbaatar", "Batbayar", "Batbold", "Batchuluun", "Batdelger", "Batdorj", "Baterdene", "Batjargal", "Batkhuu", "Batkhuyag", "Batmunkh", "Batnasan", "Batsaikhan", "Batsukh", "Batsuuri", "Battsengel", "Battulga", "Battumur", "Battur", "Bayar", "Bayaraa", "Bayarmagnai", "Bayarsaikhan", "Bayasgalan", "Bazar", "Bold", "Boldbaatar", "Bolormaa", "Bulgan", "Byamba", "Byambaa", "Byambadorj", "Byambajav", "Byambasuren", "Chimeddorj", "Chinbat", "Chuluun", "Chuluunbaatar", "Chuluunbat", "Dagvadorj", "Damba", "Damdin", "Damdindorj", "Damdinsuren", "Dash", "Dashdavaa", "Dashdorj", "Dashnyam", "Dashzeveg", "Davaa", "Davaadorj", "Davaajav", "Davaakhuu", "Davaanyam", "Davaasambuu", "Davaasuren", "Delger", "Demberel", "Dorj", "Dorjgotov", "Dorjpalam", "Dorjsuren", "Enebish", "Enkhbaatar", "Enkhbat", "Enkhbayar", "Enkhbold", "Enkhee", "Enkhjargal", "Enkhsaikhan", "Enkhtaivan", "Enkhtur", "Erdene", "Erdenebaatar", "Erdenebat", "Erdenebayar", "Erdenebileg", "Erdenechuluun", "Erdenetsogt", "Galbadrakh", "Gan", "Ganbaatar", "Ganbat", "Ganbold", "Gankhuyag", "Gansukh", "Gantulga", "Gantumur", "Ganzorig", "Gombo", "Gombosuren", "Jambal", "Jamsran", "Janchiv", "Jargal", "Jargalsaikhan", "Khan", "Khurelbaatar", "Lamjav", "Lkhagva", "Lkhagvaa", "Lkhagvadorj", "Lkhagvajav", "Lkhagvasuren", "Lkhamsuren", "Luvsan", "Luvsandamdingiin", "Mandakh", "Mendbayar", "Munkh", "Munkhbat", "Munkhbayar", "Munkhjargal", "Munkhuu", "Muugii", "Myagmar", "Myagmarjav", "Myagmarsuren", "Namsrai", "Naran", "Narangerel", "Narmandakh", "Natsagdorj", "Nergui", "Nina", "Nyam", "Nyamaa", "Nyamdavaa", "Nyamdorj", "Nyamjav", "Nyamsuren", "Ochir", "Ochirbat", "Orgil", "Otgonbaatar", "Otgonbayar", "Purev", "Purevdorj", "Purevjav", "Purevsuren", "Ragchaa", "Sambuu", "Sanjaa", "Shagdar", "Shagdarsuren", "Sharav", "Sodnom", "Sosorbaram", "Sukhbaatar", "Surenjav", "Tamir", "Terbish", "Tse", "Tsedendamba", "Tsegmid", "Tsend-Ayush", "Tsend", "Tseren", "Tserendorj", "Tseveen", "Tsogbadrakh", "Tsogoo", "Tsogt", "Tsogtsaikhan", "Tsolmon", "Tumenjargal", "Tumur", "Tumurbaatar", "Tungalag", "Turbat", "Tuul", "Tuya", "Ulambayar", "Urtnasan", "Uyanga", "Yondon", "Zaya", "Zorig", "Zorigt"]>>
 
 <<set setup.taiwaneseSlaveNames = ["Chia-hua", "Chia-hui", "Chia-jung", "Chia-ling", "Chia-ying", "Chia-yu", "Ching-yi", "En-chi", "Feng-ping", "Hsiao-han", "Hsin-yi", "Hsiu-ling", "hu-ling", "Hui-chun", "Hui-ju", "Hui-ting", "Hui-wen", "Jui-yu", "Mei-ling", "Pao-yu", "Pei-chun", "Pei-shan", "Pin-yen", "Pin-yu", "Shih-han", "Shih-ting", "Shu-chen", "Shu-chuan", "Shu-fen", "Shu-hua", "Shu-hui", "Shu-ying", "Ting-ting", "Ting-wei", "Tzu-ching", "Wan-ting", "Wei-ting", "Ya-chi", "Ya-chu", "Ya-fang", "Ya-han", "Ya-hui", "Ya-ling", "Ya-ping", "Ya-ting", "Ya-wen", "Yi-an", "Yi-chun", "Yi-hsuan", "Yi-ju", "Yi-ling", "Yi-ting", "Yu-ting", "Yu-tung", "Yu-wen", "Yung-ching"]>>
 <<set setup.taiwaneseSlaveSurnames = ["Chang", "Chao", "Chen", "Cheng", "Chi", "Chiang", "Chien", "Chin", "Ching", "Chiou", "Chiu", "Cho", "Chou", "Chu", "Chuang", "Chung", "Dong", "Fan", "Fang", "Feng", "Fu", "Guo", "Han", "Ho", "Hong", "Hou", "Hsiao", "Hsieh", "Hsu", "Hsueh", "Hu", "Huang", "Hung", "Hwang", "Jiang", "Kang", "Kao", "Ko", "Ku", "Kuan", "Kung", "Kuo", "Lai", "Lan", "Li", "Liang", "Liao", "Lien", "Lim", "Lin", "Liu", "Lo", "Lu", "Lung", "Luo", "Ma", "Mao", "Meng", "Ni", "Ou", "Pai", "Pan", "Peng", "Shen", "Shih", "Shu", "Su", "Sun", "Sung", "Tai", "Tan", "Tang", "Teng", "Ting", "Tsai", "Tsao", "Tseng", "Tu", "Tung", "Wang", "Wei", "Wen", "Weng", "Wu", "Xiao", "Ya", "Yang", "Yao", "Yeh", "Yen", "Yi", "Yin", "Yu", "Yuan", "Yung"]>>
diff --git a/src/pregmod/editGenetics.tw b/src/pregmod/editGenetics.tw
index 18afeacda2868d5af973a811c023ac7542426fa5..3901fa8b963d2d79c2ef59f35d53f7384951b840 100644
--- a/src/pregmod/editGenetics.tw
+++ b/src/pregmod/editGenetics.tw
@@ -3,7 +3,7 @@
 <html>
 <script type="text/x-template" id="birthFullNameTmpl">
 	<% if(State.variables.surnameOrder != 1) {
-		%><% if(["Chinese", "Japanese", "Korean", "Cambodian", "Vietnamese", "Hungarian", "Mongolian"].includes(s.nationality)) {
+		%><% if(["Cambodian", "Chinese", "Hungarian", "Japanese", "Korean", "Mongolian", "Taiwanese", "Vietnamese"].includes(s.nationality)) {
 			%><% if(s.birthSurname || s.surname) {	%><%- s.birthSurname || s.surname%> <% } %><b><u><%- s.birthName || s.name %></u></b><%
 		} else {
 			%><b><u><%- s.birthName || s.name %></u></b><% if(s.birthSurname || s.surname) { %> <%- s.birthSurname || s.surname %><% } %><%
@@ -14,7 +14,7 @@
 </script>
 <script type="text/x-template" id="currentFullNameTmpl">
 	<% if(State.variables.surnameOrder != 1) {
-		%><% if(["Chinese", "Japanese", "Korean", "Cambodian", "Vietnamese", "Hungarian", "Mongolian"].includes(s.nationality)) {
+		%><% if(["Cambodian", "Chinese", "Hungarian", "Japanese", "Korean", "Mongolian", "Taiwanese", "Vietnamese"].includes(s.nationality)) {
 			%><% if(s.slaveSurname) {	%><%- s.slaveSurname %> <% } %><b><u><%- s.slaveName %></u></b><%
 		} else {
 			%><b><u><%- s.slaveName %></u></b><% if(s.slaveSurname) { %> <%- s.slaveSurname %><% } %><%
diff --git a/src/uncategorized/generateXYSlave.tw b/src/uncategorized/generateXYSlave.tw
index b31ecb1aa0047a48a1e7a72c6b820cabe23fbcfb..f4869a0d6657cbdd0cc268c3265fb331dc63ff14 100644
--- a/src/uncategorized/generateXYSlave.tw
+++ b/src/uncategorized/generateXYSlave.tw
@@ -453,31 +453,31 @@
 <<else>>
 	/% Temporarily use activeSlave.foreskin to store the chance of circumcision. %/
 	<<switch $activeSlave.nationality>>
-	<<case "Iranian" "Moroccan" "Afghan" "Tunisian" "Palestinian" "Sahrawi">>
+	<<case "Afghan" "Iranian" "Moroccan" "Palestinian" "Sahrawi" "Tunisian">>
 		<<set $activeSlave.foreskin = 100>>
-	<<case "Turkish" "Nigerian" "Iraqi" "Yemeni" "Jordanian" "Gabonese" "Tajik" "Comorian" "Kurdish" "Mauritanian">>
+	<<case "Comorian" "Gabonese" "Iraqi" "Jordanian" "Kurdish" "Mauritanian" "Nigerian" "Tajik" "Turkish" "Yemeni">>
 		<<set $activeSlave.foreskin = 99>>
-	<<case "Algerian" "Maldivian" "Azerbaijani" "Liberian">>
+	<<case "Algerian" "Azerbaijani" "Liberian" "Maldivian">>
 		<<set $activeSlave.foreskin = 98>>
-	<<case "Saudi" "Uzbek" "Libyan" "Djiboutian" "Eritrean" "Ivorian">>
+	<<case "Djiboutian" "Eritrean" "Ivorian" "Libyan" "Saudi" "Uzbek">>
 		<<set $activeSlave.foreskin = 97>>
-	<<case "Zairian" "Pakistani" "Nigerien" "Turkmen" "Sierra Leonean">>
+	<<case "Nigerien" "Pakistani" "Sierra "Turkmen" "Zairian" Leonean">>
 		<<set $activeSlave.foreskin = 96>>
-	<<case "Egyptian" "Tuvaluan" "Malagasy" "Nauruan" "a Cook Islander" "Niuean" "Palauan" "Samoan" "a Solomon Islander" "Tongan" "Ni-Vanuatu" "Gambian" "Togolese">>
+	<<case "a Cook Islander" "Egyptian" "Gambian" "Malagasy" "Nauruan" "Ni-Vanuatu" "Niuean" "Palauan" "Samoan" "a Solomon Islander" "Togolese" "Tongan" "Tuvaluan">>
 		<<set $activeSlave.foreskin = 95>>
 	<<case "Cameroonian" "Senegalese" "Somali">>
 		<<set $activeSlave.foreskin = 94>>
-	<<case "Indonesian" "Bangladeshi" "Syrian" "Beninese" "Bissau-Guinean">>
+	<<case "Bangladeshi" "Beninese" "Bissau-Guinean" "Indonesian" "Syrian">>
 		<<set $activeSlave.foreskin = 93>>
-	<<case "Israeli" "Ghanan" "Ethiopian" "Filipina" "Kosovan">>
+	<<case "Ethiopian" "Filipina" "Ghanan" "Israeli" "Kosovan">>
 		<<set $activeSlave.foreskin = 92>>
 	<<case "Kenyan" "Kyrgyz">>
 		<<set $activeSlave.foreskin = 91>>
-	<<case "Omani" "Burkinabé">>
+	<<case "Burkinabé" "Omani">>
 		<<set $activeSlave.foreskin = 88>>
 	<<case "Equatoguinean">>
 		<<set $activeSlave.foreskin = 87>>
-	<<case "Malian" "Kuwaiti">>
+	<<case "Kuwaiti" "Malian">>
 		<<set $activeSlave.foreskin = 86>>
 	<<case "Guinean">>
 		<<set $activeSlave.foreskin = 84>>
@@ -497,15 +497,15 @@
 		<<set $activeSlave.foreskin = 70>>
 	<<case "Central African">>
 		<<set $activeSlave.foreskin = 63>>
-	<<case "Malaysian" "Burundian">>
+	<<case "Burundian" "Malaysian">>
 		<<set $activeSlave.foreskin = 61>>
 	<<case "Lebanese">>
 		<<set $activeSlave.foreskin = 60>>
 	<<case "Angolan">>
 		<<set $activeSlave.foreskin = 58>>
-	<<case "Kazakh" "Fijian">>
+	<<case "Fijian" "Kazakh">>
 		<<set $activeSlave.foreskin = 56>>
-	<<case "Korean" "Bruneian" "Mosotho">>
+	<<case "Bruneian" "Korean" "Mosotho">>
 		/% Population-weighted average of South Korea and North Korea. %/
 		<<set $activeSlave.foreskin = 52>>
 	<<case "Albanian">>
@@ -528,13 +528,13 @@
 		<<set $activeSlave.foreskin = 33>>
 	<<case "Scottish">>
 		<<set $activeSlave.foreskin = 28>>
-	<<case "Ugandan" "Australian">>
+	<<case "Australian" "Ugandan">>
 		<<set $activeSlave.foreskin = 27>>
 	<<case "Namibian">>
 		<<set $activeSlave.foreskin = 26>>
 	<<case "South Sudanese">>
 		<<set $activeSlave.foreskin = 24>>
-	<<case "Belgian" "Thai" "Cypriot">>
+	<<case "Belgian" "Cypriot" "Thai">>
 		<<set $activeSlave.foreskin = 23>>
 	<<case "Malawian">>
 		<<set $activeSlave.foreskin = 22>>
@@ -546,40 +546,37 @@
 		<<set $activeSlave.foreskin = 19>>
 	<<case "Mauritian">>
 		<<set $activeSlave.foreskin = 17>>
-	<<case "Singaporean" "Surinamese" "Motswana">>
+	<<case "Motswana" "Singaporean" "Surinamese">>
 		<<set $activeSlave.foreskin = 15>>
-	<<case "Jamaican" "French" "Chinese" "Indian">>
+	<<case "Chinese" "French" "Indian" "Jamaican">>
 		<<set $activeSlave.foreskin = 14>>
-	<<case "Zambian" "Bulgarian" "Rwandan">>
+	<<case "Bulgarian" "Rwandan" "Zambian">>
 		<<set $activeSlave.foreskin = 13>>
-	<<case "Russian" "French Guianan" "Guyanese">>
+	<<case "French Guianan" "Guyanese" "Russian">>
 		<<set $activeSlave.foreskin = 12>>
 	<<case "German">>
 		<<set $activeSlave.foreskin = 11>>
 	<<case "Belarusian" "Georgian" "Papua New Guinean">>
 		<<set $activeSlave.foreskin = 10>>
-	<<case "Zimbabwean" "Japanese">>
+	<<case "Japanese" "Zimbabwean">>
 		<<set $activeSlave.foreskin = 9>>
-	<<case "Taiwanese" "Slovene" "Sri Lankan" "Swazi">>
+	<<case "Slovene" "Sri Lankan" "Swazi" "Taiwanese">>
 		<<set $activeSlave.foreskin = 8>>
-	<<case "Haitian" "Spanish" "Catalan">>
+	<<case "Catalan" "Haitian" "Spanish">>
 		<<set $activeSlave.foreskin = 7>>
-	<<case "Dutch" "Austrian" "Swiss" "East Timorese" "Trinidadian">>
+	<<case "Austrian" "Dutch" "East Timorese" "Swiss" "Trinidadian">>
 		<<set $activeSlave.foreskin = 6>>
-	<<case "Danish" "Swedish" "Greek" "a Liechtensteiner">>
+	<<case "Danish" "Greek" "a Liechtensteiner" "Swedish">>
 		<<set $activeSlave.foreskin = 5>>
-	<<case "Peruvian" "Serbian" "Nepalese" "Burmese" "Cambodian" "Mongolian">>
+	<<case "Burmese" "Cambodian" "Mongolian" "Nepalese" "Peruvian" "Serbian">>
 		<<set $activeSlave.foreskin = 4>>
-	<<case "Italian" "Norwegian" "Argentinian">>
+	<<case "Argentinian" "Italian" "Norwegian">>
 		<<set $activeSlave.foreskin = 3>>
-	<<case "Ukrainian" "Luxembourgian" "Vincentian" "Tibetan">>
+	<<case "Luxembourgian" "Tibetan" "Ukrainian" "Vincentian">>
 		<<set $activeSlave.foreskin = 2>>
-	<<case "Portuguese" "Hungarian" "Irish" "Finnish" "Brazilian" "Bermudian" "Uruguayan" "Monégasque" "Andorran" "Croatian" "Moldovan" "Panamanian" "Barbadian" "Bhutanese" "Seychellois">>
+	<<case "Andorran" "Barbadian" "Bermudian" "Bhutanese" "Brazilian" "Croatian" "Finnish" "Hungarian" "Irish" "Moldovan" "Monégasque" "Panamanian" "Portuguese" "Seychellois" "Uruguayan">>
 			<<set $activeSlave.foreskin = 1>>
-	<<case 	"Cuban" "Guatemalan" "Chilean" "Bolivian" "Venezuelan" "Lithuanian" "Slovak" "Czech" "Romanian" "Estonian" "Icelandic" "Polish" "Colombian" 
-			"Armenian" "Vietnamese" "Sammarinese" "Marshallese" "Greenlandic" "Belizean" "Costa Rican" "Salvadoran" "Micronesian" "Grenadian" "Honduran"
-			"I-Kiribati" "Laotian" "Maltese" "Nicaraguan" "Antiguan" "Bahamian" "Dominiquais" "Ecuadorian" "Latvian" "Paraguayan" "Kittitian" "Vatican"
-			"Saint Lucian" "Cape Verdean" "São Toméan">>
+	<<case 	"Antiguan" "Armenian" "Bahamian" "Belizean" "Bolivian" "Cape Verdean" "Chilean" "Colombian" "Costa Rican" "Cuban" "Czech" "Dominiquais" "Ecuadorian" "Estonian" "Greenlandic" "Grenadian" "Guatemalan" "Honduran" "I-Kiribati" "Icelandic" "Kittitian" "Laotian" "Latvian" "Lithuanian" "Maltese" "Marshallese" "Micronesian" "Nicaraguan" "Paraguayan" "Polish" "Romanian" "Saint Lucian" "Salvadoran" "Sammarinese" "São Toméan" "Slovak" "Vatican" "Venezuelan" "Vietnamese">>
 		<<set $activeSlave.foreskin = 0>>
 	<<default>>
 		/% Some overlooked country, or possibly stateless. Use global average. %/
diff --git a/src/uncategorized/hgSelect.tw b/src/uncategorized/hgSelect.tw
index 9d25131cc5b0d86dbd8e3696b374a9ce567c24d3..64b7af1253d99d3d6b8bbb5e89fa6e801bfd9088 100644
--- a/src/uncategorized/hgSelect.tw
+++ b/src/uncategorized/hgSelect.tw
@@ -11,7 +11,7 @@
 	<<set $HeadGirl = $slaves[_i]>>
 	<<if $surnameOrder != 1>>
 		<<switch $HeadGirl.nationality>>
-		<<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
+		<<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">>
 			<<if $HeadGirl.slaveSurname>>
 				<<set _HGName = $HeadGirl.slaveSurname + " " + $HeadGirl.slaveName>>
 			<<else>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 13fc2ab145fe7be49842195cb8b417d98d46535c..9979c43a661a9883c63f9ae1d1fb58c7c94dd3fa 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -337,7 +337,7 @@ She comes to you for an inspection
 		$activeSlave.birthName.
 	<<elseif $surnameOrder != 1>>>>
 		<<switch $activeSlave.nationality>>
-		<<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
+		<<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">>
 			<<if $activeSlave.birthSurname>>$activeSlave.birthSurname <</if>>$activeSlave.birthName.
 		<<default>>
 			$activeSlave.birthName<<if $activeSlave.birthSurname>> $activeSlave.birthSurname<</if>>.
@@ -360,7 +360,7 @@ She comes to you for an inspection
 	$activeSlave.slaveName<<if $activeSlave.slaveSurname>> $activeSlave.slaveSurname<</if>> is not its original name: it was once called
 	<<if $surnameOrder != 1>>
 		<<switch $activeSlave.nationality>>
-		<<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
+		<<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">>
 			<<if $activeSlave.birthSurname>>$activeSlave.birthSurname <</if>>$activeSlave.birthName.
 		<<default>>
 			$activeSlave.birthName<<if $activeSlave.birthSurname>> $activeSlave.birthSurname<</if>>.
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index 23e7f3d06a6196dd6f4763fab46286bb7e97b0d5..239c04aa9fb783a6bc0a008544c1a6e086ea18c9 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -11,7 +11,7 @@
 		<<if $eligibleSlaves[$i].slaveSurname>>
 			<<if $surnameOrder != 1>>
 				<<switch $eligibleSlaves[$i].nationality>>
-					<<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
+					<<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">>
 						<<set _slaveName = $eligibleSlaves[$i].slaveSurname + " " + $eligibleSlaves[$i].slaveName>>
 					<<default>>
 						<<set _slaveName = $eligibleSlaves[$i].slaveName + " " + $eligibleSlaves[$i].slaveSurname>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 56e0efdc0b671d1fa86d35b079893bcdd2442c9f..0191dfa364b110dc9f2df808d07f09e32761f3e0 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -11,7 +11,7 @@
 	   	<<if $slaves[$i].slaveSurname>>
 			<<if $surnameOrder != 1>>
 				<<switch $slaves[$i].nationality>>
-					<<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
+					<<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">>
 						<<set _slaveName = $slaves[$i].slaveSurname + " " + $slaves[$i].slaveName>>
 					<<default>>
 						<<set _slaveName = $slaves[$i].slaveName + " " + $slaves[$i].slaveSurname>>
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index 1d6f405b77dca5566f37723cec383994c6f7024a..95930d242822bff9d1176c009c113cb55a4c93da 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -426,7 +426,7 @@
 	<<case "Israeli">>
 		<<set $nickname = either("'God's Chosen'", "'Hebrew'", "'Levantine'", "'Tel Aviv'", "'Merchant'", "'Oven Dodger'", "'Shiksa'", "'Sharmuta'", "'Shekels'")>>
 	<<case "Italian">>
-		<<set $nickname = either("'Bologna'", "'Greaseball'", "'Latin'", "'Napoli'", "'Renaissance'", "'Rome'", "'Salami'", "'Sicilian'", "'Spaghetti'", "'Terrone'", "'Wop'")>>
+		<<set $nickname = either("'Bologna'", "'Greaseball'", "'Latin'", "'Mussolini'", "'Napoli'", "'Renaissance'", "'Rome'", "'Salami'", "'Sicilian'", "'Spaghetti'", "'Terrone'", "'Wop'")>>
 	<<case "Ivorian">>
 		<<set $nickname = either("'Abidjan'", "'Ivory'", "'Yamoussoukro'")>>
 	<<case "Jamaican">>
@@ -592,7 +592,7 @@
 	<<case "Somali">>
 		<<set $nickname = either("'Black Hawk Down'", "'Mogadishu'", "'The Captain Now'")>>
 	<<case "South African">>
-		<<set $nickname = either("'Afrikaner'", "'Apartheid'", "'Boer'", "'Cape Town'", "'Johannesburg'", "'Saffer'", "'Shaka'", "'Springbok'")>>
+		<<set $nickname = either("'Afrikaner'", "'Apartheid'", "'Boer'", "'Cape Town'", "'Johannesburg'", "'Mandela'", "'Saffer'", "'Shaka'", "'Springbok'")>>
 	<<case "Spanish">>
 		<<set $nickname = either("'Barcelona'", "'Jamon'", "'Madrid'", "'Monja'", "'Senora'", "'Siesta'", "'Toreadora'")>>
 	<<case "Sri Lankan">>
@@ -741,37 +741,37 @@
 	<<set $notApplyDesc = "may feel some gratitude due to your preference that she not be defined by her ethnicity, but this is counterbalanced by the increased independence your kindness inspires.">>
 
 <<case "vaginalWhiner">>
-	<<set $nickname = either("'Whiny'", "'Squealer'", "'Struggles'", "'Pussy Bitch'", "'Pussy Pain'", "'Shallow'", "'Rape Bait'", "'Tight Cunt'", "'Crybaby'", "'Cunt Vise'")>>
+	<<set $nickname = either("'Crybaby'", "'Cunt Vise'", "'Pussy Bitch'", "'Pussy Pain'", "'Rape Bait'", "'Shallow'", "'Squealer'", "'Struggles'", "'Tight Cunt'", "'Whiny'")>>
 	<<set $situationDesc = "has a tight pussy and not much skill using it. She still gets fucked, which results in frequent painful situations for her. Her moaning as she takes a big dick earns her the scorn of her fellow slaves.">>
 	<<set $applyDesc = "is embarrassed by her new nickname, and resolves to try harder to address her lack of skill. She hopes she'll get better at sex soon, for her own sake.">>
 	<<set $notApplyDesc = "is a little grateful you've decided to protect her from the other slaves' mockery of her sore little pussy. She still wants to get better at sex, for her own sake.">>
 
 <<case "analWhiner">>
-	<<set $nickname = either("'Whiny'", "'Squealer'", "'Struggles'", "'Anal Bitch'", "'Ass Pain'", "'Painal'", "'Butt Rape'", "'Tight Ass'", "'Crybaby'", "'Ass Vise'")>>
+	<<set $nickname = either("'Anal Bitch'", "'Ass Pain'", "'Ass Vise'", "'Butt Rape'", "'Crybaby'", "'Painal'", "'Squealer'", "'Struggles'", "'Tight Ass'", "'Whiny'")>>
 	<<set $situationDesc = "has a tight asshole and not much skill taking an anal fuck. She still gets buttraped, which causes her a great deal of anal pain. Her sobbing as she takes a big dick up her tight little asspussy earns her the scorn of her fellow slaves.">>
 	<<set $applyDesc = "is embarrassed by her new nickname, and resolves to try harder to address her lack of skill. She hopes she'll get better at buttsex soon, for her own sake.">>
 	<<set $notApplyDesc = "is a little grateful you've decided to protect her from the other slaves' mockery of her sore little asshole. She still wants to get better at buttsex, for her own sake.">>
 
 <<case "girlish">>
-	<<set $nickname = either("'Missie'", "'Slender'", "'Tomboy'", "'Ano'", "'Supermodel'", "'Runway'", "'Toothpick'", "'Zero'", "'Slip'")>>
+	<<set $nickname = either("'Ano'", "'Missie'", "'Runway'", "'Slender'", "'Slip'", "'Supermodel'", "'Tomboy'", "'Toothpick'", "'Zero'")>>
 	<<set $situationDesc = "has a trim form: her assets are quite modest. The slave society of the Free Cities tends to follow average male desires, which is to say that many slaves find themselves augmented to very large proportions. It's natural that slaves required to carry such burdens should resent her.">>
 	<<set $applyDesc = "is prouder of her lithe form that she was before, and is a little relieved at the added evidence that you don't plan to give her major implants any time soon.">>
 	<<set $notApplyDesc = "realizes that her form isn't necessarily due to some master plan and that you may see fit to change it; she begins to regard the remote surgery with apprehension.">>
 	
 <<case "flat">>
-	<<set $nickname = either("'Flatty'", "'Ironing Board'", "'Plank'", "'Undersized'", "'Itty Bitty'", "'Flat'", "'DFC'")>>
+	<<set $nickname = either("'DFC'", "'Flat'", "'Flatty'", "'Ironing Board'", "'Itty Bitty'", "'Mosquito Bites'", "'Plank'", "'Undersized'")>>
 	<<set $situationDesc = "has barely any breasts to speak of, she is completely flat. The slave society of the Free Cities tends to follow average male desires, which is to say that many slaves find themselves carrying comically oversized breasts. It's natural that slaves required to carry such burdens should resent her.">>
 	<<set $applyDesc = "further believes that chests should be deliciously flat, and is a little relieved at the added evidence that you don't plan to give her breasts the size of her head any time soon.">>
 	<<set $notApplyDesc = "realizes that her form isn't necessarily due to some master plan and that you may see fit to change it; she begins to regard the remote surgery with apprehension.">>
 
 <<case "loose">>
-	<<set $nickname = either("'Loose'", "'Used'", "'Welcoming'", "'Noisy'", "'Open'", "'Sloppy'", "'Gaping'", "'Size Queen'", "'Relaxed'", "'Accommodating'")>>
+	<<set $nickname = either("'Accommodating'", "'Gaping'", "'Loose'", "'Noisy'", "'Open'", "'Relaxed'", "'Size Queen'", "'Sloppy'", "'Used'", "'Welcoming'")>>
 	<<set $situationDesc = "has taken a lot of dick. Enough dick that her overused holes really show the mileage. She can take the largest cock without a sigh.">>
 	<<set $applyDesc = "is proud of her mileage, now that you've countenanced adding it to your name. Every cock she's taken, she's taken at your command.">>
 	<<set $notApplyDesc = "realizes that she isn't special just because she's been fucked so much, and understands that she'll have to do her best to fuck like a fresh teenager no matter how loose she gets.">>
 
 <<case "trap">>
-	<<set $nickname = either("'Girldick'", "'Otokonoko'", "'Switch'", "'Spurt'", "'Ganymede'", "'Chai'", "'Thai'", "'Trap'", "'Trappy'", "'Sissy'")>>
+	<<set $nickname = either("'Chai'", "'Ganymede'", "'Girldick'", "'Otokonoko'", "'Sissy'", "'Spurt'", "'Switch'", "'Thai'", "'Trap'", "'Trappy'")>>
 	<<set $situationDesc = "is a Free Cities sex slave, which makes her female. It makes her female despite several obvious physical issues, such as the fact that she's got an androgynous figure, or the fact that she has a penis. Neither of these makes any real difference when a cock gets shoved down her throat or stuffed up her butt, but they're hard not to notice.">>
 	<<set $applyDesc = "accepts that she's a little piece of shemale property.">>
 	<<set $notApplyDesc = "will do her best to serve as a nice little sex slave without explicit reference to how she's put together, or she'll be punished.">>
@@ -783,217 +783,217 @@
 	<<set $notApplyDesc = "is a little relieved to be protected from the mockery, even though her tiny endowment mocks her as it flops around whenever she's used.">>
 
 <<case "implants">>
-	<<set $nickname = either("'Silicone'", "'Plastique'", "'Blowup Doll'", "'Balloons'")>>
+	<<set $nickname = either("'Balloons'", "'Blowup Doll'", "'Plastique'", "'Silicone'")>>
 	<<set $situationDesc = "is full of breast implants. They're so large it's quite obvious they're fake, and the implications are clear: She's a plastic slut, and the other slaves never tire of letting her know it.">>
 	<<set $applyDesc = "accepts the implicit mockery, knowing that her bimbo-esque body is what appeals to <<if def $PC.customTitle>>her $PC.customTitle<<elseif $PC.title isnot 0>>her master<<else>>her mistress<</if>>.">>
 	<<set $notApplyDesc = "is relieved to be protected from the other slaves' mockery over her implants, though she's also a little sad she can't take them as a kind of trademark.">>
 
 <<case "bimbo">>
-	<<set $nickname = either("'Silicone'", "'Plastique'", "'Plastic'", "'Bimbo'", "'Barbie'", "'Blowup Doll'", "'Fuck Toy'", "'Fuckmeat'", "'Brain Dead'")>>
+	<<set $nickname = either("'Barbie'", "'Bimbo'", "'Blowup Doll'", "'Brain Dead'", "'Fuck Toy'", "'Fuckmeat'", "'Plastic'", "'Plastique'", "'Silicone'")>>
 	<<set $situationDesc = "is full of implants, and stupid beyond stupid. It's obvious she's fake, and her idiocy only confirms it: She's a bimbo slut, and the other slaves never tire of mocking her for it, not caring that she doesn't notice.">>
 	<<set $applyDesc = "doesn't notice the mockery, only that she now has a cute little nickname.">>
 	<<set $notApplyDesc = "would be thankful for this protection from the other slaves' mockery if she saw it as such, or was smart enough to notice it.">>
 
 <<case "stupid">>
-	<<set $nickname = either("'Dumb'", "'Dumbass'", "'Idiot'", "'Brain Dead'", "'Retard'", "'Retarded'", "'Straight F Grades'", "'Intellectually Challenged'", "'Stupid'")>>
+	<<set $nickname = either("'Brain Dead'", "'Dumb'", "'Dumbass'", "'Idiot'", "'Intellectually Challenged'", "'Retard'", "'Retarded'", "'Short Bus'", "'Straight F Grades'", "'Stupid'")>>
 	<<set $situationDesc = "is, quite simply, an uneducated dullard. Numerous slaves are a bit dumb, which makes it easier to break them, but she takes the cake and throws it in the trash. Some of the other, smarter slaves, see fit to tease her for it.">>
 	<<set $applyDesc = "accepts this mockery happily, as if she doesn't recognise it for what it is.">>
 	<<set $notApplyDesc = "would be thankful for this protection from the other slaves' mockery if she saw it as such, or was smart enough to notice it.">>
 
 <<case "smart">>
-	<<set $nickname = either("'Brainiac'", "'Nerd'", "'Smart'", "'Smarty'", "'Prodigy'", "'Einstein'", "'Genius'", "'Geek'", "'Whiz'", "'Professor'", "'Straight A Grades'")>>
+	<<set $nickname = either("'Brainiac'", "'Einstein'", "'Geek'", "'Genius'", "'Honor Roll'", "'Nerd'", "'Prodigy'", "'Professor'", "'Smart'", "'Smarty'", "'Straight A Grades'", "'Whiz'")>>
 	<<set $situationDesc = "is particularly brainy. A significant number of quality slaves are smart, but she is especially so, and it shows. She learns skills quicker, performs her duties better, and can carry intellectual conversation if allowed. Other slaves deem this enough to mock her.">>
 	<<set $applyDesc = "is proud of her intellect, and pleased that you have made it a part of her identity.">>
 	<<set $notApplyDesc = "accepts that her intellect is merely of slight interest.">>
 
 <<case "chubby">>
-	<<set $nickname = either("'Plush'", "'Chubby'", "'Hambeast'", "'Jabba'", "'Bloated'", "'Landwhale'", "'Jiggles'", "'Jiggly'", "'Tubby'", "'Whale'", "'Rotund'", "'Rubenesque'", "'Ample'", "'Jumbo'", "'Double Wide'", "'Feedee'", "'Plump'", "'Thicc'")>>
+	<<set $nickname = either("'Ample'", "'Bloated'", "'Chubby'", "'Double Wide'", "'Feedee'", "'Hambeast'", "'Jabba'", "'Jiggles'", "'Jiggly'", "'Jumbo'", "'Landwhale'", "'Plump'", "'Plush'", "'Rotund'", "'Rubenesque'", "'Thicc'", "'Tubby'", "'Whale'")>>
 	<<set $situationDesc = "is carrying a little extra weight. The cruelty of life as a slave increases your property's willingness to do cruelty where they can get away with it - what is passed to them, they pass to others - so she finds herself mocked for her size.">>
 	<<set $applyDesc = "knows that being fat makes her less valuable on the market, but she begins to accept that she's going to have to put up with being chubby for now.">>
 	<<set $notApplyDesc = "believes that this means she's going to have to lose weight soon, causing her some trepidation.">>
 	
 <<case "fat">>
-	<<set $nickname = either("'Whale'", "'Baluga'", "'Fatass'", "'Scale Breaker'", "'Lap Crusher'", "'Smothers'", "'Jiggles'", "'Jiggly'", "'Fatty'", "'Piggy'", "'Lardy'", "'Thud'", "'Buffet Closer'", "'Jumbo'", "'Double Wide'", "'Feedee'", "'Bed Breaker'", "'Roller'", "'Hambeast'", "'Jabba'", "'Bloated'")>>
+	<<set $nickname = either("'Baluga'", "'Bed Breaker'", "'Bloated'", "'Buffet Closer'", "'Double Wide'", "'Fatass'", "'Fatty'", "'Feedee'", "'Hambeast'", "'Jabba'", "'Jiggles'", "'Jiggly'", "'Jumbo'", "'Lap Crusher'", "'Lardy'", "'Piggy'", "'Roller'", "'Scale Breaker'", "'Smothers'", "'Thud'", "'Whale'")>>
 	<<set $situationDesc = "is carrying a lot of extra weight. The cruelty of life as a slave increases your property's willingness to do cruelty where they can get away with it - what is passed to them, they pass to others - so she finds herself mocked for her size.">>
 	<<set $applyDesc = "knows that being obese makes her less valuable on the market, but she begins to accept that she's going to have to put up with being fat for now.">>
 	<<set $notApplyDesc = "believes that this means she's going to have to lose a lot of weight soon, causing her some trepidation, though deep down she hopes you'll just have it sucked out instead of making her run.">>
 
 <<case "muscles">>
-	<<set $nickname = either("'Tank'", "'Amazon'", "'Gunshow'", "'Giant'", "'Gargantua'", "'Snu-Snu'", "'Prepare Yourself'", "'Gymrat'", "'Wonder Woman'", "'She-Hulk'", "'Muscle Barbie'")>>
+	<<set $nickname = either("'Amazon'", "'Gargantua'", "'Giant'", "'Gunshow'", "'Gymrat'", "'Muscle Barbie'", "'Prepare Yourself'", "'She-Hulk'", "'Snu-Snu'", "'Tank'", "'Wonder Woman'")>>
 	<<set $situationDesc = "is a big girl. Her huge muscles aren't to everyone's taste, but they're quite eye-catching, and give her some interesting sexual possibilities that wouldn't work with, for example, a sex slave not capable of supporting her own body weight on one hand for long periods. She has become the object of mixed admiration and envy from your other stock.">>
 	<<set $applyDesc = "is happy with her nickname; any embarrassment she may have felt about looking like statuary becomes a jet of pride. She's confident that this is the way you want her.">>
 	<<set $notApplyDesc = "she is a sex slave first, last, and always, no matter what her one-rep max is.">>
 
 <<case "buttslut">>
-	<<set $nickname = either("'Anal Addict'", "'Greek'", "'Back Door'", "'Sphincter'", "'Butthole'", "'Swedish'", "'Sodomy'", "'Cornhole'", "'Ass Pussy'", "'Bum-Love'", "'Second Pussy'")>>
+	<<set $nickname = either("'Anal Addict'", "'Ass Pussy'", "'Back Door'", "'Bum-Love'", "'Butthole'", "'Cornhole'", "'Greek'", "'Second Pussy'", "'Sodomy'", "'Sphincter'", "'Swedish'")>>
 	<<set $situationDesc = "loves it up the butt, and her tastes in sex are hard to miss. She's a sex slave and takes it however it's given, but honest enjoyment is hard to fake and it's pretty obvious how much fun she has when she's bent over and buttfucked. Her typical come-on is to bend over, reach around to spread her buttocks, and wink her anus by alternately clenching and relaxing her sphincter.">>
 	<<set $applyDesc = "knows that whatever the rest of her slave life holds, it will involve her slave rectum holding a lot of dick.">>
 	<<set $notApplyDesc = "understands that she'll have to take what buttsex she can get.">>
 	
 <<case "butt toy">>
-	<<set $nickname = either("'Rim Job'", "'Stinky Pinky'", "'Back Door'", "'Sphincter'", "'Butthole'", "'Reach Around'")>>
+	<<set $nickname = either("'Back Door'", "'Butthole'", "'Reach Around'", "'Rim Job'", "'Sphincter'", "'Stinky Pinky'")>>
 	<<set $situationDesc = "loves it when attention is lavished on her butt, even though she has never done anal. She's a sex slave and takes it however it's given, but honest enjoyment is hard to fake and it's pretty obvious how much fun she has when a client is roughly groping her rear. Her typical come-on is to 'accidentally' find her client's dick hotdogged betwixt her cheeks.">>
 	<<set $applyDesc = "knows that whatever the rest of her slave life holds, it will involve an ever growing amount of attention to her rear.">>
 	<<set $notApplyDesc = "understands that she'll have to take what butt play she can get.">>
 
 <<case "cumslut">>
-	<<set $nickname = either("'Vampire'", "'Sucker'", "'Deep Throat'", "'Throatclit'", "'Throat Meat'", "'No Gag Reflex'", "'Facepussy'", "'Semen Demon'", "'Cumfiend'", "'Succubus'", "'Vacuum'", "'Hoover'", "'Fellatio'", "'Pearl Necklace'", "'Swallows'", "'Gobbler'", "'Pole Smoker'", "'Meat Smoker'", "'Lip Service'", "'Guzzler'", "'Third Pussy'", "'Cocksucker'")>>
+	<<set $nickname = either("'Cocksucker'", "'Cumfiend'", "'Deep Throat'", "'Facepussy'", "'Fellatio'", "'Gobbler'", "'Guzzler'", "'Hoover'", "'Lip Service'", "'Meat Smoker'", "'No Gag Reflex'", "'Pearl Necklace'", "'Pole Smoker'", "'Semen Demon'", "'Succubus'", "'Sucker'", "'Swallows'", "'Third Pussy'", "'Throat Meat'", "'Throatclit'", "'Vacuum'", "'Vampire'")>>
 	<<set $situationDesc = "loves her some cum. Most slaves have to put effort into showing enthusiasm when on their knees and presented with the second or third cock in a row. She, on the other hand, maintains such a fetish for the stuff that she'll often suck it out of other slaves' holes, if allowed.">>
 	<<set $applyDesc = "knows that as long as she's your slave, she'll get what she needs.">>
 	<<set $notApplyDesc = "understands that cum is a luxury and she'll have to savor what comes her way naturally.">>
 
 <<case "submissive">>
-	<<set $nickname = either("'Doormat'", "'Bootlicker'", "'Sub'", "'Meek'", "'Submissive'", "'Bottom'", "'Clinger'", "'Secondary'", "'Humble'")>>
+	<<set $nickname = either("'Bootlicker'", "'Bottom'", "'Clinger'", "'Doormat'", "'Humble'", "'Meek'", "'Secondary'", "'Sub'", "'Submissive'")>>
 	<<set $situationDesc = "loves sexual submission. Whatever she's doing, she likes to be on the bottom. She'd rather be face-fucked than suck, and would rather take a dick than ride one. Some slaves look down on her willingness to put herself even farther below others, while some envy her ability to enjoy things that they have to work to tolerate.">>
 	<<set $applyDesc = "pretends to accept her new nickname obediently, but is secretly pleased by recognition of her submissive nature.">>
 	<<set $notApplyDesc = "understands that being a submissive sex slave doesn't make her special. All sex slaves must submit.">>
 
 <<case "humiliation">>
-	<<set $nickname = either("'Public Display'", "'Showoff'", "'Pornstar'", "'Nudist'", "'Attention Whore'", "'Showgirl'", "'Exhibitionist'", "'Flasher'", "'Flaunter'", "'Showboat'", "'Display Model'")>>
+	<<set $nickname = either("'Attention Whore'", "'Display Model'", "'Exhibitionist'", "'Flasher'", "'Flaunter'", "'Nudist'", "'Pornstar'", "'Public Display'", "'Showboat'", "'Showgirl'", "'Showoff'")>>
 	<<set $situationDesc = "loves to show off. Where other slaves would blush, get embarrassed, and wish they could cover themselves, she blushes, gets aroused, and enjoys the stares. Most other slaves are jealous of her predilections. Not many slaves naturally enjoy being fucked in public, and she can get off on it.">>
 	<<set $applyDesc = "accepts her new nickname without even pretending not to enjoy it. She's proud to fuck in plain view, and she wants everyone to know it. And fuck her in plain view.">>
 	<<set $notApplyDesc = "understands that she's a sex slave first, and must fuck in private like she were fucking in public.">>
 
 <<case "veteran">>
-	<<set $nickname = either("'Village Bicycle'", "'Public Favorite'", "'Whore Queen'", "'Dirty'", "'Worn'", "'Tired-Out'", "'Easy'", "'Cumdump'")>>
+	<<set $nickname = either("'Cumdump'", "'Dirty'", "'Easy'", "'Public Favorite'", "'Tired-Out'", "'Village Bicycle'", "'Whore Queen'", "'Worn'")>>
 	<<set $situationDesc = "has been with you for a while, and she's gotten fucked a lot. Hundreds and hundreds of times over many weeks. Though she does her best, at times it can be obvious that there's very little that surprises her any more. She's forgotten more sexual experience than many of your other slaves remember.">>
 	<<set $applyDesc = "knows that you've noticed all her hard work. Getting fucked day in and day out is harder than digging ditches, and she's a veteran ditchdigger.">>
 	<<set $notApplyDesc = "understands that even though she's been fucked so much, she's still just meat; she isn't special.">>
 
 <<case "cow">>
-	<<set $nickname = either("'Dairy Queen'", "'Holstein'", "'Bessie'", "'Milk Cans'", "'Cow'", "'Cowbell'", "'Milky Udders'", "'Creamy'", "'Milkmaid'", "'Milk Fountain'", "'Milk Factory'")>>
+	<<set $nickname = either("'Bessie'", "'Cow'", "'Cowbell'", "'Creamy'", "'Dairy Queen'", "'Holstein'", "'Milk Cans'", "'Milk Factory'", "'Milk Fountain'", "'Milkmaid'", "'Milky Udders'")>>
 	<<set $situationDesc = "is a good stock animal. Her body efficiently turns the cheap slave nutrition produced by your arcology into a never-ending river of rich milk.">>
 	<<set $applyDesc = "knows that her future involves many hours having her nipples gently tugged by a milking machine.">>
 	<<set $notApplyDesc = "understands that she must continue to be a good milking slave, but that such duties do not necessarily define her.">>
 
 <<case "novice">>
-	<<set $nickname = either("'Fumbles'", "'Calamity'", "'Clumsy'", "'Fresh Meat'", "'Slippery'", "'Sorry'", "'Fresh'", "'Innocent'", "'Novice'")>>
+	<<set $nickname = either("'Calamity'", "'Clumsy'", "'Fresh Meat'", "'Fresh'", "'Fumbles'", "'Innocent'", "'Novice'", "'Slippery'", "'Sorry'")>>
 	<<set $situationDesc = "does her best; she really tries. But she simply hasn't mastered the skills that more experienced sex slaves take for granted. Though this can be annoying and at times even painful, it is a source of occasional slapstick comedy.">>
 	<<set $applyDesc = "has a constant reminder that no matter how skilled a courtesan she becomes, some of her greatest hits will be told as amusing anecdotes for the rest of her service.">>
 	<<set $notApplyDesc = "understands that what matters is not what she did yesterday, or how much they liked it, but what she does today, and how much they like it.">>
 
 <<case "head girl">>
-	<<set $nickname = either("'Mistress'", "'On Your Knees'", "'Bottom Bitch'", "'Top'", "'Favorite'", "'Perfect'", "'Mrs.'")>>
+	<<set $nickname = either("'Bottom Bitch'", "'Favorite'", "'Mistress'", "'Mrs.'", "'On Your Knees'", "'Perfect'", "'Top'")>>
 	<<set $situationDesc = "occupies a place in the hierarchy of your penthouse that is certainly one which encourages nicknaming. Your other slaves view her with mixed envy, adoration, emulation, and apprehension. She is someone to curry favor with, to offer sexual favors, and at times someone to avoid. To the devoted slave her closeness to you is enviable; to the rebellious slave her alliance with you is traitorous.">>
 	<<set $applyDesc = "was already proud of and happy with her exalted position, but now she is all the more so. She had always nursed the secret fear that this was temporary, but her place at your right hand is now part of her name.">>
 	<<set $notApplyDesc = "begins to fear a little that she may one day be supplanted, since you did not think it right to make her place a part of her name.">>
 
 <<case "Concubine">>
-	<<set $nickname = either("'Missus'", "'Mrs.'", "'Beauty'", "'Empress'", "'Queen'", "'Princess'", "'Contessa'")>>
+	<<set $nickname = either("'Beauty'", "'Contessa'", "'Empress'", "'Missus'", "'Mrs.'", "'Princess'", "'Queen'")>>
 	<<set $situationDesc = "occupies a place in the hierarchy of your penthouse that is certainly one which encourages nicknaming. Your other slaves view her with mixed envy and admiration. She has much of the luxury of the Head Girl and none of the responsibility, and all she has to do for this exalted place is keep your sexual satisfaction as her prime goal.">>
 	<<set $applyDesc = "was already proud of and happy with her exalted position, but now she is all the more so. She had always nursed the secret fear that this was temporary, but her place in your bed is now part of her name.">>
 	<<set $notApplyDesc = "begins to fear a little that she may one day be supplanted, since you did not think it right to make her place a part of her name.">>
 
 <<case "Attendant">>
-	<<set $nickname = either("'Healing Hand'", "'Helping Hand'", "'Bath Girl'", "'Spa Mother'", "'Steam Queen'", "'Warm Water'", "'Mist Queen'", "'Misty'")>>
+	<<set $nickname = either("'Bath Girl'", "'Healing Hand'", "'Helping Hand'", "'Mist Queen'", "'Misty'", "'Spa Mother'", "'Steam Queen'", "'Warm Water'")>>
 	<<set $situationDesc = "is loved by almost every slave in your penthouse. Getting a chance to go and spend some time in her spa is a wonderful treat, for which slaves are willing to work very hard. She's very willing to help them find sexual release, but mostly just provides minor care and an understanding ear for their troubles.">>
 	<<set $applyDesc = "enjoys helping your girls, and is happy to learn that the role is part of her name now.">>
 	<<set $notApplyDesc = "is a bit sad that her role isn't part of her name, since she likes helping your girls and now wonders whether she'll be allowed to keep doing so.">>
 
 <<case "Madam">>
-	<<set $nickname = either("'Mother'", "'Boss Bitch'", "'Pimp Queen'", "'Pimparella'", "'Whore Queen'", "'Brothel Queen'", "'Pimp Hand'")>>
+	<<set $nickname = either("'Boss Bitch'", "'Brothel Queen'", "'Mother'", "'Pimp Hand'", "'Pimp Queen'", "'Pimparella'", "'Whore Queen'")>>
 	<<set $situationDesc = "is in an unusually responsible and pragmatic position, for a slave. She runs her whores' lives with almost total control, overseeing the sale of their bodies day in, day out. Some resent her, some love her, but all depend on her.">>
 	<<set $applyDesc = "enjoys running a whorehouse, and is happy to learn that the role is part of her name now.">>
 	<<set $notApplyDesc = "is a bit sad that her role isn't part of her name, since she likes running a whorehouse and now wonders whether she'll be allowed to keep doing so.">>
 
 <<case "DJ">>
-	<<set $nickname = either("'Celebutante'", "'Club Queen'", "'Club Princess'", "'Club Idol'", "'Arcology Idol'", "'LP'", "'EP'", "'SuperBass'", "'Bassgirl'", "'Subwoofers'", "'Bass Slut'", "'DJ Whore'")>>
+	<<set $nickname = either("'Arcology Idol'", "'Bass Slut'", "'Bassgirl'", "'Celebutante'", "'Club Idol'", "'Club Princess'", "'Club Queen'", "'DJ Whore'", "'EP'", "'LP'", "'Subwoofers'", "'SuperBass'")>>
 	<<set $situationDesc = "has a leadership role that requires decisiveness and discretion, but has to maintain a role of flirtatiousness and fun, at the same time. Other slaves marvel at how she must give another slut orders one moment, and girlishly giggle at a prominent citizen the next.">>
 	<<set $applyDesc = "enjoys being one of the most idolized girls in the arcology, and is happy to learn that the role is part of her name now.">>
 	<<set $notApplyDesc = "is a bit sad that her role isn't part of her name, since she likes being one of the most idolized girls in the arcology and now wonders whether she'll be allowed to keep doing so.">>
 
 <<case "Recruiter">>
-	<<set $nickname = either("'Trapper'", "'Cam Queen'", "'Slaver'", "'Snake'", "'Spider'", "'Slavecatcher'", "'Camgirl'", "'Honeytrap'", "'Honeypot'")>>
+	<<set $nickname = either("'Cam Queen'", "'Camgirl'", "'Honeypot'", "'Honeytrap'", "'Slavecatcher'", "'Slaver'", "'Snake'", "'Spider'", "'Trapper'")>>
 	<<set $situationDesc = "is fundamentally a liar, in her role as recruiter. She must constantly lie by omission if not by commission, telling everyone interested in slavery all about everything good about being your slave, while leaving out the fundamental reality of sexual servitude.">>
 	<<set $applyDesc = "enjoys seeing girls go from faces on a screen to fellow fuckslaves, and is happy to learn that the role is part of her name now.">>
 	<<set $notApplyDesc = "is a bit sad that her role isn't part of her name, since she likes making girls go from faces on a screen to fellow fuckslaves and now wonders whether she'll be allowed to keep doing so.">>
 
 <<case "Wardeness">>
-	<<set $nickname = either("'Rapist'", "'Snake'", "'Spider'", "'Nightstick'", "'Jailoress'", "'Interrogatrix'", "'Inquisitrix'", "'Stoolie'")>>
+	<<set $nickname = either("'Inquisitrix'", "'Interrogatrix'", "'Jailoress'", "'Nightstick'", "'Rapist'", "'Snake'", "'Spider'", "'Stoolie'")>>
 	<<set $situationDesc = "has perhaps the most hated role among your slaves. Her charges hate her, of course. But almost every slave who was once one of her charges hates her too, for they have not forgotten how her whim was once the law to them.">>
 	<<set $applyDesc = "enjoys having a row of cells full of slaves to abuse, and is happy to learn that the role is part of her name now.">>
 	<<set $notApplyDesc = "is a bit sad that her role isn't part of her name, since she likes having a row of cells full of slaves to abuse and now wonders whether she'll be allowed to keep doing so.">>
 
 <<case "Milkmaid">>
-	<<set $nickname = either("'Dairy Queen'", "'Strong Hands'", "'Cowhand'", "'Cowpoke'", "'Milktugger'", "'Cream Queen'")>>
+	<<set $nickname = either("'Cowhand'", "'Cowpoke'", "'Cream Queen'", "'Dairy Queen'", "'Milktugger'", "'Strong Hands'")>>
 	<<set $situationDesc = "has a physically demanding and emotionally rewarding role. It's hard work, hauling milk and shifting cows all day, but her girls love her. It's hard not to love someone when you depend on them so totally.">>
 	<<set $applyDesc = "enjoys being a milkmaid, despite the tough work, and is happy to learn that the role is part of her name now.">>
 	<<set $notApplyDesc = "is a bit sad that her role isn't part of her name, since she likes being a milkmaid, despite the tough work, and now wonders whether she'll be allowed to keep doing so.">>
 
 <<case "Collectrix">>
-	<<set $nickname = either("'Cum Queen'", "'Buttfucker'", "'Prostate Poker'", "'Extractrix'", "'Sodomizer'", "'Orgasmotron'")>>
+	<<set $nickname = either("'Buttfucker'", "'Cum Queen'", "'Extractrix'", "'Orgasmotron'", "'Prostate Poker'", "'Sodomizer'")>>
 	<<set $situationDesc = "is required to fuck more exhaustingly than any other slave in the arcology. It's one thing to take dick all day; it's quite another to be expected to constantly massage prostates to orgasm. Naturally, the other slaves notice.">>
 	<<set $applyDesc = "really enjoys being expected to bone butts constantly, and is happy to learn that the role is part of her name now.">>
 	<<set $notApplyDesc = "is a bit sad that her role isn't part of her name, since she likes being expected to bone butts constantly and now wonders whether she'll be allowed to keep doing so.">>
 
 <<case "Schoolteacher">>
-	<<set $nickname = either("'Schoolteacher'", "'Sensei'", "'Teach'", "'Principal'", "'Professor'", "'Schoolmistress'", "'Ruler'", "'Profesora'", "'Headmistress'")>>
+	<<set $nickname = either("'Headmistress'", "'Principal'", "'Profesora'", "'Professor'", "'Ruler'", "'Schoolmistress'", "'Schoolteacher'", "'Sensei'", "'Teach'")>>
 	<<set $situationDesc = "might consider her role boring, if she weren't allowed to use sexual abuse as a correction for poor attentiveness. As it is, her sexual aggressiveness draws much open comment and some private infatuation from the students.">>
 	<<set $applyDesc = "likes teaching, especially because she's allowed to use the students, and is happy to learn that the role is part of her name now.">>
 	<<set $notApplyDesc = "is a bit sad that her role isn't part of her name, since she likes teaching, especially because she's allowed to use the students, and now wonders whether she'll be allowed to keep doing so.">>
 
 <<case "Stewardess">>
-	<<set $nickname = either("'Martinent'", "'Perfectionist'", "'Inspectrix'", "'Top Mop'", "'Concierge'", "'Housemistress'")>>
+	<<set $nickname = either("'Concierge'", "'Housemistress'", "'Inspectrix'", "'Martinent'", "'Perfectionist'", "'Top Mop'")>>
 	<<set $situationDesc = "might consider her role boring, if she weren't allowed to use sexual abuse as a correction for poor work. As it is, her sexual aggressiveness draws much open comment and some private infatuation from the servants.">>
 	<<set $applyDesc = "likes being in charge of household tasks, especially because she's allowed to use the servants, and is happy to learn that the role is part of her name now.">>
 	<<set $notApplyDesc = "is a bit sad that her role isn't part of her name, since she likes being in charge of household tasks, especially because she's allowed to use the servants, and now wonders whether she'll be allowed to keep doing so.">>
 
 <<case "bodyguard">>
-	<<set $nickname = either("'Aegis'", "'Amazon'", "'Paladin'", "'Athena'", "'Diana'", "'Widow'", "'Terminatrix'", "'Bloody'", "'Gunsmoke'")>>
+	<<set $nickname = either("'Aegis'", "'Amazon'", "'Athena'", "'Bloody'", "'Diana'", "'Gunsmoke'", "'Paladin'", "'Terminatrix'", "'Widow'")>>
 	<<set $situationDesc = "divides your other slaves. She is a physically intimidating sight, wearing normal slave attire and obviously sexually available, but also carrying a sword across her back and an automatic weapon at her hip. Some revere her unique position of responsibility, while others mock how far she steps outside the bounds of sexual slavery.">>
 	<<set $applyDesc = "knew a while ago that she was likely to spend some time shadowing your every move. But now, she understands that not only is your life in her hands, it is going to remain so. She is almost awed by the responsibility.">>
 	<<set $notApplyDesc = "realizes to her apprehension that she may someday be a simple sex slave again, respected for her holes rather than her swordswomanship.">>
 
 <<case "server">>
-	<<set $nickname = either("'Bottom'", "'Bedwarmer'", "'Sub'", "'Girltoy'", "'Slave Slut'", "'Please No'", "'Lovergirl'", "'House Slave'")>>
+	<<set $nickname = either("'Bedwarmer'", "'Bottom'", "'Girltoy'", "'House Slave'", "'Lovergirl'", "'Please No'", "'Slave Slut'", "'Sub'")>>
 	<<set $situationDesc = "holds a place in the hierarchy of your penthouse that almost demands a nickname. She is the lowest of the low, below even your other slaves. She is a pitiable creature, living with a large number of sexually charged people, slave and free, all of whom have the right to demand any sexual service they wish of her.">>
 	<<set $applyDesc = "has become almost proud of her strange, exhausting situation. Hers is not the struggle of slaves to know their place, for she knows hers. It is on the bottom.">>
 	<<set $notApplyDesc = "begins to hope a little that maybe she can rise beyond her current station.">>
 
 <<case "nipples">>
-	<<set $nickname = either("'Eye Hazard'", "'THO'", "'Nips'", "'Puffy'", "'Pointy'", "'Titclits'", "'Dicknipples'")>>
+	<<set $nickname = either("'Dicknipples'", "'Eye Hazard'", "'Nips'", "'Pointy'", "'Puffy'", "'THO'", "'Titclits'")>>
 	<<set $situationDesc = "has a pair of nipples that are hard to ignore. Whenever she's sexually aroused, they jut proudly from her chest. As a result, it's totally impossible for her to conceal arousal. When she's ready for it, her big nipples let the whole world know she's easy.">>
 	<<set $applyDesc = "is proud of the nickname, almost amusingly so. She flaunts her nipples in a way she didn't before.">>
 	<<set $notApplyDesc = "accepts that her nipples are just another part of her, and that if she pokes those who fuck her in the missionary position a little, that's all right.">>
 
 <<case "areolae">>
-	<<set $nickname = either("'Headlights'", "'Broad Based'", "'Highbeams'", "'Cans'", "'Areolae'", "'Dark Circles'")>>
+	<<set $nickname = either("'Areolae'", "'Broad Based'", "'Cans'", "'Dark Circles'", "'Headlights'", "'Highbeams'")>>
 	<<set $situationDesc = "has areolae broader than many slaves' entire breasts. Some slaves find them unattractive, making them an easy target for mockery; others like them, and playfully torment her by giving her a nickname based on them.">>
 	<<set $applyDesc = "is proud of the nickname, almost amusingly so. She flaunts her lovely broad areolae happily, the nipples in their centers hard.">>
 	<<set $notApplyDesc = "accepts that her broad areolae are just another part of her, just like her big tits.">>
 
 <<case "lips">>
-	<<set $nickname = either("'DSLs'", "'Pillows'", "'Kissy'", "'Facepussy'", "'Beestung'", "'Ducklips'")>>
+	<<set $nickname = either("'Beestung'", "'DSLs'", "'Ducklips'", "'Facepussy'", "'Kissy'", "'Pillows'")>>
 	<<set $situationDesc = "has lovely lips. They're so big she can hardly talk straight, and they even hinder her ability to communicate any facial expression other than a desire to be facefucked. This is appropriate, as she spends a lot of time getting facefucked.">>
 	<<set $applyDesc = "accepts that her big lips define her. Even more than before, she presents her mouth for oral sex whenever she flirts, and she views her throat as her primary sexual organ.">>
 	<<set $notApplyDesc = "accepts that her mouth is only one of her holes, and that as a sex slave she'll be taking cock in all of them, even if her lips are huge.">>
 
 <<case "mark">>
-	<<set $nickname = either("'Marked'", "'Chosen'", "'Breeder'", "'Special'", "'Ass Kisser'", "'Favors'", "'Connections'")>>
+	<<set $nickname = either("'Ass Kisser'", "'Breeder'", "'Chosen'", "'Connections'", "'Favors'", "'Marked'", "'Special'")>>
 	<<set $situationDesc = "an Elite Breeder. She has permanently been marked as the mother of societies children. If she isn't currently swelling with life, she will be soon. However, she is also granted special benefits befitting the mother of future generations of gifted children.">>
 	<<set $applyDesc = "takes pride in her new nickname and the bond it displays between her and her sire. She has to make sure that it doesn't go to her head, though.">>
 	<<set $notApplyDesc = "understands that she is expected to obey and fuck just like any of your other slaves, regardless of her status as a breeder.">>
 
 <<case "broodmother">>
-	<<set $nickname = either("'Broodmother'", "'Breeder'", "'Naedoko'", "'Nursery'", "'Bakery'", "'Baby Factory'")>>
+	<<set $nickname = either("'Baby Factory'", "'Bakery'", "'Breeder'", "'Broodmother'", "'Naedoko'", "'Nursery'")>>
 	<<set $situationDesc = "is a Broodmother. Her belly is enormous, unavoidable evidence that her life has been dedicated to carrying children. Her taut belly is stuffed with her brood and barely gets smaller with every child born from her.">>
 	<<set $applyDesc = "takes a bit of solace from her new hope in her nickname that she will be kept in good shape and not have to worry about her pregnancy draining her, but also a bit of fear from her suspicion that she'll remain this way until she's out of eggs.">>
 	<<set $notApplyDesc = "understands that she is expected to obey, work, and fuck just like any of your other slaves, regardless of how big her pregnancy is.">>
 	
 <<case "hyperbroodmother">>
-	<<set $nickname = either("'Broodmother'", "'Tentacle Raped'", "'Naedoko'", "'Nursery'", "'Seedbed'", "'Bursting'", "'Baby Factory'")>>
+	<<set $nickname = either("'Baby Factory'", "'Broodmother'", "'Bursting'", "'Naedoko'", "'Nursery'", "'Seedbed'", "'Tentacle Raped'")>>
 	<<set $situationDesc = "is a Broodmother. Her belly is enormous, unavoidable evidence that her life has been dedicated to carrying children. Her taut belly constantly bulges and squirms from her brood writhing within her and it is a very real possibility that she may pop.">>
 	<<set $applyDesc = "takes a bit of solace from her new hope in her nickname that she will be kept in good shape and not have to worry about her pregnancy draining her, but also a bit of fear from her suspicion that she'll remain this way until she dies or her body is used up.">>
 	<<set $notApplyDesc = "understands that she is expected to obey, work, and fuck just like any of your other slaves, regardless of how big her pregnancy is.">>
 
 <<case "hyperpreg">>
-	<<set $nickname = either("'Hyperbreeder'", "'Waterslide'", "'Squirmy'", "'Hyperfertile'", "'Bulgey'", "'Bursting'", "'Balloon'", "'Clown Car'")>>
+	<<set $nickname = either("'Balloon'", "'Bulgey'", "'Bursting'", "'Clown Car'", "'Hyperbreeder'", "'Hyperfertile'", "'Squirmy'", "'Waterslide'")>>
 	<<set $situationDesc = "is a breeding slave. Her belly is huge, unavoidable evidence that she's very pregnant. Her taut belly constantly bulges and squirms from her brood writhing within her and it is a very real possibility that she may pop.">>
 	<<set $applyDesc = "takes a bit of solace from her new hope at her nickname that she will be kept in good shape and not have to worry about the size of her pregnancy, and a bit of fear from her suspicion that producing babies is her whole future.">>
 	<<set $notApplyDesc = "understands that she is expected to obey, work, and fuck just like any of your other slaves, regardless of how big her pregnancy is.">>
 
 <<case "babymaker">>
-	<<set $nickname = either("'Daddy'", "'Sirer'", "'Potent'", "'Cum Cannon'", "'Baby Maker'", "'Womb Filler'", "'Fire Hose'", "'Baker'", "'Popper'", "'Belly Popper'", "'Breeding Bull'", "'Breeding Stud'", "'Breeding Stallion'", "'Breeding Boar'")>>
+	<<set $nickname = either("'Baby Maker'", "'Baker'", "'Belly Popper'", "'Breeding Boar'", "'Breeding Bull'", "'Breeding Stallion'", "'Breeding Stud'", "'Cum Cannon'", "'Daddy'", "'Fire Hose'", "'Popper'", "'Potent'", "'Sirer'", "'Womb Filler'")>>
 	<<set $situationDesc = "is a terror to any fertile girl she fucks. Horrifically potent, she leaves a trail of pregnancies in her wake. A great deal of the babies in your slaves might just be hers.">>
 	<<set $applyDesc = "takes a bit of pride from her new nickname and hopes you'll keep letting her knock bitches up.">>
 	<<set $notApplyDesc = "understands that she is a slave and it is not her place to decide who gets pregnant and who doesn't.">>
@@ -1001,15 +1001,15 @@
 <<case "fertilityGoddess">>
 	<<switch $activeSlave.nationality>>
 	<<case "Algerian" "Congolese" "Ethiopian" "Ghanan" "Kenyan" "Libyan" "Malian" "Moroccan" "Nigerian" "Sudanese" "Tanzanian" "Tunisian" "Ugandan" "Cameroonian" "Gabonese" "Djiboutian" "Zambian" "Malagasy" "Nigerien" "Burundian", "Seychellois">>
-		<<set $nickname = either("'Asase Ya'", "'Ala'")>>
+		<<set $nickname = either("'Ala'", "'Asase Ya'")>>
 	<<case "Roman Revivalist">>
-		<<set $nickname = either("'Venus'", "'Terra'", "'Epona'", "'Fecunditas'")>>
+		<<set $nickname = either("'Epona'", "'Fecunditas'", "'Terra'", "'Venus'")>>
 	<<case "Ancient Egyptian Revivalist" "Egyptian">>
-		<<set $nickname = either("'Hathor'", "'Bastet'", "'Heqet'", "'Meskhenet'")>>
+		<<set $nickname = either("'Bastet'", "'Hathor'", "'Heqet'", "'Meskhenet'")>>
 	<<case "Aztec Revivalist">>
 		<<set $nickname = either("'Xochiquetzal'")>>
 	<<case "Edo Revivalist" "Japanese">>
-		<<set $nickname = either("'Kisshōten'", "'Inari Ōkami'")>>
+		<<set $nickname = either("'Inari Ōkami'", "'Kisshōten'")>>
 	<<case "Arabian Revivalist" "Arabic">>
 		<<set $nickname = either("'Al-Lat'")>>
 	<<case "Ancient Chinese Revivalist" "Chinese">>
@@ -1028,15 +1028,15 @@
 		<<set $nickname = either("'Bhūmi'", "'Parvati'", "'Sinivali'")>>
 	<<default>>
 		<<if $activeSlave.race == "white">>
-			<<set $nickname = either("'Venus'", "'Gaia'", "'Freyja'", "'Aphrodite'", "'Demeter'", "'Ceres'")>>
+			<<set $nickname = either("'Aphrodite'", "'Ceres'", "'Demeter'", "'Freyja'", "'Gaia'", "'Venus'")>>
 		<<elseif $activeSlave.race == "pacific islander">>
 			<<set $nickname = either("'Haumea'", "'Nuakea'")>>
 		<<elseif $activeSlave.race == "amerindian">>
 			<<set $nickname = either("'Atahensic'", "'Hanhepi Wi'")>>
 		<<elseif $activeSlave.race == "black">>
-			<<set $nickname = either("'Asase Ya'", "'Ala'")>>
+			<<set $nickname = either("'Ala'", "'Asase Ya'")>>
 		<<else>>
-			<<set $nickname = either("'Venus'", "'Gaia'")>>
+			<<set $nickname = either("'Gaia'", "'Venus'")>>
 		<</if>>
 	<</switch>>
 	<<set $situationDesc = "is the spitting image of a fertility idol. With her wide hips, heavy bossom and fecund belly, she lives up to the title.">>
@@ -1044,31 +1044,31 @@
 	<<set $notApplyDesc = "accepts that her motherly curves are just the mark of a sex slave and not a goddess.">>
 
 <<case "superSquirter">>
-	<<set $nickname = either("'Baby'", "'Bedwetter'", "'Squirter'", "'Gusher'", "'Needs Diapers'", "'Panty Wetter'", "'Super Soaker'", "'Geyser'", "'Girlcum'", "'Fountain'")>>
+	<<set $nickname = either("'Baby'", "'Bedwetter'", "'Fountain'", "'Geyser'", "'Girlcum'", "'Gusher'", "'Needs Diapers'", "'Panty Wetter'", "'Squirter'", "'Super Soaker'", "'Water Park'")>>
 	<<set $situationDesc = "completely soaks herself and her partners whenever she cums. Every orgasm from her unleashes a waterfall of girlcum from her pussy.">>
 	<<set $applyDesc = "takes pride in the amount of girlcum she makes, even though it looks like she peed herself when she cums with her clothes on.">>
 	<<set $notApplyDesc = "understands that she must learn to control herself and stop soaking her partners, clothes and bed.">>
 
 <<case "labia">>
-	<<set $nickname = either("'Flaps'", "'Petals'", "'Blooming'", "'Folds'", "'Flower'", "'Roastie'", "'Meatflaps'")>>
+	<<set $nickname = either("'Blooming'", "'Flaps'", "'Flower'", "'Folds'", "'Meatflaps'", "'Petals'", "'Roastie'")>>
 	<<set $situationDesc = "has pretty pussylips, larger than most girls'. When she's aroused they announce her state to the whole world, becoming engorged with lust. Other slaves can't help but notice, and mock her uniqueness down there.">>
 	<<set $applyDesc = "really starts to see the appearance of her pussy as a trademark. She's prouder of it than she was before, and she enjoys sex a bit more too, really appreciating it when she gets to feel another slave gently nibble her lovely folds.">>
 	<<set $notApplyDesc = "accepts that the most important part of her vagina is the warm, wet interior, not the generously endowed exterior.">>
 
 <<case "old">>
-	<<set $nickname = either("'Auntie'", "'Oba-san'", "'Cougar'", "'Mommy'", "'Mother'", "'Okā-san'", "'Big Sis'", "'Onē-san'", "'Cradle Robber'", "'MILF'", "'Mature'", "'Jukusei'", "'Seasoned'")>>
+	<<set $nickname = either("'Auntie'", "'Big Sis'", "'Cougar'", "'Cradle Robber'", "'Jukusei'", "'Mature'", "'MILF'", "'Mommy'", "'Mother'", "'Oba-san'", "'Okā-san'", "'Onē-san'", "'Seasoned'")>>
 	<<set $situationDesc = "is older than the average Free Cities slave. It has its downsides; she's worth less at sale and her earning potential as a whore is lower. But, on the other hand, good experience is irreplaceable, and in your experience all slaves feel remarkably similar inside, regardless of age. Nevertheless, some younger slaves resent her.">>
 	<<set $applyDesc = "understands that far from being a mockery, your sanction has turned an intended insult into a reference to the advantages of her years.">>
 	<<set $notApplyDesc = "understands that she must do her best to fuck like the teenager she isn't.">>
 
 <<case "reallyold">>
-	<<set $nickname = either("'Granny'", "'Grandma'", "'GMILF'", "'Obā-chan'", "'Senior'", "'Senior Citizen'", "'Aged'", "'Generation X'")>>
+	<<set $nickname = either("'Aged'", "'Generation X'", "'GMILF'", "'Grandma'", "'Granny'", "'Obā-chan'", "'Senior Citizen'", "'Senior'")>>
 	<<set $situationDesc = "is old. Really old. Old enough to be a grandmother. This, naturally, makes her one of the most experienced sluts in the arcology, a desirable quality in and of itself. Many of the younger slaves mock her relentlessly for her age.">>
 	<<set $applyDesc = "accepts her new nickname with pride. This acknowledgement of her age has her ready to show these young sluts a thing or two.">>
 	<<set $notApplyDesc = "understands that she must do her best to fuck like the teenager she once was.	">>
 
 <<case "young">>
-	<<set $nickname = either("'Precocious'", "'Jailbait'", "'Pedobait'", "'Pocket Pussy'", "'Underage'", "'Lolita'", "'Loli'", "'Juliet'", "'Baby'", "'Babycakes'", "'Party Van'", "'PTHC'", "'POMF'", "'Candydoll'", "'Imouto'")>>
+	<<set $nickname = either("'Baby'", "'Babycakes'", "'Candydoll'", "'Imouto'", "'Jailbait'", "'Juliet'", "'Loli'", "'Lolita'", "'Party Van'", "'Pedobait'", "'Pocket Pussy'", "'POMF'", "'Precocious'", "'PTHC'", "'Underage'")>>
 	<<if random(1, 1500) <= 100>>
 		<<if ($activeSlave.physicalAge < 13)>>
 			<<set $nickname = "'Preteen'">>
@@ -1084,67 +1084,67 @@
 	<<set $notApplyDesc = "understands that despite her young age she must do her best to fuck like the most veteran of whores.">>
 
 <<case "trans">>
-	<<set $nickname = either("'Surprise'", "'Queen'", "'Shemale'", "'Missie'", "'Girly'", "'Legs Crossed'", "'Trap'")>>
+	<<set $nickname = either("'Girly'", "'Legs Crossed'", "'Missie'", "'Queen'", "'Shemale'", "'Surprise'", "'Trap'")>>
 	<<set $situationDesc = "might have looked like a sissy or a trap at some point, but she no longer does. She has the curves and the face to be mistaken for a natural woman if she wears clothes that conceal her cock, which is an ability with all sorts of interesting uses. Mockery always fixes on what's unusual, of course, and some of your other slaves even envy her equipment.">>
 	<<set $applyDesc = "believes that you approve of her as she is now, and that she can treat her dick as an asset.">>
 	<<set $notApplyDesc = "understands that she must do her best to fuck like the natural girl she isn't.">>
 
 <<case "amp">>
-	<<set $nickname = either("'Pocket Pussy'", "'Stumps'", "'Nubs'", "'Fucknugget'", "'Cocksock'", "'Fleshlight'", "'Onahole'", "'Dickholster'")>>
+	<<set $nickname = either("'Cocksock'", "'Dickholster'", "'Fleshlight'", "'Fucknugget'", "'Nubs'", "'Onahole'", "'Pocket Pussy'", "'Stumps'")>>
 	<<set $situationDesc = "is a fun little fucktoy, a limbless torso with nice wet holes than can be used regardless of her feelings. Giving a poor quadruple amputee a nickname might seem like stooping to wanton cruelty, but other slaves are willing to call her anything to take their minds off their own status.">>
 	<<set $applyDesc = "takes a tiny bit of solace from her nickname, hoping that by accepting it, you were expressing an enjoyment of her attenuated body.">>
 	<<set $notApplyDesc = "understands that she would be a sex toy even if she still had arms and legs.">>
 
 <<case "blind">>
-	<<set $nickname = either("'Blind'", "'Stares'", "'No-Sight'", "'Deadeye'", "'Sightless'", "'Crash'")>>
+	<<set $nickname = either("'Blind'", "'Crash'", "'Deadeye'", "'No-Sight'", "'Sightless'", "'Stares'")>>
 	<<set $situationDesc = "is blind. Her dull eyes reveal her condition. She has to feel her way between jobs and is at the mercy of everyone.">>
 	<<set $applyDesc = "accepts that her disability defines her. She keeps her eyes wide open, no longer fearing what others say about them.">>
 	<<set $notApplyDesc = "understands that she is expected to obey, work, and fuck just like any of your other slaves, regardless of her eyesight.">>
 
 <<case "preg">>
-	<<set $nickname = either("'Broodmother'", "'Breeder'", "'Breeding Cow'", "'Breeding Sow'", "'Breeding Bitch'", "'Breeding Stock'", "'Breeding Mare'", "'Mare'", "'Fertile'", "'Mother'", "'Mommy'", "'Ninpuchan'", "'Preggers'")>>
+	<<set $nickname = either("'Breeder'", "'Breeding Bitch'", "'Breeding Cow'", "'Breeding Mare'", "'Breeding Sow'", "'Breeding Stock'", "'Broodmother'", "'Fertile'", "'Mare'", "'Mommy'", "'Mother'", "'Ninpuchan'", "'Preggers'")>>
 	<<set $situationDesc = "is a breeding slave. Her belly seems to grow daily, unavoidable evidence that she's pregnant. Most men prefer slaves without pregnant stomachs, but those that enjoy them adore her. She occupies a strange place in slave culture, desired and abhorred, hopeful and fearful.">>
 	<<set $applyDesc = "takes a bit of solace from her new hope at her nickname that she will be allowed to complete her pregnancy, and a bit of fear from her suspicion that producing babies is her whole future.">>
 	<<set $notApplyDesc = "understands that she is expected to obey, work, and fuck just like any of your other slaves, regardless of her pregnancy.">>
 
 <<case "hung">>
-	<<set $nickname = either("'Tentpole'", "'Hung'", "'Tripod'", "'Third Arm'", "'Long Dong'", "'Bitchbreaker'", "'Swingin' Dick'", "'Long'", "'Shaft'")>>
+	<<set $nickname = either("'Bitchbreaker'", "'Hung'", "'Long Dong'", "'Long'", "'Shaft'", "'Swingin' Dick'", "'Tentpole'", "'Third Arm'", "'Tripod'")>>
 	<<set $situationDesc = "is a Free Cities sex slave, which makes her a girl. The pretension is hard to maintain at times, however, as her massive member swings around, gets in the way, sticks out of clothing, and blows huge loads. Half the fun of using her butt is making her absurd dick slap around. It's an obvious target for a nickname, especially since more than one slave has personal experience with how she feels inside them.">>
 	<<set $applyDesc = "enjoys being nicknamed for her dick. She's special, her dick is special, and now that she's been nicknamed for it, she's confident she and her dick will be allowed to go on being special.">>
 	<<set $notApplyDesc = "realizes that she's just a slave girl behind, no matter what's dangling in front, and does her best to take it like one.">>
 
 <<case "gelding">>
-	<<set $nickname = either("'Neutered'", "'Nipped'", "'Clipped'", "'Empty'", "'Sackless'", "'Limp'", "'Gelded'", "'Soft'")>>
+	<<set $nickname = either("'Clipped'", "'Empty'", "'Gelded'", "'Limp'", "'Neutered'", "'Nipped'", "'Sackless'", "'Soft'")>>
 	<<set $situationDesc = "is a Free Cities sex slave, which makes her a girl. This is an easier thing for her to accept since her testicles were removed. The lack of testosterone makes her docile and more accepting of her proper role as a receptacle for hard dick. Naturally, other slaves have taken notice.">>
 	<<set $applyDesc = "naturally viewed her own castration as a subject of revulsion and horror. Now, though, she begins to see herself as filling a right and proper role as a gelded slave.">>
 	<<set $notApplyDesc = "realizes that the process of turning her from what she was into what she is did not make her special.">>
 
 <<case "short">>
-	<<set $nickname = either("'Shortstack'", "'Waif'", "'Petite'", "'Cock Sock'", "'Pocket Pussy'", "'Funsize'", "'Miniature'", "'Tiny'", "'Shortstuff'", "'Shorty'")>>
+	<<set $nickname = either("'Cock Sock'", "'Funsize'", "'Miniature'", "'Petite'", "'Pocket Pussy'", "'Shortstack'", "'Shortstuff'", "'Shorty'", "'Tiny'", "'Waif'")>>
 	<<set $situationDesc = "is fairly low to the ground. This makes her a bit different, sexually; she's better for several oral sex positions, but most standing positions turn into a game of how long her partner can hold her at the appropriate height.">>
 	<<set $applyDesc = "is a little proud that her diminutive stature, once nothing but a source of embarrassment, is apparently significant to you.">>
 	<<set $notApplyDesc = "realizes that she'll just have to reach higher to make up for her height, since you don't consider it special.">>
 
 <<case "tall">>
-	<<set $nickname = either("'Skyscraper'", "'Basketballer'", "'B-Baller'", "'Everest'", "'Giant'", "'Beanpole'")>>
+	<<set $nickname = either("'B-Baller'", "'Basketballer'", "'Beanpole'", "'Everest'", "'Giant'", "'Skyscraper'", "'Stretch'")>>
 	<<set $situationDesc = "is impressively tall for a girl. This makes her sexually convenient, since her holes are at convenient cock height. She spends many of her sexual encounters bent slightly at the waist to allow herself to be taken from behind.">>
 	<<set $applyDesc = "is quite proud of her impressive height, even more so than before. She resolves to tower over other slaves sexually as well as literally.">>
 	<<set $notApplyDesc = "realizes that being tall doesn't make her special, and understands that it's her holes that make her, not how high they are.">>
 
 <<case "boobs">>
-	<<set $nickname = either("'Bouncing'", "'Bouncy'", "'Stacked'", "'Hooters'", "'Airbags'", "'Tatas'", "'Melons'", "'Funbags'", "'Jugs'", "'Bristols'", "'Oppai'", "'Bazookas'", "'Norks'", "'Knockers'", "'Chounyuu'")>>
+	<<set $nickname = either("'Airbags'", "'Bazookas'", "'Bouncing'", "'Bouncy'", "'Bristols'", "'Chounyuu'", "'Funbags'", "'Hooters'", "'Jugs'", "'Knockers'", "'Melons'", "'Norks'", "'Oppai'", "'Stacked'", "'Tatas'")>>
 	<<set $situationDesc = "has large breasts. Pointing this out is about as observant as describing the sky as blue. When she enters a room, they precede her. When she takes it doggy style, they prop her up. Other slaves are envious of the attention she gets, and happy they don't have to carry such burdens.">>
 	<<set $applyDesc = "was of course proud of her huge breasts before this new nickname. Now, though, she accepts them as a sort of trademark.">>
 	<<set $notApplyDesc = "accepts that having titanic tits does not make her special, since what's important is her holes, not her boobs.">>
 
 <<case "butt">>
-	<<set $nickname = either("'Bootylicious'", "'Jiggly'", "'Wide Load'", "'Moneymaker'", "'Buns'", "'Badonkadonk'", "'Brazilian'", "'Bunda'", "'Milkshake'", "'Tushy'", "'Heiny'", "'Rump'", "'Backside'", "'Thunder Thighs'")>>
+	<<set $nickname = either("'Backside'", "'Badonkadonk'", "'Bootylicious'", "'Brazilian'", "'Bunda'", "'Buns'", "'Heiny'", "'Jiggly'", "'Milkshake'", "'Moneymaker'", "'Rump'", "'Thunder Thighs'", "'Tushy'", "'Wide Load'")>>
 	<<set $situationDesc = "has a large ass. Pointing this out is about as observant as describing the sky as blue. (Though impressive for other reasons, for her sexual partners, since they sometimes have difficulty drawing breath for such remarks.) When she enters a room, it follows her. When she takes it doggy style, it pads penetration to an almost inconvenient degree. Other slaves are envious of the attention she gets, and happy they don't have to carry such burdens.">>
 	<<set $applyDesc = "was of course proud of her huge ass before this new nickname. Now, though, she accepts it as a sort of trademark.">>
 	<<set $notApplyDesc = "accepts that having a massive ass does not make her special, since what's important is her holes, not her buttocks.">>
 
 <<case "virgin">>
-	<<set $nickname = either("'Pure'", "'Innocent'", "'Flower'", "'Chaste'", "'Unbroken'", "'Doomed'", "'Chastity'", "'Pristine'", "'Unspoilt'", "'Vestal'")>>
+	<<set $nickname = either("'Chaste'", "'Chastity'", "'Doomed'", "'Flower'", "'Innocent'", "'Pristine'", "'Pure'", "'Unbroken'", "'Unspoilt'", "'Vestal'")>>
 	<<set $situationDesc = "has never had vanilla sex. This is not unusual in the Free Cities, since many slaveowners value and preserve virginity. Virgins form a separate class of sorts among slaves. Some of them even dislike their status, as having a virgin pussy can often result in a tired tongue or a sore butt.">>
 	<<set $applyDesc = "understands that it's her fate to remain unspoiled a while longer, and redoubles her efforts to do better with her other parts.">>
 	<<set $notApplyDesc = "dreads and anticipates the day when she'll lose her pearl of great price and gain another way to please a man.">>
diff --git a/src/uncategorized/rename.tw b/src/uncategorized/rename.tw
index aa9087ae2b4e04fd4a793002ae7be0720afc55f6..473d48093954d2d752bf0d4ec3ba3f596883bc84 100644
--- a/src/uncategorized/rename.tw
+++ b/src/uncategorized/rename.tw
@@ -19,7 +19,7 @@
 		angrily tries to resist her new name, insisting that her name is
 		<<if $surnameOrder != 1>>
 			<<switch $activeSlave.nationality>>
-			<<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
+			<<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">>
 				<<if $activeSlave.birthSurname>>$activeSlave.birthSurname <</if>>$activeSlave.birthName.
 			<<default>>
 				$activeSlave.birthName<<if $activeSlave.birthSurname>> $activeSlave.birthSurname<</if>>.
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 381207ab4fcd59a2d86e52ebd07273334ce0ae57..42f89561ff247cada7d2639362627edf674c09e4 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -610,7 +610,7 @@
 	<<case "a hijab and abaya">>
 		$activeSlave.slaveName's abaya
 		<<if $activeSlave.boobs > 12000>>
-			modestly covers $possessive breasts, although the fabric struggles to cover the entirety of $possessive breasts.
+			modestly covers $possessive breasts, although the fabric struggles to ensure they are entirely covered.
 		<<elseif $activeSlave.boobs > 4000>>
 			modestly covers $possessive breasts. It has been let out a great deal in order to cover the size of $possessive chest.
 		<<elseif $activeSlave.boobs > 2000>>
@@ -8695,7 +8695,7 @@ $pronounCap has
 	<<if _lsd != -1>>
 		<<if $surnameOrder != 1>>
 			<<switch $slaves[_lsd].nationality>>
-			<<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
+			<<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">>
 				<<if $slaves[_lsd].slaveSurname>><<set _daddy = $slaves[_lsd].slaveSurname>><<set _daddy += " " + $slaves[_lsd].slaveName>><<else>><<set _daddy = $slaves[_lsd].slaveName>><</if>>
 			<<default>>
 				<<set _daddy = $slaves[_lsd].slaveName>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 0283dae673b67919df30d8da98348b6825873164..d42161ab717885219e91b0afdc0c8f1b6834c91d 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -885,7 +885,7 @@
 
 <<if $surnameOrder != 1>>
 	<<switch $PC.nationality>>
-	<<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
+	<<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">>
 		<<if $PC.surname>><<set $PCTitle = $PC.surname>><<set $PCTitle += " " + $PC.name>><<else>><<set $PCTitle = $PC.name>><</if>>
 	<<default>>
 		<<set $PCTitle = $PC.name>>
@@ -2531,9 +2531,9 @@ This experience
 <</widget>>
 
 /* see how they are on a single line? This permits "."s and other things to be appended directly onto the widget result */
-<<widget "PlayerName">><<if $surnameOrder != 1>><<switch $PC.nationality>><<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">><<if $PC.surname>>$PC.surname <</if>>$PC.name<<default>>$PC.name<<if $PC.surname>> $PC.surname<</if>><</switch>><<else>>$PC.name<<if $PC.surname>> $PC.surname<</if>><</if>><</widget>>
+<<widget "PlayerName">><<if $surnameOrder != 1>><<switch $PC.nationality>><<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">><<if $PC.surname>>$PC.surname <</if>>$PC.name<<default>>$PC.name<<if $PC.surname>> $PC.surname<</if>><</switch>><<else>>$PC.name<<if $PC.surname>> $PC.surname<</if>><</if>><</widget>>
 
-<<widget "SlaveFullName">><<if $surnameOrder != 1>><<switch $args[0].nationality>><<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">><<if $args[0].slaveSurname>>$args[0].slaveSurname <</if>>$args[0].slaveName<<default>>$args[0].slaveName<<if $args[0].slaveSurname>> $args[0].slaveSurname<</if>><</switch>><<else>>$args[0].slaveName<<if $args[0].slaveSurname>> $args[0].slaveSurname<</if>><</if>><</widget>>
+<<widget "SlaveFullName">><<if $surnameOrder != 1>><<switch $args[0].nationality>><<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">><<if $args[0].slaveSurname>>$args[0].slaveSurname <</if>>$args[0].slaveName<<default>>$args[0].slaveName<<if $args[0].slaveSurname>> $args[0].slaveSurname<</if>><</switch>><<else>>$args[0].slaveName<<if $args[0].slaveSurname>> $args[0].slaveSurname<</if>><</if>><</widget>>
 
 <<widget "PoliteRudeTitle">><<switch $args[0].nationality>><<case "Japanese">><<if $args[0].trust > 0>>$PC.name<<if $PC.title > 0>>kun<<else>>chan<</if>><<else>><<if $PC.surname>><<print $PC.surname>><<else>><<print $PC.name>><<s>>an<</if>><</if>><<default>><<if $args[0].intelligence < -2>><<Master>><<elseif $args[0].intelligence > 1>><<if $PC.title > 0>>Ma<<s>>ther<<else>>Mi<<s>>tre<<ss>><</if>><<elseif $args[0].trust > 0>>$PC.name<<else>><<if $PC.surname>>$PC.surname<<else>>$PC.name<</if>><</if>><</switch>><</widget>>
 
@@ -2541,7 +2541,7 @@ This experience
  Call as <<EventNameLink>>
  $args[0]: Slave.
 */
-<<widget "EventNameLink">><<if $surnameOrder != 1>><<switch $args[0].nationality>><<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">><<if $args[0].slaveSurname>><<set _name = $args[0].slaveSurname>><<set _name += " " + $args[0].slaveName>><<else>><<set _name = $args[0].slaveName>><</if>><<default>><<set _name = $args[0].slaveName>><<if $args[0].slaveSurname>><<set _name += " " + $args[0].slaveSurname>><</if>><</switch>><<else>><<set _name = $args[0].slaveName>><<if $args[0].slaveSurname>><<set _name += " " + $args[0].slaveSurname>><</if>><</if>><span id="name"><<print "[[_name|Long Slave Description][$nextLink = passage(), $eventDescription = 1]]">></span><</widget>>
+<<widget "EventNameLink">><<if $surnameOrder != 1>><<switch $args[0].nationality>><<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">><<if $args[0].slaveSurname>><<set _name = $args[0].slaveSurname>><<set _name += " " + $args[0].slaveName>><<else>><<set _name = $args[0].slaveName>><</if>><<default>><<set _name = $args[0].slaveName>><<if $args[0].slaveSurname>><<set _name += " " + $args[0].slaveSurname>><</if>><</switch>><<else>><<set _name = $args[0].slaveName>><<if $args[0].slaveSurname>><<set _name += " " + $args[0].slaveSurname>><</if>><</if>><span id="name"><<print "[[_name|Long Slave Description][$nextLink = passage(), $eventDescription = 1]]">></span><</widget>>
 
 /*
  Call as <<EventNameDelink>>