diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index b48e99821f28292340bff9191699ce815e452baf..b2afb733285222c44ec0229ae31b96fb8f123bde 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4,8 +4,13 @@
 
 4/13/2018
 
+	46
+	-fixes to walkPast
+	-code cleaning
+
 	45
 	-several fixes, most notable being NationalityToName not recognizing Revivalist slaves
+	-fSlaveSlaveDick overhaul
 	-code improvements
 
 	44
diff --git a/src/uncategorized/REresistantmotherdaughter.tw b/src/uncategorized/REresistantmotherdaughter.tw
index 61e05909417e5d35154d3cdb2d47a2dc32ca74c3..98c48d21bddad423e9174b17016fb68f0b7e3966 100644
--- a/src/uncategorized/REresistantmotherdaughter.tw
+++ b/src/uncategorized/REresistantmotherdaughter.tw
@@ -2,16 +2,16 @@
 
 <<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check">>
 
-<<set $i = $slaves.findIndex(function(s) { return s.ID == $mother.ID; })>>
-<<set $j = $slaves.findIndex(function(s) { return s.ID == $daughter.ID; })>>
+<<set $i = $slaveIndices[$mother]>>
+<<set $j = $slaveIndices[$daughter]>>
 
-$mother.slaveName and her daughter are both having trouble getting acclimated to your ownership, with their obedience suffering as a result. Though neither of them have done anything particular egregious lately, their combined list of minor transgressions is reaching a point where rendering punishment on the two would not be seen as unfair. By happenstance they come before you for inspection one after the other. Though they certainly see each other naked frequently around the penthouse, neither seems particularly comfortable around the other when nudity is involved. While you finish $mother.slaveName's inspection, her daughter fidgets uneasily even while trying to mimic the posture and appearance of an obedient slave. It occurs to you that the current situation presents an opportunity to do //something// about this resistant mother daughter pair.
+$slaves[$i].slaveName and her daughter are both having trouble getting acclimated to your ownership, with their obedience suffering as a result. Though neither of them have done anything particular egregious lately, their combined list of minor transgressions is reaching a point where rendering punishment on the two would not be seen as unfair. By happenstance they come before you for inspection one after the other. Though they certainly see each other naked frequently around the penthouse, neither seems particularly comfortable around the other when nudity is involved. While you finish $slaves[$i].slaveName's inspection, her daughter fidgets uneasily even while trying to mimic the posture and appearance of an obedient slave. It occurs to you that the current situation presents an opportunity to do //something// about this resistant mother daughter pair.
 
 <br><br>
 <span id="result">
 <br><<link "Spend the evening gently acclimating them to your ownership">>
 	<<replace "#result">>
-	Though neither of the two vehemently protests your decision to have them both join you in bed, furtive uneasy glances are exchanged between the two. Since they're already naked, they clamber onto your bed before you and reluctantly kneel facing each other, leaving enough space between them for you and for them to avert their eyes to avoid the other's nakedness. They clearly assume you would start by using one of them, so they're quite taken aback when you remain standing at the edge of the bed and suggest that $mother.slaveName play with her daughter. $daughter.slaveName awkwardly flounders a little as her mother's hands roam about her body, but does not reel back from the intimate touching. In time you instruct $daughter.slaveName to pleasure her mother, but still decline to join the incestuous union unfolding on your sheets. You extend the foreplay for hours, bringing both mother and daughter to such a state of naked arousal that they begin grinding against each other uninhibitedly. They are both so desperate for release that they do not object when you finally decide to join them, instead eagerly moving to include you in their coupling. What started with $daughter.slaveName awkwardly kneeling unmoving while her mother sucked her nipples ends with $daughter.slaveName on all fours getting fucked by you while orally pleasuring $mother.slaveName. You gaze over at $mother.slaveName and she moans and licks her lips enticingly back at you as $daughter.slaveName moans into her fuckhole.
+	Though neither of the two vehemently protests your decision to have them both join you in bed, furtive uneasy glances are exchanged between the two. Since they're already naked, they clamber onto your bed before you and reluctantly kneel facing each other, leaving enough space between them for you and for them to avert their eyes to avoid the other's nakedness. They clearly assume you would start by using one of them, so they're quite taken aback when you remain standing at the edge of the bed and suggest that $slaves[$i].slaveName play with her daughter. $slaves[$j].slaveName awkwardly flounders a little as her mother's hands roam about her body, but does not reel back from the intimate touching. In time you instruct $slaves[$j].slaveName to pleasure her mother, but still decline to join the incestuous union unfolding on your sheets. You extend the foreplay for hours, bringing both mother and daughter to such a state of naked arousal that they begin grinding against each other uninhibitedly. They are both so desperate for release that they do not object when you finally decide to join them, instead eagerly moving to include you in their coupling. What started with $slaves[$j].slaveName awkwardly kneeling unmoving while her mother sucked her nipples ends with $slaves[$j].slaveName on all fours getting fucked by you while orally pleasuring $slaves[$i].slaveName. You gaze over at $slaves[$i].slaveName and she moans and licks her lips enticingly back at you as $slaves[$j].slaveName moans into her fuckhole.
 	@@.mediumaquamarine;They have both become more trusting of you.@@
 
 	<<set $slaves[$i].trust += 4, $slaves[$j].trust += 4, $slaves[$i].oralCount += 1, $slaves[$j].oralCount += 1, $oralTotal += 2>>
@@ -36,10 +36,10 @@ $mother.slaveName and her daughter are both having trouble getting acclimated to
 <</link>>
 <br><<link "Make an example of the mother">>
 	<<replace "#result">>
