diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index cea7f75b95518c3775e2720cd6c579779bdfe01f..d33ce278d55f2d88de3d3850431d0d10434e166a 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -43,23 +43,23 @@
 
 <<set _clothesTemp = $activeSlave.clothes>>
 <<switch $RESSevent>>
-	/*Some events start with the slave naked (any event that starts with the daily inspection, for example).  Here we switch their clothing just for the image to load, then switch it back quickly so the player's choice is not messed up.*/
-	<<case "devoted lotion" "sore shoulders" "bed snuggle" "confident tanning" "devoted nympho" "devoted exhibition" "permitted masturbation" "terrified inspection" "spa boobs" "resistant shower" "resistant gelding" "rebellious arrogant" "bondage gear" "vocal disobedience" "heavy piercing" "resting amp" "age implant" "shift masturbation" "shift sleep" "slave dick huge" "obedient idiot" "tendon fall" "unhappy virgin" "fearful balls" "extreme aphrodisiacs" "shaped areolae" "huge tits" "trusting HG" "ignorant horny" "used whore" "restricted smart" "restricted profession" "mods please" "penitent" "devoted waist" "muscles" "obedient girlish" "huge naturals" "hugely pregnant" "slave dick on slave" "slave clit on slave" "language lesson" "kitchen molestation" "mindbroken morning" "sleeping ambivalent" "sexy succubus" "PA flirting" "fucktoy tribbing" "tittymonster inspection" "bonded love" "bad dream" "cockfeeder resistance" "suppository resistance" "shower slip" "happy dance" "plimb help" "orchiectomy please" "torpedo squeeze" "retching cum feeding" "subjugation blues" "transition anxiety" "moist pussy" "breast expansion blues" "gaped asshole" "ara ara" "im scared" "ass fitting" "young PC age difference" "old PC age difference" "devoted educated slave" "devoted shortstack" "desperate null" "implant inspection" "back stretch" "modest clothes">>
-		<<set $activeSlave.clothes = "no clothing">>
-	<<case "whore rebellious">>
-	 	/* this scene states they are wearing "thick, durable latex with temperature regulation and anchor points for restraint" no matter what they are assigned to wear. */
-	 	<<set $activeSlave.clothes = "restrictive latex">>
-	<<case "inconvenient labia">>
-		/* "pulling down the compression shorts $he was wearing" */
-		<<if isItemAccessible("sport shorts")>>
-			<<if $activeSlave.boobs >= 650>>
-				<<set $activeSlave.clothes = "sport shorts and a sports bra">>
-			<<else>>
-				<<set $activeSlave.clothes = "sport shorts">>
-			<</if>>
+/*Some events start with the slave naked (any event that starts with the daily inspection, for example).  Here we switch their clothing just for the image to load, then switch it back quickly so the player's choice is not messed up.*/
+<<case "devoted lotion" "sore shoulders" "bed snuggle" "confident tanning" "devoted nympho" "devoted exhibition" "permitted masturbation" "terrified inspection" "spa boobs" "resistant shower" "resistant gelding" "rebellious arrogant" "bondage gear" "vocal disobedience" "heavy piercing" "resting amp" "age implant" "shift masturbation" "shift sleep" "slave dick huge" "obedient idiot" "tendon fall" "unhappy virgin" "fearful balls" "extreme aphrodisiacs" "shaped areolae" "huge tits" "trusting HG" "ignorant horny" "used whore" "restricted smart" "restricted profession" "mods please" "penitent" "devoted waist" "muscles" "obedient girlish" "huge naturals" "hugely pregnant" "slave dick on slave" "slave clit on slave" "language lesson" "kitchen molestation" "mindbroken morning" "sleeping ambivalent" "sexy succubus" "PA flirting" "fucktoy tribbing" "tittymonster inspection" "bonded love" "bad dream" "cockfeeder resistance" "suppository resistance" "shower slip" "happy dance" "plimb help" "orchiectomy please" "torpedo squeeze" "retching cum feeding" "subjugation blues" "transition anxiety" "moist pussy" "breast expansion blues" "gaped asshole" "ara ara" "im scared" "ass fitting" "young PC age difference" "old PC age difference" "devoted educated slave" "devoted shortstack" "desperate null" "implant inspection" "back stretch" "modest clothes">>
+	<<set $activeSlave.clothes = "no clothing">>
+<<case "whore rebellious">>
+	/* this scene states they are wearing "thick, durable latex with temperature regulation and anchor points for restraint" no matter what they are assigned to wear. */
+	<<set $activeSlave.clothes = "restrictive latex">>
+<<case "inconvenient labia">>
+	/* "pulling down the compression shorts $he was wearing" */
+	<<if isItemAccessible("sport shorts")>>
+		<<if $activeSlave.boobs >= 650>>
+			<<set $activeSlave.clothes = "sport shorts and a sports bra">>
 		<<else>>
