diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw
index 287194ee5d0ceca9d3822b786d41f73767fee914..225df3426cf9e1e32570255d77d08462ced12073 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -1,24 +1,28 @@
 :: Salon [nobr]
 
-<<set $nextButton = "Confirm changes", $nextLink = "AS Dump", $returnTo = "Slave Interact">>
+<<set $nextButton = "Confirm changes", $nextLink = "Slave Interact">>
+<<set $AS = $activeSlave.ID>>
+<<run App.Utils.setLocalPronouns(getSlave($AS))>>
 
 <<set $showEncyclopedia = 1>><<set $encyclopedia = "The Auto Salon">>
 <<if $showInches == 2>>
-	<<set _oldHLength = Math.round($activeSlave.hLength/2.54), _newHLength = 0>>
+	<<set _oldHLength = Math.round(getSlave($AS).hLength/2.54), _newHLength = 0>>
 <<else>>
-	<<set _oldHLength = $activeSlave.hLength, _newHLength = 0>>
+	<<set _oldHLength = getSlave($AS).hLength, _newHLength = 0>>
 <</if>>
 
 <h1>The Auto Salon</h1>
 
-<span class="note">$activeSlave.slaveName is seated in the auto salon. $He is awaiting your artistic pleasure.</span>
+<span class="note">
+	<<= getSlave($AS).slaveName>> is seated in the auto salon. $He is awaiting your artistic pleasure.
+</span>
 
 /* 000-250-006 */
 <<if $seeImages == 1>>
 	<<if $imageChoice == 1>>
-		<div class="imageRef lrgVector"><div class="mask">&nbsp;</div><<= SlaveArt($activeSlave, 3, 0)>></div>
+		<div class="imageRef lrgVector"><div class="mask">&nbsp;</div><<= SlaveArt(getSlave($AS), 3, 0)>></div>
 	<<else>>
-		<div class="imageRef lrgRender"><div class="mask">&nbsp;</div><<= SlaveArt($activeSlave, 3, 0)>></div>
+		<div class="imageRef lrgRender"><div class="mask">&nbsp;</div><<= SlaveArt(getSlave($AS), 3, 0)>></div>
 	<</if>>
 <</if>>
 /* 000-250-006 */
@@ -26,84 +30,84 @@
 /* EYES */
 
 <h3>Eyewear</h3>
-<<if getBestVision($activeSlave) === 0>>
+<<if getBestVision(getSlave($AS)) === 0>>
 	$He is blind, and
-	<<if $activeSlave.eyewear == "none">>
+	<<if getSlave($AS).eyewear == "none">>
 		has no eyewear.
 	<<else>>
-		is wearing $activeSlave.eyewear. [[Remove|Salon][$activeSlave.eyewear = "none"]]
+		is wearing <<= getSlave($AS).eyewear>>. [[Remove|Salon][getSlave($AS).eyewear = "none"]]
 	<</if>>
 	<div class="choices">