-	You give them orders of devastating simplicity: You are going to assrape $mother.slaveName and if her daughter offers even the most token of resistance, you'll punish $mother.slaveName. They're stunned, but you shake them out of their shock by grabbing $mother.slaveName by the arm <<if $PC.dick == 0>>,donning a strap-on<</if>>and shoving her over your desk. $daughter.slaveName flinches visibly as you enter her mother's ass in one brutal stroke, for which you stain her mother's asscheeks a rosy red with a torrent of harsh spanks. $mother.slaveName takes the rough anal pounding with only quiet sobbing and the occasional whimper of pain, but her daughter can't bear to see $mother.slaveName in such duress and breaks her shortlived silence to beg for mercy. When you step away from $mother.slaveName, $daughter.slaveName lets out a sigh of relief, but her expression soon turns to horror and revulsion when you return to mount her mother with a lash in hand.
+	You give them orders of devastating simplicity: You are going to assrape $slaves[$i].slaveName and if her daughter offers even the most token of resistance, you'll punish $slaves[$i].slaveName. They're stunned, but you shake them out of their shock by grabbing $slaves[$i].slaveName by the arm <<if $PC.dick == 0>>,donning a strap-on<</if>>and shoving her over your desk. $slaves[$j].slaveName flinches visibly as you enter her mother's ass in one brutal stroke, for which you stain her mother's asscheeks a rosy red with a torrent of harsh spanks. $slaves[$i].slaveName takes the rough anal pounding with only quiet sobbing and the occasional whimper of pain, but her daughter can't bear to see $slaves[$i].slaveName in such duress and breaks her shortlived silence to beg for mercy. When you step away from $slaves[$i].slaveName, $slaves[$j].slaveName lets out a sigh of relief, but her expression soon turns to horror and revulsion when you return to mount her mother with a lash in hand.
 	<br><br>
-	When you eventually finish your merciless assrape of $mother.slaveName, her body is covered in bruises, marks, and handprints. A testament to $daughter.slaveName's inability to keep her silence as you brutalized her mother. You leave your office wordlessly to attend to other matters, while behind you $daughter.slaveName gazes forlornly at the gibbering mess you have reduced her mother to.
-	Your severe punishment of her mother has encouraged $daughter.slaveName to @@.gold;fear you@@. $mother.slaveName has been fucked into @@.hotpink;submission@@ but your savage treatment has caused her to @@.red;hate buttsex.@@
+	When you eventually finish your merciless assrape of $slaves[$i].slaveName, her body is covered in bruises, marks, and handprints. A testament to $slaves[$j].slaveName's inability to keep her silence as you brutalized her mother. You leave your office wordlessly to attend to other matters, while behind you $slaves[$j].slaveName gazes forlornly at the gibbering mess you have reduced her mother to.
+	Your severe punishment of her mother has encouraged $slaves[$j].slaveName to @@.gold;fear you@@. $slaves[$i].slaveName has been fucked into @@.hotpink;submission@@ but your savage treatment has caused her to @@.red;hate buttsex.@@
 
 	<<set $slaves[$j].trust -= 10>>
 	<<set $slaves[$i].devotion += 4, $slaves[$i].analCount += 1, $analTotal += 1, $slaves[$i].sexualFlaw = "hates anal">>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index 1f858d00916a8870cc7489bad4bbb4e7bbf4725b..7e4394e915a321f3f2260184f35492c3490cfede 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -243,7 +243,7 @@
 
 /% These are variables that either should be made into _temp vars or should be Zeroed out once done with them instead of here. This can also interfere with debugging or hide NaN's as zeroing things out would clear a NaN. Also could stop from NaN's getting worse? %/
 /% Integer and float variables. No real need to zero them out but doesn't hurt to have them in a known state, though this might mask variables NaN'ing out. Takes up the least amount of Memory besides a "" string. %/
-<<set $averageProsperity = 0, $beauty = 0, $beautyMultiplier = 0, $boobsID = -1, $boobsInterestTargetID = -1, $brideSlave = -1, $buttslutID = -1, $buttslutInterestTargetID = -1, $cumslutID = -1, $FResult = 0, $groomSlave = -1, $humiliationID = -1, $humiliationInterestTargetID = -1, $i = 0, $individualCosts = 0, $influenceBonus = 0, $j = 0, $masochistID = -1, $masochistInterestTargetID = -1, $opinion = 0, $r = 0, $subID = -1, $submissiveInterestTargetID = -1, $weddingSlaveID = -1, $x = 0>>
+<<set $averageProsperity = 0, $beauty = 0, $beautyMultiplier = 0, $boobsID = -1, $boobsInterestTargetID = -1, $brideSlave = -1, $buttslutID = -1, $buttslutInterestTargetID = -1, $cumslutID = -1, $FResult = 0, $groomSlave = -1, $humiliationID = -1, $humiliationInterestTargetID = -1, $i = 0, $individualCosts = 0, $influenceBonus = 0, $j = 0, $masochistID = -1, $masochistInterestTargetID = -1, $opinion = 0, $r = 0, $subID = -1, $submissiveInterestTargetID = -1, $weddingSlaveID = -1, $x = 0, $mother = -1, $daughter = -1, $devMother = -1, $devDaughter = -1, $alphaTwin = -1, $betaTwin = -1, $youngerSister = -1, $olderSister = -1>>
 
 /% Other arrays %/
 <<set $events = [], $RESSevent = [], $RESSTRevent = [], $RETSevent = [], $RECIevent = [], $RecETSevent = [], $REFIevent = [], $REFSevent = [], $PESSevent = [], $PETSevent = [], $FSAcquisitionEvents = [], $FSNonconformistEvents = [], $qualifiedNicknames = [], $REAnalCowgirlSubIDs = [], $REButtholeCheckinIDs = [], $recruit = [], $RETasteTestSubIDs = [], $devotedSlaves = [], $rebelSlaves = [], $REBoobCollisionSubIDs = [], $REIfYouEnjoyItSubIDs = [], $RESadisticDescriptionSubIDs = [], $REShowerForceSubIDs = [], $RESimpleAssaultIDs = [], $RECockmilkInterceptionIDs = [], $REInterslaveBeggingIDs = [], $bedSlaves = [], $qualifiedFS = []>>