-			<<set $activeSlave.clothes = "spats and a tank top">>
+			<<set $activeSlave.clothes = "sport shorts">>
 		<</if>>
+	<<else>>
+		<<set $activeSlave.clothes = "spats and a tank top">>
+	<</if>>
 <</switch>>
 <span id="artFrame">
 /* 000-250-006 */
@@ -4451,10 +4451,12 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 
 <<default>>
 	<br>ERROR: bad RESS event $RESSevent
+
 <</switch>>
 
 <br><br>
 <span id="result">
+
 <<switch $RESSevent>>
 
 <<case "first period">>
@@ -17359,8 +17361,8 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 		<<run newSlave(_newSlaves[_ress])>> /* skip New Slave Intro */
 		<<run cashX(-8333, "slaveTransfer", _newSlaves[_ress])>>
 	<</if>>
-	You seize a tablet and hurry out of your office, working furiously and using every feature of $assistantName to the utmost. These bitches have offended you, and you quickly frame the structure of an appropriate revenge. By the time you get to where $eventSlave.slaveName is still being heckled by spoiled, drunken harpies, everyone else present in that arcology hall has mysteriously received urgent messages and gone elsewhere. $eventSlave.slaveName <<if canSee($eventSlave)>>sees you approach, and stares at you<<else>>recognizes your dominant footsteps approaching, and turns to face you<</if>>, $his sudden intense look alerting your vile little guests to your presence. One of them attempts to frame an insult for the interloper, but one of _his2 friends pokes _him2 in the side and whispers something in _his2 ear and _he2 goes silent, staring at you with wide eyes.
-	<<if $PC.title != 1>>_He2 then winces, visibly realizing that you're likely aware that _he2 called $eventSlave.slaveName's owner $his Master. Somehow, the mistake seems important to _him2 now that you're standing here, effortlessly dominating the space for all your femininity.<</if>>
+	You seize a tablet and hurry out of your office, working furiously and using every feature of $assistantName to the utmost. These bitches have offended you, and you quickly frame the structure of an appropriate revenge. By the time you get to where $activeSlave.slaveName is still being heckled by spoiled, drunken harpies, everyone else present in that arcology hall has mysteriously received urgent messages and gone elsewhere. $activeSlave.slaveName <<if canSee($activeSlave)>>sees you approach, and stares at you<<else>>recognizes your dominant footsteps approaching, and turns to face you<</if>>, $his sudden intense look alerting your vile little guests to your presence. One of them attempts to frame an insult for the interloper, but one of _his2 friends pokes _him2 in the side and whispers something in _his2 ear and _he2 goes silent, staring at you with wide eyes.
+	<<if $PC.title != 1>>_He2 then winces, visibly realizing that you're likely aware that _he2 called $activeSlave.slaveName's owner $his Master. Somehow, the mistake seems important to _him2 now that you're standing here, effortlessly dominating the space for all your femininity.<</if>>
 	<br><br>
 	You hold the tablet out to them wordlessly. It's displaying security footage of the three of them, boarding a public VTOL transport for another arcology nearby. The prominent timestamp is thirty minutes in the future. The scene changes, showing them partying in one of that arcology's nightclubs. You clear your throat, dragging their attention away from the counterfeited footage, and describe in detail the other evidence — tickets, identification checks, biometrics — that will prove they left your arcology and visited two others before regrettably disappearing. One of them tries, with utter predictability, to threaten you with _his2 father, but you tell _him2 bluntly that if he does make the effort, he'll be looking in the wrong place.
 	<br><br>
