diff --git a/src/art/vector/Feet.tw b/src/art/vector/Feet.tw
index 1286d04a0147f766d42981cd39c19541ff55ad5d..b0fb37f9276a289b4cb3f81b1100936a4b4d6f77 100644
--- a/src/art/vector/Feet.tw
+++ b/src/art/vector/Feet.tw
@@ -106,7 +106,7 @@
<<unset _art_outfit >> /* clean up variable possibly already set by prior widget run */
<<switch _artSlave.clothes>> /* select available clothes */
- <<case "a ball gown" "a biyelgee costume" "a bunny outfit" "a cheerleader outfit" "a dirndl" "a fallen nuns habit" "a halter top dress" "a hijab and abaya" "a huipil" "a kimono" "a latex catsuit" "a long qipao" "a maternity dress" "a military uniform" "a mini dress" "a monokini" "a mounty outfit" "a nice maid outfit" "a nice nurse outfit" "a red army uniform" "a schoolgirl outfit" "a schutzstaffel uniform" "a slave gown" "a slutty maid outfit" "a slutty nurse outfit" "a slutty qipao" "a slutty schutzstaffel uniform" "a succubus outfit" "a toga" "an apron" "attractive lingerie" "battlearmor" "battledress" "body oil" "clubslut netting" "conservative clothing" "cutoffs and a t-shirt" "lederhosen" "nice business attire" "restrictive latex" "slutty business attire" "spats and a tank top" "stretch pants and a crop-top" "Western clothing">>
+ <<case "a ball gown" "a biyelgee costume" "a bunny outfit" "a cheerleader outfit" "a dirndl" "a fallen nuns habit" "a halter top dress" "a hijab and abaya" "a huipil" "a kimono" "a latex catsuit" "a long qipao" "a maternity dress" "a military uniform" "a mini dress" "a monokini" "a mounty outfit" "a nice maid outfit" "a nice nurse outfit" "a red army uniform" "a schoolgirl outfit" "a schutzstaffel uniform" "a slave gown" "a slutty maid outfit" "a slutty nurse outfit" "a slutty qipao" "a slutty schutzstaffel uniform" "a succubus outfit" "a toga" "an apron" "attractive lingerie" "battlearmor" "battledress" "clubslut netting" "conservative clothing" "cutoffs and a t-shirt" "lederhosen" "nice business attire" "restrictive latex" "slutty business attire" "spats and a tank top" "stretch pants and a crop-top" "Western clothing">>
<<set _art_outfit = clothing2artSuffix(_artSlave.clothes) >>
<</switch>>
diff --git a/src/pregmod/basenationalitiesControls.tw b/src/pregmod/basenationalitiesControls.tw
index 680769a7e3ce3696df808b923763d35ae411114b..8f7586a9c08ba6b7213b9c83ef0584f573aa77c5 100644
--- a/src/pregmod/basenationalitiesControls.tw
+++ b/src/pregmod/basenationalitiesControls.tw
@@ -42,7 +42,7 @@ Filter by Race:
<<else>>
<<print "
<<link _race>>
- <<set $baseControlsFilter to setup.filterRaces[" + _i + "].toLowerCase().replace(/[ -]/g, '')>>
+ <<set $baseControlsFilter = setup.filterRaces[" + _i + "].toLowerCase().replace(/[ -]/g, '')>>
<<replace '#PopControl'>><<include 'Basenationalities Controls'>><</replace>>
<</link>>
">>
@@ -60,7 +60,7 @@ Filter by Region:
<<else>>
<<print "
<<link _region>>
- <<set $baseControlsFilter to setup.filterRegions[" + _i + "].toLowerCase().replace(/[ -]/g, '')>>
+ <<set $baseControlsFilter = setup.filterRegions[" + _i + "].toLowerCase().replace(/[ -]/g, '')>>
<<replace '#PopControl'>><<include 'Basenationalities Controls'>><</replace>>
<</link>>
">>
@@ -130,37 +130,38 @@ Filter by Region:
<<else>>
/* Filtered pop controls */
<<set _controlsNationality = setup[$baseControlsFilter+'Nationalities']>>
- <<for _i = 0; _i < _controlsNationality.length; _i++>>
+ <<set _keys = Object.keys(_controlsNationality)>>
+ <<for _i = 0; _i < _keys.length; _i++>>
<div style="float: left;">
- <<set _nation = _controlsNationality[_i]>>
+ <<set _nation = _keys[_i]>>
<<print "
_nation
@@.plusButton;<<link '+'>>
- <<set hashPush($nationalities, _controlsNationality[" + _i + "])>>
- <<replace '#PopControl'>><<include 'Basenationalities Controls'>><</replace>>
- <</link>>@@
- ">>
- <<if def $nationalitiescheck[_nation]>>
- <<print "
- @@.minusButton;<<link '–'>>
- <<set $nationalities[_controlsNationality["+_i+"]] -= 1>>
- <<if $nationalities[_controlsNationality["+_i+"]] <= 0>>
- <<set delete $nationalities[_controlsNationality["+_i+"]]>>
- <</if>>
+ <<set hashPush($nationalities, _keys[" + _i + "])>>
<<replace '#PopControl'>><<include 'Basenationalities Controls'>><</replace>>
<</link>>@@
">>
+ <<if def $nationalitiescheck[_nation]>>
+ <<print "
+ @@.minusButton;<<link '–'>>
+ <<set $nationalities[_keys["+_i+"]] -= 1>>
+ <<if $nationalities[_keys["+_i+"]] <= 0>>
+ <<set delete $nationalities[_keys["+_i+"]]>>
+ <</if>>
+ <<replace '#PopControl'>><<include 'Basenationalities Controls'>><</replace>>
+ <</link>>@@
+ ">>
+ <</if>>
+ <<if $nationalities[_nation] > 1 >>
+ <<print "
+ @@.zeroButton;<<link '0'>>
+ <<set delete $nationalities[_keys["+_i+"]]>>
+ <<replace '#PopControl'>><<include 'Basenationalities Controls'>><</replace>>
+ <</link>>@@
+ ">>
<</if>>
- <<if $nationalities[_nation] > 1 >>
- <<print "
- @@.zeroButton;<<link '0'>>
- <<set delete $nationalities[_controlsNationality["+_i+"]]>>
- <<replace '#PopControl'>><<include 'Basenationalities Controls'>><</replace>>
- <</link>>@@
- ">>
- <</if>>
- <<if _i < _controlsNationality.length-1>>| <</if>>
- </div>
+ <<if _i < _keys.length-1>>| <</if>>
+ </div>
<</for>>
<</if>>
<div style="clear: both; height: 0;"></div>
diff --git a/src/uncategorized/generateXXSlave.tw b/src/uncategorized/generateXXSlave.tw
index 3656576519cfc4fe08f1385d4964028c44dd7021..74e4b096325128187b1af09c907aa88ab1607ef0 100644
--- a/src/uncategorized/generateXXSlave.tw
+++ b/src/uncategorized/generateXXSlave.tw
@@ -109,8 +109,9 @@
<<else>>
<<set _capUpgradeCheck = setup[$captureUpgradeRace.toLowerCase().replace(/[ -]/g, '')+'Nationalities']>>
<<set _capUpgradeNationalities = []>>
- <<for _u = 0; _u < _capUpgradeCheck.length; _u++>>
- <<set _capNation = _capUpgradeCheck[_u]>>
+ <<set _keys = Object.keys(_capUpgradeCheck)>>
+ <<for _u = 0; _u < _keys.length; _u++>>
+ <<set _capNation = _keys[_u]>>
<<if _capNation in $nationalities>>
<<set _capUpgradeNationalities.push(_capNation)>>
<</if>>
@@ -118,7 +119,7 @@
<<if _capUpgradeNationalities.length > 0>>
<<set $activeSlave.nationality = _capUpgradeNationalities.random(), $activeSlave.race = $captureUpgradeRace>>
<<else>>
- <<set $activeSlave.nationality = _capUpgradeCheck.random(), $activeSlave.race = $captureUpgradeRace>>
+ <<set $activeSlave.nationality = _keys.random(), $activeSlave.race = $captureUpgradeRace>>
<</if>>
<</if>>
<<if $activeSlave.race != $captureUpgradeRace>>
diff --git a/src/uncategorized/generateXYSlave.tw b/src/uncategorized/generateXYSlave.tw
index 737d6f80d4a84b22f97ec513a80445eb728bbe34..53c7849f43bc32207058e61f4637b30e307d0b81 100644
--- a/src/uncategorized/generateXYSlave.tw
+++ b/src/uncategorized/generateXYSlave.tw
@@ -116,8 +116,9 @@
<<else>>
<<set _capUpgradeCheck = setup[$captureUpgradeRace.toLowerCase().replace(/[ -]/g, '')+'Nationalities']>>
<<set _capUpgradeNationalities = []>>
- <<for _u = 0; _u < _capUpgradeCheck.length; _u++>>
- <<set _capNation = _capUpgradeCheck[_u]>>
+ <<set _keys = Object.keys(_capUpgradeCheck)>>
+ <<for _u = 0; _u < _keys.length; _u++>>
+ <<set _capNation = _keys[_u]>>
<<if _capNation in $nationalities>>
<<set _capUpgradeNationalities.push(_capNation)>>
<</if>>
@@ -125,7 +126,7 @@
<<if _capUpgradeNationalities.length > 0>>
<<set $activeSlave.nationality = _capUpgradeNationalities.random(), $activeSlave.race = $captureUpgradeRace>>
<<else>>
- <<set $activeSlave.nationality = _capUpgradeCheck.random(), $activeSlave.race = $captureUpgradeRace>>
+ <<set $activeSlave.nationality = _keys.random(), $activeSlave.race = $captureUpgradeRace>>
<</if>>
<</if>>
<<if $activeSlave.race != $captureUpgradeRace>>