@@ -252,7 +252,7 @@
 <<set $activeSlave = 0, $eventSlave = 0, $slaveWithoutBonuses = 0, $subSlave = 0, $milfSlave = 0, $milkTap = 0, $relation = 0>>
 
 /% Slave Objects that never get zeroed so null them here. Second most memory eaten up. %/
-<<set $assayedSlave = null, $beforeGingering = null, $mother = null, $daughter = null, $devMother = null, $devDaughter = null, $alphaTwin = null, $betaTwin = null, $youngerSister = null, $olderSister = null, $recruiterMother = null, $recruiterSister = null, $sibling = null, $recruiterSlave = null>>
+<<set $assayedSlave = null, $beforeGingering = null, $recruiterMother = null, $recruiterSister = null, $sibling = null, $recruiterSlave = null>>
 
 /% Slave Object Arrays. These can take up the most memory. %/
 <<set $eligibleSlaves = [], $slavesInLine = []>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 05a66ed78d732ea283a17a80fb4fbe583324b97c..e7c3fbc5147b5255bcb2d5ebe5c12ba0eedd23f2 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -95,9 +95,11 @@
 <<set _devMothers = _relatedSlaves.filter(function(s) { return s.relation == "mother" && s.devotion > 50 && s.anus != 0 && s.relationshipTarget != s.relationTarget && canWalk(s); })>>
 <<for _devMothers.length > 0>>
 	<<set $devMother = _devMothers.pluck()>>
-	<<set $devDaughter = _relatedSlaves.find(function(s) { return s.ID == $devMother.relationTarget && s.devotion > 50 && s.anus != 0 && canWalk(s); })>>
-	<<if (def $devDaughter)>>
+	<<set $devDaughter = getSlave($devMother.relationTarget)>>
+	<<if (def $devDaughter) && $devDaughter.devotion > 50 && $devDaughter.anus != 0 && canWalk($devDaughter)>>
 		<<set $events.push("RE devoted mother daughter")>>
+		<<set $devMother = $devMother.ID>>
+		<<set $devDaughter = $devDaughter.ID>>
 		<<break>>
 	<</if>>
 <</for>>
@@ -105,9 +107,11 @@
 <<set _resMothers = _relatedSlaves.filter(function(s) { return s.relation == "mother" && s.devotion < 10 && s.anus != 0 && s.relationshipTarget != s.relationTarget && canWalk(s); })>>
 <<for _resMothers.length > 0>>
 	<<set $mother = _resMothers.pluck()>>
-	<<set $daughter = _relatedSlaves.find(function(s) { return s.ID == $mother.relationTarget && s.devotion < 10 && s.anus != 0 && canWalk(s); })>>
-	<<if (def $daughter)>>
+	<<set $daughter = getSlave($mother.relationTarget)>>
+	<<if (def $daughter) && $daughter.devotion < 10 && $daughter.anus != 0 && canWalk($daughter)>>
 		<<set $events.push("RE resistant mother daughter")>>
+		<<set $mother = $mother.ID>>
+		<<set $daughter = $daughter.ID>>
 		<<break>>
 	<</if>>
 <</for>>
@@ -115,9 +119,11 @@
 <<set _youngerSisters = _relatedSlaves.filter(function(s) { return s.relation == "sister" && canPenetrate(s); })>>
 <<for _youngerSisters.length > 0>>
 	<<set $youngerSister = _youngerSisters.pluck()>>
-	<<set $olderSister = _relatedSlaves.find(function(s) { return s.ID == $youngerSister.relationTarget && s.anus == 0 && $youngerSister.devotion > (s.devotion+20); })>>
-	<<if (def $olderSister)>>
+	<<set $olderSister = getSlave($youngerSister.relationTarget)>>
+	<<if (def $olderSister) && $olderSister.anus == 0 && $youngerSister.devotion > ($olderSister.devotion+20)>>
 		<<set $events.push("RE sibling revenge")>>
+		<<set $youngerSister = $youngerSister.ID>>
+		<<set $olderSister = $olderSister.ID>>
 		<<break>>
 	<</if>>
 <</for>>
@@ -125,9 +131,11 @@
 <<set _twins = _relatedSlaves.filter(function(s) { return s.relation == "twin" && s.anus > 0 && s.devotion > 50 && canWalk(s); })>>
 <<for _twins.length > 0>>
 	<<set $alphaTwin = _twins.pluck()>>
-	<<set $betaTwin = _relatedSlaves.find(function(s) { return s.ID == $alphaTwin.relationTarget && s.anus > 0 && s.devotion > 50 && canWalk(s); })>>
-	<<if (def $betaTwin)>>
+	<<set $betaTwin = getSlave($alphaTwin.relationTarget)>>
+	<<if (def $betaTwin) && $betaTwin.anus > 0 && $betaTwin.devotion > 50 && canWalk($betaTwin)>>
 		<<set $events.push("RE devoted twins")>>
+		<<set $alphaTwin = $alphaTwin.ID>>
+		<<set $betaTwin = $betaTwin.ID>>
 		<<break>>
 	<</if>>
 <</for>>
@@ -142,6 +150,8 @@
 	<<set $devDaughter = randomDaughter($devMother)>>
 	<<if (def $devDaughter) && ($devDaughter.devotion > 50) && ($devDaughter.anus != 0) && canWalk($devDaughter)>>
 		<<set $events.push("RE devoted mother daughter")>>
+		<<set $devMother = $devMother.ID>>
+		<<set $devDaughter = $devDaughter.ID>>
 		<<break>>
 	<</if>>
 <</for>>
@@ -152,6 +162,8 @@
 	<<set $daughter = randomDaughter($mother)>>
 	<<if (def $daughter) && ($daughter.devotion < 10) && ($daughter.anus != 0) && canWalk($daughter)>>
 		<<set $events.push("RE resistant mother daughter")>>
+		<<set $mother = $mother.ID>>
+		<<set $daughter = $daughter.ID>>
 		<<break>>
 	<</if>>
 <</for>>