@@ -17368,16 +17370,16 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 	<br><br><span id="result2">
 	<<link "Let your public servant take revenge on them">>
 		<<replace "#result2">>
-		Although they don't know it, your trio of new captures escape the usual choice of introductions to life among your sex slaves. In order to ensure that their fate has been properly obscured, you keep them in confinement for a while. After that, the usual beautification your slaves undergo will eliminate any possibility of their being recognized, even on public duty. That doesn't mean they have it easy, though. You delegate $eventSlave.slaveName to break them in, letting $him visit each of them whenever $he wants and treat them however $he wants.
-		<<if ($eventSlave.energy > 95) || ($eventSlave.devotion > 50)>>
+		Although they don't know it, your trio of new captures escape the usual choice of introductions to life among your sex slaves. In order to ensure that their fate has been properly obscured, you keep them in confinement for a while. After that, the usual beautification your slaves undergo will eliminate any possibility of their being recognized, even on public duty. That doesn't mean they have it easy, though. You delegate $activeSlave.slaveName to break them in, letting $him visit each of them whenever $he wants and treat them however $he wants.
+		<<if ($activeSlave.energy > 95) || ($activeSlave.devotion > 50)>>
 			$He approaches the task
-			<<if $eventSlave.energy > 95>>
+			<<if $activeSlave.energy > 95>>
 				eagerly, seeing it as an opportunity to sate $his urges
 			<<else>>
 				dutifully, seeing it as $his responsibility to break them well for you
 			<</if>>
 			as well as to get some petty revenge.
-			<<switch $eventSlave.fetish>>
+			<<switch $activeSlave.fetish>>
 			<<case "submissive">>
 				$He's a sub, but this actually means that $he can do a reasonable dom impression when $he works at it. $He certainly has experience with what works, even if it's from the other side. The erstwhile rich girls are required to kiss $his feet, literally.
 			<<case "cumslut">>
@@ -17387,14 +17389,14 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 				<<for _ress = 0; _ress < _newSlaves.length; _ress++>><<set _newSlaves[_ress].oralCount += 10>><</for>>
 				<<set $oralTotal += 30>>
 			<<case "buttslut">>
-				$He has a one track mind, and that track is anal sex. So, $he assrapes them, enjoying their sobbed apologies while $he <<if canPenetrate($eventSlave)>>fills their backdoors with $his cum<<else>>uses a dildo on them<</if>>.
+				$He has a one track mind, and that track is anal sex. So, $he assrapes them, enjoying their sobbed apologies while $he <<if canPenetrate($activeSlave)>>fills their backdoors with $his cum<<else>>uses a dildo on them<</if>>.
 				<<for _ress = 0; _ress < _newSlaves.length; _ress++>><<set _newSlaves[_ress].analCount += 10>><</for>>
-				<<set $slaves[$slaveIndices[$eventSlave.ID]].penetrativeCount += 10>>
+				<<set $activeSlave.penetrativeCount += 10>>
 				<<set $analTotal += 30, $penetrativeTotal += 30>>
 			<<case "boobs">>
-				$He forces them to <<if $eventSlave.nipples == "fuckable">>eat out $his nipples<<elseif $eventSlave.lactation > 0>>nurse from $him<<else>>suck $his nipples until $he orgasms<</if>>, mostly for how much $he enjoys the sensation, but also for the revulsion it produces.
+				$He forces them to <<if $activeSlave.nipples == "fuckable">>eat out $his nipples<<elseif $activeSlave.lactation > 0>>nurse from $him<<else>>suck $his nipples until $he orgasms<</if>>, mostly for how much $he enjoys the sensation, but also for the revulsion it produces.
 				<<for _ress = 0; _ress < _newSlaves.length; _ress++>><<set _newSlaves[_ress].oralCount += 10>><</for>>
-				<<set $slaves[$slaveIndices[$eventSlave.ID]].mammaryCount += 10>>
+				<<set $activeSlave.mammaryCount += 10>>
 				<<set $oralTotal += 30, $mammaryTotal += 30>>
 				<<if $activeSlave.lactation > 0>>
 					<<set $activeSlave.lactationDuration = 2>>
@@ -17404,25 +17406,25 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 					<<= induceLactation($activeSlave)>>
 				<</if>>
 			<<case "pregnancy">>
