diff --git a/artTools/vector_source_ndmain.svg b/artTools/vector_source_ndmain.svg
index 2d3b803cd1ef645e9859b8032a49f318e747002a..2771d3923a60aad3b73133608b7094b5cb1daa52 100644
--- a/artTools/vector_source_ndmain.svg
+++ b/artTools/vector_source_ndmain.svg
@@ -76,6 +76,8 @@
 	.areola{fill:#D76B93;}
 	.labia{fill:#D76B93;}
 	.hair{fill:#3F403F;}
+	.pubic_hair{fill:#3F403F;}
+	.underarm_hair{fill:#3F403F;}
 	.shoe{fill:#3E65B0;}
 	.shoe_shadow{fill:#15406D;}
 	.smart_piercing{fill:#4DB748;}
@@ -3038,33 +3040,33 @@
     <g inkscape:groupmode="layer" id="Pussy_Tattoo" inkscape:label="Pussy_Tattoo" style="display:none"><path style="fill:none;stroke:none" d="m 247.43521,421.40369 c 11.48595,-7.47207 25.83395,-7.39381 43.33727,-0.45163" id="path4363" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/><text xml:space="preserve" id="text4365" style="" x="25.568281" y="0" transform="translate(4.5961944,18.031224)"><textPath xlink:href="#path4363" id="textPath4369">'+_art_pussy_tattoo_text+'</textPath></text>
 </g>
     <g inkscape:groupmode="layer" id="Pubic_Hair_Bushy" inkscape:label="Pubic_Hair_Bushy" style="display:none">
-      <path inkscape:connector-curvature="0" id="path482" d="m 249.48898,436.75813 c -6.78529,-4.57983 56.86706,-8.22908 51.44484,-2.95019 -18.22849,20.15326 -17.23937,20.40028 -18.33755,23.11936 -0.89098,2.85521 -1.24494,5.26859 -2.05043,6.99794 -3.60433,7.73828 -7.00206,4.30232 -10.68074,-7.98611 -0.34551,-1.53578 -1.13547,-3.35376 -1.26389,-0.7249 -0.1217,7.77396 -0.17177,4.01335 -0.0579,5.90399 0.41023,6.80974 5.9635,6.40432 3.9292,6.91885 -1.44049,0.36434 -2.85679,-0.5665 -4.34452,-2.04624 -3.94884,-4.3204 -3.29824,-6.49203 -4.04877,-7.66271 -1.10943,-1.7305 -2.10108,-2.20681 -6.05624,-7.71252 -5.23164,-7.68882 -6.87946,-12.14339 -8.534,-13.85747 z" class="hair" sodipodi:nodetypes="cccsccsscscc"/>
+      <path inkscape:connector-curvature="0" id="path482" d="m 249.48898,436.75813 c -6.78529,-4.57983 56.86706,-8.22908 51.44484,-2.95019 -18.22849,20.15326 -17.23937,20.40028 -18.33755,23.11936 -0.89098,2.85521 -1.24494,5.26859 -2.05043,6.99794 -3.60433,7.73828 -7.00206,4.30232 -10.68074,-7.98611 -0.34551,-1.53578 -1.13547,-3.35376 -1.26389,-0.7249 -0.1217,7.77396 -0.17177,4.01335 -0.0579,5.90399 0.41023,6.80974 5.9635,6.40432 3.9292,6.91885 -1.44049,0.36434 -2.85679,-0.5665 -4.34452,-2.04624 -3.94884,-4.3204 -3.29824,-6.49203 -4.04877,-7.66271 -1.10943,-1.7305 -2.10108,-2.20681 -6.05624,-7.71252 -5.23164,-7.68882 -6.87946,-12.14339 -8.534,-13.85747 z" class="pubic_hair" sodipodi:nodetypes="cccsccsscscc"/>
     </g>
     <g style="display:none" inkscape:label="Pubic_Hair_Very_Bushy" id="Pubic_Hair_Very_Bushy" inkscape:groupmode="layer">
-      <path sodipodi:nodetypes="ccscsccsscscc" class="hair" d="m 243.73898,428.50813 c -6.78529,-4.57983 75.86706,-8.97908 70.44484,-3.70019 -9.22097,7.16124 -15.84888,12.76324 -21.00794,17.74471 -7.02099,6.7793 -9.94658,12.80728 -10.57961,14.37465 -0.89098,2.85521 -1.24494,5.26859 -2.05043,6.99794 -3.60433,7.73828 -7.00206,4.30232 -10.68074,-7.98611 -0.34551,-1.53578 -1.13547,-3.35376 -1.26389,-0.7249 -0.1217,7.77396 -0.17177,4.01335 -0.0579,5.90399 0.41023,6.80974 5.9635,6.40432 3.9292,6.91885 -1.44049,0.36434 -2.85679,-0.5665 -4.34452,-2.04624 -3.94884,-4.3204 -3.29824,-6.49203 -4.04877,-7.66271 -1.10943,-1.7305 -2.10108,-2.20681 -6.05624,-7.71252 -5.23164,-7.68882 -12.62946,-20.39339 -14.284,-22.10747 z" id="path1736" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccscsccsscscc" class="pubic_hair" d="m 243.73898,428.50813 c -6.78529,-4.57983 75.86706,-8.97908 70.44484,-3.70019 -9.22097,7.16124 -15.84888,12.76324 -21.00794,17.74471 -7.02099,6.7793 -9.94658,12.80728 -10.57961,14.37465 -0.89098,2.85521 -1.24494,5.26859 -2.05043,6.99794 -3.60433,7.73828 -7.00206,4.30232 -10.68074,-7.98611 -0.34551,-1.53578 -1.13547,-3.35376 -1.26389,-0.7249 -0.1217,7.77396 -0.17177,4.01335 -0.0579,5.90399 0.41023,6.80974 5.9635,6.40432 3.9292,6.91885 -1.44049,0.36434 -2.85679,-0.5665 -4.34452,-2.04624 -3.94884,-4.3204 -3.29824,-6.49203 -4.04877,-7.66271 -1.10943,-1.7305 -2.10108,-2.20681 -6.05624,-7.71252 -5.23164,-7.68882 -12.62946,-20.39339 -14.284,-22.10747 z" id="path1736" inkscape:connector-curvature="0"/>
     </g>
     <g style="display:none" inkscape:label="Pubic_Hair_Bush" id="Pubic_Hair_Bush" inkscape:groupmode="layer">
-      <path sodipodi:nodetypes="ccssc" class="hair" d="m 248.86398,435.82063 c 0.76067,-2.61985 52.40275,-5.90239 52.26438,-2.24385 -17.08062,12.11853 -22.69234,17.9945 -30.28863,20.90256 -0.70822,0.27113 -1.60542,0.58108 -2.19967,0.31127 -5.68902,-2.58302 -10.98986,-8.86604 -19.77608,-18.96998 z" id="path991" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccssc" class="pubic_hair" d="m 248.86398,435.82063 c 0.76067,-2.61985 52.40275,-5.90239 52.26438,-2.24385 -17.08062,12.11853 -22.69234,17.9945 -30.28863,20.90256 -0.70822,0.27113 -1.60542,0.58108 -2.19967,0.31127 -5.68902,-2.58302 -10.98986,-8.86604 -19.77608,-18.96998 z" id="path991" inkscape:connector-curvature="0"/>
     </g>
     <g inkscape:groupmode="layer" id="Pubic_Hair_Neat" inkscape:label="Pubic_Hair_Neat" style="display:inline">
-      <path d="M 487.94,432.27" class="hair" id="path225" inkscape:connector-curvature="0"/>
-      <path d="m 267.23463,450.73798 3.11592,-0.15136 c 0.93021,-6.40662 3.95894,-11.50631 6.66908,-16.80443 -5.58516,-0.0849 -11.59094,-0.67726 -16.5428,0.002 1.54591,5.70209 4.03226,11.33653 6.7578,16.95379 z" id="path5158" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" class="hair"/>
+      <path d="M 487.94,432.27" class="pubic_hair" id="path225" inkscape:connector-curvature="0"/>
+      <path d="m 267.23463,450.73798 3.11592,-0.15136 c 0.93021,-6.40662 3.95894,-11.50631 6.66908,-16.80443 -5.58516,-0.0849 -11.59094,-0.67726 -16.5428,0.002 1.54591,5.70209 4.03226,11.33653 6.7578,16.95379 z" id="path5158" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" class="pubic_hair"/>
     </g>
     <g inkscape:groupmode="layer" id="Pubic_Hair_Strip" inkscape:label="Pubic_Hair_Strip" style="display:none">
-      <path d="m 269.71234,450.54695 c -0.9132,-5.13504 -0.64072,-10.30716 -0.77885,-15.17311 -0.0607,0.14298 -2.97403,0.0918 -2.98274,0.26114 -0.24225,4.71122 0.35973,10.49291 1.31373,15.17455 0.65868,-0.0634 0.69222,0.37553 2.44786,-0.26258 z" id="path4354" inkscape:connector-curvature="0" class="hair" sodipodi:nodetypes="ccscc"/>
+      <path d="m 269.71234,450.54695 c -0.9132,-5.13504 -0.64072,-10.30716 -0.77885,-15.17311 -0.0607,0.14298 -2.97403,0.0918 -2.98274,0.26114 -0.24225,4.71122 0.35973,10.49291 1.31373,15.17455 0.65868,-0.0634 0.69222,0.37553 2.44786,-0.26258 z" id="path4354" inkscape:connector-curvature="0" class="pubic_hair" sodipodi:nodetypes="ccscc"/>
     </g>
     <g inkscape:groupmode="layer" id="Pubic_Hair_Wispy" inkscape:label="Pubic_Hair_Wispy" style="display:inline">
-      <path id="path5043-34-6-2" d="m 273.81429,447.35474 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -5.09375,-0.0625 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 2.34375,-0.0937 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -1.09375,0.96875 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 3.5625,-1.375 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -5.8125,1.375 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 6.55238,-0.25746 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -4.17738,1.55061 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -3.21875,-0.4375 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 1.4375,0.25 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 6.84375,-0.8125 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -3.09375,0.1875 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -4.1875,1.6875 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 1.61488,0.46129 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -0.30381,0.75366 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 4.6875,-2.375 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -0.0937,0.625 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 0.40625,1.09375 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -3.21875,-0.9375 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 1.25,0.75 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -3.44762,1.74254 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 0.32262,1.17561 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 1.75,-1.9375 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 3.71875,0.0625 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -1.125,1.03125 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -2.21875,-0.40625 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -0.25,0.625 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 0.42738,0.64879 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z" inkscape:connector-curvature="0" class="hair"/>
+      <path id="path5043-34-6-2" d="m 273.81429,447.35474 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -5.09375,-0.0625 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 2.34375,-0.0937 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -1.09375,0.96875 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 3.5625,-1.375 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -5.8125,1.375 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 6.55238,-0.25746 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -4.17738,1.55061 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -3.21875,-0.4375 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 1.4375,0.25 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 6.84375,-0.8125 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -3.09375,0.1875 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -4.1875,1.6875 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 1.61488,0.46129 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -0.30381,0.75366 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 4.6875,-2.375 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -0.0937,0.625 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 0.40625,1.09375 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -3.21875,-0.9375 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 1.25,0.75 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -3.44762,1.74254 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 0.32262,1.17561 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 1.75,-1.9375 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 3.71875,0.0625 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -1.125,1.03125 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -2.21875,-0.40625 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -0.25,0.625 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 0.42738,0.64879 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z" inkscape:connector-curvature="0" class="pubic_hair"/>
     </g>
     <g style="display:none" inkscape:label="Pubic_Hair_None" id="Pubic_Hair_None" inkscape:groupmode="layer"/>
     <g inkscape:groupmode="layer" id="Pubic_Hair_Underarm_Bushy" inkscape:label="Pubic_Hair_Underarm_Bushy" style="display:none">
-      <path class="hair" sodipodi:nodetypes="csssssssssssscscsssssssssssscc" inkscape:connector-curvature="0" id="path6194" d="m 366.20427,261.03056 c 0.13146,-0.36234 0.25633,-0.72885 0.37475,-1.09842 0.0847,-0.26441 0.16615,0.48524 0.24433,0.2181 0.0776,-0.26508 0.15198,-1.54693 0.22324,-1.81389 0.14866,-0.55696 0.43993,1.02347 0.48368,0.69805 0.0532,-0.39589 0.0855,-3.15543 0.15783,-3.54413 0.0896,-0.48142 0.40413,1.14871 0.47504,0.67397 0.0512,-0.34299 -0.12882,-2.79211 -0.095,-3.13039 0.0884,-0.88306 0.49757,0.39798 0.57068,0.15512 0.0765,-0.25419 -0.42854,-3.10432 -0.41998,-3.36088 0.019,-0.56769 0.46037,0.9903 0.46057,0.46192 10e-5,-0.29524 -0.43391,-2.69328 -0.4406,-2.97211 -0.0181,-0.75284 0.78866,0.86867 0.71205,0.27537 -0.0755,-0.5847 -1.03338,-3.38692 -1.17848,-3.76045 -0.56055,-0.51144 -1.86986,-1.56899 -2.13184,-1.52608 -0.18763,0.0307 -1.46685,0.95145 -2.27522,1.31365 0.0533,0.77994 -1.0733,3.67276 -0.97884,4.53321 0.0479,0.4359 1.30345,-1.18296 1.3598,-0.73422 0.0534,0.42505 -1.03037,3.52655 -0.97059,3.95852 0.0653,0.47209 1.27477,-1.72489 1.34627,-1.25012 0.0786,0.52179 -0.63644,3.44969 -0.55235,3.96732 0.0791,0.48678 0.95699,-1.43624 1.03915,-0.95979 0.0843,0.48893 -0.18955,2.70509 -0.10379,3.17625 0.0633,0.34788 0.48615,-1.04442 0.54937,-0.70953 0.0907,0.48037 0.0559,2.96157 0.14456,3.4082 0.0911,0.45879 0.30546,-1.11803 0.39202,-0.7037 0.0607,0.29036 0.11992,1.92808 0.17737,2.19286 0.0625,0.28806 0.12288,-0.7993 0.18058,-0.54533 0.0927,0.40819 0.1786,0.76977 0.25538,1.0765 z"/>
+      <path class="underarm_hair" sodipodi:nodetypes="csssssssssssscscsssssssssssscc" inkscape:connector-curvature="0" id="path6194" d="m 366.20427,261.03056 c 0.13146,-0.36234 0.25633,-0.72885 0.37475,-1.09842 0.0847,-0.26441 0.16615,0.48524 0.24433,0.2181 0.0776,-0.26508 0.15198,-1.54693 0.22324,-1.81389 0.14866,-0.55696 0.43993,1.02347 0.48368,0.69805 0.0532,-0.39589 0.0855,-3.15543 0.15783,-3.54413 0.0896,-0.48142 0.40413,1.14871 0.47504,0.67397 0.0512,-0.34299 -0.12882,-2.79211 -0.095,-3.13039 0.0884,-0.88306 0.49757,0.39798 0.57068,0.15512 0.0765,-0.25419 -0.42854,-3.10432 -0.41998,-3.36088 0.019,-0.56769 0.46037,0.9903 0.46057,0.46192 10e-5,-0.29524 -0.43391,-2.69328 -0.4406,-2.97211 -0.0181,-0.75284 0.78866,0.86867 0.71205,0.27537 -0.0755,-0.5847 -1.03338,-3.38692 -1.17848,-3.76045 -0.56055,-0.51144 -1.86986,-1.56899 -2.13184,-1.52608 -0.18763,0.0307 -1.46685,0.95145 -2.27522,1.31365 0.0533,0.77994 -1.0733,3.67276 -0.97884,4.53321 0.0479,0.4359 1.30345,-1.18296 1.3598,-0.73422 0.0534,0.42505 -1.03037,3.52655 -0.97059,3.95852 0.0653,0.47209 1.27477,-1.72489 1.34627,-1.25012 0.0786,0.52179 -0.63644,3.44969 -0.55235,3.96732 0.0791,0.48678 0.95699,-1.43624 1.03915,-0.95979 0.0843,0.48893 -0.18955,2.70509 -0.10379,3.17625 0.0633,0.34788 0.48615,-1.04442 0.54937,-0.70953 0.0907,0.48037 0.0559,2.96157 0.14456,3.4082 0.0911,0.45879 0.30546,-1.11803 0.39202,-0.7037 0.0607,0.29036 0.11992,1.92808 0.17737,2.19286 0.0625,0.28806 0.12288,-0.7993 0.18058,-0.54533 0.0927,0.40819 0.1786,0.76977 0.25538,1.0765 z"/>
     </g>
     <g style="display:none" inkscape:label="Pubic_Hair_Underarm_Neat" id="Pubic_Hair_Underarm_Neat" inkscape:groupmode="layer">
-      <path d="m 366.20427,261.03056 c 1.63862,-3.4584 2.59857,-14.54607 1.56813,-17.19774 -1.22544,0.4905 -0.93075,0.98444 -2.09456,-0.14993 0.39519,5.78518 0.94588,12.65451 0.52643,17.34767 z" id="path5158-3" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc" class="hair"/>
+      <path d="m 366.20427,261.03056 c 1.63862,-3.4584 2.59857,-14.54607 1.56813,-17.19774 -1.22544,0.4905 -0.93075,0.98444 -2.09456,-0.14993 0.39519,5.78518 0.94588,12.65451 0.52643,17.34767 z" id="path5158-3" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc" class="underarm_hair"/>
     </g>
     <g inkscape:groupmode="layer" id="Pubic_Hair_Underarm_Shaved" inkscape:label="Pubic_Hair_Underarm_Shaved" style="display:none">
-      <path id="path5043-34-6-2-6" d="m 367.7004,260.21275 c 0.11703,-0.85444 -0.21517,-6.69299 -0.11028,-7.50528 0.63394,3.49908 0.6254,3.28725 0.11028,7.50528 z m 0.83701,-7.50514 c 0.11703,-0.85444 -0.21517,-6.693 -0.11028,-7.50529 0.63394,3.49908 0.6254,3.28725 0.11028,7.50529 z m -0.26409,3.48112 c 0.11702,-0.85444 -0.21518,-6.693 -0.11029,-7.5053 0.63394,3.4991 0.62541,3.28725 0.11029,7.5053 z m -0.79101,-1.8348 c 0.11703,-0.85442 -0.21517,-6.693 -0.11028,-7.50529 0.63394,3.49908 0.6254,3.28725 0.11028,7.50529 z m 0.8168,5.5715 c 0.11702,-0.85444 -0.21518,-6.69301 -0.11029,-7.5053 0.63394,3.4991 0.62541,3.28725 0.11029,7.5053 z m -0.47436,-8.89294 c 0.11703,-0.85442 -0.21518,-6.69299 -0.11028,-7.50528 0.63393,3.49908 0.6254,3.28724 0.11028,7.50528 z m -0.74277,9.7311 c 0.11703,-0.85442 -0.21518,-6.693 -0.11028,-7.50529 0.63393,3.49909 0.6254,3.28725 0.11028,7.50529 z m -0.89678,-6.5191 c 0.11703,-0.85442 -0.21517,-6.693 -0.11028,-7.50529 0.63394,3.49909 0.6254,3.28725 0.11028,7.50529 z m 0.92228,-4.65204 c 0.11703,-0.85443 -0.21517,-6.693 -0.11028,-7.50529 0.63393,3.4991 0.6254,3.28725 0.11028,7.50529 z m -0.46587,2.0652 c 0.11703,-0.85442 -0.21517,-6.69299 -0.11028,-7.50528 0.63394,3.49908 0.6254,3.28724 0.11028,7.50528 z m -0.23854,10.28739 c 0.11703,-0.85443 -0.21517,-6.693 -0.11028,-7.50529 0.63394,3.49909 0.6254,3.28725 0.11028,7.50529 z m 0.28554,-4.60959 c 0.11702,-0.85444 -0.21518,-6.693 -0.11029,-7.5053 0.63394,3.4991 0.62541,3.28726 0.11029,7.5053 z m -1.03053,-6.56516 c 0.11702,-0.85443 -0.21518,-6.69299 -0.11029,-7.50529 0.63394,3.49909 0.62541,3.28726 0.11029,7.50529 z m -0.70169,2.27902 c 0.11702,-0.85443 -0.21518,-6.693 -0.11029,-7.50529 0.63394,3.49909 0.62541,3.28725 0.11029,7.50529 z m -0.69865,-0.6198 c 0.11703,-0.85442 -0.21517,-6.693 -0.11028,-7.50529 0.63394,3.49909 0.6254,3.28725 0.11028,7.50529 z m 1.63393,7.45952 c 0.11703,-0.85441 -0.21518,-6.69299 -0.11028,-7.50529 0.63393,3.49909 0.6254,3.28726 0.11028,7.50529 z m -0.60346,-0.28039 c 0.11703,-0.85442 -0.21518,-6.693 -0.11028,-7.50528 0.63393,3.4991 0.6254,3.28724 0.11028,7.50528 z m -1.14284,0.35109 c 0.11703,-0.85443 -0.21517,-6.693 -0.11028,-7.50529 0.63394,3.49909 0.6254,3.28725 0.11028,7.50529 z m 1.41645,-4.53838 c 0.11703,-0.85444 -0.21517,-6.693 -0.11028,-7.50529 0.63394,3.49908 0.6254,3.28724 0.11028,7.50529 z m -0.9315,1.67474 c 0.11703,-0.85443 -0.21518,-6.69299 -0.11028,-7.50529 0.63393,3.49909 0.6254,3.28726 0.11028,7.50529 z m -1.19754,-5.48546 c 0.11703,-0.85442 -0.21517,-6.693 -0.11028,-7.50528 0.63394,3.49908 0.6254,3.28724 0.11028,7.50528 z m -1.21101,0.20901 c 0.11703,-0.85441 -0.21518,-6.69299 -0.11028,-7.50527 0.63393,3.49907 0.6254,3.28724 0.11028,7.50527 z m 1.64859,3.02377 c 0.11703,-0.85443 -0.21518,-6.69299 -0.11028,-7.50529 0.63393,3.49909 0.6254,3.28725 0.11028,7.50529 z m -0.62774,5.47539 c 0.11702,-0.85444 -0.21518,-6.693 -0.11029,-7.50529 0.63394,3.49909 0.62541,3.28725 0.11029,7.50529 z m -0.84802,-1.89514 c 0.11703,-0.85443 -0.21518,-6.693 -0.11028,-7.50529 0.63393,3.49909 0.6254,3.28725 0.11028,7.50529 z m 0.7392,-3.18296 c 0.11702,-0.85441 -0.21518,-6.69299 -0.11029,-7.50528 0.63394,3.49908 0.62541,3.28725 0.11029,7.50528 z m -0.57967,-0.51111 c 0.11702,-0.85443 -0.21518,-6.693 -0.11029,-7.50529 0.63394,3.49909 0.6254,3.28724 0.11029,7.50529 z m -0.70628,0.48341 c 0.11703,-0.85442 -0.21518,-6.693 -0.11028,-7.50529 0.63393,3.49908 0.6254,3.28725 0.11028,7.50529 z" inkscape:connector-curvature="0" class="hair"/>
+      <path id="path5043-34-6-2-6" d="m 367.7004,260.21275 c 0.11703,-0.85444 -0.21517,-6.69299 -0.11028,-7.50528 0.63394,3.49908 0.6254,3.28725 0.11028,7.50528 z m 0.83701,-7.50514 c 0.11703,-0.85444 -0.21517,-6.693 -0.11028,-7.50529 0.63394,3.49908 0.6254,3.28725 0.11028,7.50529 z m -0.26409,3.48112 c 0.11702,-0.85444 -0.21518,-6.693 -0.11029,-7.5053 0.63394,3.4991 0.62541,3.28725 0.11029,7.5053 z m -0.79101,-1.8348 c 0.11703,-0.85442 -0.21517,-6.693 -0.11028,-7.50529 0.63394,3.49908 0.6254,3.28725 0.11028,7.50529 z m 0.8168,5.5715 c 0.11702,-0.85444 -0.21518,-6.69301 -0.11029,-7.5053 0.63394,3.4991 0.62541,3.28725 0.11029,7.5053 z m -0.47436,-8.89294 c 0.11703,-0.85442 -0.21518,-6.69299 -0.11028,-7.50528 0.63393,3.49908 0.6254,3.28724 0.11028,7.50528 z m -0.74277,9.7311 c 0.11703,-0.85442 -0.21518,-6.693 -0.11028,-7.50529 0.63393,3.49909 0.6254,3.28725 0.11028,7.50529 z m -0.89678,-6.5191 c 0.11703,-0.85442 -0.21517,-6.693 -0.11028,-7.50529 0.63394,3.49909 0.6254,3.28725 0.11028,7.50529 z m 0.92228,-4.65204 c 0.11703,-0.85443 -0.21517,-6.693 -0.11028,-7.50529 0.63393,3.4991 0.6254,3.28725 0.11028,7.50529 z m -0.46587,2.0652 c 0.11703,-0.85442 -0.21517,-6.69299 -0.11028,-7.50528 0.63394,3.49908 0.6254,3.28724 0.11028,7.50528 z m -0.23854,10.28739 c 0.11703,-0.85443 -0.21517,-6.693 -0.11028,-7.50529 0.63394,3.49909 0.6254,3.28725 0.11028,7.50529 z m 0.28554,-4.60959 c 0.11702,-0.85444 -0.21518,-6.693 -0.11029,-7.5053 0.63394,3.4991 0.62541,3.28726 0.11029,7.5053 z m -1.03053,-6.56516 c 0.11702,-0.85443 -0.21518,-6.69299 -0.11029,-7.50529 0.63394,3.49909 0.62541,3.28726 0.11029,7.50529 z m -0.70169,2.27902 c 0.11702,-0.85443 -0.21518,-6.693 -0.11029,-7.50529 0.63394,3.49909 0.62541,3.28725 0.11029,7.50529 z m -0.69865,-0.6198 c 0.11703,-0.85442 -0.21517,-6.693 -0.11028,-7.50529 0.63394,3.49909 0.6254,3.28725 0.11028,7.50529 z m 1.63393,7.45952 c 0.11703,-0.85441 -0.21518,-6.69299 -0.11028,-7.50529 0.63393,3.49909 0.6254,3.28726 0.11028,7.50529 z m -0.60346,-0.28039 c 0.11703,-0.85442 -0.21518,-6.693 -0.11028,-7.50528 0.63393,3.4991 0.6254,3.28724 0.11028,7.50528 z m -1.14284,0.35109 c 0.11703,-0.85443 -0.21517,-6.693 -0.11028,-7.50529 0.63394,3.49909 0.6254,3.28725 0.11028,7.50529 z m 1.41645,-4.53838 c 0.11703,-0.85444 -0.21517,-6.693 -0.11028,-7.50529 0.63394,3.49908 0.6254,3.28724 0.11028,7.50529 z m -0.9315,1.67474 c 0.11703,-0.85443 -0.21518,-6.69299 -0.11028,-7.50529 0.63393,3.49909 0.6254,3.28726 0.11028,7.50529 z m -1.19754,-5.48546 c 0.11703,-0.85442 -0.21517,-6.693 -0.11028,-7.50528 0.63394,3.49908 0.6254,3.28724 0.11028,7.50528 z m -1.21101,0.20901 c 0.11703,-0.85441 -0.21518,-6.69299 -0.11028,-7.50527 0.63393,3.49907 0.6254,3.28724 0.11028,7.50527 z m 1.64859,3.02377 c 0.11703,-0.85443 -0.21518,-6.69299 -0.11028,-7.50529 0.63393,3.49909 0.6254,3.28725 0.11028,7.50529 z m -0.62774,5.47539 c 0.11702,-0.85444 -0.21518,-6.693 -0.11029,-7.50529 0.63394,3.49909 0.62541,3.28725 0.11029,7.50529 z m -0.84802,-1.89514 c 0.11703,-0.85443 -0.21518,-6.693 -0.11028,-7.50529 0.63393,3.49909 0.6254,3.28725 0.11028,7.50529 z m 0.7392,-3.18296 c 0.11702,-0.85441 -0.21518,-6.69299 -0.11029,-7.50528 0.63394,3.49908 0.62541,3.28725 0.11029,7.50528 z m -0.57967,-0.51111 c 0.11702,-0.85443 -0.21518,-6.693 -0.11029,-7.50529 0.63394,3.49909 0.6254,3.28724 0.11029,7.50529 z m -0.70628,0.48341 c 0.11703,-0.85442 -0.21518,-6.693 -0.11028,-7.50529 0.63393,3.49908 0.6254,3.28725 0.11028,7.50529 z" inkscape:connector-curvature="0" class="underarm_hair"/>
     </g>
     <g style="display:none" inkscape:label="Pubic_Hair_Underarm_None" id="Pubic_Hair_Underarm_None" inkscape:groupmode="layer"/>
   </g>
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 5991ec3eb4618d2b324a8540c3e899bbc7aa509e..2cf48aec033d21bb25ea77b049838ded188f8c0d 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,15 @@
 
 0.10.7.1-0.3.x
 
+6/17/2018
+
+	23
+	-typos fixed
+	-careless enactment of certain Subjugationist laws may now have consequences
+	-added Elite breeder auction
+	-unfucked set race slavegen
+	-fixes
+
 6/16/2018
 
 	22
diff --git a/src/art/vector/Generate_Stylesheet.tw b/src/art/vector/Generate_Stylesheet.tw
index 6cb482413b3aff141277af18658c178065023955..6782bdd8c315f32fb98ae2eadf1d8d66260eb805 100644
--- a/src/art/vector/Generate_Stylesheet.tw
+++ b/src/art/vector/Generate_Stylesheet.tw
@@ -23,10 +23,12 @@
 ."+_art_display_class+" .boob    { "+_boobSkinStyle+"; }
 ."+_art_display_class+" .penis   { "+_penisSkinStyle+"; }
 ."+_art_display_class+" .scrotum { "+_scrotumSkinStyle+"; }
-."+_art_display_class+" .belly	 { "+_bellySkinStyle+"; }
+."+_art_display_class+" .belly   { "+_bellySkinStyle+"; }
 ."+_art_display_class+" .areola  { "+_areolaStyle+"; }
 ."+_art_display_class+" .labia   { "+_labiaStyle+"; }
 ."+_art_display_class+" .hair    { fill:"+_hairColour+"; }
+."+_art_display_class+" .pubic_hair     { fill:"+_pubicHairColour+"; }
+."+_art_display_class+" .underarm_hair  { fill:"+_underarmHairColour+"; }
 ."+_art_display_class+" .shoe    { fill:"+_shoeColour+"; }
 ."+_art_display_class+" .shoe_shadow    { fill:"+_shoeShadowColour+"; }
 ."+_art_display_class+" .smart_piercing { fill:#4DB748; }
diff --git a/src/art/vector/Set_Colour_Hair.tw b/src/art/vector/Set_Colour_Hair.tw
index d3eb0a1a1a4a3ecbb69a2ad6c78c35cfb10b0a0d..23d45df451fc77bb648e542d1858c39ae1fcd458 100644
--- a/src/art/vector/Set_Colour_Hair.tw
+++ b/src/art/vector/Set_Colour_Hair.tw
@@ -3,58 +3,9 @@
 /* 
 "Free-Cities Dyes (taken from Cosmetic Rules Assistant Settings)"-
 to-"HTML Color"-Map
-courtesy of Nov-X */
+courtesy of Nov-X 
+*/
 
-<<switch _artSlave.hColor>>
-<<case "auburn">>
-  <<set _hairColour = "#7e543e">>
-<<case "black">>
-  <<set _hairColour = "#3F4040">>
-<<case "blonde">>
-  <<set _hairColour = "#F4F1A3">>
-<<case "blue">>
-  <<set _hairColour = "#4685C5">>
-<<case "brown">>
-  <<set _hairColour = "#8D4F21">>
-<<case "burgundy">>
-  <<set _hairColour = "#5f3946">>
-<<case "chestnut">>
-  <<set _hairColour = "#663622">>
-<<case "chocolate">>
-  <<set _hairColour = "#6e4937">>
-<<case "copper">>
-  <<set _hairColour = "#a16145">>
-<<case "dark brown">>
-  <<set _hairColour = "#463325">>
-<<case "ginger">>
-  <<set _hairColour = "#da822d">>
-<<case "golden">>
-  <<set _hairColour = "#ffdf31">>
-<<case "green">>
-  <<set _hairColour = "#5FBA46">>
-<<case "grey">>
-  <<set _hairColour = "#9e9fa4">>
-<<case "hazel">>
-  <<set _hairColour = "#8d6f1f">>
-<<case "pink">>
-  <<set _hairColour = "#D18CBC">>
-<<case "platinum blonde">>
-  <<set _hairColour = "#fcf3c1">>
-<<case "red">>
-  <<set _hairColour = "#BB2027">>
-<<case "silver">>
-  <<set _hairColour = "#cdc9c6">>
-<<case "strawberry-blonde">>
-  <<set _hairColour = "#e5a88c">>
-<<case "blazing red">>
-  <<set _hairColour = "#E00E2B">>
-<<case "neon green">>
-  <<set _hairColour = "#25d12b">>
-<<case "neon blue">>
-  <<set _hairColour = "#2284C3">>
-<<case "neon pink">>
-  <<set _hairColour = "#cc26aa">>
-<<default>>
-  /* everything else: assume it already is HTML compliant color name or value */
-  <<set _hairColour to extractHairColor(_artSlave.hColor) >>
-<</switch>> 
+<<set _hairColour to extractHairColor(_artSlave.hColor) >>
+<<set _pubicHairColour to extractHairColor(_artSlave.pubicHColor) >>
+<<set _underarmHairColour to extractHairColor(_artSlave.underArmHColor) >>
diff --git a/src/art/vector/layers/Pubic_Hair_Bush.tw b/src/art/vector/layers/Pubic_Hair_Bush.tw
index 4c0730b1d6a50fc5decd4592478c62ae49286200..e5715545888e0e18379c9d78998f196ee5429ad2 100644
--- a/src/art/vector/layers/Pubic_Hair_Bush.tw
+++ b/src/art/vector/layers/Pubic_Hair_Bush.tw
@@ -1,3 +1,3 @@
 :: Art_Vector_Pubic_Hair_Bush [nobr]
 
-<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path sodipodi:nodetypes="ccssc" class="hair" d="m 248.86398,435.82063 c 0.76067,-2.61985 52.40275,-5.90239 52.26438,-2.24385 -17.08062,12.11853 -22.69234,17.9945 -30.28863,20.90256 -0.70822,0.27113 -1.60542,0.58108 -2.19967,0.31127 -5.68902,-2.58302 -10.98986,-8.86604 -19.77608,-18.96998 z" id="path991"/></svg></html>' >>
\ No newline at end of file
+<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path sodipodi:nodetypes="ccssc" class="pubic_hair" d="m 248.86398,435.82063 c 0.76067,-2.61985 52.40275,-5.90239 52.26438,-2.24385 -17.08062,12.11853 -22.69234,17.9945 -30.28863,20.90256 -0.70822,0.27113 -1.60542,0.58108 -2.19967,0.31127 -5.68902,-2.58302 -10.98986,-8.86604 -19.77608,-18.96998 z" id="path991"/></svg></html>' >>
\ No newline at end of file
diff --git a/src/art/vector/layers/Pubic_Hair_Bushy.tw b/src/art/vector/layers/Pubic_Hair_Bushy.tw
index bf532765a9694ed0cee068648a1030c9979c93dc..8eb2c3d60110f81842daf86e2a44d015c112d9d5 100644
--- a/src/art/vector/layers/Pubic_Hair_Bushy.tw
+++ b/src/art/vector/layers/Pubic_Hair_Bushy.tw
@@ -1,3 +1,3 @@
 :: Art_Vector_Pubic_Hair_Bushy [nobr]
 
-<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path id="path482" d="m 249.48898,436.75813 c -6.78529,-4.57983 56.86706,-8.22908 51.44484,-2.95019 -18.22849,20.15326 -17.23937,20.40028 -18.33755,23.11936 -0.89098,2.85521 -1.24494,5.26859 -2.05043,6.99794 -3.60433,7.73828 -7.00206,4.30232 -10.68074,-7.98611 -0.34551,-1.53578 -1.13547,-3.35376 -1.26389,-0.7249 -0.1217,7.77396 -0.17177,4.01335 -0.0579,5.90399 0.41023,6.80974 5.9635,6.40432 3.9292,6.91885 -1.44049,0.36434 -2.85679,-0.5665 -4.34452,-2.04624 -3.94884,-4.3204 -3.29824,-6.49203 -4.04877,-7.66271 -1.10943,-1.7305 -2.10108,-2.20681 -6.05624,-7.71252 -5.23164,-7.68882 -6.87946,-12.14339 -8.534,-13.85747 z" class="hair" sodipodi:nodetypes="cccsccsscscc"/></svg></html>' >>
\ No newline at end of file
+<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path id="path482" d="m 249.48898,436.75813 c -6.78529,-4.57983 56.86706,-8.22908 51.44484,-2.95019 -18.22849,20.15326 -17.23937,20.40028 -18.33755,23.11936 -0.89098,2.85521 -1.24494,5.26859 -2.05043,6.99794 -3.60433,7.73828 -7.00206,4.30232 -10.68074,-7.98611 -0.34551,-1.53578 -1.13547,-3.35376 -1.26389,-0.7249 -0.1217,7.77396 -0.17177,4.01335 -0.0579,5.90399 0.41023,6.80974 5.9635,6.40432 3.9292,6.91885 -1.44049,0.36434 -2.85679,-0.5665 -4.34452,-2.04624 -3.94884,-4.3204 -3.29824,-6.49203 -4.04877,-7.66271 -1.10943,-1.7305 -2.10108,-2.20681 -6.05624,-7.71252 -5.23164,-7.68882 -6.87946,-12.14339 -8.534,-13.85747 z" class="pubic_hair" sodipodi:nodetypes="cccsccsscscc"/></svg></html>' >>
\ No newline at end of file
diff --git a/src/art/vector/layers/Pubic_Hair_Neat.tw b/src/art/vector/layers/Pubic_Hair_Neat.tw
index 860dec69d1bf8e6063bccf4287d561bcd6dc12af..556a7bd98c8fd9410f16754f819467e91c2b7be9 100644
--- a/src/art/vector/layers/Pubic_Hair_Neat.tw
+++ b/src/art/vector/layers/Pubic_Hair_Neat.tw
@@ -1,3 +1,3 @@
 :: Art_Vector_Pubic_Hair_Neat [nobr]
 
-<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path d="M 487.94,432.27" class="hair" id="path225"/><path d="m 268.31434,450.76987 3.08824,-0.44117 c 0.32893,-6.46544 2.86908,-11.82526 5.07352,-17.35295 -5.56875,0.43615 -11.6036,0.4062 -16.47058,1.54412 2.07073,5.53315 5.0715,10.91128 8.30882,16.25 z" id="path5158" sodipodi:nodetypes="ccccc" class="hair"/></svg></html>' >>
\ No newline at end of file
+<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path d="M 487.94,432.27" class="pubic_hair" id="path225"/><path d="m 267.23463,450.73798 3.11592,-0.15136 c 0.93021,-6.40662 3.95894,-11.50631 6.66908,-16.80443 -5.58516,-0.0849 -11.59094,-0.67726 -16.5428,0.002 1.54591,5.70209 4.03226,11.33653 6.7578,16.95379 z" id="path5158" sodipodi:nodetypes="ccccc" class="pubic_hair"/></svg></html>' >>
\ No newline at end of file
diff --git a/src/art/vector/layers/Pubic_Hair_Strip.tw b/src/art/vector/layers/Pubic_Hair_Strip.tw
index eff79e292f94d471d50e8d3b33d2ca0426b02dc9..77170ae1dfbbfe0365dda5542bac02fbab716699 100644
--- a/src/art/vector/layers/Pubic_Hair_Strip.tw
+++ b/src/art/vector/layers/Pubic_Hair_Strip.tw
@@ -1,3 +1,3 @@
 :: Art_Vector_Pubic_Hair_Strip [nobr]
 
-<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path d="m 269.56049,452.50944 c -1.40005,-5.77308 -1.03375,-11.64897 -1.1895,-17.1356 -0.0607,0.14298 -2.41153,0.0918 -2.42024,0.26114 -0.28336,5.51075 0.58836,12.48612 1.82744,17.45241 0.0721,0.006 2.3802,3.43392 1.7823,-0.578 z" id="path4354" class="hair" sodipodi:nodetypes="ccsccc"/></svg></html>' >>
\ No newline at end of file
+<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path d="m 269.71234,450.54695 c -0.9132,-5.13504 -0.64072,-10.30716 -0.77885,-15.17311 -0.0607,0.14298 -2.97403,0.0918 -2.98274,0.26114 -0.24225,4.71122 0.35973,10.49291 1.31373,15.17455 0.65868,-0.0634 0.69222,0.37553 2.44786,-0.26258 z" id="path4354" class="pubic_hair" sodipodi:nodetypes="ccscc"/></svg></html>' >>
\ No newline at end of file
diff --git a/src/art/vector/layers/Pubic_Hair_Underarm_Bushy.tw b/src/art/vector/layers/Pubic_Hair_Underarm_Bushy.tw
index 323917dd91bdff8899be81712fbd1a8fcb0139b5..22c201a95cc4fc0d4dab5e3ef52c2c7123c2f924 100644
--- a/src/art/vector/layers/Pubic_Hair_Underarm_Bushy.tw
+++ b/src/art/vector/layers/Pubic_Hair_Underarm_Bushy.tw
@@ -1,3 +1,3 @@
 :: Art_Vector_Pubic_Hair_Underarm_Bushy [nobr]
 
-<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path class="hair" sodipodi:nodetypes="csssssssssssscscsssssssssssscc" id="path6194" d="m 366.20427,261.03056 c 0.13146,-0.36234 0.25633,-0.72885 0.37475,-1.09842 0.0847,-0.26441 0.16615,0.48524 0.24433,0.2181 0.0776,-0.26508 0.15198,-1.54693 0.22324,-1.81389 0.14866,-0.55696 0.43993,1.02347 0.48368,0.69805 0.0532,-0.39589 0.0855,-3.15543 0.15783,-3.54413 0.0896,-0.48142 0.40413,1.14871 0.47504,0.67397 0.0512,-0.34299 -0.12882,-2.79211 -0.095,-3.13039 0.0884,-0.88306 0.49757,0.39798 0.57068,0.15512 0.0765,-0.25419 -0.42854,-3.10432 -0.41998,-3.36088 0.019,-0.56769 0.46037,0.9903 0.46057,0.46192 10e-5,-0.29524 -0.43391,-2.69328 -0.4406,-2.97211 -0.0181,-0.75284 0.78866,0.86867 0.71205,0.27537 -0.0755,-0.5847 -1.03338,-3.38692 -1.17848,-3.76045 -0.56055,-0.51144 -1.86986,-1.56899 -2.13184,-1.52608 -0.18763,0.0307 -1.46685,0.95145 -2.27522,1.31365 0.0533,0.77994 -1.0733,3.67276 -0.97884,4.53321 0.0479,0.4359 1.30345,-1.18296 1.3598,-0.73422 0.0534,0.42505 -1.03037,3.52655 -0.97059,3.95852 0.0653,0.47209 1.27477,-1.72489 1.34627,-1.25012 0.0786,0.52179 -0.63644,3.44969 -0.55235,3.96732 0.0791,0.48678 0.95699,-1.43624 1.03915,-0.95979 0.0843,0.48893 -0.18955,2.70509 -0.10379,3.17625 0.0633,0.34788 0.48615,-1.04442 0.54937,-0.70953 0.0907,0.48037 0.0559,2.96157 0.14456,3.4082 0.0911,0.45879 0.30546,-1.11803 0.39202,-0.7037 0.0607,0.29036 0.11992,1.92808 0.17737,2.19286 0.0625,0.28806 0.12288,-0.7993 0.18058,-0.54533 0.0927,0.40819 0.1786,0.76977 0.25538,1.0765 z"/></svg></html>' >>
\ No newline at end of file
+<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path class="underarm_hair" sodipodi:nodetypes="csssssssssssscscsssssssssssscc" id="path6194" d="m 366.20427,261.03056 c 0.13146,-0.36234 0.25633,-0.72885 0.37475,-1.09842 0.0847,-0.26441 0.16615,0.48524 0.24433,0.2181 0.0776,-0.26508 0.15198,-1.54693 0.22324,-1.81389 0.14866,-0.55696 0.43993,1.02347 0.48368,0.69805 0.0532,-0.39589 0.0855,-3.15543 0.15783,-3.54413 0.0896,-0.48142 0.40413,1.14871 0.47504,0.67397 0.0512,-0.34299 -0.12882,-2.79211 -0.095,-3.13039 0.0884,-0.88306 0.49757,0.39798 0.57068,0.15512 0.0765,-0.25419 -0.42854,-3.10432 -0.41998,-3.36088 0.019,-0.56769 0.46037,0.9903 0.46057,0.46192 10e-5,-0.29524 -0.43391,-2.69328 -0.4406,-2.97211 -0.0181,-0.75284 0.78866,0.86867 0.71205,0.27537 -0.0755,-0.5847 -1.03338,-3.38692 -1.17848,-3.76045 -0.56055,-0.51144 -1.86986,-1.56899 -2.13184,-1.52608 -0.18763,0.0307 -1.46685,0.95145 -2.27522,1.31365 0.0533,0.77994 -1.0733,3.67276 -0.97884,4.53321 0.0479,0.4359 1.30345,-1.18296 1.3598,-0.73422 0.0534,0.42505 -1.03037,3.52655 -0.97059,3.95852 0.0653,0.47209 1.27477,-1.72489 1.34627,-1.25012 0.0786,0.52179 -0.63644,3.44969 -0.55235,3.96732 0.0791,0.48678 0.95699,-1.43624 1.03915,-0.95979 0.0843,0.48893 -0.18955,2.70509 -0.10379,3.17625 0.0633,0.34788 0.48615,-1.04442 0.54937,-0.70953 0.0907,0.48037 0.0559,2.96157 0.14456,3.4082 0.0911,0.45879 0.30546,-1.11803 0.39202,-0.7037 0.0607,0.29036 0.11992,1.92808 0.17737,2.19286 0.0625,0.28806 0.12288,-0.7993 0.18058,-0.54533 0.0927,0.40819 0.1786,0.76977 0.25538,1.0765 z"/></svg></html>' >>
\ No newline at end of file
diff --git a/src/art/vector/layers/Pubic_Hair_Underarm_Neat.tw b/src/art/vector/layers/Pubic_Hair_Underarm_Neat.tw
index 56a3b9645ebd6786cf342fa61138ab67985f7bac..f41e25602d9d525d1dc368808b3a60bea813aadd 100644
--- a/src/art/vector/layers/Pubic_Hair_Underarm_Neat.tw
+++ b/src/art/vector/layers/Pubic_Hair_Underarm_Neat.tw
@@ -1,3 +1,3 @@
 :: Art_Vector_Pubic_Hair_Underarm_Neat [nobr]
 
-<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path d="m 366.20427,261.03056 c 1.63862,-3.4584 2.59857,-14.54607 1.56813,-17.19774 -1.22544,0.4905 -0.93075,0.98444 -2.09456,-0.14993 0.39519,5.78518 0.94588,12.65451 0.52643,17.34767 z" id="path5158-3" sodipodi:nodetypes="cccc" class="hair"/></svg></html>' >>
\ No newline at end of file
+<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path d="m 366.20427,261.03056 c 1.63862,-3.4584 2.59857,-14.54607 1.56813,-17.19774 -1.22544,0.4905 -0.93075,0.98444 -2.09456,-0.14993 0.39519,5.78518 0.94588,12.65451 0.52643,17.34767 z" id="path5158-3" sodipodi:nodetypes="cccc" class="underarm_hair"/></svg></html>' >>
\ No newline at end of file
diff --git a/src/art/vector/layers/Pubic_Hair_Underarm_Shaved.tw b/src/art/vector/layers/Pubic_Hair_Underarm_Shaved.tw
index 73b314887833f2b28d8d73601e6e3c9c53ebb4ab..684d4c57fe18558be5ce918941ae0fdecd10d54b 100644
--- a/src/art/vector/layers/Pubic_Hair_Underarm_Shaved.tw
+++ b/src/art/vector/layers/Pubic_Hair_Underarm_Shaved.tw
@@ -1,3 +1,3 @@
 :: Art_Vector_Pubic_Hair_Underarm_Shaved [nobr]
 
-<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path id="path5043-34-6-2-6" d="m 367.7004,260.21275 c 0.11703,-0.85444 -0.21517,-6.69299 -0.11028,-7.50528 0.63394,3.49908 0.6254,3.28725 0.11028,7.50528 z m 0.83701,-7.50514 c 0.11703,-0.85444 -0.21517,-6.693 -0.11028,-7.50529 0.63394,3.49908 0.6254,3.28725 0.11028,7.50529 z m -0.26409,3.48112 c 0.11702,-0.85444 -0.21518,-6.693 -0.11029,-7.5053 0.63394,3.4991 0.62541,3.28725 0.11029,7.5053 z m -0.79101,-1.8348 c 0.11703,-0.85442 -0.21517,-6.693 -0.11028,-7.50529 0.63394,3.49908 0.6254,3.28725 0.11028,7.50529 z m 0.8168,5.5715 c 0.11702,-0.85444 -0.21518,-6.69301 -0.11029,-7.5053 0.63394,3.4991 0.62541,3.28725 0.11029,7.5053 z m -0.47436,-8.89294 c 0.11703,-0.85442 -0.21518,-6.69299 -0.11028,-7.50528 0.63393,3.49908 0.6254,3.28724 0.11028,7.50528 z m -0.74277,9.7311 c 0.11703,-0.85442 -0.21518,-6.693 -0.11028,-7.50529 0.63393,3.49909 0.6254,3.28725 0.11028,7.50529 z m -0.89678,-6.5191 c 0.11703,-0.85442 -0.21517,-6.693 -0.11028,-7.50529 0.63394,3.49909 0.6254,3.28725 0.11028,7.50529 z m 0.92228,-4.65204 c 0.11703,-0.85443 -0.21517,-6.693 -0.11028,-7.50529 0.63393,3.4991 0.6254,3.28725 0.11028,7.50529 z m -0.46587,2.0652 c 0.11703,-0.85442 -0.21517,-6.69299 -0.11028,-7.50528 0.63394,3.49908 0.6254,3.28724 0.11028,7.50528 z m -0.23854,10.28739 c 0.11703,-0.85443 -0.21517,-6.693 -0.11028,-7.50529 0.63394,3.49909 0.6254,3.28725 0.11028,7.50529 z m 0.28554,-4.60959 c 0.11702,-0.85444 -0.21518,-6.693 -0.11029,-7.5053 0.63394,3.4991 0.62541,3.28726 0.11029,7.5053 z m -1.03053,-6.56516 c 0.11702,-0.85443 -0.21518,-6.69299 -0.11029,-7.50529 0.63394,3.49909 0.62541,3.28726 0.11029,7.50529 z m -0.70169,2.27902 c 0.11702,-0.85443 -0.21518,-6.693 -0.11029,-7.50529 0.63394,3.49909 0.62541,3.28725 0.11029,7.50529 z m -0.69865,-0.6198 c 0.11703,-0.85442 -0.21517,-6.693 -0.11028,-7.50529 0.63394,3.49909 0.6254,3.28725 0.11028,7.50529 z m 1.63393,7.45952 c 0.11703,-0.85441 -0.21518,-6.69299 -0.11028,-7.50529 0.63393,3.49909 0.6254,3.28726 0.11028,7.50529 z m -0.60346,-0.28039 c 0.11703,-0.85442 -0.21518,-6.693 -0.11028,-7.50528 0.63393,3.4991 0.6254,3.28724 0.11028,7.50528 z m -1.14284,0.35109 c 0.11703,-0.85443 -0.21517,-6.693 -0.11028,-7.50529 0.63394,3.49909 0.6254,3.28725 0.11028,7.50529 z m 1.41645,-4.53838 c 0.11703,-0.85444 -0.21517,-6.693 -0.11028,-7.50529 0.63394,3.49908 0.6254,3.28724 0.11028,7.50529 z m -0.9315,1.67474 c 0.11703,-0.85443 -0.21518,-6.69299 -0.11028,-7.50529 0.63393,3.49909 0.6254,3.28726 0.11028,7.50529 z m -1.19754,-5.48546 c 0.11703,-0.85442 -0.21517,-6.693 -0.11028,-7.50528 0.63394,3.49908 0.6254,3.28724 0.11028,7.50528 z m -1.21101,0.20901 c 0.11703,-0.85441 -0.21518,-6.69299 -0.11028,-7.50527 0.63393,3.49907 0.6254,3.28724 0.11028,7.50527 z m 1.64859,3.02377 c 0.11703,-0.85443 -0.21518,-6.69299 -0.11028,-7.50529 0.63393,3.49909 0.6254,3.28725 0.11028,7.50529 z m -0.62774,5.47539 c 0.11702,-0.85444 -0.21518,-6.693 -0.11029,-7.50529 0.63394,3.49909 0.62541,3.28725 0.11029,7.50529 z m -0.84802,-1.89514 c 0.11703,-0.85443 -0.21518,-6.693 -0.11028,-7.50529 0.63393,3.49909 0.6254,3.28725 0.11028,7.50529 z m 0.7392,-3.18296 c 0.11702,-0.85441 -0.21518,-6.69299 -0.11029,-7.50528 0.63394,3.49908 0.62541,3.28725 0.11029,7.50528 z m -0.57967,-0.51111 c 0.11702,-0.85443 -0.21518,-6.693 -0.11029,-7.50529 0.63394,3.49909 0.6254,3.28724 0.11029,7.50529 z m -0.70628,0.48341 c 0.11703,-0.85442 -0.21518,-6.693 -0.11028,-7.50529 0.63393,3.49908 0.6254,3.28725 0.11028,7.50529 z" class="hair"/></svg></html>' >>
\ No newline at end of file
+<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path id="path5043-34-6-2-6" d="m 367.7004,260.21275 c 0.11703,-0.85444 -0.21517,-6.69299 -0.11028,-7.50528 0.63394,3.49908 0.6254,3.28725 0.11028,7.50528 z m 0.83701,-7.50514 c 0.11703,-0.85444 -0.21517,-6.693 -0.11028,-7.50529 0.63394,3.49908 0.6254,3.28725 0.11028,7.50529 z m -0.26409,3.48112 c 0.11702,-0.85444 -0.21518,-6.693 -0.11029,-7.5053 0.63394,3.4991 0.62541,3.28725 0.11029,7.5053 z m -0.79101,-1.8348 c 0.11703,-0.85442 -0.21517,-6.693 -0.11028,-7.50529 0.63394,3.49908 0.6254,3.28725 0.11028,7.50529 z m 0.8168,5.5715 c 0.11702,-0.85444 -0.21518,-6.69301 -0.11029,-7.5053 0.63394,3.4991 0.62541,3.28725 0.11029,7.5053 z m -0.47436,-8.89294 c 0.11703,-0.85442 -0.21518,-6.69299 -0.11028,-7.50528 0.63393,3.49908 0.6254,3.28724 0.11028,7.50528 z m -0.74277,9.7311 c 0.11703,-0.85442 -0.21518,-6.693 -0.11028,-7.50529 0.63393,3.49909 0.6254,3.28725 0.11028,7.50529 z m -0.89678,-6.5191 c 0.11703,-0.85442 -0.21517,-6.693 -0.11028,-7.50529 0.63394,3.49909 0.6254,3.28725 0.11028,7.50529 z m 0.92228,-4.65204 c 0.11703,-0.85443 -0.21517,-6.693 -0.11028,-7.50529 0.63393,3.4991 0.6254,3.28725 0.11028,7.50529 z m -0.46587,2.0652 c 0.11703,-0.85442 -0.21517,-6.69299 -0.11028,-7.50528 0.63394,3.49908 0.6254,3.28724 0.11028,7.50528 z m -0.23854,10.28739 c 0.11703,-0.85443 -0.21517,-6.693 -0.11028,-7.50529 0.63394,3.49909 0.6254,3.28725 0.11028,7.50529 z m 0.28554,-4.60959 c 0.11702,-0.85444 -0.21518,-6.693 -0.11029,-7.5053 0.63394,3.4991 0.62541,3.28726 0.11029,7.5053 z m -1.03053,-6.56516 c 0.11702,-0.85443 -0.21518,-6.69299 -0.11029,-7.50529 0.63394,3.49909 0.62541,3.28726 0.11029,7.50529 z m -0.70169,2.27902 c 0.11702,-0.85443 -0.21518,-6.693 -0.11029,-7.50529 0.63394,3.49909 0.62541,3.28725 0.11029,7.50529 z m -0.69865,-0.6198 c 0.11703,-0.85442 -0.21517,-6.693 -0.11028,-7.50529 0.63394,3.49909 0.6254,3.28725 0.11028,7.50529 z m 1.63393,7.45952 c 0.11703,-0.85441 -0.21518,-6.69299 -0.11028,-7.50529 0.63393,3.49909 0.6254,3.28726 0.11028,7.50529 z m -0.60346,-0.28039 c 0.11703,-0.85442 -0.21518,-6.693 -0.11028,-7.50528 0.63393,3.4991 0.6254,3.28724 0.11028,7.50528 z m -1.14284,0.35109 c 0.11703,-0.85443 -0.21517,-6.693 -0.11028,-7.50529 0.63394,3.49909 0.6254,3.28725 0.11028,7.50529 z m 1.41645,-4.53838 c 0.11703,-0.85444 -0.21517,-6.693 -0.11028,-7.50529 0.63394,3.49908 0.6254,3.28724 0.11028,7.50529 z m -0.9315,1.67474 c 0.11703,-0.85443 -0.21518,-6.69299 -0.11028,-7.50529 0.63393,3.49909 0.6254,3.28726 0.11028,7.50529 z m -1.19754,-5.48546 c 0.11703,-0.85442 -0.21517,-6.693 -0.11028,-7.50528 0.63394,3.49908 0.6254,3.28724 0.11028,7.50528 z m -1.21101,0.20901 c 0.11703,-0.85441 -0.21518,-6.69299 -0.11028,-7.50527 0.63393,3.49907 0.6254,3.28724 0.11028,7.50527 z m 1.64859,3.02377 c 0.11703,-0.85443 -0.21518,-6.69299 -0.11028,-7.50529 0.63393,3.49909 0.6254,3.28725 0.11028,7.50529 z m -0.62774,5.47539 c 0.11702,-0.85444 -0.21518,-6.693 -0.11029,-7.50529 0.63394,3.49909 0.62541,3.28725 0.11029,7.50529 z m -0.84802,-1.89514 c 0.11703,-0.85443 -0.21518,-6.693 -0.11028,-7.50529 0.63393,3.49909 0.6254,3.28725 0.11028,7.50529 z m 0.7392,-3.18296 c 0.11702,-0.85441 -0.21518,-6.69299 -0.11029,-7.50528 0.63394,3.49908 0.62541,3.28725 0.11029,7.50528 z m -0.57967,-0.51111 c 0.11702,-0.85443 -0.21518,-6.693 -0.11029,-7.50529 0.63394,3.49909 0.6254,3.28724 0.11029,7.50529 z m -0.70628,0.48341 c 0.11703,-0.85442 -0.21518,-6.693 -0.11028,-7.50529 0.63393,3.49908 0.6254,3.28725 0.11028,7.50529 z" class="underarm_hair"/></svg></html>' >>
\ No newline at end of file
diff --git a/src/art/vector/layers/Pubic_Hair_Very_Bushy.tw b/src/art/vector/layers/Pubic_Hair_Very_Bushy.tw
index fd2eb2f3b9b28a9d634adae93a71b96d8e0a6b94..224cc9c287b7dd3aa8706d4bde84edaac593242c 100644
--- a/src/art/vector/layers/Pubic_Hair_Very_Bushy.tw
+++ b/src/art/vector/layers/Pubic_Hair_Very_Bushy.tw
@@ -1,3 +1,3 @@
 :: Art_Vector_Pubic_Hair_Very_Bushy [nobr]
 
-<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path sodipodi:nodetypes="ccscsccsscscc" class="hair" d="m 243.73898,428.50813 c -6.78529,-4.57983 75.86706,-8.97908 70.44484,-3.70019 -9.22097,7.16124 -15.84888,12.76324 -21.00794,17.74471 -7.02099,6.7793 -9.94658,12.80728 -10.57961,14.37465 -0.89098,2.85521 -1.24494,5.26859 -2.05043,6.99794 -3.60433,7.73828 -7.00206,4.30232 -10.68074,-7.98611 -0.34551,-1.53578 -1.13547,-3.35376 -1.26389,-0.7249 -0.1217,7.77396 -0.17177,4.01335 -0.0579,5.90399 0.41023,6.80974 5.9635,6.40432 3.9292,6.91885 -1.44049,0.36434 -2.85679,-0.5665 -4.34452,-2.04624 -3.94884,-4.3204 -3.29824,-6.49203 -4.04877,-7.66271 -1.10943,-1.7305 -2.10108,-2.20681 -6.05624,-7.71252 -5.23164,-7.68882 -12.62946,-20.39339 -14.284,-22.10747 z" id="path1736"/></svg></html>' >>
\ No newline at end of file
+<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path sodipodi:nodetypes="ccscsccsscscc" class="pubic_hair" d="m 243.73898,428.50813 c -6.78529,-4.57983 75.86706,-8.97908 70.44484,-3.70019 -9.22097,7.16124 -15.84888,12.76324 -21.00794,17.74471 -7.02099,6.7793 -9.94658,12.80728 -10.57961,14.37465 -0.89098,2.85521 -1.24494,5.26859 -2.05043,6.99794 -3.60433,7.73828 -7.00206,4.30232 -10.68074,-7.98611 -0.34551,-1.53578 -1.13547,-3.35376 -1.26389,-0.7249 -0.1217,7.77396 -0.17177,4.01335 -0.0579,5.90399 0.41023,6.80974 5.9635,6.40432 3.9292,6.91885 -1.44049,0.36434 -2.85679,-0.5665 -4.34452,-2.04624 -3.94884,-4.3204 -3.29824,-6.49203 -4.04877,-7.66271 -1.10943,-1.7305 -2.10108,-2.20681 -6.05624,-7.71252 -5.23164,-7.68882 -12.62946,-20.39339 -14.284,-22.10747 z" id="path1736"/></svg></html>' >>
\ No newline at end of file
diff --git a/src/art/vector/layers/Pubic_Hair_Wispy.tw b/src/art/vector/layers/Pubic_Hair_Wispy.tw
index 215bc7daf632e7e017928cf366252e8a131c72d7..357546214ee78132859fbb46807c2538b6e2e5ec 100644
--- a/src/art/vector/layers/Pubic_Hair_Wispy.tw
+++ b/src/art/vector/layers/Pubic_Hair_Wispy.tw
@@ -1,3 +1,3 @@
 :: Art_Vector_Pubic_Hair_Wispy [nobr]
 
-<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path id="path5043-34-6-2" d="m 273.81429,447.35474 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -5.09375,-0.0625 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 2.34375,-0.0937 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -1.09375,0.96875 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 3.5625,-1.375 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -5.8125,1.375 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 6.55238,-0.25746 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -4.17738,1.55061 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -3.21875,-0.4375 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 1.4375,0.25 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 6.84375,-0.8125 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -3.09375,0.1875 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -4.1875,1.6875 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 1.61488,0.46129 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -0.30381,0.75366 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 4.6875,-2.375 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -0.0937,0.625 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 0.40625,1.09375 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -3.21875,-0.9375 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 1.25,0.75 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -3.44762,1.74254 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 0.32262,1.17561 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 1.75,-1.9375 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 3.71875,0.0625 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -1.125,1.03125 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -2.21875,-0.40625 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -0.25,0.625 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 0.42738,0.64879 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z" class="hair"/></svg></html>' >>
\ No newline at end of file
+<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path id="path5043-34-6-2" d="m 273.81429,447.35474 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -5.09375,-0.0625 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 2.34375,-0.0937 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -1.09375,0.96875 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 3.5625,-1.375 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -5.8125,1.375 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 6.55238,-0.25746 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -4.17738,1.55061 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -3.21875,-0.4375 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 1.4375,0.25 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 6.84375,-0.8125 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -3.09375,0.1875 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -4.1875,1.6875 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 1.61488,0.46129 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -0.30381,0.75366 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 4.6875,-2.375 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -0.0937,0.625 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 0.40625,1.09375 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -3.21875,-0.9375 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 1.25,0.75 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -3.44762,1.74254 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 0.32262,1.17561 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 1.75,-1.9375 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 3.71875,0.0625 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -1.125,1.03125 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -2.21875,-0.40625 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m -0.25,0.625 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z m 0.42738,0.64879 c -0.58321,-0.0286 -4.39619,0.89467 -4.94967,0.87377 2.21896,-0.9831 2.08008,-0.95308 4.94967,-0.87377 z" class="pubic_hair"/></svg></html>' >>
\ No newline at end of file
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index ff3ba328e9ee8d63ad69dd3524d310bc652ae6f7..2b3378e91c94f500d09a1ca958575eb72516d43b 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -218,7 +218,7 @@ The previous owner seems to have left in something of a hurry.
 		<<set $activeSlave.clothes = "uncomfortable straps", $activeSlave.collar = "uncomfortable leather", $activeSlave.shoes = "flats">>
 		<<set $activeSlave.assignment = "please you">>
 	<<case "Subjugationist">>
-		<<set $fixedRace = $activeArcology.FSSubjugationistRace>><<include "Generate New Slave">><<set $fixedRace = 0>>
+		<<set $fixedRace = $activeArcology.FSSubjugationistRace>><<include "Generate New Slave">>
 		<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(-25,-45), $activeSlave.health = random(0,15)>>
 		<<set $activeSlave.face = random(15,100)>>
 		<<set $activeSlave.oralSkill = random(15,35), $activeSlave.analSkill = random(15,35)>>
@@ -414,7 +414,7 @@ The previous owner seems to have left in something of a hurry.
 		<<set $activeSlave.clothes = "a toga", $activeSlave.collar = "pretty jewelry", $activeSlave.shoes = "flats">>
 		<<set $activeSlave.assignment = "guard you", $Bodyguard = $activeSlave>>
 	<<case "AztecRevivalist">>
-		<<set $fixedRace = "latina">><<include "Generate New Slave">><<set $fixedRace = 0>>
+		<<set $fixedRace = "latina">><<include "Generate New Slave">>
 		<<set $activeSlave.nationality = "Mexican">>
 		<<NationalityToName $activeSlave>>
 		<<set $activeSlave.accent = 0>>
@@ -438,7 +438,7 @@ The previous owner seems to have left in something of a hurry.
 		<<set $activeSlave.clothes = "slutty jewelry", $activeSlave.collar = "ancient Egyptian", $activeSlave.shoes = "flats">>
 		<<set $activeSlave.assignment = "please you">>
 	<<case "EdoRevivalist">>
-		<<set $fixedRace = "asian">><<include "Generate New Slave">><<set $fixedRace = 0>>
+		<<set $fixedRace = "asian">><<include "Generate New Slave">>
 		<<set $activeSlave.nationality = "Japanese">>
 		<<NationalityToName $activeSlave>>
 		<<set $activeSlave.accent = 0>>
@@ -459,7 +459,7 @@ The previous owner seems to have left in something of a hurry.
 		<<set $activeSlaveOneTimeMinAge = 36>>
 		<<set $activeSlaveOneTimeMaxAge = 38>>
 		<<set $one_time_age_overrides_pedo_mode = 1>>
-		<<set $fixedRace = "asian">><<include "Generate New Slave">><<set $fixedRace = 0>>
+		<<set $fixedRace = "asian">><<include "Generate New Slave">>
 		<<set $activeSlave.nationality = "Chinese">>
 		<<NationalityToName $activeSlave>>
 		<<NationalityToAccent $activeSlave>>
diff --git a/src/pregmod/eliteSlave.tw b/src/pregmod/eliteSlave.tw
new file mode 100644
index 0000000000000000000000000000000000000000..4afff93e1616d0fa6d0d8f82f92533039780ecd4
--- /dev/null
+++ b/src/pregmod/eliteSlave.tw
@@ -0,0 +1,217 @@
+:: Elite Slave[nobr]
+
+<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves">>
+<<set $showEncyclopedia = 1, $encyclopedia = "Slave Schools">>
+
+You check to see if any potential breeding slaves are on auction. <<if $eliteAuctioned == 1>>There are none available right now, but there probably will be next week.<<else>>
+
+<<set $eliteAuctioned = 1>>
+
+<<if $arcologies[0].FSMaturityPreferentialist > 20>>
+	<<set $activeSlaveOneTimeMinAge = 25>>
+<<else>>
+	<<set $activeSlaveOneTimeMinAge = $fertilityAge>>
+<</if>>
+<<if $arcologies[0].FSYouthPreferentialist > 20>>
+	<<set $activeSlaveOneTimeMaxAge = 23>>
+<<else>>
+	<<set $activeSlaveOneTimeMaxAge = 40>>
+<</if>>
+<<set $one_time_age_overrides_pedo_mode = 1>>
+<<if $arcologies[0].FSSupremacist != "unset">>
+	<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
+<<elseif $arcologies[0].FSSubjugationist != "unset">>
+	<<set _races = ["white", "white", "white", "white", "white", "white", "white", "white", "white", "asian", "asian", "asian", "asian", "asian", "asian", "latina", "latina", "latina", "black", "black", "middle eastern", "middle eastern", "indo-aryan", "indo-aryan", "southern european", "southern european", "semitic", "semitic", "malay", "malay", "amerindian", "pacific islander", "mixed race"]>>
+	<<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+	<<set $fixedRace = _races.random()>>
+<</if>>
+<<include "Generate XX Slave">>
+<<set $activeSlave.origin = "She was purchased from a member of the Elite.">>
+<<set $activeSlave.career = "a slave">>
+<<set $activeSlave.prestige = 1>>
+<<set $activeSlave.trust = random(60,100)>>
+<<set $activeSlave.devotion = random(60,100)>>
+<<if $arcologies[0].FSPaternalist > 20>>
+	<<set $activeSlave.health = 100>>
+	<<set $activeSlave.intelligenceImplant = 1>>
+<<else>>
+	<<set $activeSlave.health = random(10,60)>>
+	<<set $activeSlave.intelligenceImplant = random(0,1,1)>>
+<</if>>
+<<if $arcologies[0].FSSlimnessEnthusiast > 20>>
+	<<if $arcologies[0].FSHedonisticDecadence > 20 || $arcologies[0].FSPhysicalIdealistLaw == 1>>
+		<<set _weightMax = 30>>
+	<<else>>
+		<<set _weightMax = 0>>
+	<</if>>
+<<elseif $arcologies[0].FSPhysicalIdealistLaw == 1>>
+	<<set _weightMax = 30>>
+<<else>>
+	<<set _weightMax = 100>>
+<</if>>
+<<if $arcologies[0].FSHedonisticDecadence > 20>>
+	<<if $arcologies[0].FSSlimnessEnthusiast > 20>>
+		<<set _weightMin = 10>>
+	<<else>>
+		<<set _weightMin = 95>>
+	<</if>>
+<<else>>
+	<<set _weightMin = -70>>
+<</if>>
+<<set $activeSlave.weight = random(_weightMin, _weightMax)>>
+<<if $arcologies[0].FSPhysicalIdealist > 20>>
+	<<if $arcologies[0].FSPhysicalIdealistLaw == 1>>
+		<<set _musclesMin = 20>>
+		<<set _musclesMax = 50>>
+	<<else>>
+		<<set _musclesMin = 95>>
+		<<set _musclesMax = 100>>
+	<</if>>
+<<elseif $arcologies[0].FSHedonisticDecadence > 20>>
+	<<if $arcologies[0].FSHedonisticDecadenceStrongFat == 1>>
+		<<set _musclesMin = 50>>
+		<<set _musclesMax = 100>>
+	<<else>>
+		<<set _musclesMin = -100>>
+		<<set _musclesMax = 50>>
+	<</if>>
+<<else>>
+	<<set _musclesMin = -50>>
+	<<set _musclesMax = 50>>
+<</if>>
+<<set $activeSlave.muscles = random(_musclesMin, _musclesMax)>>
+<<if $arcologies[0].FSPhysicalIdealist > 20>>
+	<<set $activeSlave.height += 5>>
+<</if>>
+<<set $activeSlave.eyes = 1>>
+<<if ($activeSlave.weight < -30)>>
+	<<set $activeSlave.waist = random(-55,0)>>
+<<elseif $activeSlave.physicalAge < 13>>
+	<<set $activeSlave.waist = random(-25,25)>>
+<<elseif ($activeSlave.weight <= 30)>>
+	<<set $activeSlave.waist = random(-45,5)>>
+<<elseif ($activeSlave.weight <= 160)>>
+	<<set $activeSlave.waist = random(-20,10)>>
+<</if>>
+<<if $activeSlave.voice < 2>>
+	<<set $activeSlave.voice++>>
+<</if>>
+<<if $activeSlave.accent > 1>>
+	<<set $activeSlave.accent = 1>>
+<</if>>
+<<if $activeSlave.shoulders > 0>>
+	<<set $activeSlave.shoulders -= 2>>
+<</if>>
+<<if $arcologies[0].FSAssetExpansionist > 20>>
+	<<set $activeSlave.boobs = (random(50,500) * 100)>>
+	<<set $activeSlave.butt = random(6,20)>>
+	<<if $arcologies[0].FSTransformationFetishist > 20>>
+		<<set $activeSlave.boobsImplant = $activeSlave.boobs-200>>
+		<<set $activeSlave.buttImplant = $activeSlave.butt-1>>
+	<</if>>
+<<elseif $arcologies[0].FSSlimnessEnthusiast > 20>>
+	<<set $activeSlave.boobs = (random(3,5) * 100)>>
+	<<set $activeSlave.butt = random(0,2)>>
+	<<if $arcologies[0].FSTransformationFetishist > 20>>
+		<<set $activeSlave.boobsImplant = $activeSlave.boobs-50>>
+		<<if $activeSlave.butt > 1>>
+			<<set $activeSlave.buttImplant = 1>>
+		<</if>>
+	<</if>>
+<<else>>
+	<<set $activeSlave.boobs = (random(5,10) * 100)>>
+	<<set $activeSlave.butt = random(3,7)>>
+	<<if $arcologies[0].FSTransformationFetishist > 20>>
+		<<set $activeSlave.boobsImplant = $activeSlave.boobs-200>>
+		<<set $activeSlave.buttImplant = $activeSlave.butt-1>>
+	<</if>>
+<</if>>
+<<if $arcologies[0].FSTransformationFetishist > 20>>
+	<<set $activeSlave.boobShape = "normal">>
+<<else>>
+	<<set $activeSlave.boobShape = either("perky", "perky", "torpedo-shaped", "wide-set")>>
+<</if>>
+<<if $activeSlave.nipples == "tiny">>
+	<<set $activeSlave.nipples = "puffy">>
+<</if>>
+<<set $activeSlave.face = 100>>
+<<set $activeSlave.faceShape = either("cute", "cute", "sensual", "sensual", "sensual", "normal", "normal", "exotic", "exotic")>>
+<<set $activeSlave.lips = random(45,75)>>
+<<if $arcologies[0].FSTransformationFetishist > 20>>
+	<<set $activeSlave.lips += 25>>
+	<<set $activeSlave.lipsImplant = 25>>
+<</if>>
+<<if $activeSlave.teeth != "normal">>
+	<<set $activeSlave.teeth = "normal">>
+<</if>>
+<<if $activeSlave.vaginaLube == 0>>
+	<<set $activeSlave.vaginaLube++>>
+<</if>>
+<<set $activeSlave.preg = 0>>
+<<set $activeSlave.birthsTotal = either(0,0,0,0,0,0,0,0,1,1,1,1,2,2,3,4)>>
+<<if $arcologies[0].FSPastoralist > 20 || $activeSlave.birthsTotal > 0>>
+	<<set $activeSlave.lactation = 1>>
+	<<if $arcologies[0].FSPastoralist > 20>>
+		<<set $activeSlave.lactationAdaptation = $arcologies[0].FSPastoralist>>
+	<<else>>
+		<<set $activeSlave.lactationAdaptation = Math.min($activeSlave.birthsTotal*10, 100)>>
+	<</if>>
+<<else>>
+	<<set $activeSlave.lactation = either(0, 0, 0 , 0, 1)>>
+<</if>>
+<<if $activeSlave.birthsTotal > 0>>
+	<<set $activeSlave.vagina = random(2,3)>>
+	<<set $activeSlave.pregWeek = either(-4, -3, -2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)>>
+<<else>>
+	<<set $activeSlave.vagina = random(0,3)>>
+	<<set $activeSlave.pregWeek = 0>>
+<</if>>
+<<if $activeSlave.hips <= 0>>
+	<<set $activeSlave.hips = 1>>
+<</if>>
+<<if $arcologies[0].FSGenderRadicalist > 20>>
+	<<set $activeSlave.dick = random(2,5)>>
+	<<set $activeSlave.balls = random(2,10)>>
+	<<set $activeSlave.scrotum = $activeSlave.balls>>
+	<<set $activeSlave.prostate = random(1,3)>>
+<</if>>
+<<set $activeSlave.makeup = 2>>
+<<set $activeSlave.nails = 1>>
+<<if $activeSlave.vagina == 0>>
+	<<set $activeSlave.vaginalSkill = 30>>
+<<else>>
+	<<set $activeSlave.vaginalSkill = 100>>
+<</if>>
+<<if $activeSlave.anus == 0>>
+	<<set $activeSlave.analSkill = 10>>
+<<else>>
+	<<set $activeSlave.analSkill = 70>>
+<</if>>
+<<set $activeSlave.oralSkill = 100>>
+<<set $activeSlave.vaginalAccessory = "chastity belt">>
+<<set $activeSlave.intelligence = either(2,2,2,2,2,2,2,3)>>
+<<set $activeSlave.attrKnown = 1>>
+<<set $activeSlave.fetishKnown = 1>>
+<<set $activeSlave.behavioralQuirk = "confident">>
+<<set $activeSlave.sexualQuirk = either("gagfuck queen", "strugglefuck queen", "tease", "romantic", "romantic", "perverted", "caring", "caring", "unflinching")>>
+<<set $activeSlave.pubertyXX = 1>>
+<<set $activeSlave.breedingMark = 1>>
+
+<<slaveCost $activeSlave>>
+
+<br><br>
+
+It will take <<print cashFormat($slaveCost)>> to win the auction.
+
+<br><br>
+<<if $cash >= $slaveCost>>
+	[[Place that bid|New Slave Intro][$cash -= $slaveCost,$nextButton = "Continue",$nextLink = "AS Dump",$returnTo = "Main"]]
+<<else>>
+	//You lack the necessary funds to place a winning bid.//
+<</if>>
+
+<br><br>
+
+<<set $saleDescription = 1>><<include "Long Slave Description">>
+
+<</if>>
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index 589a0b18b2028f36bf60caff4327d048213a57d5..4d9b411055834057dc0e2cc011f9ddb3f63469d5 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -602,7 +602,7 @@ The offered price is <<print cashFormat($slaveCost)>>.
 			<<elseif $Concubine.boobs > 2000>>
 				$Concubine.slaveName massages her big breasts. <<if canTalk($Concubine)>>"I doubt it will work, but if you're looking for an excu<<s>>e, you don't need one!"<<else>>She scoffs at the commercial and clearly expresses her doubt before puffing out her chest at you.<</if>> She leans into you so her bust flops into your lap.
 			<<else>>
-				$Concubine.slaveName cups her breasts. <<if canTalk($Concubine)>>"What a joke. I <<s>>ure it doe<<s>>n't work, plu<<s>> don't you think they are lovely enough already, <<Master>>?"<<else>>She scoffs with doubt before proudly sticking out her chest.<</if>> She bounces her tits for you. You'll have to agree with her; not a bit of sag to them.
+				$Concubine.slaveName cups her breasts. <<if canTalk($Concubine)>>"What a joke. I'm <<s>>ure it doe<<s>>n't work, plu<<s>> don't you think they are lovely enough already, <<Master>>?"<<else>>She scoffs with doubt before proudly sticking out her chest.<</if>> She bounces her tits for you. You'll have to agree with her; not a bit of sag to them.
 			<</if>>
 			<<if $PC.boobsBonus > 2 && $PC.boobsImplant == 0>>
 				She slides closer to you, wraps an arm around your back and grabs your huge breasts. <<if canTalk($Concubine)>>"Oh <<Master>>! It feel<<s>> like YOU might need it!" She jiggles your boobs in her hands.<<else>>She jiggles your huge boobs in her hands. She's calling you saggy!<</if>> You take that as an open invitation and throw the covers over the two of you so you can have a little fun before bed.
diff --git a/src/uncategorized/REFS.tw b/src/uncategorized/REFS.tw
index c04423a377529b41526eeaf4ad43ab9ee00948c9..786d091546defcdfc9450434feba740af0298c33 100644
--- a/src/uncategorized/REFS.tw
+++ b/src/uncategorized/REFS.tw
@@ -251,7 +251,7 @@ On this particular outing you happen to cross paths with a comely female citizen
 			<<replace "#result2">>
 			As your new playmate lies slumbering in bed, you consult with $assistantName as to the cost of the surgery conducted today. With some creative accounting, you settle the citizen's other outstanding debts and then arrange for her to be charged a sum in excess of her financial means for the surgery conducted on her today. Of course, that was not what you agreed, but it was her mistake for undergoing an expensive procedure without a formal contract. When she awakens, though she will retain her new bimbo body, she will be just another slave in your penthouse.
 			<<set $activeSlaveOneTimeMaxAge = 22>>
-			<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+			<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 			<<include "Generate XX Slave">>
 			<<set $activeSlave.origin = "She was enslaved by you when you overcharged her for surgery.">>
 			<<set $activeSlave.devotion = random(-70,-55)>>
@@ -332,7 +332,7 @@ On this particular outing you happen to cross paths with a comely female citizen
 			<br><br>
 			<<set $cash -= 10000>>
 			<<set $activeSlaveOneTimeMaxAge = 22>>
-			<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+			<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 			<<include "Generate XX Slave">>
 			<<set $activeSlave.origin = "She was enslaved by you when you purchased her debt.">>
 			<<set $activeSlave.devotion = random(-55,0)>>
@@ -388,7 +388,7 @@ On this particular outing you happen to cross paths with a comely female citizen
 			<<set $activeSlaveOneTimeMinAge = 36>>
 			<<set $activeSlaveOneTimeMaxAge = 42>>
 			<<set $one_time_age_overrides_pedo_mode = 1>>
-			<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+			<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 			<<include "Generate XX Slave">>
 			<<set $activeSlave.origin = "She was enslaved by you when you purchased her debt.">>
 			<<set $activeSlave.devotion = random(-90,-75)>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 27d49d4808acd8dd5a77f45147b465bd1286a58f..056b35af5de7df1bf0ac0bb64492f28938ee8450 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -16599,9 +16599,9 @@ You tell her kindly that you understand, and that she'll be trained to address t
 	<br><br>
 	"We shouldn't have come here," one of them says dully. She's wrong in that they would have had no trouble at all if they hadn't offended you, but right in that here, they put themselves entirely under your power. Tourists would never visit if this were widely known, but fortunately, you've been successful at concealing this. They begin to cry, and then to beg, and then the drones bag them and take them away.
 	<<set $cash -= 25000>>
-	<<set $fixedNationality = "American">>
 	<<for _ress = 0; _ress < 3; _ress++>>
-		<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+		<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
+		<<set $fixedNationality = "American">>
 		<<include "Generate New Slave">>
 		<<set _origin = "You enslaved her for abusing " + $eventSlave.slaveName + " while she was serving the public.">>
 		<<set $activeSlave.origin = _origin>>
@@ -16628,7 +16628,6 @@ You tell her kindly that you understand, and that she'll be trained to address t
 		<<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
 		<<AddSlave $activeSlave>> /* skip New Slave Intro */
 	<</for>>
-	<<set $fixedNationality = 0>>
 	<br><br><span id="result2">
 	<<link "Let your public servant take revenge on them">>
 		<<replace "#result2">>
diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw
index a52a425ba368ec0558d44cdfb36c4f574bb92a8b..e9ea3a90660f29028fcc1d743e8bbfd174fa5793 100644
--- a/src/uncategorized/arcadeReport.tw
+++ b/src/uncategorized/arcadeReport.tw
@@ -132,19 +132,19 @@
 	<</if>>
 	<<if $showEWD != 0>>
 		<br>&nbsp;&nbsp;&nbsp;
-		<<include "SA drugs">>
 		<<include "SA rules">>
 		<<include "SA diet">>
 		<<include "SA long term effects">>
+		<<include "SA drugs">>
 		<<include "SA relationships">>
 		<<include "SA rivalries">>
 		<br><<include "SA devotion">>
 	<<else>>
 		<<silently>>
-		<<include "SA drugs">>
 		<<include "SA rules">>
 		<<include "SA diet">>
 		<<include "SA long term effects">>
+		<<include "SA drugs">>
 		<<include "SA relationships">>
 		<<include "SA rivalries">>
 		<<include "SA devotion">>
diff --git a/src/uncategorized/buySlaves.tw b/src/uncategorized/buySlaves.tw
index 256348e5ec62c1aebebe401ab6413392dfceb993..11536381a54c195e746e650cc28bfc65cb4a0cad 100644
--- a/src/uncategorized/buySlaves.tw
+++ b/src/uncategorized/buySlaves.tw
@@ -231,6 +231,10 @@ __Sex Slave Purchase Options__
 	<br>[[Attend an auction of a prestigious slave|Prestigious Slave]] | //Variable and expensive.//
 <</if>>
 
+<<if ($propOutcome == 1)>>
+	<br>[[Attend an auction of other Elite's stock|Elite Slave]] | //Limited and very expensive.//
+<</if>>
+
 <<if ($rep > 17000)>>
 	<br>[[Acquire other slaveowners' stock|Special Slave]] | //Variable and expensive.//
 <</if>>
diff --git a/src/uncategorized/generateXXSlave.tw b/src/uncategorized/generateXXSlave.tw
index c85758dd6e2b17553602e385072ec2dc85ad1141..bd74499927e0c3e6934518e1f2d9bf4b06f79428 100644
--- a/src/uncategorized/generateXXSlave.tw
+++ b/src/uncategorized/generateXXSlave.tw
@@ -94,37 +94,68 @@
 
 /% Begin height replacement section. %/
 /% Since we use nationality for height effects we need to initialize it now instead of later on like in vanilla Free Cities. %/
-<<if $fixedNationality == 0>>
-	<<set $activeSlave.nationality = hashChoice($nationalities)>>
-<<else>>
-	<<set $activeSlave.nationality = $fixedNationality>>
-	<<set $fixedNationality = 0>>
-<</if>>
-<<NationalityToRace $activeSlave>>
-/* Corporate slavegen with race selection */
-<<if passage() == "Corporate Market" && ($captureUpgradeRace != "unselected") && ($captureUpgradeRace != "none")>> 
-	<<if $captureUpgradeRace == "mixed race">>
-		<<set $activeSlave.race = "mixed race">>
+<<if $fixedRace == 0>>
+	<<if $fixedNationality == 0>>
+		<<set $activeSlave.nationality = hashChoice($nationalities)>>
 	<<else>>
-		<<set _capUpgradeCheck = setup[$captureUpgradeRace.toLowerCase().replace(/[ -]/g, '')+'Nationalities']>>
-		<<set _capUpgradeNationalities = []>>
-		<<for _u = 0; _u < _capUpgradeCheck.length; _u++>>
-			<<set _capNation = _capUpgradeCheck[_u]>>
-			<<if _capNation in $nationalities>>
-				<<set _capUpgradeNationalities.push(_capNation)>>
-			<</if>>
-		<</for>>
-		<<if _capUpgradeNationalities.length > 0>>
-			<<set $activeSlave.nationality = _capUpgradeNationalities.random(), $activeSlave.race = $captureUpgradeRace>>
+		<<set $activeSlave.nationality = $fixedNationality>>
+		<<set $fixedNationality = 0>>
+	<</if>>
+	<<NationalityToRace $activeSlave>>
+	/* Corporate slavegen with race selection */
+	<<if passage() == "Corporate Market" && ($captureUpgradeRace != "unselected") && ($captureUpgradeRace != "none")>> 
+		<<if $captureUpgradeRace == "mixed race">>
+			<<set $activeSlave.race = "mixed race">>
 		<<else>>
-			<<set $activeSlave.nationality = _capUpgradeCheck.random(), $activeSlave.race = $captureUpgradeRace>>
+			<<set _capUpgradeCheck = setup[$captureUpgradeRace.toLowerCase().replace(/[ -]/g, '')+'Nationalities']>>
+			<<set _capUpgradeNationalities = []>>
+			<<for _u = 0; _u < _capUpgradeCheck.length; _u++>>
+				<<set _capNation = _capUpgradeCheck[_u]>>
+				<<if _capNation in $nationalities>>
+					<<set _capUpgradeNationalities.push(_capNation)>>
+				<</if>>
+			<</for>>
+			<<if _capUpgradeNationalities.length > 0>>
+				<<set $activeSlave.nationality = _capUpgradeNationalities.random(), $activeSlave.race = $captureUpgradeRace>>
+			<<else>>
+				<<set $activeSlave.nationality = _capUpgradeCheck.random(), $activeSlave.race = $captureUpgradeRace>>
+			<</if>>
+		<</if>>
+		<<if $activeSlave.race != $captureUpgradeRace>>
+			<<set $activeSlave.race = $captureUpgradeRace>>
 		<</if>>
 	<</if>>
-	<<if $activeSlave.race != $captureUpgradeRace>>
-		<<set $activeSlave.race = $captureUpgradeRace>>
-	<</if>>
+	/*end Corporate slavegen with race selection */
+<<else>>
+	<<switch $fixedRace>>
+	<<case "white">>
+		<<set $activeSlave.nationality = setup.whiteNationalities.random()>>
+	<<case "asian">>
+		<<set $activeSlave.nationality = setup.asianNationalities.random()>>
+	<<case "latina">>
+		<<set $activeSlave.nationality = setup.latinaNationalities.random()>>
+	<<case "black">>
+		<<set $activeSlave.nationality = setup.blackNationalities.random()>>
+	<<case "pacific islander">>
+		<<set $activeSlave.nationality = setup.pacificislanderNationalities.random()>>
+	<<case "southern european">>
+		<<set $activeSlave.nationality = setup.southerneuropeanNationalities.random()>>
+	<<case "amerindian">>
+		<<set $activeSlave.nationality = setup.amerindianNationalities.random()>>
+	<<case "semitic">>
+		<<set $activeSlave.nationality = setup.semiticNationalities.random()>>
+	<<case "middle eastern">>
+		<<set $activeSlave.nationality = setup.middleeasternNationalities.random()>>
+	<<case "indo-aryan">>
+		<<set $activeSlave.nationality = setup.indoaryanNationalities.random()>>
+	<<case "malay">>
+		<<set $activeSlave.nationality = setup.malayNationalities.random()>>
+	<<default>>
+		<<set $activeSlave.nationality = hashChoice($nationalities)>>
+	<</switch>>
+	<<set $activeSlave.race = $fixedRace>>
+	<<set $fixedRace = 0>>
 <</if>>
-/*end Corporate slavegen with race selection */
 <<NationalityToName $activeSlave>>
 <<NationalityToAccent $activeSlave>>
 
diff --git a/src/uncategorized/generateXYSlave.tw b/src/uncategorized/generateXYSlave.tw
index a75b1f5adf648c53c591586771558afd84201cd8..15665189893d62c7c2c8f9a9f0ccecbfdb4b694d 100644
--- a/src/uncategorized/generateXYSlave.tw
+++ b/src/uncategorized/generateXYSlave.tw
@@ -100,38 +100,68 @@
 <</if>>
 
 /% Since we use nationality for height effects we need to initialize it now instead of later on like in vanilla Free Cities. %/
-
-<<if $fixedNationality == 0>>
-	<<set $activeSlave.nationality = hashChoice($nationalities)>>
-<<else>>
-	<<set $activeSlave.nationality = $fixedNationality>>
-	<<set $fixedNationality = 0>>
-<</if>>
-<<NationalityToRace $activeSlave>>
-/* Corporate slavegen with race selection */
-<<if passage() == "Corporate Market" && ($captureUpgradeRace != "unselected") && ($captureUpgradeRace != "none")>>
-	<<if $captureUpgradeRace == "mixed race">>
-		<<set $activeSlave.race = "mixed race">>
+<<if $fixedRace == 0>>
+	<<if $fixedNationality == 0>>
+		<<set $activeSlave.nationality = hashChoice($nationalities)>>
 	<<else>>
-		<<set _capUpgradeCheck = setup[$captureUpgradeRace.toLowerCase().replace(/[ -]/g, '')+'Nationalities']>>
-		<<set _capUpgradeNationalities = []>>
-		<<for _u = 0; _u < _capUpgradeCheck.length; _u++>>
-			<<set _capNation = _capUpgradeCheck[_u]>>
-			<<if _capNation in $nationalities>>
-				<<set _capUpgradeNationalities.push(_capNation)>>
-			<</if>>
-		<</for>>
-		<<if _capUpgradeNationalities.length > 0>>
-			<<set $activeSlave.nationality = _capUpgradeNationalities.random(), $activeSlave.race = $captureUpgradeRace>>
+		<<set $activeSlave.nationality = $fixedNationality>>
+		<<set $fixedNationality = 0>>
+	<</if>>
+	<<NationalityToRace $activeSlave>>
+	/* Corporate slavegen with race selection */
+	<<if passage() == "Corporate Market" && ($captureUpgradeRace != "unselected") && ($captureUpgradeRace != "none")>>
+		<<if $captureUpgradeRace == "mixed race">>
+			<<set $activeSlave.race = "mixed race">>
 		<<else>>
-			<<set $activeSlave.nationality = _capUpgradeCheck.random(), $activeSlave.race = $captureUpgradeRace>>
+			<<set _capUpgradeCheck = setup[$captureUpgradeRace.toLowerCase().replace(/[ -]/g, '')+'Nationalities']>>
+			<<set _capUpgradeNationalities = []>>
+			<<for _u = 0; _u < _capUpgradeCheck.length; _u++>>
+				<<set _capNation = _capUpgradeCheck[_u]>>
+				<<if _capNation in $nationalities>>
+					<<set _capUpgradeNationalities.push(_capNation)>>
+				<</if>>
+			<</for>>
+			<<if _capUpgradeNationalities.length > 0>>
+				<<set $activeSlave.nationality = _capUpgradeNationalities.random(), $activeSlave.race = $captureUpgradeRace>>
+			<<else>>
+				<<set $activeSlave.nationality = _capUpgradeCheck.random(), $activeSlave.race = $captureUpgradeRace>>
+			<</if>>
+		<</if>>
+		<<if $activeSlave.race != $captureUpgradeRace>>
+			<<set $activeSlave.race = $captureUpgradeRace>>
 		<</if>>
 	<</if>>
-	<<if $activeSlave.race != $captureUpgradeRace>>
-		<<set $activeSlave.race = $captureUpgradeRace>>
-	<</if>>
+	/* end Corporate slavegen with race selection */
+<<else>>
+	<<switch $fixedRace>>
+	<<case "white">>
+		<<set $activeSlave.nationality = setup.whiteNationalities.random()>>
+	<<case "asian">>
+		<<set $activeSlave.nationality = setup.asianNationalities.random()>>
+	<<case "latina">>
+		<<set $activeSlave.nationality = setup.latinaNationalities.random()>>
+	<<case "black">>
+		<<set $activeSlave.nationality = setup.blackNationalities.random()>>
+	<<case "pacific islander">>
+		<<set $activeSlave.nationality = setup.pacificislanderNationalities.random()>>
+	<<case "southern european">>
+		<<set $activeSlave.nationality = setup.southerneuropeanNationalities.random()>>
+	<<case "amerindian">>
+		<<set $activeSlave.nationality = setup.amerindianNationalities.random()>>
+	<<case "semitic">>
+		<<set $activeSlave.nationality = setup.semiticNationalities.random()>>
+	<<case "middle eastern">>
+		<<set $activeSlave.nationality = setup.middleeasternNationalities.random()>>
+	<<case "indo-aryan">>
+		<<set $activeSlave.nationality = setup.indoaryanNationalities.random()>>
+	<<case "malay">>
+		<<set $activeSlave.nationality = setup.malayNationalities.random()>>
+	<<default>>
+		<<set $activeSlave.nationality = hashChoice($nationalities)>>
+	<</switch>>
+	<<set $activeSlave.race = $fixedRace>>
+	<<set $fixedRace = 0>>
 <</if>>
-/* end Corporate slavegen with race selection */
 <<NationalityToName $activeSlave>>
 <<NationalityToAccent $activeSlave>>
 
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index 50c8a161bad699d965e2b256bf2f0bdf16f24b5e..7af245f0071a517eb8135b4a88189a85e8124bf7 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -55,7 +55,7 @@ As you step off the elevator, you hear female shouting. Apparently one of $arcol
 <<set $contractCost = 1000>>
 <<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>>
 <<set $activeSlaveOneTimeMaxAge = 42>>
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate New Slave">>
 <<if $PStrip == 1>>
 	<<set $activeSlave.origin = "She offered herself to you as a slave to escape the hard life of a free whore.">>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 9a3da198f210d131bb518bc9842a3d685f60cbcc..0558d5cf95779f46509505e8629588225bec00af 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -520,6 +520,12 @@ The legalities completed, ''__@@.pink;<<SlaveFullName $activeSlave>>@@__'' <<if
 	<</if>>
 <</if>>
 
+<<if $activeSlave.breedingMark == 1>>
+	She knows her duty in life and playfully splays herself across your desk with her legs spread wide. Unfortunately, she must first be unwrapped before any breeding can begin, so for the time being, she rights herself and makes her way to your crotch to show you just how much she was worth the ¤.
+	<<set $activeSlave.oralCount++, $oralTotal++>>
+
+<<else>>
+
 <<if $rulesAssistantAuto == 0>>
 	<br>
 	<span id="rules">
@@ -933,7 +939,6 @@ The legalities completed, ''__@@.pink;<<SlaveFullName $activeSlave>>@@__'' <<if
  <br>
 <</switch>>
 
-
 <br>//Have her changed...//
 
 <<if $activeSlave.health < -20>>
@@ -1872,4 +1877,6 @@ The legalities completed, ''__@@.pink;<<SlaveFullName $activeSlave>>@@__'' <<if
 
 </span>
 
-<<set $PC.slaving += .1, $PC.trading += .1>>
+<</if>>
+
+<<set $PC.trading += .1>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index 96d9bb8e4519847ec3b8f3b1b66bc2780d82ff5d..876ed4f8404297a6949118d9f131d7ea9df5e5b0 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -248,7 +248,7 @@
 
 <<set $thisWeeksFSWares = $merchantFSWares.randomMany(2)>>
 
-<<set $coursed = 0, $eventDescription = 0, $pitFought = 0, $preOwnedViewed = 0, $prestigeAuctioned = 0, $repGain = 0, $shelterSlave = 0, $shelterSlaveBought = 0, $slaveMarketLimit = 10 + ($rep / 1000), $slavesSeen = 0, $slavesSacrificedThisWeek = 0, $subSlaves = 0>>
+<<set $coursed = 0, $eventDescription = 0, $pitFought = 0, $preOwnedViewed = 0, $prestigeAuctioned = 0, $eliteAuctioned = 0, $repGain = 0, $shelterSlave = 0, $shelterSlaveBought = 0, $slaveMarketLimit = 10 + ($rep / 1000), $slavesSeen = 0, $slavesSacrificedThisWeek = 0, $subSlaves = 0>>
 
 /% These are variables that either should be made into _temp vars or should be Zeroed out once done with them instead of here. This can also interfere with debugging or hide NaN's as zeroing things out would clear a NaN. Also could stop from NaN's getting worse? %/
 /% Integer and float variables. No real need to zero them out but doesn't hurt to have them in a known state, though this might mask variables NaN'ing out. Takes up the least amount of Memory besides a "" string. %/
diff --git a/src/uncategorized/reAWOL.tw b/src/uncategorized/reAWOL.tw
index a0193690333f7d3be35230f305c88767e0d3565d..a568f0e82fd152cd8c62d779775cbe88da45a25b 100644
--- a/src/uncategorized/reAWOL.tw
+++ b/src/uncategorized/reAWOL.tw
@@ -78,7 +78,7 @@ Your window of opportunity to act is closing. If you have plans for punishing th
 										<</if>>
 										<<set $activeSlaveOneTimeMaxAge = 43>>
 										<<set $one_time_age_overrides_pedo_mode = 1>>
-										<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+										<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 										<<include "Generate XX Slave">>
 										<<set $activeSlave.origin = "You sentenced her to enslavement as a punishment for dereliction of her duty to you as a mercenary and for theft.">>
 										<<set $activeSlave.career = "a soldier">>
@@ -158,7 +158,7 @@ Your window of opportunity to act is closing. If you have plans for punishing th
 									<</if>>
 									<<set $activeSlaveOneTimeMaxAge = 43>>
 									<<set $one_time_age_overrides_pedo_mode = 1>>
-									<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+									<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 									<<include "Generate XX Slave">>
 									<<set $activeSlave.origin = "You sentenced her to enslavement as a punishment for dereliction of her duty to you as a mercenary and for theft.">>
 									<<set $activeSlave.career = "a soldier">>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index 890309e05ceaebe310b687e1389e9bad001c5743..83f2ffb187347ace120a93ca6b01b45b0bb85926 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -361,7 +361,7 @@
 
 <<set $contractCost = 1000>>
 <<set $activeSlaveOneTimeMaxAge = 42>>
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate New Slave">>
 <<set $activeSlave.origin = "She offered herself for voluntary enslavement to get to an arcology in which implants are uncommon, since she has a fear of surgery.">>
 <<set $activeSlave.health = random(-20,20)>>
@@ -487,7 +487,7 @@
 
 <<set $contractCost = 1000>>
 <<set $activeSlaveOneTimeMaxAge = 42>>
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate New Slave">>
 <<set $activeSlave.origin = "You received her from a surgeon who botched an implant operation on her and needed to get her out of sight.">>
 <<set $activeSlave.boobsImplant += random(10,20)*200>>
@@ -701,7 +701,7 @@
 
 <<set $contractCost = 1000>>
 <<set $activeSlaveOneTimeMaxAge = 24>>
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate New Slave">>
 <<set $activeSlave.origin = "She sold herself to you to escape those who condemned her lifestyle.">>
 <<set $activeSlave.career = "a shut-in">>
@@ -810,7 +810,7 @@
 <<set $contractCost = 1000>>
 <<set $activeSlaveOneTimeMinAge = 10>>
 <<set $activeSlaveOneTimeMaxAge = 18>>
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate XX Slave">>
 <<set $activeSlave.origin = "She thought she was important; she was not.">>
 <<set $activeSlave.career = "a student from a private school">>
@@ -901,7 +901,7 @@
 <<set $activeSlaveOneTimeMinAge = 18>>
 */
 <<set $activeSlaveOneTimeMaxAge = 24>>
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate New Slave">>
 <<set $activeSlave.origin = "She offered herself to you for enslavement because she had a disgustingly naive view of medieval Japanese culture.">>
 <<set $activeSlave.devotion = random(-15,-5)>>
diff --git a/src/uncategorized/reMilfTourist.tw b/src/uncategorized/reMilfTourist.tw
index 4ea84d6ddeb09681f3affb48c7d16c3a1a419420..232c1d821f682a327f410267f5b3975eb6cf3370 100644
--- a/src/uncategorized/reMilfTourist.tw
+++ b/src/uncategorized/reMilfTourist.tw
@@ -10,7 +10,7 @@
 <<set $activeSlaveOneTimeMinAge = 36>>
 <<set $activeSlaveOneTimeMaxAge = 42>>
 <<set $one_time_age_overrides_pedo_mode = 1>> /* middle-aged */
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate XX Slave">>
 <<set $activeSlave.origin = "She came to your arcology as a tourist and found herself enslaved.">>
 <<set $activeSlave.devotion = random(-70,-55)>>
diff --git a/src/uncategorized/rePokerNight.tw b/src/uncategorized/rePokerNight.tw
index 5e3e16c7b84bf1d641baa65bae9c85a10e6dfc26..32b2a9c5428de16f809debbc8e5ae56844838985 100644
--- a/src/uncategorized/rePokerNight.tw
+++ b/src/uncategorized/rePokerNight.tw
@@ -67,7 +67,7 @@ On a particularly lackadaisical evening, you find yourself alerted to a message
 									<<set $activeSlaveOneTimeMinAge = 38>>
 									<<set $activeSlaveOneTimeMaxAge = 43>>
 									<<set $one_time_age_overrides_pedo_mode = 1>>
-									<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+									<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 									<<include "Generate XX Slave">>
 									<<set $activeSlave.origin = "She put herself up as collateral at a poker game, and lost.">>
 									<<set $activeSlave.career = "a soldier">>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 3eee026924ba7516d9dabd29d3406c93796a8e38..96abbef4718f17895dd6f81d9d78d99c9dc923c8 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -28,7 +28,7 @@
 <</if>>
 <<set $activeSlaveOneTimeMaxAge = 19>>
 <<set $one_time_age_overrides_pedo_mode = 1>>
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate XX Slave">>
 <<set $activeSlave.origin = "She offered herself to you as a slave to escape a life of boredom.">>
 <<set $activeSlave.career = "a party girl">>
@@ -61,7 +61,7 @@ Your head girl sends you a discreet message that she may have found a slave for
 	<<set $activeSlaveOneTimeMinAge = 16>>
 <</if>>
 <<set $activeSlaveOneTimeMaxAge = 19>>
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate XY Slave">>
 <<set $activeSlave.origin = "She offered herself to you as a slave to escape a life of boredom.">>
 <<set $activeSlave.career = "a party girl">>
@@ -89,7 +89,7 @@ Your head girl sends you a discreet message that she may have found a slave for
 <<if $minimumSlaveAge < 14 && $pedo_mode == 0>>
 	<<set $activeSlaveOneTimeMinAge = random($minimumSlaveAge, 14)>>
 <</if>>
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate XX Slave">>
 <<set $activeSlave.origin = "She offered herself to you as a slave to escape the hard life of a free whore.">>
 <<set $activeSlave.career = "a prostitute">>
@@ -127,7 +127,7 @@ Your head girl sends you a discreet message that she may have found a slave for
 
 <<case "female debtor">>
 
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate XX Slave">>
 <<set $activeSlave.origin = "She was enslaved after she fell into debt to you.">>
 <<set $activeSlave.devotion = random(-45,-25)>>
@@ -138,7 +138,7 @@ One of the tenants in your arcology has not paid rent in some time. In the Free
 <<case "male debtor">>
 
 <<set $activeSlaveOneTimeMaxAge = 30>>
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate XY Slave">>
 <<set $activeSlave.origin = "You turned her into a slave girl after she fell into debt to you.">>
 <<set $activeSlave.devotion = random(-45,-25)>>
@@ -163,7 +163,7 @@ One of the tenants in your arcology has not paid rent in some time. In the Free
 <<set $activeSlaveOneTimeMaxAge = 30>>
 <</if>>
 <<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to be pregnant. %/
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate XX Slave">>
 <<set $activeSlave.origin = "She sold herself into slavery out of fear that life on the streets was endangering her pregnancy.">>
 <<set $activeSlave.devotion = random(0,15)>>
@@ -194,7 +194,7 @@ A young woman comes to your penthouse for an interview. You accepted her request
 <</if>>
 <<set $activeSlaveOneTimeMaxAge = 22>>
 <<set $one_time_age_overrides_pedo_mode = 1>>
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate XX Slave">>
 <<set $activeSlave.origin = "She offered herself as a slave to escape the horrors a blind girl faces on the streets.">>
 <<set $activeSlave.devotion = random(20,30)>>
@@ -223,7 +223,7 @@ A young <<if $activeSlave.physicalAge < 13>>girl<<elseif $activeSlave.physicalAg
 
 <<set $activeSlaveOneTimeMinAge = 10>>
 <<set $activeSlaveOneTimeMaxAge = 14>>
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate New Slave">>
 <<set $activeSlave.origin = "She came to you to escape being sold to a cruel master after her producer informed her of her debt.">>
 <<set $activeSlave.career = "a musician">>
@@ -265,7 +265,7 @@ Recently, a young musical prodigy has taken both the old world and the free citi
 <<set $activeSlaveOneTimeMinAge = $fertilityAge + $minimumSlaveAge>>
 <<set $activeSlaveOneTimeMaxAge = Math.max($activeSlaveOneTimeMinAge,$retirementAge-2)>>
 <<set $one_time_age_overrides_pedo_mode = 1>>
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate XX Slave">>
 <<set $activeSlave.origin = "She sold herself into slavery to escape life on the streets.">>
 <<set $activeSlave.devotion = random(0,15)>>
@@ -283,7 +283,7 @@ A <<if $activeSlave.physicalAge > 50>>old woman<<elseif $activeSlave.physicalAge
 <<case "tg addict">>
 
 <<set $activeSlaveOneTimeMaxAge = 25>>
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate XY Slave">>
 <<set $activeSlave.origin = "You tricked her into enslavement, manipulating her based on her surgical addiction.">>
 <<set $activeSlave.devotion = random(-75,-60)>>
@@ -388,7 +388,7 @@ She hikes up her skirt and spins around slowly, displaying a petite, half-hard c
 
 <<set $activeSlaveOneTimeMinAge = random(12, 16)>>
 <<set $activeSlaveOneTimeMaxAge = 19>>
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate XX Slave">>
 <<set $activeSlave.origin = "She asked to be enslaved out of naive infatuation with you.">>
 <<set $activeSlave.devotion = random(25,30)>>
@@ -413,7 +413,7 @@ After a short while, your assistant whispers in your earpiece, <<if $assistant =
 
 <<set $activeSlaveOneTimeMinAge = 28>>
 <<set $activeSlaveOneTimeMaxAge = 32>>
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate XX Slave">>
 <<set $activeSlave.origin = "She asked to be enslaved in the hope you'd treat a fellow woman well.">>
 <<set $activeSlave.devotion = random(10,15)>>
@@ -443,7 +443,7 @@ After a short while, your assistant whispers in your earpiece, <<if $assistant =
 
 <<set $activeSlaveOneTimeMinAge = 13>>
 <<set $activeSlaveOneTimeMaxAge = 20>>
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate XY Slave">>
 <<set $activeSlave.origin = "She asked to be enslaved since she felt you were her only hope of becoming a prettier woman.">>
 <<set $activeSlave.devotion = random(10,15)>>
@@ -485,7 +485,7 @@ After a short while, your assistant whispers in your earpiece, <<if $assistant =
 
 <<set $activeSlaveOneTimeMinAge = 13>>
 <<set $activeSlaveOneTimeMaxAge = 21>>
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate XX Slave">>
 <<set $activeSlave.origin = "She got into debt for damaging someone's property during a student protest and you bought out her debt.">>
 <<set $activeSlave.devotion = random(-25,0)>>
@@ -523,7 +523,7 @@ Given the damage to an expensive classic car and the meager balance of her bank
 
 <<set $activeSlaveOneTimeMinAge = 13>>
 <<set $activeSlaveOneTimeMaxAge = 21>>
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate XY Slave">>
 <<set $activeSlave.origin = "She got into debt for damaging someone's property during a student protest and you bought out her debt.">>
 <<set $activeSlave.devotion = random(-30,-5)>>
@@ -564,7 +564,7 @@ Given the damage to an expensive classic car and the meager balance of his bank
 
 <<set $activeSlaveOneTimeMinAge = 13>>
 <<set $activeSlaveOneTimeMaxAge = 27>>
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate XX Slave">>
 <<set $activeSlave.origin = "She got into debt for damaging someone's property during a student protest and you bought out her debt.">>
 <<set $activeSlave.devotion = -100>>
@@ -620,7 +620,7 @@ Given the damage to an expensive classic car and the meager balance of her bank
 <<case "female SE">>
 
 <<set $activeSlaveOneTimeMaxAge = 21>>
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate XX Slave">>
 <<set $activeSlave.origin = "She enslaved herself to be with a man she loved, only to be sold to you afterward.">>
 <<set $activeSlave.devotion = random(-30,-5)>>
@@ -658,7 +658,7 @@ The situation does yield a few business opportunities too, as not all of the guy
 <<case "MTF SE">>
 
 <<set $activeSlaveOneTimeMaxAge = 21>>
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate XY Slave">>
 <<set $activeSlave.origin = "She (formerly he) enslaved herself to be with a man she loved, only to be sold to you afterward.">>
 <<set $activeSlave.devotion = random(-30,-5)>>
@@ -697,7 +697,7 @@ It isn't just all natural females either, as a few men also jumped on the bandwa
 <<case "DG SE">>
 
 <<set $activeSlaveOneTimeMaxAge = 21>>
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate XY Slave">>
 <<set $activeSlave.origin = "She (formerly he) enslaved herself to be with a man she loved, only to be sold to you afterward.">>
 <<set $activeSlave.devotion = random(-30,-5)>>
@@ -1619,7 +1619,7 @@ She pauses, looking directly at you for the first time, though you get the sense
 
 <<set $activeSlaveOneTimeMinAge = 18>>
 <<set $activeSlaveOneTimeMaxAge = 42>>
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate New Slave">>
 <<set $activeSlave.origin = "She offered herself to you for enslavement out of devotion to her artistic 'craft'.">>
 <<set $activeSlave.boobs = random(4,6)*50>>
@@ -1689,7 +1689,7 @@ The current sale offer comes from one of the arcology's oldest college frat-hous
 
 <<case "immigrant">>
 
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate XX Slave">>
 <<set $activeSlave.origin = "She sold herself into slavery to pay her immigration costs.">>
 <<set $activeSlave.devotion = random(-45,-25)>>
@@ -1741,7 +1741,7 @@ As you are heading back to your penthouse from overseeing a promising new store'
 
 <<set $activeSlaveOneTimeMinAge = $fertilityAge>>
 <<set $activeSlaveOneTimeMaxAge = 22>>
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate XX Slave">>
 <<set $activeSlave.origin = "You helped her give birth, leaving her deeply indebted to you.">>
 <<set $activeSlave.devotion = random(0,20)>>
diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw
index bcde247ccee9cb429f02171e7321716fa26c76af..c4c2e5d6b87462a13dafc9948c03e92b9d3c783b 100644
--- a/src/uncategorized/reShelterInspection.tw
+++ b/src/uncategorized/reShelterInspection.tw
@@ -5,7 +5,7 @@
 <<set $activeSlaveOneTimeMinAge = 36>>
 <<set $activeSlaveOneTimeMaxAge = 42>>
 <<set $one_time_age_overrides_pedo_mode = 1>>
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<set $contractCost = 10000>>
 <<include "Generate XX Slave">>
 <<set $activeSlave.origin = "She was once an inspector for the Shelter, but you put a stop to that.">>
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index 32c2ae0faddcda8c5fddc974ae79093fab219adc..da839225c8fa25d158a463e449f010a10e0d2ac2 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -27,7 +27,7 @@
 <<set $activeSlaveOneTimeMinAge = ($fertilityAge + $minimumSlaveAge)>>
 <<set $activeSlaveOneTimeMaxAge = 40>>
 <<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to have a daughter who can be a slave. %/
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate New Slave">>
 <<set $activeSlave.origin = "She sold herself into slavery to escape addiction debts.">>
 <<set $activeSlave.devotion = random(-15,15)>>
@@ -66,7 +66,7 @@ A matronly woman comes to your penthouse in tears. It seems she is a tenant of y
 <<set $activeSlaveOneTimeMinAge = ($fertilityAge + $minimumSlaveAge)>>
 <<set $activeSlaveOneTimeMaxAge = 40>>
 <<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to have a daughter who can be a slave. %/
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate XX Slave">>
 <<set $activeSlave.origin = "She was enslaved after you called in her business debts.">>
 <<set $activeSlave.career = "a business owner">>
@@ -528,7 +528,7 @@ It would cost <<print cashFormat($contractCost)>> to enslave the two of them.
 <<set $contractCost = 1500>>
 <<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>>
 <<set $activeSlaveOneTimeMaxAge = 21>>
-<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 <<include "Generate XY Slave">>
 <<set $activeSlave.origin = "She was sold into slavery by her older sister.">>
 <<set $activeSlave.career = "a reluctant anal whore">>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index ab8c451a196c497f312d7dc9696af8a8c77dcd34..9e34e87fea46b48ceb221d2ee15282c097090c98 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -2326,6 +2326,9 @@
 	<<set $opinion = Math.trunc($opinion/20)>>
 	<<set $opinion = Math.clamp($opinion, -10, 10)>>
 
+	<<if $arcologies[_market].FSSubjugationist > 20>>
+		<<set $fixedRace = $arcologies[_market].FSSubjugationistRace>>
+	<</if>>
 	<<include "Generate New Slave">>
 	<<set $activeSlave.origin = "You bought her from ">>
 	<<set $activeSlave.origin += $arcologies[_market].name>>
@@ -2355,7 +2358,6 @@
 	<</if>>
 	<<if $arcologies[_market].FSSubjugationist > 20>>
 		They're universally $arcologies[_market].FSSubjugationistRace.
-		<<set $fixedRace = $arcologies[_market].FSSubjugationistRace>><<NationalityToRace $activeSlave>><<NationalityToName $activeSlave>><<NationalityToAccent $activeSlave>><<set $fixedRace = 0>>
 	<</if>>
 
 	<<if $arcologies[_market].FSRepopulationFocus > 50>>
@@ -2911,7 +2913,7 @@
 
 
 <<case "indentures">>
-	<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>>
+	<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
 	<<include "Generate New Slave">>
 	<<set $activeSlave.origin = "You purchased her indenture contract, making her yours for as long as it lasts.">>
 	<<set $activeSlave.indentureRestrictions = either(0,1,1,2,2,2,2)>>