@@ -162,6 +174,8 @@
 	<<set $olderSister = randomSister($youngerSister)>>
 	<<if (def $olderSister) && ($olderSister.anus == 0) && $youngerSister.devotion > ($olderSister.devotion+20)>>
 		<<set $events.push("RE sibling revenge")>>
+		<<set $youngerSister = $youngerSister.ID>>
+		<<set $olderSister = $olderSister.ID>>
 		<<break>>
 	<</if>>
 <</for>>
@@ -172,6 +186,8 @@
 	<<set $betaTwin = randomTwinSister($alphaTwin)>>
 	<<if (def $betaTwin) && ($betaTwin.anus > 0) && ($betaTwin.devotion > 50) && canWalk($betaTwin)>>
 		<<set $events.push("RE devoted twins")>>
+		<<set $alphaTwin = $alphaTwin.ID>>
+		<<set $betaTwin = $betaTwin.ID>>
 		<<break>>
 	<</if>>
 <</for>>
@@ -259,10 +275,8 @@
 				<<set $boobsInterestTargetID = $slaves[$i].ID>>
 			<</if>>
 			<<if ($pregnancyID != 0) && ($pregnancyInterestTargetID == 0)>>
-				<<if ($slaves[$i].anus != 0)>>
-					<<set $REFIevent.push("pregnancy")>>
-					<<set $pregnancyInterestTargetID = $slaves[$i].ID>>
-				<</if>>
+				<<set $REFIevent.push("pregnancy")>>
+				<<set $pregnancyInterestTargetID = $slaves[$i].ID>>
 			<</if>>
 			<<if ($masochistID != 0) && ($masochistInterestTargetID == 0)>>
 				<<set $REFIevent.push("masochist")>>
@@ -279,6 +293,10 @@
 <<if def $devotedSlaves[3]>>
 	<<set $devotedSlaves = $devotedSlaves.shuffle()>>
 	<<set $devotedSlaves.length = 4>>
+	<<set $devotedSlaves[0] = $devotedSlaves[0].ID>>
+	<<set $devotedSlaves[1] = $devotedSlaves[1].ID>>
+	<<set $devotedSlaves[2] = $devotedSlaves[2].ID>>
+	<<set $devotedSlaves[3] = $devotedSlaves[3].ID>>
 	<<set $events.push("RE devotees")>>
 <</if>>
 
@@ -287,6 +305,8 @@
 	<<if def $bedSlaves[1]>>
 		<<set $bedSlaves = $bedSlaves.shuffle()>>
 		<<set $bedSlaves.length = 2>>
+		<<set $bedSlaves[0] = $bedSlaves[0].ID>>
+		<<set $bedSlaves[1] = $bedSlaves[1].ID>>
 		<<set $events.push("RE full bed")>>
 	<</if>>
 <</if>>
@@ -302,6 +322,8 @@
 <<if $rebelSlaves.length > 1>>
 	<<set $rebelSlaves = $rebelSlaves.shuffle()>>
 	<<set $rebelSlaves.length = 2>>
+	<<set $rebelSlaves[0] = $rebelSlaves[0].ID>>
+	<<set $rebelSlaves[1] = $rebelSlaves[1].ID>>
 	<<set $events.push("RE rebels")>>
 <</if>>
 
diff --git a/src/uncategorized/reDevotedMotherDaughter.tw b/src/uncategorized/reDevotedMotherDaughter.tw
index bc4f93d4e0ac026e31cd84202eea18341be34cc5..0ca2dac80904e5fd20464b5656267f9e9b5f9c29 100644
--- a/src/uncategorized/reDevotedMotherDaughter.tw
+++ b/src/uncategorized/reDevotedMotherDaughter.tw
@@ -2,17 +2,17 @@
 
 <<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check">>
 
-<<set $i = $slaveIndices[$devMother.ID]>>
-<<set $j = $slaveIndices[$devDaughter.ID]>>
+<<set $i = $slaveIndices[$devMother]>>
+<<set $j = $slaveIndices[$devDaughter]>>
 
-$devMother.slaveName and her daughter $devDaughter.slaveName are both good slaves, devoted and obedient. They'd probably do anything you order them to do. By happenstance they come before you for inspection one after the other. They certainly see each other stark naked frequently enough. As you finish $devMother.slaveName's inspection, her daughter waits patiently for her turn. It occurs to you that they probably would do //anything// you order them to do, and that they're so acclimated to sexual slavery that they might well enjoy it.
+$slaves[$i].slaveName and her daughter $slaves[$j].slaveName are both good slaves, devoted and obedient. They'd probably do anything you order them to do. By happenstance they come before you for inspection one after the other. They certainly see each other stark naked frequently enough. As you finish $slaves[$i].slaveName's inspection, her daughter waits patiently for her turn. It occurs to you that they probably would do //anything// you order them to do, and that they're so acclimated to sexual slavery that they might well enjoy it.
 
 <br><br>
 
 <span id="result">
 <br><<link "Spend the night sharing your bed with them, and each of them with the other">>
 	<<replace "#result">>
-	Neither of them bats an eye when you announce you're turning in early and that they'll be joining you. Since they're already naked, they get into your big soft bed before you and lie facing each other, with enough room in between them for you to take a central position. They clearly assume you'll start with one of them on each side of you, so they're quite surprised when you slide in behind $devMother.slaveName instead. $devDaughter.slaveName snuggles up to her mother happily enough, however. You extend the foreplay to hours, eventually bringing both of them to such a state of naked arousal that they begin grinding against each other as much as they do you. They get the idea, and things turn into a sort of unspoken mutual one-upsmanship between them. What starts with $devDaughter.slaveName clearly feeling very daring as she sucks her mother's nipple ends with $devMother.slaveName lying on her back getting fucked by you while she orally pleasures $devDaughter.slaveName. You're face to face with $devDaughter.slaveName and she groans happily into your mouth as $devMother.slaveName moans into her fuckhole.
+	Neither of them bats an eye when you announce you're turning in early and that they'll be joining you. Since they're already naked, they get into your big soft bed before you and lie facing each other, with enough room in between them for you to take a central position. They clearly assume you'll start with one of them on each side of you, so they're quite surprised when you slide in behind $slaves[$i].slaveName instead. $slaves[$j].slaveName snuggles up to her mother happily enough, however. You extend the foreplay to hours, eventually bringing both of them to such a state of naked arousal that they begin grinding against each other as much as they do you. They get the idea, and things turn into a sort of unspoken mutual one-upsmanship between them. What starts with $slaves[$j].slaveName clearly feeling very daring as she sucks her mother's nipple ends with $slaves[$i].slaveName lying on her back getting fucked by you while she orally pleasures $slaves[$j].slaveName. You're face to face with $slaves[$j].slaveName and she groans happily into your mouth as $slaves[$i].slaveName moans into her fuckhole.
 	@@.mediumaquamarine;They have both become more trusting of you.@@
 
 	<<set $slaves[$i].trust += 4, $slaves[$j].trust += 4, $slaves[$i].oralCount += 1, $slaves[$j].oralCount += 1, $oralTotal += 2>>
