diff --git a/src/js/utilJS.tw b/src/js/utilJS.tw
index 33448f8fa5097948a1415034b80efa76949873f0..f9015f54b47450447a6b948caf80ef53fa89fcf8 100644
--- a/src/js/utilJS.tw
+++ b/src/js/utilJS.tw
@@ -1,4 +1,4 @@
-:: UtilJS [script]
+:: UtilJS [script]
 
 /*
  * Height.mean(nationality, race, genes, age) - returns the mean height for the given combination and age in years (>=2)
@@ -90,7 +90,7 @@ window.Height = (function(){
 		"Afghan": 163.8, "Algerian": 162, "Argentinian": 159.6, "Armenian": 158.1, "Australian": 161.8, "Austrian": 166,
 		"Bangladeshi": 150.6, "Belarusian": 166.8, "Belgian": 168.1, "Bolivian": 142.2, "Brazilian": 158.8,
 		"British": 161.9, "Burmese": undefined, "Canadian": 162.3, "Chilean": 157.2, "Chinese": 155.8, "Colombian": 158.7,
-		"Congolese": 157.7, "Cuban": 156, "Czech": 167.22, "Danish": 168.7, "Dominican": 156.4, "Dutch": 169, "Egyptian": 158.9,
+		"Zairian": 157.7, "Cuban": 156, "Czech": 167.22, "Danish": 168.7, "Dominican": 156.4, "Dutch": 169, "Egyptian": 158.9,
 		"Emirati": 158.9, "Estonian": 165.5, "Ethiopian": 157.6, "Filipina": 151.8, "Finnish": 165.3, "French": 162.5,
 		"German": 162.8, "Ghanan": 158.5, "Greek": 165, "Guatemalan": 147.3, "Haitian": 158.6, "Hungarian": 164,
 		"Icelandic": 168, "Indian": 151.9, "Indonesian": 147, "Iranian": 157.2, "Iraqi": 155.8, "Irish": 163, "Israeli": 166,
@@ -117,7 +117,13 @@ window.Height = (function(){
 		"Niuean": 160.4, "Palauan": 161.4, "Palestinian": 158.2, "Papua New Guinean": 150.7, "Paraguayan": 158.3, "Qatari": 155,
 		"Kittitian": 156.9, "Saint Lucian": 157.1, "Vincentian": 156.2, "Samoan": 161, "Seychellois": 155.8,
 		"Slovene": 167.4, "a Solomon Islander": 151.8, "Sri Lankan": 151.4, "Surinamese": 155.7, "Tajik": 161.2, "Tongan": 159.5,
-		"Trinidadian": 157.4, "Turkmen": 158.2, "Ni-Vanuatu": 149.8, "Vatican": 162.5,
+		"Trinidadian": 157.4, "Turkmen": 158.2, "Ni-Vanuatu": 149.8, "Vatican": 162.5, "Angolan": undefined, "Beninese": 159.3, 
+		"Bissau-Guinean": undefined, "Burkinabé": 161.6, "Cape Verdean": undefined, "Catalan": undefined, "Central African": 158.9, 
+		"Chadian": 162.6, "Comorian": 154.8, "Congolese": 159, "Equatoguinean": undefined, "Eritrean": undefined, 
+		"French Polynesian": undefined, "Gambian": 157.8, "Guinean": 158.8, "Ivorian": 158.9, "Kurdish": undefined, "Liberian": 157.3, 
+		"Malawian": 155, "Mauritanian": undefined, "Mauritian": undefined, "Mosotho": 157.6, "Motswana": undefined, "Mozambican": 156, 
+		"Namibian": 160.7, "Rwandan": 157.7, "Sahrawi": undefined, "São Toméan": undefined, "Senegalese": 163, "Sierra Leonean": undefined, 
+		"Somali": undefined, "South Sudanese": undefined, "Swazi": 159.1, "Tibetan": undefined, "Togolese": 159, 
 		"": 162.5 // default
 	};
 	const xyMeanHeight = {
@@ -125,7 +131,7 @@ window.Height = (function(){
 		"Afghan": undefined, "Algerian": 172.2, "Argentinian": 174.46, "Armenian": undefined, "Australian": 175.6,
 		"Austrian": 179, "Bangladeshi": 150.8, "Belarusian": 176.9, "Belgian": 178.7, "Bolivian": 160, "Brazilian": 170.7,
 		"British": 175.3, "Burmese": 168.0, "Canadian": 175.1, "Chilean": 169.6, "Chinese": 167.1, "Colombian": 170.6,
-		"Congolese": 158.9, "Cuban": 168, "Czech": 180.31, "Danish": 180.4, "Dominican": 168.4, "Dutch": 181, "Egyptian": 170.3,
+		"Zairian": 158.9, "Cuban": 168, "Czech": 180.31, "Danish": 180.4, "Dominican": 168.4, "Dutch": 181, "Egyptian": 170.3,
 		"Emirati": 170.3, "Estonian": 179.1, "Ethiopian": undefined, "Filipina": 163.5, "Finnish": 178.9, "French": 175.6,
 		"German": 175.4, "Ghanan": 169.5, "Greek": 177, "Guatemalan": 157.5, "Haitian": undefined, "Hungarian": 176,
 		"Icelandic": 181, "Indian": 164.7, "Indonesian": 158, "Iranian": 170.3, "Iraqi": 165.4, "Irish": 177, "Israeli": 177,
@@ -152,7 +158,13 @@ window.Height = (function(){
 		"Niuean": 169.7, "Palauan": 174.6, "Palestinian": 169.7, "Papua New Guinean": 163.5, "Paraguayan": 168.8, "Qatari": 166.2,
 		"Kittitian": 164.4, "Saint Lucian": 168.3, "Vincentian": 165.4, "Samoan": 173, "Seychellois": 168.5,
 		"Slovene": 180.3, "a Solomon Islander": 163.1, "Sri Lankan": 163.6, "Surinamese": 165.2, "Tajik": 175.2, "Tongan": 168.2,
-		"Trinidadian": 170.8, "Turkmen": 171.4, "Ni-Vanuatu": 160.5, "Vatican": 176.5,
+		"Trinidadian": 170.8, "Turkmen": 171.4, "Ni-Vanuatu": 160.5, "Vatican": 176.5, "Angolan": undefined, "Beninese": undefined, 
+		"Bissau-Guinean": undefined, "Burkinabé": undefined, "Cape Verdean": undefined, "Catalan": undefined, "Central African": undefined, 
+		"Chadian": undefined, "Comorian": undefined, "Congolese": undefined, "Equatoguinean": undefined, "Eritrean": undefined, 
+		"French Polynesian": undefined, "Gambian": 168, "Guinean": undefined, "Ivorian": undefined, "Kurdish": undefined, "Liberian": undefined, 
+		"Malawian": 166, "Mauritanian": undefined, "Mauritian": undefined, "Mosotho": undefined, "Motswana": undefined, "Mozambican": undefined, 
+		"Namibian": undefined, "Rwandan": undefined, "Sahrawi": undefined, "São Toméan": undefined, "Senegalese": undefined, "Sierra Leonean": undefined, 
+		"Somali": undefined, "South Sudanese": undefined, "Swazi": undefined, "Tibetan": undefined, "Togolese": undefined, 
 		"": 172.5 // defaults
 	};
 	
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 7fd3cee4f3d83a6369a031827a15ea5f554a6e9c..894acbc4853646eb53294e7cdc514b0011dc4ded 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -15,7 +15,7 @@
 
 	<<unset $whiteNationalities, $asianNationalities, $latinaNationalities, $middleeasternNationalities, $blackNationalities, $indoaryanNationalities, $pacificislanderNationalities, $malayNationalities, $amerindianNationalities, $southerneuropeanNationalities, $semiticNationalities>>
 
-	<<unset $whiteAmericanSlaveNames, $africanAmericanSlaveNames, $asianAmericanSlaveNames, $latinaSlaveNames, $russianSlaveNames, $egyptianSlaveNames, $brazilianSlaveNames, $chineseSlaveNames, $koreanSlaveNames, $indianSlaveNames, $indonesianSlaveNames, $bangladeshiSlaveNames, $japaneseSlaveNames, $nigerianSlaveNames, $pakistaniSlaveNames, $mexicanSlaveNames, $filipinaSlaveNames, $ethiopianSlaveNames, $germanSlaveNames, $saudiSlaveNames, $turkishSlaveNames, $colombianSlaveNames, $argentinianSlaveNames, $vietnameseSlaveNames, $iranianSlaveNames, $congoleseSlaveNames, $frenchSlaveNames, $thaiSlaveNames, $britishSlaveNames, $italianSlaveNames, $spanishSlaveNames, $kenyanSlaveNames, $ukrainianSlaveNames, $canadianSlaveNames, $peruvianSlaveNames, $venezuelanSlaveNames, $irishSlaveNames, $icelandicSlaveNames, $finnishSlaveNames, $newZealanderSlaveNames, $polishSlaveNames, $greekSlaveNames, $israeliSlaveNames, $armenianSlaveNames, $moroccanSlaveNames, $romanianSlaveNames, $swedishSlaveNames, $lithuanianSlaveNames, $bolivianSlaveNames, $haitianSlaveNames, $cubanSlaveNames, $whiteSouthAfricanSlaveNames, $blackSouthAfricanSlaveNames, $chileanSlaveNames, $belgianSlaveNames, $danishSlaveNames, $norwegianSlaveNames, $hungarianSlaveNames, $estonianSlaveNames, $slovakSlaveNames, $kazakhSlaveNames, $zimbabweanSlaveNames, $ugandanSlaveNames, $tanzanianSlaveNames, $dutchSlaveNames, $austrianSlaveNames, $swissSlaveNames, $puertoRicanSlaveNames, $czechSlaveNames, $portugueseSlaveNames, $jamaicanSlaveNames, $malaysianSlaveNames, $guatemalanSlaveNames, $ghananSlaveNames, $serbianSlaveNames, $australianSlaveNames, $burmeseSlaveNames, $algerianSlaveNames, $sudaneseSlaveNames, $iraqiSlaveNames, $uzbekSlaveNames, $nepaleseSlaveNames, $afghanSlaveNames, $yemeniSlaveNames, $lebaneseSlaveNames, $tunisianSlaveNames, $emiratiSlaveNames, $libyanSlaveNames, $jordanianSlaveNames, $omaniSlaveNames, $malianSlaveNames, $sammarineseSlaveNames, $marshalleseSlaveNames, $syrianSlaveNames, $bermudianSlaveNames, $uruguayanSlaveNames, $monegasqueSlaveNames, $montenegrinSlaveNames, $cambodianSlaveNames, $cameroonianSlaveNames, $gaboneseSlaveNames, $djiboutianSlaveNames, $greenlandicSlaveNames, $tuvaluanSlaveNames, $zambianSlaveNames, $albanianSlaveNames, $bruneianSlaveNames, $singaporeanSlaveNames>>
+	<<unset $whiteAmericanSlaveNames, $africanAmericanSlaveNames, $asianAmericanSlaveNames, $latinaSlaveNames, $russianSlaveNames, $egyptianSlaveNames, $brazilianSlaveNames, $chineseSlaveNames, $koreanSlaveNames, $indianSlaveNames, $indonesianSlaveNames, $bangladeshiSlaveNames, $japaneseSlaveNames, $nigerianSlaveNames, $pakistaniSlaveNames, $mexicanSlaveNames, $filipinaSlaveNames, $ethiopianSlaveNames, $germanSlaveNames, $saudiSlaveNames, $turkishSlaveNames, $colombianSlaveNames, $argentinianSlaveNames, $vietnameseSlaveNames, $iranianSlaveNames, $congoleseSlaveNames, $frenchSlaveNames, $thaiSlaveNames, $britishSlaveNames, $italianSlaveNames, $spanishSlaveNames, $kenyanSlaveNames, $ukrainianSlaveNames, $canadianSlaveNames, $peruvianSlaveNames, $venezuelanSlaveNames, $irishSlaveNames, $icelandicSlaveNames, $finnishSlaveNames, $newZealanderSlaveNames, $polishSlaveNames, $greekSlaveNames, $israeliSlaveNames, $armenianSlaveNames, $moroccanSlaveNames, $romanianSlaveNames, $swedishSlaveNames, $lithuanianSlaveNames, $bolivianSlaveNames, $haitianSlaveNames, $cubanSlaveNames, $whiteSouthAfricanSlaveNames, $blackSouthAfricanSlaveNames, $chileanSlaveNames, $belgianSlaveNames, $danishSlaveNames, $norwegianSlaveNames, $hungarianSlaveNames, $estonianSlaveNames, $slovakSlaveNames, $kazakhSlaveNames, $zimbabweanSlaveNames, $ugandanSlaveNames, $tanzanianSlaveNames, $dutchSlaveNames, $austrianSlaveNames, $swissSlaveNames, $puertoRicanSlaveNames, $czechSlaveNames, $portugueseSlaveNames, $jamaicanSlaveNames, $malaysianSlaveNames, $guatemalanSlaveNames, $ghananSlaveNames, $serbianSlaveNames, $australianSlaveNames, $burmeseSlaveNames, $algerianSlaveNames, $sudaneseSlaveNames, $iraqiSlaveNames, $uzbekSlaveNames, $nepaleseSlaveNames, $afghanSlaveNames, $yemeniSlaveNames, $lebaneseSlaveNames, $tunisianSlaveNames, $emiratiSlaveNames, $libyanSlaveNames, $jordanianSlaveNames, $omaniSlaveNames, $malianSlaveNames, $sammarineseSlaveNames, $marshalleseSlaveNames, $syrianSlaveNames, $bermudianSlaveNames, $uruguayanSlaveNames, $monegasqueSlaveNames, $montenegrinSlaveNames, $cambodianSlaveNames, $cameroonianSlaveNames, $gaboneseSlaveNames, $djiboutianSlaveNames, $greenlandicSlaveNames, $tuvaluanSlaveNames, $zambianSlaveNames, $albanianSlaveNames, $bruneianSlaveNames, $singaporeanSlaveNames, $laotianSlaveNames, $mongolianSlaveNames, $taiwaneseSlaveNames, $belizeanSlaveNames, $grenadianSlaveNames, $iKiribatiSlaveNames, $malagasySlaveNames, $maldivianSlaveNames, $bosnianSlaveNames, $croatianSlaveNames, $kosovanSlaveNames, $macedonianSlaveNames, $honduranSlaveNames, $malteseSlaveNames, $nauruanSlaveNames, $micronesianSlaveNames, $costaRicanSlaveNames, $salvadoranSlaveNames, $nicaraguanSlaveNames, $panamanianSlaveNames, $nigerienSlaveNames, $andorranSlaveNames, $bulgarianSlaveNames, $luxembourgianSlaveNames, $moldovanSlaveNames, $bahamianSlaveNames, $barbadianSlaveNames, $dominiquaisSlaveNames, $trinidadianSlaveNames, $palauanSlaveNames, $papuaNewGuineanSlaveNames, $kittitianSlaveNames, $ecuadorianSlaveNames, $frenchGuiananSlaveNames, $guyaneseSlaveNames, $paraguayanSlaveNames, $surinameseSlaveNames, $bhutaneseSlaveNames, $eastTimoreseSlaveNames, $kyrgyzSlaveNames, $sriLankanSlaveNames, $liechtensteinerSlaveNames, $scottishSlaveNames, $vaticanSlaveNames, $belarusianSlaveNames, $burundianSlaveNames, $latvianSlaveNames, $seychelloisSlaveNames, $sloveneSlaveNames, $antiguanSlaveNames, $dominicanSlaveNames, $saintLucianSlaveNames, $arubanSlaveNames, $azerbaijaniSlaveNames, $bahrainiSlaveNames, $cypriotSlaveNames, $georgianSlaveNames, $kuwaitiSlaveNames, $qatariSlaveNames, $tajikSlaveNames, $turkmenSlaveNames, $vincentianSlaveNames, $cookIslanderSlaveNames, $fijianSlaveNames, $niVanuatuSlaveNames, $niueanSlaveNames, $palestinianSlaveNames, $samoanSlaveNames, $solomonIslanderSlaveNames, $tonganSlaveNames, $catalanSlaveNames, $equatoguineanSlaveNames, $frenchPolynesianSlaveNames, $kurdishSlaveNames, $tibetanSlaveNames, $bissauGuineanSlaveNames, $chadianSlaveNames, $comorianSlaveNames, $ivorianSlaveNames, $mauritanianSlaveNames, $mauritianSlaveNames, $mosothoSlaveNames, $sierraLeoneanSlaveNames, $swaziSlaveNames, $angolanSlaveNames, $sahrawiSlaveNames, $burkinabeSlaveNames, $capeVerdeanSlaveNames, $motswanaSlaveNames, $somaliSlaveNames, $rwandanSlaveNames, $saoTomeanSlaveNames, $benineseSlaveNames, $centralAfricanSlaveNames, $gambianSlaveNames, $senegaleseSlaveNames, $togoleseSlaveNames, $eritreanSlaveNames, $guineanSlaveNames, $malawianSlaveNames, $zairianSlaveNames $liberianSlaveNames, $mozambicanSlaveNames, $namibianSlaveNames, $southSudaneseSlaveNames>>
 
 	<<unset $cowSlaveNames, $chattelReligionistSlaveNames, $romanSlaveNames, $aztecSlaveNames, $ancientEgyptianSlaveNames, $edoSlaveNames>>
 
diff --git a/src/uncategorized/generateXYSlave.tw b/src/uncategorized/generateXYSlave.tw
index cd591d40f90d702cb3254c7f14a155cd12e5e20e..1555efc0d3d865c59fc94b206622c508278b0527 100644
--- a/src/uncategorized/generateXYSlave.tw
+++ b/src/uncategorized/generateXYSlave.tw
@@ -1,4 +1,4 @@
-:: Generate XY Slave [nobr]
+:: Generate XY Slave [nobr]
 
 <<BaseSlave>>
 /% Defaults that differ from the old template %/
@@ -452,61 +452,75 @@
 <<else>>
 	/% Temporarily use activeSlave.foreskin to store the chance of circumcision. %/
 	<<switch $activeSlave.nationality>>
-	<<case "Iranian" "Moroccan" "Afghan" "Tunisian">>
+	<<case "Iranian" "Moroccan" "Afghan" "Tunisian" "Palestinian" "Sahrawi">>
 		<<set $activeSlave.foreskin = 100>>
-	<<case "Turkish" "Nigerian" "Iraqi" "Yemeni" "Jordanian" "Gabonese" "Tajik">>
+	<<case "Turkish" "Nigerian" "Iraqi" "Yemeni" "Jordanian" "Gabonese" "Tajik" "Comorian" "Kurdish" "Mauritanian">>
 		<<set $activeSlave.foreskin = 99>>
-	<<case "Algerian" "Maldivian" "Azerbaijani">>
+	<<case "Algerian" "Maldivian" "Azerbaijani" "Liberian">>
 		<<set $activeSlave.foreskin = 98>>
-	<<case "Saudi" "Uzbek" "Libyan" "Djiboutian">>
+	<<case "Saudi" "Uzbek" "Libyan" "Djiboutian" "Eritrean" "Ivorian">>
 		<<set $activeSlave.foreskin = 97>>
-	<<case "Congolese" "Pakistani" "Nigerien" "Turkmen">>
-		/% Population-weighted average of Democratic Republic of Congo and Republic of Congo %/
+	<<case "Zairian" "Pakistani" "Nigerien" "Turkmen" "Sierra Leonean">>
 		<<set $activeSlave.foreskin = 96>>
-	<<case "Egyptian" "Tuvaluan" "Malagasy" "Nauruan" "a Cook Islander" "Niuean" "Palauan" "Samoan" "a Solomon Islander" "Tongan" "Ni-Vanuatu">>
+	<<case "Egyptian" "Tuvaluan" "Malagasy" "Nauruan" "a Cook Islander" "Niuean" "Palauan" "Samoan" "a Solomon Islander" "Tongan" "Ni-Vanuatu" "Gambian" "Togolese">>
 		<<set $activeSlave.foreskin = 95>>
-	<<case "Cameroonian">>
+	<<case "Cameroonian" "Senegalese" "Somali">>
 		<<set $activeSlave.foreskin = 94>>
-	<<case "Indonesian" "Bangladeshi" "Syrian">>
+	<<case "Indonesian" "Bangladeshi" "Syrian" "Beninese" "Bissau-Guinean">>
 		<<set $activeSlave.foreskin = 93>>
 	<<case "Israeli" "Ghanan" "Ethiopian" "Filipina" "Kosovan">>
 		<<set $activeSlave.foreskin = 92>>
-	<<case "Kenyan" "Kyrgyz" "Palestinian">>
+	<<case "Kenyan" "Kyrgyz">>
 		<<set $activeSlave.foreskin = 91>>
-	<<case "Omani">>
+	<<case "Omani" "Burkinabé">>
 		<<set $activeSlave.foreskin = 88>>
+	<<case "Equatoguinean">>
+		<<set $activeSlave.foreskin = 87>>
 	<<case "Malian" "Kuwaiti">>
 		<<set $activeSlave.foreskin = 86>>
+	<<case "Guinean">>
+		<<set $activeSlave.foreskin = 84>>
 	<<case "Bahraini">>
 		<<set $activeSlave.foreskin = 81>>
+	<<case "French Polynesian">>
+		<<set $activeSlave.foreskin = 78>>
 	<<case "American" "Qatari">>
 		<<set $activeSlave.foreskin = 77>>
 	<<case "Emirati">>
 		<<set $activeSlave.foreskin = 76>>
+	<<case "Chadian">>
+		<<set $activeSlave.foreskin = 74>>
 	<<case "Tanzanian">>
 		<<set $activeSlave.foreskin = 72>>
+	<<case "Congolese">>
+		<<set $activeSlave.foreskin = 70>>
+	<<case "Central African">>
+		<<set $activeSlave.foreskin = 63>>
 	<<case "Malaysian" "Burundian">>
 		<<set $activeSlave.foreskin = 61>>
 	<<case "Lebanese">>
 		<<set $activeSlave.foreskin = 60>>
+	<<case "Angolan">>
+		<<set $activeSlave.foreskin = 58>>
 	<<case "Kazakh" "Fijian">>
 		<<set $activeSlave.foreskin = 56>>
-	<<case "Korean" "Bruneian">>
+	<<case "Korean" "Bruneian" "Mosotho">>
 		/% Population-weighted average of South Korea and North Korea. %/
 		<<set $activeSlave.foreskin = 52>>
 	<<case "Albanian">>
 		<<set $activeSlave.foreskin = 48>>
+	<<case "Mozambican">>
+		<<set $activeSlave.foreskin = 47>>
 	<<case "South African">>
 		<<set $activeSlave.foreskin = 45>>
 	<<case "Dominican">>
 		<<set $activeSlave.foreskin = 43>>
 	<<case "Bosnian">>
 		<<set $activeSlave.foreskin = 42>>
+	<<case "Sudanese">>
+		<<set $activeSlave.foreskin = 39>>
 	<<case "Mexican">>
 		<<set $activeSlave.foreskin = 38>>
-	<<case "Sudanese">>
-		/% Population-weighted average of Sudan and South Sudan. %/
-		<<set $activeSlave.foreskin = 36>>
 	<<case "Macedonian">>
 		<<set $activeSlave.foreskin = 34>>
 	<<case "a New Zealander">>
@@ -515,19 +529,27 @@
 		<<set $activeSlave.foreskin = 28>>
 	<<case "Ugandan" "Australian">>
 		<<set $activeSlave.foreskin = 27>>
+	<<case "Namibian">>
+		<<set $activeSlave.foreskin = 26>>
+	<<case "South Sudanese">>
+		<<set $activeSlave.foreskin = 24>>
 	<<case "Belgian" "Thai" "Cypriot">>
 		<<set $activeSlave.foreskin = 23>>
+	<<case "Malawian">>
+		<<set $activeSlave.foreskin = 22>>
 	<<case "British">>
 		<<set $activeSlave.foreskin = 21>>
 	<<case "Puerto Rican">>
 		<<set $activeSlave.foreskin = 20>>
 	<<case "Montenegrin">>
 		<<set $activeSlave.foreskin = 19>>
-	<<case "Singaporean" "Surinamese">>
+	<<case "Mauritian">>
+		<<set $activeSlave.foreskin = 17>>
+	<<case "Singaporean" "Surinamese" "Motswana">>
 		<<set $activeSlave.foreskin = 15>>
 	<<case "Jamaican" "French" "Chinese" "Indian">>
 		<<set $activeSlave.foreskin = 14>>
-	<<case "Zambian" "Bulgarian">>
+	<<case "Zambian" "Bulgarian" "Rwandan">>
 		<<set $activeSlave.foreskin = 13>>
 	<<case "Russian" "French Guianan" "Guyanese">>
 		<<set $activeSlave.foreskin = 12>>
@@ -537,9 +559,9 @@
 		<<set $activeSlave.foreskin = 10>>
 	<<case "Zimbabwean" "Japanese">>
 		<<set $activeSlave.foreskin = 9>>
-	<<case "Taiwanese" "Slovene" "Sri Lankan">>
+	<<case "Taiwanese" "Slovene" "Sri Lankan" "Swazi">>
 		<<set $activeSlave.foreskin = 8>>
-	<<case "Haitian" "Spanish">>
+	<<case "Haitian" "Spanish" "Catalan">>
 		<<set $activeSlave.foreskin = 7>>
 	<<case "Dutch" "Austrian" "Swiss" "East Timorese" "Trinidadian">>
 		<<set $activeSlave.foreskin = 6>>
@@ -549,14 +571,14 @@
 		<<set $activeSlave.foreskin = 4>>
 	<<case "Italian" "Norwegian" "Argentinian">>
 		<<set $activeSlave.foreskin = 3>>
-	<<case "Ukrainian" "Luxembourgian" "Vincentian">>
+	<<case "Ukrainian" "Luxembourgian" "Vincentian" "Tibetan">>
 		<<set $activeSlave.foreskin = 2>>
 	<<case "Portuguese" "Hungarian" "Irish" "Finnish" "Brazilian" "Bermudian" "Uruguayan" "Monégasque" "Andorran" "Croatian" "Moldovan" "Panamanian" "Barbadian" "Bhutanese" "Seychellois">>
 			<<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">>
+			"Saint Lucian" "Cape Verdean" "São Toméan">>
 		<<set $activeSlave.foreskin = 0>>
 	<<default>>
 		/% Some overlooked country, or possibly stateless. Use global average. %/