-		Give $him: [[Cosmetic glasses|Salon][$activeSlave.eyewear = "glasses",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+		Give $him: [[Cosmetic glasses|Salon][getSlave($AS).eyewear = "glasses",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 	</div>
-<<elseif anyVisionEquals($activeSlave, 1)>>
+<<elseif anyVisionEquals(getSlave($AS), 1)>>
 	$He is nearsighted, and $he
-	<<if $activeSlave.eyewear == "none">>
+	<<if getSlave($AS).eyewear == "none">>
 		has no eyewear.
 	<<else>>
-		is wearing $activeSlave.eyewear. [[Remove|Salon][$activeSlave.eyewear = "none"]]
+		is wearing <<= getSlave($AS).eyewear>>. [[Remove|Salon][getSlave($AS).eyewear = "none"]]
 	<</if>>
 	<div class="choices">
-		Give $him: [[Cosmetic glasses|Salon][$activeSlave.eyewear = "glasses",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-		| [[Corrective glasses|Salon][$activeSlave.eyewear = "corrective glasses",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-		| [[Corrective contacts|Salon][$activeSlave.eyewear = "corrective contacts",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+		Give $him: [[Cosmetic glasses|Salon][getSlave($AS).eyewear = "glasses",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+		| [[Corrective glasses|Salon][getSlave($AS).eyewear = "corrective glasses",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+		| [[Corrective contacts|Salon][getSlave($AS).eyewear = "corrective contacts",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 		<span class="note">Nearsightedness will impede performance on some assignments.</span>
 	</div>
 <<else>>
 	$His vision is normal, and $he
-	<<if $activeSlave.eyewear == "none">>
+	<<if getSlave($AS).eyewear == "none">>
 		has no eyewear.
 	<<else>>
-		is wearing $activeSlave.eyewear. [[Remove|Salon][$activeSlave.eyewear = "none"]]
+		is wearing <<= getSlave($AS).eyewear>>. [[Remove|Salon][getSlave($AS).eyewear = "none"]]
 	<</if>>
 	<div class="choices">
-		Give $him: [[Cosmetic glasses|Salon][$activeSlave.eyewear = "glasses",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-		| [[Blurring glasses|Salon][$activeSlave.eyewear = "blurring glasses",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-		| [[Blurring contacts|Salon][$activeSlave.eyewear = "blurring contacts",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+		Give $him: [[Cosmetic glasses|Salon][getSlave($AS).eyewear = "glasses",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+		| [[Blurring glasses|Salon][getSlave($AS).eyewear = "blurring glasses",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+		| [[Blurring contacts|Salon][getSlave($AS).eyewear = "blurring contacts",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 		<span class="note">Blurring options are annoying and impede performance on some assignments.</span>
 	</div>
 <</if>>
 
 <div>
 	Custom glass eyes and cosmetic lenses:
-	$He has <<print App.Desc.eyesType($activeSlave)>><<if hasAnyEyes($activeSlave)>>, they are <<print App.Desc.eyeColor($activeSlave)>><</if>>.
+	$He has <<print App.Desc.eyesType(getSlave($AS))>><<if hasAnyEyes(getSlave($AS))>>, they are <<print App.Desc.eyeColor(getSlave($AS))>><</if>>.
 	
 	<div class="choices">
 		/* remove lenses */
 		<<set _n = 0>>
-		<<if hasLeftEye($activeSlave) && getLeftEyeColor($activeSlave) !== getGeneticEyeColor($activeSlave, "left")>>
+		<<if hasLeftEye(getSlave($AS)) && getLeftEyeColor(getSlave($AS)) !== getGeneticEyeColor(getSlave($AS), "left")>>
 			<<set _n++>>
-			[[Remove left lens|Salon][resetEyeColor($activeSlave, "left")]]
+			[[Remove left lens|Salon][resetEyeColor(getSlave($AS), "left")]]
 		<</if>>
-		<<if hasRightEye($activeSlave) && getRightEyeColor($activeSlave) !== getGeneticEyeColor($activeSlave, "right")>>
+		<<if hasRightEye(getSlave($AS)) && getRightEyeColor(getSlave($AS)) !== getGeneticEyeColor(getSlave($AS), "right")>>
 			<<set _n++>>
 			<<if _n > 0>>|<</if>>
-			[[Remove right lens|Salon][resetEyeColor($activeSlave, "right")]]
+			[[Remove right lens|Salon][resetEyeColor(getSlave($AS), "right")]]
 		<</if>>
 		<<if _n === 2>>
-			| [[Remove both lenses|Salon][resetEyeColor($activeSlave, "both")]]
+			| [[Remove both lenses|Salon][resetEyeColor(getSlave($AS), "both")]]
 		<</if>>
 		/* remove glass eyes */
 		<<set _n = 0>>
-		<<if getLeftEyeType($activeSlave) === 2>>
+		<<if getLeftEyeType(getSlave($AS)) === 2>>
 			<<set _n++>>
-			[[Remove left glass eye|Salon][eyeSurgery($activeSlave, "left", "remove")]]
+			[[Remove left glass eye|Salon][eyeSurgery(getSlave($AS), "left", "remove")]]
 		<</if>>
-		<<if getRightEyeType($activeSlave) === 2>>
+		<<if getRightEyeType(getSlave($AS)) === 2>>
 			<<set _n++>>
 			<<if _n > 0>>|<</if>>
-			[[Remove right glass eye|Salon][eyeSurgery($activeSlave, "right", "remove")]]
+			[[Remove right glass eye|Salon][eyeSurgery(getSlave($AS), "right", "remove")]]
 		<</if>>
 		<<if _n === 2>>
-			| [[Remove both glass eyes|Salon][eyeSurgery($activeSlave, "both", "remove")]]
+			| [[Remove both glass eyes|Salon][eyeSurgery(getSlave($AS), "both", "remove")]]
 		<</if>>
 	</div>
 </div>
 
 <div>
-	<<if hasBothEyes($activeSlave)>>
+	<<if hasBothEyes(getSlave($AS))>>
 		Change what $his eyes look like:
-	<<elseif hasAnyEyes($activeSlave)>>
+	<<elseif hasAnyEyes(getSlave($AS))>>
 		Change what $his eye looks like or give $him a new glass eye:
 	<<else>>
 		Choose what kind of glass eyes you want $him to have:
@@ -175,16 +179,16 @@
 	<<if $artificialEyeSide != "" && $artificialEyeColor != "">>
 		<<link "Give" "Salon">>
 			/* make sure the eye(s) exists: give glass eye if there is none */
-			<<if ($artificialEyeSide === "left" || $artificialEyeSide === "both") && getLeftEyeType($activeSlave) === 0>>
-				<<run eyeSurgery($activeSlave, "left", "glass")>>
+			<<if ($artificialEyeSide === "left" || $artificialEyeSide === "both") && getLeftEyeType(getSlave($AS)) === 0>>
+				<<run eyeSurgery(getSlave($AS), "left", "glass")>>
 			<</if>>
-			<<if ($artificialEyeSide === "right" || $artificialEyeSide === "both") && getRightEyeType($activeSlave) === 0>>
-				<<run eyeSurgery($activeSlave, "right", "glass")>>
+			<<if ($artificialEyeSide === "right" || $artificialEyeSide === "both") && getRightEyeType(getSlave($AS)) === 0>>
+				<<run eyeSurgery(getSlave($AS), "right", "glass")>>
 			<</if>>
 
 			/* apply modifications */
-			<<run setEyeColorFull($activeSlave, $artificialEyeColor, $artificialEyeShape, $artificialEyeFill, $artificialEyeSide)>>
-			<<run cashX(forceNeg($modCost), "slaveMod", $activeSlave)>>
+			<<run setEyeColorFull(getSlave($AS), $artificialEyeColor, $artificialEyeShape, $artificialEyeFill, $artificialEyeSide)>>
+			<<run cashX(forceNeg($modCost), "slaveMod", getSlave($AS))>>
 
 			/* reset variables */
 			<<set $artificialEyeSide = "", $artificialEyeColor = "", $artificialEyeShape = "", $artificialEyeFill = "">>
@@ -192,8 +196,8 @@
 
 		/* make the following easier to read */
 		<<set _both = $artificialEyeSide === "both",
-		_leftGlass = !hasLeftEye($activeSlave) || getLeftEyeType($activeSlave) === 2,
-		_rightGlass = !hasRightEye($activeSlave) || getRightEyeType($activeSlave) === 2>>
+		_leftGlass = !hasLeftEye(getSlave($AS)) || getLeftEyeType(getSlave($AS)) === 2,
+		_rightGlass = !hasRightEye(getSlave($AS)) || getRightEyeType(getSlave($AS)) === 2>>
 
 		$him $artificialEyeColor
 		<<if _both>>
@@ -230,11 +234,11 @@
 /* EARS */
 <h3>Ears</h3>
 <div>
-	<<if $activeSlave.earT != "none" && $activeSlave.earTColor != "hairless">>
-		$His fluffy ears are $activeSlave.earTColor.
+	<<if getSlave($AS).earT != "none" && getSlave($AS).earTColor != "hairless">>
+		$His fluffy ears are <<= getSlave($AS).earTColor>>.
 		<div class="choices">
-			<<if $activeSlave.earTColor != $activeSlave.hColor>>
-				[[Match current hair|Salon][$activeSlave.earTColor = $activeSlave.hColor]] or <span class="note">choose a new one:</span>
+			<<if getSlave($AS).earTColor != getSlave($AS).hColor>>
+				[[Match current hair|Salon][getSlave($AS).earTColor = getSlave($AS).hColor]] or <span class="note">choose a new one:</span>
 			<<else>>
 				<span class="note">Choose a dye color before dyeing $his ears:</span>
 			<</if>>
@@ -293,83 +297,83 @@
 
 		<<if $primaryEarColor != 0>>
 			<div class="choices">
-				[["Dye " + $his + " ears"|Salon][$activeSlave.earTColor = ($primaryEarColor + $secondaryEarColor),cashX(forceNeg($modCost), "slaveMod", $activeSlave), $primaryEarColor = 0, $secondaryEarColor = ""]] $primaryEarColor $secondaryEarColor now?
+				[["Dye " + $his + " ears"|Salon][getSlave($AS).earTColor = ($primaryEarColor + $secondaryEarColor),cashX(forceNeg($modCost), "slaveMod", getSlave($AS)), $primaryEarColor = 0, $secondaryEarColor = ""]] $primaryEarColor $secondaryEarColor now?
 			</div>
 		<</if>>
 	<</if>>
 </div>
 
 <div>
-	<<if $activeSlave.earImplant == 1>>
+	<<if getSlave($AS).earImplant == 1>>
 		$He has artificial inner ear implants,
-		<<if $activeSlave.earwear == "none">>
+		<<if getSlave($AS).earwear == "none">>
 			which are unobstructed.
 		<<else>>
-			and is wearing $activeSlave.earwear. [[Remove|Salon][$activeSlave.earwear = "none"]]
+			and is wearing <<= getSlave($AS).earwear>>. [[Remove|Salon][getSlave($AS).earwear = "none"]]
 		<</if>>
-	<<elseif $activeSlave.hears < -1>>
+	<<elseif getSlave($AS).hears < -1>>
 		$He is deaf, and
-		<<if $activeSlave.earwear == "none">>
+		<<if getSlave($AS).earwear == "none">>
 			is wearing nothing on $his ears.
 		<<else>>
-			is wearing $activeSlave.earwear. [[Remove|Salon][$activeSlave.earwear = "none"]]
+			is wearing <<= getSlave($AS).earwear>>. [[Remove|Salon][getSlave($AS).earwear = "none"]]
 		<</if>>
-	<<elseif $activeSlave.hears > -1>>
+	<<elseif getSlave($AS).hears > -1>>
 		$His hearing is normal, and $he
-		<<if $activeSlave.earwear == "none">>
+		<<if getSlave($AS).earwear == "none">>
 			has nothing in $his ears.
 		<<else>>
-			is wearing $activeSlave.earwear. [[Remove|Salon][$activeSlave.earwear = "none"]]
+			is wearing <<= getSlave($AS).earwear>>. [[Remove|Salon][getSlave($AS).earwear = "none"]]
 		<</if>>
 	<<else>>
 		$He is hearing impaired, and
-		<<if $activeSlave.earwear == "none">>
+		<<if getSlave($AS).earwear == "none">>
 			wears nothing to correct or worsen this.
 		<<else>>
-			is wearing $activeSlave.earwear. [[Remove|Salon][$activeSlave.earwear = "none"]]
+			is wearing <<= getSlave($AS).earwear>>. [[Remove|Salon][getSlave($AS).earwear = "none"]]
 		<</if>>
 	<</if>>
 	<div class="choices">
 		Give $him:
-		[[Hearing aids|Salon][$activeSlave.earwear = "hearing aids",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-		| [[Muffling ear plugs|Salon][$activeSlave.earwear = "muffling ear plugs",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-		| [[Deafening ear plugs|Salon][$activeSlave.earwear = "deafening ear plugs",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+		[[Hearing aids|Salon][getSlave($AS).earwear = "hearing aids",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+		| [[Muffling ear plugs|Salon][getSlave($AS).earwear = "muffling ear plugs",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+		| [[Deafening ear plugs|Salon][getSlave($AS).earwear = "deafening ear plugs",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 		<span class="note">Muffling options are annoying and impede performance on some assignments.</span>
 	</div>
 </div>
 
 /*End ear check */
 <div>
-	<<if $activeSlave.horn != "none">>
-		$His $activeSlave.horn are $activeSlave.hornColor
+	<<if getSlave($AS).horn != "none">>
+		$His <<= getSlave($AS).horn>> are <<= getSlave($AS).hornColor>>
 		<div class="choices">
 			Set horn color:
-				[[Black|Salon][$activeSlave.hornColor = "black",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Blazing Red|Salon][$activeSlave.hornColor = "blazing red",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Blue-Violet|Salon][$activeSlave.hornColor = "blue-violet",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Blue|Salon][$activeSlave.hornColor = "blue",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Brown|Salon][$activeSlave.hornColor = "brown",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Burgundy|Salon][$activeSlave.hornColor = "burgundy",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Copper|Salon][$activeSlave.hornColor = "copper",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Dark Blue|Salon][$activeSlave.hornColor = "dark blue",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Dark Brown|Salon][$activeSlave.hornColor = "dark brown",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Dark Orchid|Salon][$activeSlave.hornColor = "dark orchid",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Deep Red|Salon][$activeSlave.hornColor = "deep red",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Golden|Salon][$activeSlave.hornColor = "golden",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Green-yellow|Salon][$activeSlave.hornColor = "green-yellow",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Green|Salon][$activeSlave.hornColor = "green",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Grey|Salon][$activeSlave.hornColor = "grey",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Jet Black|Salon][$activeSlave.hornColor = "jet black",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Neon Blue|Salon][$activeSlave.hornColor = "neon blue",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Neon Green|Salon][$activeSlave.hornColor = "neon green",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Neon Pink|Salon][$activeSlave.hornColor = "neon pink",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Pink|Salon][$activeSlave.hornColor = "pink",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Ivory|Salon][$activeSlave.hornColor = "ivory",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Purple|Salon][$activeSlave.hornColor = "purple",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Red|Salon][$activeSlave.hornColor = "red",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Sea Green|Salon][$activeSlave.hornColor = "sea green",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Silver|Salon][$activeSlave.hornColor = "silver",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[White|Salon][$activeSlave.hornColor = "white",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+				[[Black|Salon][getSlave($AS).hornColor = "black",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Blazing Red|Salon][getSlave($AS).hornColor = "blazing red",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Blue-Violet|Salon][getSlave($AS).hornColor = "blue-violet",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Blue|Salon][getSlave($AS).hornColor = "blue",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Brown|Salon][getSlave($AS).hornColor = "brown",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Burgundy|Salon][getSlave($AS).hornColor = "burgundy",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Copper|Salon][getSlave($AS).hornColor = "copper",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Dark Blue|Salon][getSlave($AS).hornColor = "dark blue",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Dark Brown|Salon][getSlave($AS).hornColor = "dark brown",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Dark Orchid|Salon][getSlave($AS).hornColor = "dark orchid",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Deep Red|Salon][getSlave($AS).hornColor = "deep red",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Golden|Salon][getSlave($AS).hornColor = "golden",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Green-yellow|Salon][getSlave($AS).hornColor = "green-yellow",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Green|Salon][getSlave($AS).hornColor = "green",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Grey|Salon][getSlave($AS).hornColor = "grey",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Jet Black|Salon][getSlave($AS).hornColor = "jet black",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Neon Blue|Salon][getSlave($AS).hornColor = "neon blue",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Neon Green|Salon][getSlave($AS).hornColor = "neon green",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Neon Pink|Salon][getSlave($AS).hornColor = "neon pink",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Pink|Salon][getSlave($AS).hornColor = "pink",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Ivory|Salon][getSlave($AS).hornColor = "ivory",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Purple|Salon][getSlave($AS).hornColor = "purple",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Red|Salon][getSlave($AS).hornColor = "red",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Sea Green|Salon][getSlave($AS).hornColor = "sea green",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Silver|Salon][getSlave($AS).hornColor = "silver",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[White|Salon][getSlave($AS).hornColor = "white",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 		</div>
 	<</if>>
 </div>
@@ -378,10 +382,10 @@
 
 <h3>Hair</h3>
 <div>
-	<<if $activeSlave.bald != 1>>
-		$His hair is $activeSlave.hColor.
-		<<if $activeSlave.origHColor != $activeSlave.hColor>>
-			[[Restore natural color|Salon][$activeSlave.hColor = $activeSlave.origHColor]] or <span class="note">choose a new one:</span>
+	<<if getSlave($AS).bald != 1>>
+		$His hair is <<= getSlave($AS).hColor>>.
+		<<if getSlave($AS).origHColor != getSlave($AS).hColor>>
+			[[Restore natural color|Salon][getSlave($AS).hColor = getSlave($AS).origHColor]] or <span class="note">choose a new one:</span>
 		<<else>>
 			<span class="note">Choose a dye color before dyeing $his hair:</span>
 		<</if>>
@@ -439,97 +443,97 @@
 
 		<<if $primaryHairColor != 0>>
 			<div class="choices">
-				[["Dye " + $his + " hair"|Salon][$activeSlave.hColor = ($primaryHairColor + $secondaryHairColor),cashX(forceNeg($modCost), "slaveMod", $activeSlave), $primaryHairColor = 0, $secondaryHairColor = ""]] $primaryHairColor $secondaryHairColor now?
+				[["Dye " + $his + " hair"|Salon][getSlave($AS).hColor = ($primaryHairColor + $secondaryHairColor),cashX(forceNeg($modCost), "slaveMod", getSlave($AS)), $primaryHairColor = 0, $secondaryHairColor = ""]] $primaryHairColor $secondaryHairColor now?
 			</div>
 		<</if>>
 
 		<div>
-			<<if $activeSlave.hStyle !== "shaved">>
-				$His $activeSlave.hStyle hair is <<= lengthToEitherUnit($activeSlave.hLength)>> long.
+			<<if getSlave($AS).hStyle !== "shaved">>
+				$His <<= getSlave($AS).hStyle>> hair is <<= lengthToEitherUnit(getSlave($AS).hLength)>> long.
 			<<else>>
 				$His hair is shaved smooth.
 			<</if>>
 			<span class="note">General hairstyles will conform to hair length and clothing choices.</span>
 		</div>
 		<div class="choices">
-			<<if $activeSlave.hLength > 1>>
+			<<if getSlave($AS).hLength > 1>>
 				Style $his hair:
-				[[Afro|Salon][$activeSlave.hStyle = "afro",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Braided|Salon][$activeSlave.hStyle = "braided",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Cornrows|Salon][$activeSlave.hStyle = "cornrows",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Curled|Salon][$activeSlave.hStyle = "curled",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Dreadlocks|Salon][$activeSlave.hStyle = "dreadlocks",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Eary|Salon][$activeSlave.hStyle = "eary",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[In a bun|Salon][$activeSlave.hStyle = "bun",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[In a messy bun|Salon][$activeSlave.hStyle = "messy bun",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[In a ponytail|Salon][$activeSlave.hStyle = "ponytail",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[In tails|Salon][$activeSlave.hStyle = "tails",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Luxurious|Salon][$activeSlave.hStyle = "luxurious",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Messy|Salon][$activeSlave.hStyle = "messy",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Neat|Salon][$activeSlave.hStyle = "neat",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Permed|Salon][$activeSlave.hStyle = "permed",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Shaved sides|Salon][$activeSlave.hStyle = "strip",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Up|Salon][$activeSlave.hStyle = "up",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+				[[Afro|Salon][getSlave($AS).hStyle = "afro",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Braided|Salon][getSlave($AS).hStyle = "braided",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Cornrows|Salon][getSlave($AS).hStyle = "cornrows",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Curled|Salon][getSlave($AS).hStyle = "curled",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Dreadlocks|Salon][getSlave($AS).hStyle = "dreadlocks",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Eary|Salon][getSlave($AS).hStyle = "eary",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[In a bun|Salon][getSlave($AS).hStyle = "bun",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[In a messy bun|Salon][getSlave($AS).hStyle = "messy bun",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[In a ponytail|Salon][getSlave($AS).hStyle = "ponytail",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[In tails|Salon][getSlave($AS).hStyle = "tails",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Luxurious|Salon][getSlave($AS).hStyle = "luxurious",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Messy|Salon][getSlave($AS).hStyle = "messy",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Neat|Salon][getSlave($AS).hStyle = "neat",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Permed|Salon][getSlave($AS).hStyle = "permed",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Shaved sides|Salon][getSlave($AS).hStyle = "strip",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Up|Salon][getSlave($AS).hStyle = "up",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 			<<else>>
 				<span class="note">$His hair is too short to style meaningfully</span>
 			<</if>>
 		</div>
 
 		<div class="choices">
-			<<if $activeSlave.hLength > 1>>
+			<<if getSlave($AS).hLength > 1>>
 				Cut and style $his hair:
-				[[Shaved|Salon][$activeSlave.hStyle = "shaved",$activeSlave.hLength = 0,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Trimmed short|Salon][$activeSlave.hStyle = "trimmed",$activeSlave.hLength = 10,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Buzzcut|Salon][$activeSlave.hStyle = "buzzcut",$activeSlave.hLength = 1,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+				[[Shaved|Salon][getSlave($AS).hStyle = "shaved",getSlave($AS).hLength = 0,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Trimmed short|Salon][getSlave($AS).hStyle = "trimmed",getSlave($AS).hLength = 10,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Buzzcut|Salon][getSlave($AS).hStyle = "buzzcut",getSlave($AS).hLength = 1,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 			<</if>>
 		</div>
 
 		<div class="choices">
 			Cut or lengthen $his hair:
-			<<if $activeSlave.hLength > 5>>
-				[[Very short|Salon][$activeSlave.hLength = 5,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+			<<if getSlave($AS).hLength > 5>>
+				[[Very short|Salon][getSlave($AS).hLength = 5,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 			<</if>>
-			<<if $activeSlave.hLength > 10>>
-				| [[Short|Salon][$activeSlave.hLength = 10,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+			<<if getSlave($AS).hLength > 10>>
+				| [[Short|Salon][getSlave($AS).hLength = 10,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 			<</if>>
-			<<if $activeSlave.hLength > 30>>
-				| [[Shoulder length|Salon][$activeSlave.hLength = 30,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+			<<if getSlave($AS).hLength > 30>>
+				| [[Shoulder length|Salon][getSlave($AS).hLength = 30,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 			<</if>>
-			<<if $activeSlave.hLength > 60>>
-				| [[Long|Salon][$activeSlave.hLength = 60,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+			<<if getSlave($AS).hLength > 60>>
+				| [[Long|Salon][getSlave($AS).hLength = 60,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 			<</if>>
-			<<if $activeSlave.hLength > 100>>
-				| [[Very long|Salon][$activeSlave.hLength = 100,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+			<<if getSlave($AS).hLength > 100>>
+				| [[Very long|Salon][getSlave($AS).hLength = 100,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 			<</if>>
-			<<if $activeSlave.hLength == 1>>
-				| [[Apply hair growth stimulating treatment|Salon][$activeSlave.hLength = 1,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			<<elseif $activeSlave.hLength < 150>>
-				| [[Apply extensions|Salon][$activeSlave.hLength += 10,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+			<<if getSlave($AS).hLength == 1>>
+				| [[Apply hair growth stimulating treatment|Salon][getSlave($AS).hLength = 1,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			<<elseif getSlave($AS).hLength < 150>>
+				| [[Apply extensions|Salon][getSlave($AS).hLength += 10,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 			<</if>>
 				| Custom length: <<textbox "_newHLength" _oldHLength "Salon">>
 			<<if $showInches == 1>>
-				cm (<<= cmToInchString($activeSlave.hLength)>>)
+				cm (<<= cmToInchString(getSlave($AS).hLength)>>)
 			<<elseif $showInches == 2>>
 				inches
 			<</if>>
-			[[Apply|Salon][cashX(forceNeg($modCost), "slaveMod", $activeSlave), $activeSlave.hLength = (Number(_newHLength) || $activeSlave.hLength)]]
+			[[Apply|Salon][cashX(forceNeg($modCost), "slaveMod", getSlave($AS)), getSlave($AS).hLength = (Number(_newHLength) || getSlave($AS).hLength)]]
 		</div>
 
 		<div class="choices">
 			Have $his hair carefully maintained at its current length:
-			<<if $activeSlave.haircuts == 1>>
-				[[Cease maintenance|Salon][$activeSlave.haircuts = 0]]
+			<<if getSlave($AS).haircuts == 1>>
+				[[Cease maintenance|Salon][getSlave($AS).haircuts = 0]]
 			<<else>>
-				[[Begin maintenance|Salon][$activeSlave.haircuts = 1]]
+				[[Begin maintenance|Salon][getSlave($AS).haircuts = 1]]
 			<</if>>
 		</div>
 	<<else>>
-		<<if $activeSlave.hStyle == "bald">>
+		<<if getSlave($AS).hStyle == "bald">>
 			$He is completely bald.
 		<<else>>
-			$His current wig is $activeSlave.hColor.
-			<<if $activeSlave.hStyle != "bald">>
-				[[Remove wig|Salon][$activeSlave.hStyle = "bald",$activeSlave.hLength = 0,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] or <span class="note">choose a new one:</span>
+			$His current wig is <<= getSlave($AS).hColor>>.
+			<<if getSlave($AS).hStyle != "bald">>
+				[[Remove wig|Salon][getSlave($AS).hStyle = "bald",getSlave($AS).hLength = 0,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]] or <span class="note">choose a new one:</span>
 			<<else>>
 				<span class="note">Choose a wig color:</span>
 			<</if>>
@@ -588,52 +592,52 @@
 
 			<<if $primaryHairColor != 0>>
 				<div class="choices">
-					[[Change|Salon][$activeSlave.hColor = ($primaryHairColor + $secondaryHairColor),cashX(forceNeg($modCost), "slaveMod", $activeSlave), $primaryHairColor = 0, $secondaryHairColor = ""]] $his wig color to $primaryHairColor $secondaryHairColor
+					[[Change|Salon][getSlave($AS).hColor = ($primaryHairColor + $secondaryHairColor),cashX(forceNeg($modCost), "slaveMod", getSlave($AS)), $primaryHairColor = 0, $secondaryHairColor = ""]] $his wig color to $primaryHairColor $secondaryHairColor
 				</div>
 			<</if>>
 		<</if>>
 
 		<div>
-			<<if $activeSlave.hStyle != "bald">>
-				$His $activeSlave.hStyle wig is <<= lengthToEitherUnit($activeSlave.hLength)>> long.
+			<<if getSlave($AS).hStyle != "bald">>
+				$His <<= getSlave($AS).hStyle>> wig is <<= lengthToEitherUnit(getSlave($AS).hLength)>> long.
 				<span class="note">General hairstyles will conform to hair length and clothing choices.</span>
 
-				<<if $activeSlave.hLength == 0>><<set $activeSlave.hLength = 10>><</if>>
+				<<if getSlave($AS).hLength == 0>><<set getSlave($AS).hLength = 10>><</if>>
 
 				<div class="choices">
 					Set wig length to:
-					<<if $activeSlave.hLength != 10>>[[lengthToEitherUnit(10)|Salon][$activeSlave.hLength = 10,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>>
-					<<if $activeSlave.hLength != 30>>[[lengthToEitherUnit(30)|Salon][$activeSlave.hLength = 30,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>>
-					<<if $activeSlave.hLength != 60>>[[lengthToEitherUnit(60)|Salon][$activeSlave.hLength = 60,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>>
-					<<if $activeSlave.hLength != 90>>[[lengthToEitherUnit(90)|Salon][$activeSlave.hLength = 90,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>>
-					<<if $activeSlave.hLength != 120>>[[lengthToEitherUnit(120)|Salon][$activeSlave.hLength = 120,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>>
-					<<if $activeSlave.hLength != 150>>[[lengthToEitherUnit(150)|Salon][$activeSlave.hLength = 150,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>>
+					<<if getSlave($AS).hLength != 10>>[[lengthToEitherUnit(10)|Salon][getSlave($AS).hLength = 10,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]<</if>>
+					<<if getSlave($AS).hLength != 30>>[[lengthToEitherUnit(30)|Salon][getSlave($AS).hLength = 30,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]<</if>>
+					<<if getSlave($AS).hLength != 60>>[[lengthToEitherUnit(60)|Salon][getSlave($AS).hLength = 60,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]<</if>>
+					<<if getSlave($AS).hLength != 90>>[[lengthToEitherUnit(90)|Salon][getSlave($AS).hLength = 90,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]<</if>>
+					<<if getSlave($AS).hLength != 120>>[[lengthToEitherUnit(120)|Salon][getSlave($AS).hLength = 120,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]<</if>>
+					<<if getSlave($AS).hLength != 150>>[[lengthToEitherUnit(150)|Salon][getSlave($AS).hLength = 150,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]<</if>>
 				</div>
 			<<else>>
 				$He is not wearing a wig.
 			<</if>>
 			<div class="choices">
-				<<if $activeSlave.hStyle != "bald">>
+				<<if getSlave($AS).hStyle != "bald">>
 					Set wig style:
 				<<else>>
 					Give $him a wig:
 				<</if>>
-				[[Afro|Salon][$activeSlave.hStyle = "afro",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Braided|Salon][$activeSlave.hStyle = "braided",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Cornrows|Salon][$activeSlave.hStyle = "cornrows",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Curled|Salon][$activeSlave.hStyle = "curled",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Dreadlocks|Salon][$activeSlave.hStyle = "dreadlocks",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Eary|Salon][$activeSlave.hStyle = "eary",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[In a bun|Salon][$activeSlave.hStyle = "bun",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[In a messy bun|Salon][$activeSlave.hStyle = "messy bun",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[In a ponytail|Salon][$activeSlave.hStyle = "ponytail",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[In tails|Salon][$activeSlave.hStyle = "tails",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Luxurious|Salon][$activeSlave.hStyle = "luxurious",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Messy|Salon][$activeSlave.hStyle = "messy",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Neat|Salon][$activeSlave.hStyle = "neat",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Permed|Salon][$activeSlave.hStyle = "permed",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Shaved sides|Salon][$activeSlave.hStyle = "strip",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-				| [[Up|Salon][$activeSlave.hStyle = "up",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+				[[Afro|Salon][getSlave($AS).hStyle = "afro",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Braided|Salon][getSlave($AS).hStyle = "braided",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Cornrows|Salon][getSlave($AS).hStyle = "cornrows",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Curled|Salon][getSlave($AS).hStyle = "curled",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Dreadlocks|Salon][getSlave($AS).hStyle = "dreadlocks",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Eary|Salon][getSlave($AS).hStyle = "eary",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[In a bun|Salon][getSlave($AS).hStyle = "bun",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[In a messy bun|Salon][getSlave($AS).hStyle = "messy bun",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[In a ponytail|Salon][getSlave($AS).hStyle = "ponytail",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[In tails|Salon][getSlave($AS).hStyle = "tails",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Luxurious|Salon][getSlave($AS).hStyle = "luxurious",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Messy|Salon][getSlave($AS).hStyle = "messy",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Neat|Salon][getSlave($AS).hStyle = "neat",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Permed|Salon][getSlave($AS).hStyle = "permed",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Shaved sides|Salon][getSlave($AS).hStyle = "strip",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+				| [[Up|Salon][getSlave($AS).hStyle = "up",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 			</div>
 		</div>
 	<</if>>
@@ -643,25 +647,25 @@
 
 <div>
 	<<makeupDescription>>
-	<<if $activeSlave.makeup > 0>>
-		[[Remove|Salon][$activeSlave.makeup = 0,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+	<<if getSlave($AS).makeup > 0>>
+		[[Remove|Salon][getSlave($AS).makeup = 0,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 	<</if>>
 	<div class="choices">
 	Apply makeup:
-		[[Nice|Salon][$activeSlave.makeup = 1,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-		| [[Gorgeous|Salon][$activeSlave.makeup = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-		| [[Slutty|Salon][$activeSlave.makeup = 4,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-		| [[Color-coordinate with hair|Salon][$activeSlave.makeup = 3,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+		[[Nice|Salon][getSlave($AS).makeup = 1,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+		| [[Gorgeous|Salon][getSlave($AS).makeup = 2,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+		| [[Slutty|Salon][getSlave($AS).makeup = 4,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+		| [[Color-coordinate with hair|Salon][getSlave($AS).makeup = 3,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 	</div>
 	<div class="choices">
 		&nbsp;&nbsp;
-		[[Neon|Salon][$activeSlave.makeup = 5,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-		| [[Neon, color-coordinate with hair|Salon][$activeSlave.makeup = 6,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+		[[Neon|Salon][getSlave($AS).makeup = 5,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+		| [[Neon, color-coordinate with hair|Salon][getSlave($AS).makeup = 6,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 	</div>
 	<div class="choices">
 		&nbsp;&nbsp;
-		[[Metallic|Salon][$activeSlave.makeup = 7,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-		| [[Metallic, color-coordinate with hair|Salon][$activeSlave.makeup = 8,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+		[[Metallic|Salon][getSlave($AS).makeup = 7,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+		| [[Metallic, color-coordinate with hair|Salon][getSlave($AS).makeup = 8,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 	</div>
 </div>
 
@@ -669,25 +673,25 @@
 <div>
 	<<nailsDescription>>
 
-	<<if hasAnyArms($activeSlave)>>
+	<<if hasAnyArms(getSlave($AS))>>
 		<div class="choices">
 			Treat nails:
-			[[Clip|Salon][$activeSlave.nails = 0,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Extend|Salon][$activeSlave.nails = 1,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Sharp, claw-like|Salon][$activeSlave.nails = 3,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Bright, glittery|Salon][$activeSlave.nails = 4,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Streetwalker-style|Salon][$activeSlave.nails = 5,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Color-coordinate with hair|Salon][$activeSlave.nails = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+			[[Clip|Salon][getSlave($AS).nails = 0,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Extend|Salon][getSlave($AS).nails = 1,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Sharp, claw-like|Salon][getSlave($AS).nails = 3,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Bright, glittery|Salon][getSlave($AS).nails = 4,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Streetwalker-style|Salon][getSlave($AS).nails = 5,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Color-coordinate with hair|Salon][getSlave($AS).nails = 2,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 		</div>
 		<div class="choices">
 			&nbsp;&nbsp;
-			[[Neon|Salon][$activeSlave.nails = 6,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Neon, color-coordinate with hair|Salon][$activeSlave.nails = 7,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+			[[Neon|Salon][getSlave($AS).nails = 6,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Neon, color-coordinate with hair|Salon][getSlave($AS).nails = 7,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 		</div>
 		<div class="choices">
 			&nbsp;&nbsp;
-			[[Metallic|Salon][$activeSlave.nails = 8,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Metallic, color-coordinate with hair|Salon][$activeSlave.nails = 9,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+			[[Metallic|Salon][getSlave($AS).nails = 8,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Metallic, color-coordinate with hair|Salon][getSlave($AS).nails = 9,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 		</div>
 	<</if>>
 </div>
@@ -695,78 +699,78 @@
 /* SKIN */
 <h3>Skin</h3>
 <div>
-	$His skin is $activeSlave.skin.
+	$His skin is <<= getSlave($AS).skin>>.
 
-	<<if (setup.dyedSkins.includes($activeSlave.skin))>>
-		[[Remove coloring|Salon][$activeSlave.skin = $activeSlave.origSkin,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-	<<elseif (($activeSlave.skin == "sun tanned") || ($activeSlave.skin == "spray tanned"))>>
-		[[Remove tanning|Salon][$activeSlave.skin = $activeSlave.origSkin,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+	<<if (setup.dyedSkins.includes(getSlave($AS).skin))>>
+		[[Remove coloring|Salon][getSlave($AS).skin = getSlave($AS).origSkin,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+	<<elseif ((getSlave($AS).skin == "sun tanned") || (getSlave($AS).skin == "spray tanned"))>>
+		[[Remove tanning|Salon][getSlave($AS).skin = getSlave($AS).origSkin,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 	<</if>>
 </div>
 
-<<if (!setup.dyedSkins.includes($activeSlave.skin))>>
+<<if (!setup.dyedSkins.includes(getSlave($AS).skin))>>
 	<div class="choices">
-		<<if ($activeSlave.skin == "sun tanned" || $activeSlave.skin == "spray tanned")>>
+		<<if (getSlave($AS).skin == "sun tanned" || getSlave($AS).skin == "spray tanned")>>
 			$His skin tanning must be removed before any advanced procedure to change $his skin color.
 		<<else>>
 			Change skin tone:
 			<<set _needsSpacers = 0>>
-			<<if (skinToneLevel($activeSlave.skin) > 1)>>
+			<<if (skinToneLevel(getSlave($AS).skin) > 1)>>
 				<<if _needsSpacers == 1>> | <</if>>
-				[[Bleach|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, -2), cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+				[[Bleach|Salon][getSlave($AS).skin = changeSkinTone(getSlave($AS).skin, -2), cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 				<<set _needsSpacers = 1>>
 			<</if>>
-			<<if (skinToneLevel($activeSlave.skin) > 8)>>
+			<<if (skinToneLevel(getSlave($AS).skin) > 8)>>
 				<<if _needsSpacers == 1>> | <</if>>
-				[[Lighten|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, -1), cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+				[[Lighten|Salon][getSlave($AS).skin = changeSkinTone(getSlave($AS).skin, -1), cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 				<<set _needsSpacers = 1>>
 			<</if>>
-			<<if (skinToneLevel($activeSlave.skin) < 18)>>
+			<<if (skinToneLevel(getSlave($AS).skin) < 18)>>
 				<<if _needsSpacers == 1>> | <</if>>
-				[[Darken|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, 1), cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+				[[Darken|Salon][getSlave($AS).skin = changeSkinTone(getSlave($AS).skin, 1), cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 				<<set _needsSpacers = 1>>
 			<</if>>
-			<<if (skinToneLevel($activeSlave.skin) < 25)>>
+			<<if (skinToneLevel(getSlave($AS).skin) < 25)>>
 				<<if _needsSpacers == 1>> | <</if>>
-				[[Blacken|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, 2), cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+				[[Blacken|Salon][getSlave($AS).skin = changeSkinTone(getSlave($AS).skin, 2), cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 				<<set _needsSpacers = 1>>
 			<</if>>
 		<</if>>
 	</div>
 	<div class="choices">
 		<<set _needsSpacers = 0>>
-		<<if ($activeSlave.skin != "sun tanned")>>
-			<<if (skinToneLevel($activeSlave.skin) < 6)>>
+		<<if (getSlave($AS).skin != "sun tanned")>>
+			<<if (skinToneLevel(getSlave($AS).skin) < 6)>>
 				$His skin is so light in color that any attempt at natural tanning is more likely to damage $his skin.
-			<<elseif (skinToneLevel($activeSlave.skin) > 20)>>
+			<<elseif (skinToneLevel(getSlave($AS).skin) > 20)>>
 				$His skin is so dark in color that any attempt at natural tanning is not likely to appear on $his skin.
 			<<else>>
-				[["Sun tan " + $his + " skin"|Salon][$activeSlave.skin = "sun tanned", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+				[["Sun tan " + $his + " skin"|Salon][getSlave($AS).skin = "sun tanned", cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 				<<set _needsSpacers = 1>>
 			<</if>>
 		<</if>>
-		<<if ($activeSlave.skin != "spray tanned")>>
+		<<if (getSlave($AS).skin != "spray tanned")>>
 			<<if _needsSpacers == 1>> | <</if>>
-			[["Spray tan " + $his + " skin"|Salon][$activeSlave.skin = "spray tanned", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+			[["Spray tan " + $his + " skin"|Salon][getSlave($AS).skin = "spray tanned", cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 		<</if>>
 	</div>
 <</if>>
 
 <div class="choices">
 	Dye or paint:
-	[[Blue|Salon][$activeSlave.skin = "dyed blue",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-	| [[Camouflage|Salon][$activeSlave.skin = "camouflage patterned",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-	| [[Gray|Salon][$activeSlave.skin = "dyed gray",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-	| [[Green|Salon][$activeSlave.skin = "dyed green",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-	| [[Pink|Salon][$activeSlave.skin = "dyed pink",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-	| [[Red|Salon][$activeSlave.skin = "dyed red",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-	| [[Tiger Stripes|Salon][$activeSlave.skin = "tiger striped",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+	[[Blue|Salon][getSlave($AS).skin = "dyed blue",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+	| [[Camouflage|Salon][getSlave($AS).skin = "camouflage patterned",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+	| [[Gray|Salon][getSlave($AS).skin = "dyed gray",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+	| [[Green|Salon][getSlave($AS).skin = "dyed green",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+	| [[Pink|Salon][getSlave($AS).skin = "dyed pink",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+	| [[Red|Salon][getSlave($AS).skin = "dyed red",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+	| [[Tiger Stripes|Salon][getSlave($AS).skin = "tiger striped",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 </div>
 
-<<if $activeSlave.tail != "none">>
-	$His tail is $activeSlave.tailColor.
-	<<if $activeSlave.tailColor != $activeSlave.hColor>>
-		[[Match current hair|Salon][$activeSlave.tailColor = $activeSlave.hColor]] or <span class="note">choose a new one:</span>
+<<if getSlave($AS).tail != "none">>
+	$His tail is <<= getSlave($AS).tailColor>>.
+	<<if getSlave($AS).tailColor != getSlave($AS).hColor>>
+		[[Match current hair|Salon][getSlave($AS).tailColor = getSlave($AS).hColor]] or <span class="note">choose a new one:</span>
 	<<else>>
 		<span class="note">Choose a dye color before dyeing $his tail:</span>
 	<</if>>
@@ -824,35 +828,35 @@
 
 	<<if $primaryTailColor != 0>>
 		<div class="choices">
-			[["Dye " + $his + " tail"|Salon][$activeSlave.tailColor = ($primaryTailColor + $secondaryTailColor),cashX(forceNeg($modCost), "slaveMod", $activeSlave), $primaryTailColor = 0, $secondaryTailColor = ""]] $primaryTailColor $secondaryTailColor now?
+			[["Dye " + $his + " tail"|Salon][getSlave($AS).tailColor = ($primaryTailColor + $secondaryTailColor),cashX(forceNeg($modCost), "slaveMod", getSlave($AS)), $primaryTailColor = 0, $secondaryTailColor = ""]] $primaryTailColor $secondaryTailColor now?
 		</div>
 	<</if>>
 <</if>>
 
 /* MARKS */
 <div>
-	<<if ($activeSlave.markings == "beauty mark")>>
+	<<if (getSlave($AS).markings == "beauty mark")>>
 		$He has a prominent mole on $his face, which
-		<<if $activeSlave.face > 40>>
+		<<if getSlave($AS).face > 40>>
 			qualifies as a beauty mark and enhances $his attractiveness due to $his facial beauty.
-		<<elseif $activeSlave.face < -10>>
+		<<elseif getSlave($AS).face < -10>>
 			makes $him even less attractive.
 		<<else>>
 			qualifies as a beauty mark since $he's pretty, having no significant impact on $his beauty.
 		<</if>>
-		[[Remove it|Salon][$activeSlave.markings = "none",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+		[[Remove it|Salon][getSlave($AS).markings = "none",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 	<</if>>
 </div>
 
 <div>
-	<<if ($activeSlave.markings == "birthmark")>>
+	<<if (getSlave($AS).markings == "birthmark")>>
 		$He has a large birthmark, which
-		<<if $activeSlave.prestige > 0 || $activeSlave.porn.prestige > 1>>
+		<<if getSlave($AS).prestige > 0 || getSlave($AS).porn.prestige > 1>>
 			enhances $his attractiveness due to $his prestige.
 		<<else>>
 			detracts from $his attractiveness.
 		<</if>>
-		[[Bleach it|Salon][$activeSlave.markings = "none",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+		[[Bleach it|Salon][getSlave($AS).markings = "none",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 	<</if>>
 </div>
 
@@ -860,79 +864,79 @@
 <h3>Body hair</h3>
 /* EYEBROW HAIR */
 
-<<if $activeSlave.eyebrowHStyle != "bald">>
+<<if getSlave($AS).eyebrowHStyle != "bald">>
 	<div>
-		$His <<if $activeSlave.eyebrowFullness != "natural">>$activeSlave.eyebrowFullness<<if $activeSlave.eyebrowHStyle != "natural">>,<</if>> <</if>><<if $activeSlave.eyebrowHStyle != "natural">>$activeSlave.eyebrowHStyle <</if>> eyebrows
-		<<if $activeSlave.eyebrowHStyle == "shaved">>
-			would be $activeSlave.eyebrowHColor if present.
+		$His <<if getSlave($AS).eyebrowFullness != "natural">><<= getSlave($AS).eyebrowFullness>><<if getSlave($AS).eyebrowHStyle != "natural">>,<</if>> <</if>><<if getSlave($AS).eyebrowHStyle != "natural">><<= getSlave($AS).eyebrowHStyle>> <</if>> eyebrows
+		<<if getSlave($AS).eyebrowHStyle == "shaved">>
+			would be <<= getSlave($AS).eyebrowHColor>> if present.
 		<<else>>
-			are $activeSlave.eyebrowHColor.
+			are <<= getSlave($AS).eyebrowHColor>>.
 		<</if>>
-		<<if $activeSlave.eyebrowHColor != $activeSlave.hColor>>
-			[[Match the hair?|Salon][$activeSlave.eyebrowHColor = $activeSlave.hColor,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+		<<if getSlave($AS).eyebrowHColor != getSlave($AS).hColor>>
+			[[Match the hair?|Salon][getSlave($AS).eyebrowHColor = getSlave($AS).hColor,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 		<</if>>
 	</div>
 
 	<div class="choices">
 		Dye $his eyebrow hair:
-			[[Auburn|Salon][$activeSlave.eyebrowHColor = "auburn",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Black|Salon][$activeSlave.eyebrowHColor = "black",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Blazing Red|Salon][$activeSlave.eyebrowHColor = "blazing red",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Blonde|Salon][$activeSlave.eyebrowHColor = "blonde",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Blue-Violet|Salon][$activeSlave.eyebrowHColor = "blue-violet",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Blue|Salon][$activeSlave.eyebrowHColor = "blue",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Brown|Salon][$activeSlave.eyebrowHColor = "brown",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Burgundy|Salon][$activeSlave.eyebrowHColor = "burgundy",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Chestnut|Salon][$activeSlave.eyebrowHColor = "chestnut",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Chocolate|Salon][$activeSlave.eyebrowHColor = "chocolate brown",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Copper|Salon][$activeSlave.eyebrowHColor = "copper",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Dark Blue|Salon][$activeSlave.eyebrowHColor = "dark blue",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Dark Brown|Salon][$activeSlave.eyebrowHColor = "dark brown",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Dark Orchid|Salon][$activeSlave.eyebrowHColor = "dark orchid",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+			[[Auburn|Salon][getSlave($AS).eyebrowHColor = "auburn",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Black|Salon][getSlave($AS).eyebrowHColor = "black",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Blazing Red|Salon][getSlave($AS).eyebrowHColor = "blazing red",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Blonde|Salon][getSlave($AS).eyebrowHColor = "blonde",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Blue-Violet|Salon][getSlave($AS).eyebrowHColor = "blue-violet",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Blue|Salon][getSlave($AS).eyebrowHColor = "blue",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Brown|Salon][getSlave($AS).eyebrowHColor = "brown",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Burgundy|Salon][getSlave($AS).eyebrowHColor = "burgundy",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Chestnut|Salon][getSlave($AS).eyebrowHColor = "chestnut",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Chocolate|Salon][getSlave($AS).eyebrowHColor = "chocolate brown",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Copper|Salon][getSlave($AS).eyebrowHColor = "copper",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Dark Blue|Salon][getSlave($AS).eyebrowHColor = "dark blue",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Dark Brown|Salon][getSlave($AS).eyebrowHColor = "dark brown",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Dark Orchid|Salon][getSlave($AS).eyebrowHColor = "dark orchid",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 			| [[Deep Red|Salon][$primaryHairColor = "deep red"]]
-			| [[Ginger|Salon][$activeSlave.eyebrowHColor = "ginger",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Golden|Salon][$activeSlave.eyebrowHColor = "golden",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Green-yellow|Salon][$activeSlave.eyebrowHColor = "green-yellow",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Green|Salon][$activeSlave.eyebrowHColor = "green",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Grey|Salon][$activeSlave.eyebrowHColor = "grey",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Hazel|Salon][$activeSlave.eyebrowHColor = "hazel",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Jet Black|Salon][$activeSlave.eyebrowHColor = "jet black",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Neon Blue|Salon][$activeSlave.eyebrowHColor = "neon blue",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Neon Green|Salon][$activeSlave.eyebrowHColor = "neon green",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Neon Pink|Salon][$activeSlave.eyebrowHColor = "neon pink",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Pink|Salon][$activeSlave.eyebrowHColor = "pink",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Platinum Blonde|Salon][$activeSlave.eyebrowHColor = "platinum blonde",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Purple|Salon][$activeSlave.eyebrowHColor = "purple",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Red|Salon][$activeSlave.eyebrowHColor = "red",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Sea Green|Salon][$activeSlave.eyebrowHColor = "sea green",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Silver|Salon][$activeSlave.eyebrowHColor = "silver",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Strawberry-Blonde|Salon][$activeSlave.eyebrowHColor = "strawberry-blonde",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[White|Salon][$activeSlave.eyebrowHColor = "white",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+			| [[Ginger|Salon][getSlave($AS).eyebrowHColor = "ginger",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Golden|Salon][getSlave($AS).eyebrowHColor = "golden",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Green-yellow|Salon][getSlave($AS).eyebrowHColor = "green-yellow",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Green|Salon][getSlave($AS).eyebrowHColor = "green",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Grey|Salon][getSlave($AS).eyebrowHColor = "grey",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Hazel|Salon][getSlave($AS).eyebrowHColor = "hazel",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Jet Black|Salon][getSlave($AS).eyebrowHColor = "jet black",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Neon Blue|Salon][getSlave($AS).eyebrowHColor = "neon blue",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Neon Green|Salon][getSlave($AS).eyebrowHColor = "neon green",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Neon Pink|Salon][getSlave($AS).eyebrowHColor = "neon pink",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Pink|Salon][getSlave($AS).eyebrowHColor = "pink",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Platinum Blonde|Salon][getSlave($AS).eyebrowHColor = "platinum blonde",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Purple|Salon][getSlave($AS).eyebrowHColor = "purple",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Red|Salon][getSlave($AS).eyebrowHColor = "red",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Sea Green|Salon][getSlave($AS).eyebrowHColor = "sea green",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Silver|Salon][getSlave($AS).eyebrowHColor = "silver",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Strawberry-Blonde|Salon][getSlave($AS).eyebrowHColor = "strawberry-blonde",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[White|Salon][getSlave($AS).eyebrowHColor = "white",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 	</div>
 
 	<div class="choices">
 		Style $his eyebrow hair:
-			[[Natural|Salon][$activeSlave.eyebrowHStyle = "natural",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Curved|Salon][$activeSlave.eyebrowHStyle = "curved",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Elongated|Salon][$activeSlave.eyebrowHStyle = "elongated",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[High-Arched|Salon][$activeSlave.eyebrowHStyle = "high-arched",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Rounded|Salon][$activeSlave.eyebrowHStyle = "rounded",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Shaved|Salon][$activeSlave.eyebrowHStyle = "shaved",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Shortened|Salon][$activeSlave.eyebrowHStyle = "shortened",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Slanted Inwards|Salon][$activeSlave.eyebrowHStyle = "slanted inwards",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Slanted Outwards|Salon][$activeSlave.eyebrowHStyle = "slanted outwards",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Straight|Salon][$activeSlave.eyebrowHStyle = "straight",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+			[[Natural|Salon][getSlave($AS).eyebrowHStyle = "natural",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Curved|Salon][getSlave($AS).eyebrowHStyle = "curved",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Elongated|Salon][getSlave($AS).eyebrowHStyle = "elongated",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[High-Arched|Salon][getSlave($AS).eyebrowHStyle = "high-arched",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Rounded|Salon][getSlave($AS).eyebrowHStyle = "rounded",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Shaved|Salon][getSlave($AS).eyebrowHStyle = "shaved",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Shortened|Salon][getSlave($AS).eyebrowHStyle = "shortened",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Slanted Inwards|Salon][getSlave($AS).eyebrowHStyle = "slanted inwards",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Slanted Outwards|Salon][getSlave($AS).eyebrowHStyle = "slanted outwards",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Straight|Salon][getSlave($AS).eyebrowHStyle = "straight",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 	</div>
 
 	<div class="choices">
 		Shape $his eyebrow hair:
-			[[Natural|Salon][$activeSlave.eyebrowFullness = "natural",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Bushy|Salon][$activeSlave.eyebrowFullness = "bushy",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Thick|Salon][$activeSlave.eyebrowFullness = "thick",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Tapered|Salon][$activeSlave.eyebrowFullness = "tapered",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Threaded|Salon][$activeSlave.eyebrowFullness = "threaded",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Thin|Salon][$activeSlave.eyebrowFullness = "thin",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Pencil-Thin|Salon][$activeSlave.eyebrowFullness = "pencil-thin",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+			[[Natural|Salon][getSlave($AS).eyebrowFullness = "natural",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Bushy|Salon][getSlave($AS).eyebrowFullness = "bushy",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Thick|Salon][getSlave($AS).eyebrowFullness = "thick",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Tapered|Salon][getSlave($AS).eyebrowFullness = "tapered",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Threaded|Salon][getSlave($AS).eyebrowFullness = "threaded",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Thin|Salon][getSlave($AS).eyebrowFullness = "thin",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Pencil-Thin|Salon][getSlave($AS).eyebrowFullness = "pencil-thin",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 	</div>
 <<else>>
 	<div>
@@ -942,73 +946,73 @@
 
 /* PUBIC HAIR */
 
-<<set _pubertyAge = Math.min($activeSlave.pubertyAgeXX, $activeSlave.pubertyAgeXY)>>
-<<if $activeSlave.pubicHStyle != "bald" && $activeSlave.pubicHStyle != "hairless" && $activeSlave.physicalAge >= _pubertyAge-1>>
+<<set _pubertyAge = Math.min(getSlave($AS).pubertyAgeXX, getSlave($AS).pubertyAgeXY)>>
+<<if getSlave($AS).pubicHStyle != "bald" && getSlave($AS).pubicHStyle != "hairless" && getSlave($AS).physicalAge >= _pubertyAge-1>>
 
 	<div>
 		$His
-		<<if $activeSlave.physicalAge < _pubertyAge>>
+		<<if getSlave($AS).physicalAge < _pubertyAge>>
 			wispy pubic hair, which is just starting to grow in,
-		<<elseif $activeSlave.pubicHStyle == "in a strip">>
+		<<elseif getSlave($AS).pubicHStyle == "in a strip">>
 			pubic hair, which is shaved into a strip,
 		<<else>>
-			$activeSlave.pubicHStyle pubic hair
+			<<= getSlave($AS).pubicHStyle>> pubic hair
 		<</if>>
-		<<if $activeSlave.pubicHStyle == "waxed">>
-			would be $activeSlave.pubicHColor if present.
+		<<if getSlave($AS).pubicHStyle == "waxed">>
+			would be <<= getSlave($AS).pubicHColor>> if present.
 		<<else>>
-			is $activeSlave.pubicHColor.
+			is <<= getSlave($AS).pubicHColor>>.
 		<</if>>
-		<<if $activeSlave.pubicHColor != $activeSlave.hColor>>
-			[[Match the curtains?|Salon][$activeSlave.pubicHColor = $activeSlave.hColor,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+		<<if getSlave($AS).pubicHColor != getSlave($AS).hColor>>
+			[[Match the curtains?|Salon][getSlave($AS).pubicHColor = getSlave($AS).hColor,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 		<</if>>
 	</div>
 
 	<div class="choices">
 		Dye $his pubic hair:
-			[[Auburn|Salon][$activeSlave.pubicHColor = "auburn",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Black|Salon][$activeSlave.pubicHColor = "black",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Blazing Red|Salon][$activeSlave.pubicHColor = "blazing red",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Blonde|Salon][$activeSlave.pubicHColor = "blonde",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Blue-Violet|Salon][$activeSlave.pubicHColor = "blue-violet",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Blue|Salon][$activeSlave.pubicHColor = "blue",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Brown|Salon][$activeSlave.pubicHColor = "brown",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Burgundy|Salon][$activeSlave.pubicHColor = "burgundy",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Chestnut|Salon][$activeSlave.pubicHColor = "chestnut",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Chocolate|Salon][$activeSlave.pubicHColor = "chocolate brown",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Copper|Salon][$activeSlave.pubicHColor = "copper",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Dark Blue|Salon][$activeSlave.pubicHColor = "dark blue",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Dark Brown|Salon][$activeSlave.pubicHColor = "dark brown",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Dark Orchid|Salon][$activeSlave.pubicHColor = "dark orchid",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+			[[Auburn|Salon][getSlave($AS).pubicHColor = "auburn",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Black|Salon][getSlave($AS).pubicHColor = "black",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Blazing Red|Salon][getSlave($AS).pubicHColor = "blazing red",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Blonde|Salon][getSlave($AS).pubicHColor = "blonde",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Blue-Violet|Salon][getSlave($AS).pubicHColor = "blue-violet",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Blue|Salon][getSlave($AS).pubicHColor = "blue",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Brown|Salon][getSlave($AS).pubicHColor = "brown",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Burgundy|Salon][getSlave($AS).pubicHColor = "burgundy",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Chestnut|Salon][getSlave($AS).pubicHColor = "chestnut",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Chocolate|Salon][getSlave($AS).pubicHColor = "chocolate brown",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Copper|Salon][getSlave($AS).pubicHColor = "copper",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Dark Blue|Salon][getSlave($AS).pubicHColor = "dark blue",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Dark Brown|Salon][getSlave($AS).pubicHColor = "dark brown",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Dark Orchid|Salon][getSlave($AS).pubicHColor = "dark orchid",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 			| [[Deep Red|Salon][$primaryHairColor = "deep red"]]
-			| [[Ginger|Salon][$activeSlave.pubicHColor = "ginger",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Golden|Salon][$activeSlave.pubicHColor = "golden",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Green-yellow|Salon][$activeSlave.pubicHColor = "green-yellow",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Green|Salon][$activeSlave.pubicHColor = "green",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Grey|Salon][$activeSlave.pubicHColor = "grey",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Hazel|Salon][$activeSlave.pubicHColor = "hazel",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Jet Black|Salon][$activeSlave.pubicHColor = "jet black",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Neon Blue|Salon][$activeSlave.pubicHColor = "neon blue",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Neon Green|Salon][$activeSlave.pubicHColor = "neon green",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Neon Pink|Salon][$activeSlave.pubicHColor = "neon pink",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Pink|Salon][$activeSlave.pubicHColor = "pink",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Platinum Blonde|Salon][$activeSlave.pubicHColor = "platinum blonde",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Purple|Salon][$activeSlave.pubicHColor = "purple",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Red|Salon][$activeSlave.pubicHColor = "red",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Sea Green|Salon][$activeSlave.pubicHColor = "sea green",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Silver|Salon][$activeSlave.pubicHColor = "silver",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Strawberry-Blonde|Salon][$activeSlave.pubicHColor = "strawberry-blonde",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[White|Salon][$activeSlave.pubicHColor = "white",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+			| [[Ginger|Salon][getSlave($AS).pubicHColor = "ginger",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Golden|Salon][getSlave($AS).pubicHColor = "golden",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Green-yellow|Salon][getSlave($AS).pubicHColor = "green-yellow",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Green|Salon][getSlave($AS).pubicHColor = "green",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Grey|Salon][getSlave($AS).pubicHColor = "grey",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Hazel|Salon][getSlave($AS).pubicHColor = "hazel",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Jet Black|Salon][getSlave($AS).pubicHColor = "jet black",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Neon Blue|Salon][getSlave($AS).pubicHColor = "neon blue",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Neon Green|Salon][getSlave($AS).pubicHColor = "neon green",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Neon Pink|Salon][getSlave($AS).pubicHColor = "neon pink",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Pink|Salon][getSlave($AS).pubicHColor = "pink",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Platinum Blonde|Salon][getSlave($AS).pubicHColor = "platinum blonde",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Purple|Salon][getSlave($AS).pubicHColor = "purple",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Red|Salon][getSlave($AS).pubicHColor = "red",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Sea Green|Salon][getSlave($AS).pubicHColor = "sea green",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Silver|Salon][getSlave($AS).pubicHColor = "silver",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Strawberry-Blonde|Salon][getSlave($AS).pubicHColor = "strawberry-blonde",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[White|Salon][getSlave($AS).pubicHColor = "white",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 	</div>
 
 	<div class="choices">
 		Style $his pubic hair:
-			[[Waxed|Salon][$activeSlave.pubicHStyle = "waxed",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Landing strip|Salon][$activeSlave.pubicHStyle = "in a strip",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Neat|Salon][$activeSlave.pubicHStyle = "neat",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Bushy in the front|Salon][$activeSlave.pubicHStyle = "bushy in the front and neat in the rear",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Bushy|Salon][$activeSlave.pubicHStyle = "bushy",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Very Bushy|Salon][$activeSlave.pubicHStyle = "very bushy",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+			[[Waxed|Salon][getSlave($AS).pubicHStyle = "waxed",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Landing strip|Salon][getSlave($AS).pubicHStyle = "in a strip",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Neat|Salon][getSlave($AS).pubicHStyle = "neat",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Bushy in the front|Salon][getSlave($AS).pubicHStyle = "bushy in the front and neat in the rear",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Bushy|Salon][getSlave($AS).pubicHStyle = "bushy",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Very Bushy|Salon][getSlave($AS).pubicHStyle = "very bushy",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 	</div>
 
 <<else>>
@@ -1019,68 +1023,68 @@
 
 /* UNDERARM HAIR */
 
-<<if $activeSlave.underArmHStyle != "bald" && $activeSlave.underArmHStyle != "hairless" && $activeSlave.physicalAge >= _pubertyAge-1>>
+<<if getSlave($AS).underArmHStyle != "bald" && getSlave($AS).underArmHStyle != "hairless" && getSlave($AS).physicalAge >= _pubertyAge-1>>
 
 	<div>
 		$His
-		<<if $activeSlave.physicalAge < _pubertyAge>>
+		<<if getSlave($AS).physicalAge < _pubertyAge>>
 			wispy underarm hair
 		<<else>>
-			$activeSlave.underArmHStyle underarm hair
+			<<= getSlave($AS).underArmHStyle>> underarm hair
 		<</if>>
-		<<if $activeSlave.underArmHStyle == "waxed">>
-			would be $activeSlave.underArmHColor if present.
+		<<if getSlave($AS).underArmHStyle == "waxed">>
+			would be <<= getSlave($AS).underArmHColor>> if present.
 		<<else>>
-			is $activeSlave.underArmHColor.
+			is <<= getSlave($AS).underArmHColor>>.
 		<</if>>
-		<<if $activeSlave.underArmHColor != $activeSlave.hColor>>
-			[[Match the hair?|Salon][$activeSlave.underArmHColor = $activeSlave.hColor,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+		<<if getSlave($AS).underArmHColor != getSlave($AS).hColor>>
+			[[Match the hair?|Salon][getSlave($AS).underArmHColor = getSlave($AS).hColor,cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 		<</if>>
 	</div>
 
 	<div class="choices">
 		Dye $his armpit hair:
-			[[Auburn|Salon][$activeSlave.underArmHColor = "auburn",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Black|Salon][$activeSlave.underArmHColor = "black",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Blazing Red|Salon][$activeSlave.underArmHColor = "blazing red",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Blonde|Salon][$activeSlave.underArmHColor = "blonde",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Blue-Violet|Salon][$activeSlave.underArmHColor = "blue-violet",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Blue|Salon][$activeSlave.underArmHColor = "blue",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Brown|Salon][$activeSlave.underArmHColor = "brown",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Burgundy|Salon][$activeSlave.underArmHColor = "burgundy",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Chestnut|Salon][$activeSlave.underArmHColor = "chestnut",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Chocolate|Salon][$activeSlave.underArmHColor = "chocolate brown",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Copper|Salon][$activeSlave.underArmHColor = "copper",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Dark Blue|Salon][$activeSlave.underArmHColor = "dark blue",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Dark Brown|Salon][$activeSlave.underArmHColor = "dark brown",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Dark Orchid|Salon][$activeSlave.underArmHColor = "dark orchid",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+			[[Auburn|Salon][getSlave($AS).underArmHColor = "auburn",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Black|Salon][getSlave($AS).underArmHColor = "black",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Blazing Red|Salon][getSlave($AS).underArmHColor = "blazing red",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Blonde|Salon][getSlave($AS).underArmHColor = "blonde",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Blue-Violet|Salon][getSlave($AS).underArmHColor = "blue-violet",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Blue|Salon][getSlave($AS).underArmHColor = "blue",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Brown|Salon][getSlave($AS).underArmHColor = "brown",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Burgundy|Salon][getSlave($AS).underArmHColor = "burgundy",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Chestnut|Salon][getSlave($AS).underArmHColor = "chestnut",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Chocolate|Salon][getSlave($AS).underArmHColor = "chocolate brown",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Copper|Salon][getSlave($AS).underArmHColor = "copper",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Dark Blue|Salon][getSlave($AS).underArmHColor = "dark blue",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Dark Brown|Salon][getSlave($AS).underArmHColor = "dark brown",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Dark Orchid|Salon][getSlave($AS).underArmHColor = "dark orchid",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 			| [[Deep Red|Salon][$primaryHairColor = "deep red"]]
-			| [[Ginger|Salon][$activeSlave.underArmHColor = "ginger",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Golden|Salon][$activeSlave.underArmHColor = "golden",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Green-yellow|Salon][$activeSlave.underArmHColor = "green-yellow",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Green|Salon][$activeSlave.underArmHColor = "green",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Grey|Salon][$activeSlave.underArmHColor = "grey",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Hazel|Salon][$activeSlave.underArmHColor = "hazel",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Jet Black|Salon][$activeSlave.underArmHColor = "jet black",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Neon Blue|Salon][$activeSlave.underArmHColor = "neon blue",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Neon Green|Salon][$activeSlave.underArmHColor = "neon green",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Neon Pink|Salon][$activeSlave.underArmHColor = "neon pink",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Pink|Salon][$activeSlave.underArmHColor = "pink",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Platinum Blonde|Salon][$activeSlave.underArmHColor = "platinum blonde",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Purple|Salon][$activeSlave.underArmHColor = "purple",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Red|Salon][$activeSlave.underArmHColor = "red",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Sea Green|Salon][$activeSlave.underArmHColor = "sea green",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Silver|Salon][$activeSlave.underArmHColor = "silver",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Strawberry-Blonde|Salon][$activeSlave.underArmHColor = "strawberry-blonde",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[White|Salon][$activeSlave.underArmHColor = "white",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+			| [[Ginger|Salon][getSlave($AS).underArmHColor = "ginger",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Golden|Salon][getSlave($AS).underArmHColor = "golden",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Green-yellow|Salon][getSlave($AS).underArmHColor = "green-yellow",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Green|Salon][getSlave($AS).underArmHColor = "green",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Grey|Salon][getSlave($AS).underArmHColor = "grey",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Hazel|Salon][getSlave($AS).underArmHColor = "hazel",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Jet Black|Salon][getSlave($AS).underArmHColor = "jet black",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Neon Blue|Salon][getSlave($AS).underArmHColor = "neon blue",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Neon Green|Salon][getSlave($AS).underArmHColor = "neon green",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Neon Pink|Salon][getSlave($AS).underArmHColor = "neon pink",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Pink|Salon][getSlave($AS).underArmHColor = "pink",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Platinum Blonde|Salon][getSlave($AS).underArmHColor = "platinum blonde",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Purple|Salon][getSlave($AS).underArmHColor = "purple",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Red|Salon][getSlave($AS).underArmHColor = "red",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Sea Green|Salon][getSlave($AS).underArmHColor = "sea green",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Silver|Salon][getSlave($AS).underArmHColor = "silver",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Strawberry-Blonde|Salon][getSlave($AS).underArmHColor = "strawberry-blonde",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[White|Salon][getSlave($AS).underArmHColor = "white",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 	</div>
 
 	<div class="choices">
 		Style $his armpit hair:
-			[[Waxed|Salon][$activeSlave.underArmHStyle = "waxed",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Shaved|Salon][$activeSlave.underArmHStyle = "shaved",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Neat|Salon][$activeSlave.underArmHStyle = "neat",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-			| [[Bushy|Salon][$activeSlave.underArmHStyle = "bushy",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+			[[Waxed|Salon][getSlave($AS).underArmHStyle = "waxed",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Shaved|Salon][getSlave($AS).underArmHStyle = "shaved",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Neat|Salon][getSlave($AS).underArmHStyle = "neat",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
+			| [[Bushy|Salon][getSlave($AS).underArmHStyle = "bushy",cashX(forceNeg($modCost), "slaveMod", getSlave($AS))]]
 	</div>
 
 <<else>>