@@ -37,7 +37,7 @@ $devMother.slaveName and her daughter $devDaughter.slaveName are both good slave
 <</link>>
 <br><<link "Get them started and then keep them at it in your office">>
 	<<replace "#result">>
-	You give them orders of devastating simplicity: they are to repair to the couch in your office and are to take turns getting each other off until such time as you tell them otherwise. They're momentarily stunned, but $devMother.slaveName takes the lead and draws her daughter over to the couch by the hand. They're both accomplished sex slaves and obey orders well, so they are quite successful in the little game, if a bit mechanical. For the rest of the day, interviewees come and go and are treated to the sight of the two of them having subdued sex on the couch. Showing off one's slaves for business interlocutors is a common Free Cities practice, but more than one perceptive person figures out what the resemblance between the two slaves and the age gap between them really means. Of course, all those who figure it out are impressed by your sheer decadence.
+	You give them orders of devastating simplicity: they are to repair to the couch in your office and are to take turns getting each other off until such time as you tell them otherwise. They're momentarily stunned, but $slaves[$i].slaveName takes the lead and draws her daughter over to the couch by the hand. They're both accomplished sex slaves and obey orders well, so they are quite successful in the little game, if a bit mechanical. For the rest of the day, interviewees come and go and are treated to the sight of the two of them having subdued sex on the couch. Showing off one's slaves for business interlocutors is a common Free Cities practice, but more than one perceptive person figures out what the resemblance between the two slaves and the age gap between them really means. Of course, all those who figure it out are impressed by your sheer decadence.
 	@@.green;Your reputation has increased considerably.@@
 	<<set $rep += 1000>>
 	<<set $slaves[$i].oralCount += 5, $slaves[$j].oralCount += 5, $oralTotal += 10>>
diff --git a/src/uncategorized/reDevotedTwins.tw b/src/uncategorized/reDevotedTwins.tw
index 74d179dfb94afdc9421bc3caf30c6a4141d8bd71..dedd16253a37e032b01eca03a34d9e008b7674fa 100644
--- a/src/uncategorized/reDevotedTwins.tw
+++ b/src/uncategorized/reDevotedTwins.tw
@@ -2,10 +2,10 @@
 
 <<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check">>
 
-<<set $i = $slaveIndices[$alphaTwin.ID]>>
-<<set $j = $slaveIndices[$betaTwin.ID]>>
+<<set $i = $slaveIndices[$alphaTwin]>>
+<<set $j = $slaveIndices[$betaTwin]>>
 
-$alphaTwin.slaveName and $betaTwin.slaveName are such good and devoted slaves that they happily do everything together. They sleep in each other's arms, bathe together, work together whenever they can, and fuck together. For a while they masturbated together until they became so habituated to sexual slavery that they stopped seeing much distinction between masturbation and sex with one another. At the moment, they're getting ready for their day, chatting quietly and helping each other.
+$slaves[$i].slaveName and $slaves[$j].slaveName are such good and devoted slaves that they happily do everything together. They sleep in each other's arms, bathe together, work together whenever they can, and fuck together. For a while they masturbated together until they became so habituated to sexual slavery that they stopped seeing much distinction between masturbation and sex with one another. At the moment, they're getting ready for their day, chatting quietly and helping each other.
 <br><br>
 <span id="result">
 <<link "Take them out for the morning">>
@@ -18,7 +18,7 @@ $alphaTwin.slaveName and $betaTwin.slaveName are such good and devoted slaves th
 <</link>>
 <br><<link "Use them side by side">>
 	<<replace "#result">>
-	<br>Slave twins inevitably get used to threesomes with their sibling, and $alphaTwin.slaveName and $betaTwin.slaveName are no exception. They greet you with every appearance of arousal and begin a carefully balanced routine - foreplay with you, of course, but whatever parts of them aren't working on you work on the other slave. They stroke you while making out, stroke each other while sucking you to rock hardness, and finger each others' holes while <<if $PC.vagina == 1>>crowding their faces against your pussy. You reach down and seize a nipple in each hand, pulling them upward so they can suck your nipples instead; they use manual stimulation to keep you going while they do. With one straddling each of your thighs, grinding shamelessly, you can reach around and molest their butts with your own hands.<<else>>rubbing four breasts up and down your dick. Since you only have one cock, the symmetry ends when you start fucking them. As you switch from hole to hole, whichever twin isn't getting fucked at the moment uses her mouth and hands to stimulate your balls and her twin's fuckhole as you pound it. When you finally cum in $betaTwin.slaveName, $alphaTwin.slaveName sucks it out and they kiss deeply to share your ejaculate.<</if>> @@.hotpink;They have both become more devoted to you.@@
+	<br>Slave twins inevitably get used to threesomes with their sibling, and $slaves[$i].slaveName and $slaves[$j].slaveName are no exception. They greet you with every appearance of arousal and begin a carefully balanced routine - foreplay with you, of course, but whatever parts of them aren't working on you work on the other slave. They stroke you while making out, stroke each other while sucking you to rock hardness, and finger each others' holes while <<if $PC.vagina == 1>>crowding their faces against your pussy. You reach down and seize a nipple in each hand, pulling them upward so they can suck your nipples instead; they use manual stimulation to keep you going while they do. With one straddling each of your thighs, grinding shamelessly, you can reach around and molest their butts with your own hands.<<else>>rubbing four breasts up and down your dick. Since you only have one cock, the symmetry ends when you start fucking them. As you switch from hole to hole, whichever twin isn't getting fucked at the moment uses her mouth and hands to stimulate your balls and her twin's fuckhole as you pound it. When you finally cum in $slaves[$j].slaveName, $slaves[$i].slaveName sucks it out and they kiss deeply to share your ejaculate.<</if>> @@.hotpink;They have both become more devoted to you.@@
 
 	<<set $slaves[$i].devotion += 4, $slaves[$j].devotion += 4>>
 