-				$He doesn't have permission to impregnate them, but they don't know that, and $he lies shamelessly. <<if canPenetrate($eventSlave)>>They beg $him not to cum inside them, but $he does anyway,<<else>>$He uses a strap-on with a reservoir to fill them with cum,<</if>> and they cry themselves to sleep every night.
+				$He doesn't have permission to impregnate them, but they don't know that, and $he lies shamelessly. <<if canPenetrate($activeSlave)>>They beg $him not to cum inside them, but $he does anyway,<<else>>$He uses a strap-on with a reservoir to fill them with cum,<</if>> and they cry themselves to sleep every night.
 				<<for _ress = 0; _ress < _newSlaves.length; _ress++>><<set _newSlaves[_ress].vaginalCount += 10>><</for>>
-				<<set $slaves[$slaveIndices[$eventSlave.ID]].penetrativeCount += 10>>
+				<<set $activeSlave.penetrativeCount += 10>>
 				<<set $vaginalTotal += 30, $penetrativeTotal += 30>>
 			<<case "dom">>
 				$He prizes the opportunity to be dominant, and makes the most of it. Rather than doing something pedestrian like force them to fuck $him, $he forces them to fuck each other, punishing them for hesitation until they're eating each other out even while they cry.
 				<<for _ress = 0; _ress < _newSlaves.length; _ress++>><<set _newSlaves[_ress].oralCount += 20>><</for>>
 				<<set $oralTotal += 60>>
 			<<case "sadist">>
-				Their tears aren't a means for $him; they're an end. $He extracts them with greed, enjoying the sensation of being <<if $eventSlave.dick > 0>>sucked off<<elseif $activeSlave.vagina == -1>>rimmed<<else>>eaten out<</if>> by one sobbing rich bitch while $he forces another to spank _his3 friend's pussy.
+				Their tears aren't a means for $him; they're an end. $He extracts them with greed, enjoying the sensation of being <<if $activeSlave.dick > 0>>sucked off<<elseif $activeSlave.vagina == -1>>rimmed<<else>>eaten out<</if>> by one sobbing rich bitch while $he forces another to spank _his3 friend's pussy.
 				<<for _ress = 0; _ress < _newSlaves.length; _ress++>><<set _newSlaves[_ress].oralCount += 10>><</for>>
-				<<set $slaves[$slaveIndices[$eventSlave.ID]].oralCount += 10>>
+				<<set $activeSlave.oralCount += 10>>
 				<<set $oralTotal += 60>>
 			<<case "masochist">>
 				As a masochist, $he's naturally inclined to be on the receiving end, but in this case $he makes an exception for the sake of justice. And it's to $his victims' anguish that $he does, because $he knows pain like a lover, and inflicts it in excruciating crescendos without leaving a single mark.
 			<</switch>>
-			The horrible experience is certainly @@.gold;educational@@ for your new slaves, and $eventSlave.slaveName is @@.hotpink;well pleased.@@ Tolerating insults is part of being a public slave, but getting this opportunity to take $his pent-up frustrations out on some deserving targets is a @@.mediumaquamarine;trust building@@ exercise for $him. It seems their insults really did upset $him.
+			The horrible experience is certainly @@.gold;educational@@ for your new slaves, and $activeSlave.slaveName is @@.hotpink;well pleased.@@ Tolerating insults is part of being a public slave, but getting this opportunity to take $his pent-up frustrations out on some deserving targets is a @@.mediumaquamarine;trust building@@ exercise for $him. It seems their insults really did upset $him.
 			<<for _ress = 0; _ress < _newSlaves.length; _ress++>><<set _newSlaves[_ress].trust -= 4>><</for>>
-			<<set _ress = $slaveIndices[$eventSlave.ID]>><<set $slaves[_ress].devotion += 5, $slaves[_ress].trust += 5>>
+			<<set $activeSlave.devotion += 5, $activeSlave.trust += 5>>
 		<<else>>
 			$He obeys, but isn't so far gone into sexual slavery that $he's willing to really throw $himself into the task. $His visits are terrifying enough, though. Simply seeing their own likely futures reflected in $him is usually enough to leave your new slaves crying themselves to sleep.
 		<</if>>