diff --git a/src/uncategorized/reDevotees.tw b/src/uncategorized/reDevotees.tw
index 245b78fcf280cb2a981549d96e9a8140c724528d..6219ce748c74728a3c2b4dc8831bb60c0a81bd82 100644
--- a/src/uncategorized/reDevotees.tw
+++ b/src/uncategorized/reDevotees.tw
@@ -2,10 +2,10 @@
 
 <<set $nextButton = "Continue">>
 <<set $nextLink = "RIE Eligibility Check">>
-<<set _i = $slaveIndices[$devotedSlaves[0].ID]>>
-<<set _j = $slaveIndices[$devotedSlaves[1].ID]>>
-<<set _k = $slaveIndices[$devotedSlaves[2].ID]>>
-<<set _l = $slaveIndices[$devotedSlaves[3].ID]>>
+<<set _i = $slaveIndices[$devotedSlaves[0]]>>
+<<set _j = $slaveIndices[$devotedSlaves[1]]>>
+<<set _k = $slaveIndices[$devotedSlaves[2]]>>
+<<set _l = $slaveIndices[$devotedSlaves[3]]>>
 
 /* 000-250-006 */
 <<if $seeImages == 1>>
diff --git a/src/uncategorized/reFullBed.tw b/src/uncategorized/reFullBed.tw
index 3ace05808ffedef51604bef22f9661f1b1d45f0e..480a41755c582ce5652a5e24b63fd4fe7e577359 100644
--- a/src/uncategorized/reFullBed.tw
+++ b/src/uncategorized/reFullBed.tw
@@ -2,8 +2,8 @@
 
 <<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check">>
 
-<<set _bedSlaveOne = $slaveIndices[$bedSlaves[0].ID]>>
-<<set _bedSlaveTwo = $slaveIndices[$bedSlaves[1].ID]>>
+<<set _bedSlaveOne = $slaveIndices[$bedSlaves[0]>>
+<<set _bedSlaveTwo = $slaveIndices[$bedSlaves[1]>>
 
 /* 000-250-006 */
 <<if $seeImages == 1>>
diff --git a/src/uncategorized/reRebels.tw b/src/uncategorized/reRebels.tw
index 90419d4b20ea5387e979c6bb081efb68e7a004f3..c181aaea957afa0893265024c4027407496ca534 100644
--- a/src/uncategorized/reRebels.tw
+++ b/src/uncategorized/reRebels.tw
@@ -2,8 +2,8 @@
 
 <<set $nextButton = "Continue">>
 <<set $nextLink = "RIE Eligibility Check">>
-<<set _i = $slaves.findIndex(function(s) { return s.ID == $rebelSlaves[0].ID; })>>
-<<set _j = $slaves.findIndex(function(s) { return s.ID == $rebelSlaves[1].ID; })>>
+<<set _i = $slaveIndices[$rebelSlaves[0]]>>
+<<set _j = $slaveIndices[$rebelSlaves[1]]>>
 
 
 You have a rebel problem. $slaves[_i].slaveName and $slaves[_j].slaveName are both unbroken, and they seem to draw strength from each other. They're discreet about it, but the arcology's always-vigilant systems occasionally catch them nodding to one another after one of them is punished, or giving each other quiet words of encouragement when they think no one is listening. This is extremely dangerous and should be addressed promptly.
diff --git a/src/uncategorized/reSiblingRevenge.tw b/src/uncategorized/reSiblingRevenge.tw
index 65e303e82021778b409af29652bca8c1b00fd9f3..967ef475fdd4d8bb7b76f94be11a69220190df6d 100644
--- a/src/uncategorized/reSiblingRevenge.tw
+++ b/src/uncategorized/reSiblingRevenge.tw
@@ -2,10 +2,10 @@
 
 <<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check">>
 
-<<set $i = $slaves.findIndex(function(s) { return s.ID == $youngerSister.ID; })>>
-<<set $j = $slaves.findIndex(function(s) { return s.ID == $olderSister.ID; })>>
+<<set $i = $slaveIndices[$youngerSister]>>
+<<set $j = $slaveIndices[$olderSister]>>
 
-$youngerSister.slaveName, whose older sister tried to sell her to you, is up for inspection. As usual, you pepper your inspection with questions about her duties, her feelings about her physical condition, and experiences. More information about one's property is never a bad thing. When the inspection reaches $youngerSister.slaveName's asshole, you ask whether she enjoyed having her older sister sell her butt.
+$slaves[$i].slaveName, whose older sister tried to sell her to you, is up for inspection. As usual, you pepper your inspection with questions about her duties, her feelings about her physical condition, and experiences. More information about one's property is never a bad thing. When the inspection reaches $slaves[$i].slaveName's asshole, you ask whether she enjoyed having her older sister sell her butt.
 
 "No, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>," she says.
 
@@ -14,15 +14,15 @@ $youngerSister.slaveName, whose older sister tried to sell her to you, is up for
 <span id="result">
 <br><<link "Turnabout is fair play">>
 	<<replace "#result">>
-	$olderSister.slaveName is brought in. You gag her, throw the resisting bitch down on the couch, and hold her there. Then, you peremptorily order the wide-eyed $youngerSister.slaveName to <<if canDoAnal($olderSister)>>sodomize<<else>>face-fuck<</if>> her sister. She stares open mouthed for a moment, but comes over obediently. Her face is a strange mix of vengeful eagerness, revulsion, and even a little lust. She shoves herself into the frantically struggling girl's <<if canDoAnal($olderSister)>>butt<<else>>jaw<</if>> without mercy. Her cock is pathetically small, but by how $olderSister.slaveName reacts it might as well be a baseball bat. $youngerSister.slaveName rarely gets to penetrate anything, mostly serving as an oral slut<<if canDoAnal($youngerSister)>> and anal cocksleeve<</if>>, so she comes in no time and takes a turn holding $olderSister.slaveName down <<if canDoAnal($olderSister)>>so you can claim sloppy seconds on her spasming butthole<</if>>.
-	@@.hotpink;$youngerSister.slaveName has become more devoted to you,@@ while $olderSister.slaveName @@.mediumorchid;hates you@@ and has become @@.gold;more afraid of you,@@<<if canDoAnal($olderSister)>> and @@.lime;$olderSister.slaveName has lost her anal virginity.@@<<else>>.<</if>>
+	$slaves[$j].slaveName is brought in. You gag her, throw the resisting bitch down on the couch, and hold her there. Then, you peremptorily order the wide-eyed $slaves[$i].slaveName to <<if canDoAnal($slaves[$j])>>sodomize<<else>>face-fuck<</if>> her sister. She stares open mouthed for a moment, but comes over obediently. Her face is a strange mix of vengeful eagerness, revulsion, and even a little lust. She shoves herself into the frantically struggling girl's <<if canDoAnal($slaves[$j])>>butt<<else>>jaw<</if>> without mercy. Her cock is pathetically small, but by how $slaves[$j].slaveName reacts it might as well be a baseball bat. $slaves[$i].slaveName rarely gets to penetrate anything, mostly serving as an oral slut<<if canDoAnal($slaves[$i])>> and anal cocksleeve<</if>>, so she comes in no time and takes a turn holding $slaves[$j].slaveName down <<if canDoAnal($slaves[$j])>>so you can claim sloppy seconds on her spasming butthole<</if>>.
+	@@.hotpink;$slaves[$i].slaveName has become more devoted to you,@@ while $slaves[$j].slaveName @@.mediumorchid;hates you@@ and has become @@.gold;more afraid of you,@@<<if canDoAnal($slaves[$j])>> and @@.lime;$slaves[$j].slaveName has lost her anal virginity.@@<<else>>.<</if>>
 	<<set $slaves[$i].devotion += 4>>
 	<<set $slaves[$i].penetrativeCount += 1>>
 	<<set $penetrativeTotal += 1>>
 
 	<<set $slaves[$j].trust -= 5>>
 	<<set $slaves[$j].devotion -= 4>>
-	<<if canDoAnal($olderSister)>>
+	<<if canDoAnal($slaves[$j])>>
 		<<set $slaves[$j].anus = 1>>
 		<<set $slaves[$j].analCount += 1>>
 		<<set $analTotal += 1>>
@@ -34,10 +34,10 @@ $youngerSister.slaveName, whose older sister tried to sell her to you, is up for
 <</link>>
 <br><<link "Let her have her revenge, but remind her of her place">>
 	<<replace "#result">>
-	$olderSister.slaveName is brought in. You gag her, throw the resisting bitch down on the couch, and hold her there. Then, you peremptorily order the wide-eyed $youngerSister.slaveName to put her cock <<if canDoAnal($olderSister)>>up her sister's ass<<else>>in her sister's mouth<</if>>, and then hold it there. She stares open mouthed for a moment, but comes over obediently. Her face is a strange mix of vengeful eagerness, revulsion, and even a little lust. She shoves herself into the frantically struggling girl's <<if canDoAnal($olderSister)>>butt<<else>>jaw<</if>> without mercy. Her cock is pathetically small, but by how $olderSister.slaveName reacts it might as well be a baseball bat. $youngerSister.slaveName obeys your orders and holds still after inserting herself. You<<if $PC.dick == 0>> don a strap-on,<</if>> move around <<if canDoAnal($youngerSister)>>behind her and start ass<<else>>in front of her and start face-<</if>>fucking her in turn, slowly permitting her to find a rhythm where she can fuck and get fucked at the same time. She's getting it much harder than she's giving it but she's experienced enough that she comes quickly.
-	@@.hotpink;$youngerSister.slaveName has become more devoted to you,@@ while @@.mediumorchid;$olderSister.slaveName has become more rebellious,@@<<if canDoAnal($olderSister)>> and @@.lime;$olderSister.slaveName has lost her anal virginity.@@<<else>>.<</if>>
+	$slaves[$j].slaveName is brought in. You gag her, throw the resisting bitch down on the couch, and hold her there. Then, you peremptorily order the wide-eyed $slaves[$i].slaveName to put her cock <<if canDoAnal($slaves[$j])>>up her sister's ass<<else>>in her sister's mouth<</if>>, and then hold it there. She stares open mouthed for a moment, but comes over obediently. Her face is a strange mix of vengeful eagerness, revulsion, and even a little lust. She shoves herself into the frantically struggling girl's <<if canDoAnal($slaves[$j])>>butt<<else>>jaw<</if>> without mercy. Her cock is pathetically small, but by how $slaves[$j].slaveName reacts it might as well be a baseball bat. $slaves[$i].slaveName obeys your orders and holds still after inserting herself. You<<if $PC.dick == 0>> don a strap-on,<</if>> move around <<if canDoAnal($slaves[$i])>>behind her and start ass<<else>>in front of her and start face-<</if>>fucking her in turn, slowly permitting her to find a rhythm where she can fuck and get fucked at the same time. She's getting it much harder than she's giving it but she's experienced enough that she comes quickly.
+	@@.hotpink;$slaves[$i].slaveName has become more devoted to you,@@ while @@.mediumorchid;$slaves[$j].slaveName has become more rebellious,@@<<if canDoAnal($slaves[$j])>> and @@.lime;$slaves[$j].slaveName has lost her anal virginity.@@<<else>>.<</if>>
 	<<set $slaves[$i].devotion += 4>>
-	<<if canDoAnal($youngerSister)>>
+	<<if canDoAnal($slaves[$i])>>
 		<<set $slaves[$i].analCount += 1>>
 		<<set $analTotal += 1>>
 	<<else>>
@@ -48,7 +48,7 @@ $youngerSister.slaveName, whose older sister tried to sell her to you, is up for
 	<<set $penetrativeTotal += 1>>
 
 	<<set $slaves[$j].devotion -= 5>>
-	<<if canDoAnal($olderSister)>>
+	<<if canDoAnal($slaves[$j])>>
 		<<set $slaves[$j].anus = 1>>
 		<<set $slaves[$j].analCount += 2>>
 		<<set $analTotal += 2>>
diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw
index d098fc5e751f6591a416e458b6eccf915c9e22a8..f1e804a4eb3d073bf9f0af542c079b9db7e3efaf 100644
--- a/src/uncategorized/saServeThePublic.tw
+++ b/src/uncategorized/saServeThePublic.tw
@@ -209,7 +209,7 @@ the public.
 <</if>>
 <<set $beauty = Math.trunc($beauty*$beautyMultiplier)>>
 
-Her appearance attracted $beauty members of the public (<<print Math.trunc($beauty/7)>> a day)<<if $beauty > 160>>, so many that each of her holes was often filled by more than one cock<<elseif $beauty > 140>>, so many that she spent much of her time getting gangbanged<<elseif $beauty > 120>>, so many that citizens often spitroasted the slut<<elseif $beauty > 100>>, so many that she frequently had sex with multiple citizens at once<<elseif $beauty > 70>>, so many that she occasionally had sex with multiple citizens at once<</if>>. Most of them
+Her appearance attracted $beauty members of the public (<<print Math.trunc($beauty/7)>> a day)<<if $beauty > 160>>, so many that <<if canDoVaginal($slaves[$i]) && canDoAnal($slaves[$i])>>each of her holes were<<elseif canDoVaginal($slaves[$i]) || canDoAnal($slaves[$i])>>each of her available holes were<<else>>her mouth and anywhere else a dick could fit were<</if>> often filled by more than one cock<<elseif $beauty > 140>>, so many that she spent much of her time getting gangbanged<<elseif $beauty > 120>>, so many that citizens often spitroasted the slut<<elseif $beauty > 100>>, so many that she frequently had sex with multiple citizens at once<<elseif $beauty > 70>>, so many that she occasionally had sex with multiple citizens at once<</if>>. Most of them
 <<if $FResult > 15>>
 	were putty in her hands.
 <<elseif $FResult > 10>>
diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw
index 5743340c56f84bebe44b4125e2426cafd1057297..03ecaa222ea3c8398d4173a7b1b8ac6da164e81d 100644
--- a/src/uncategorized/saWhore.tw
+++ b/src/uncategorized/saWhore.tw
@@ -202,7 +202,7 @@ her body.
 <</if>>
 <<set $beauty = Math.trunc($beauty*$beautyMultiplier)>>
 
-Her appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a day)<<if $beauty > 160>>, so many that each of her holes was often filled by more than one cock<<elseif $beauty > 140>>, so many that she spent much of her time getting gangbanged<<elseif $beauty > 120>>, so many that customers often spitroasted the slut<<elseif $beauty > 100>>, so many that she frequently had sex with multiple customers at once<<elseif $beauty > 70>>, so many that she occasionally had sex with multiple customers at once<</if>>. They paid <<print cashFormat($FResult)>> on average.
+Her appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a day)<<if $beauty > 160>>, so many that <<if canDoVaginal($slaves[$i]) && canDoAnal($slaves[$i])>>each of her holes was<<elseif canDoVaginal($slaves[$i]) || canDoAnal($slaves[$i])>>each of her available holes was<<else>>her mouth and anywhere else a cock could fit was<</if>>often filled by more than one cock<<elseif $beauty > 140>>, so many that she spent much of her time getting gangbanged<<elseif $beauty > 120>>, so many that customers often spitroasted the slut<<elseif $beauty > 100>>, so many that she frequently had sex with multiple customers at once<<elseif $beauty > 70>>, so many that she occasionally had sex with multiple customers at once<</if>>. They paid <<print cashFormat($FResult)>> on average.
 <<set _incomeStats.customers = $beauty>>
 
 <<if $seeAge == 1>>
diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index 9b92f7e0ea2abae12957b43eb6d34ddca8e758df..14714d30870154e21ce4b9de283e1bfcbc6abf17 100644
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw
@@ -237,9 +237,9 @@
 %/
 	<<default>> /* WALKPASTS START HERE */
 
-		<<if (_partnerSlave.heels == 1) && !["flats", "flats with short stockings", "flats with long stockings", "none"].includes(_partnerSlave.shoes)>>
+		<<if ($activeSlave.heels == 1) && !["flats", "flats with short stockings", "flats with long stockings", "none"].includes($activeSlave.shoes)>>
 			walks past your desk with the tiny swaying steps she must take in order to walk on her surgically altered legs. She is on her way to
-		<<elseif ["heels", "heels with short stockings", "heels with long stockings", "pumps", "pumps with short stockings", "pumps with long stockings"].includes(_partnerSlave.shoes)>>
+		<<elseif ["heels", "heels with short stockings", "heels with long stockings", "pumps", "pumps with short stockings", "pumps with long stockings"].includes($activeSlave.shoes)>>
 			walks past your desk with the swaying steps she must take in her high heels. She is on her way to
 		<<elseif ($activeSlave.shoes == "boots")>>
 			walks past your desk with the confident gait encouraged by her high heeled boots. She is on her way to