diff --git a/src/npc/abort.tw b/src/npc/abort.tw
index c92c485f7799d629e8302279afdfcfce2f8b7d86..42f9e0d2a88934b8de3b78bd4ba8a2caca906e39 100644
--- a/src/npc/abort.tw
+++ b/src/npc/abort.tw
@@ -12,7 +12,7 @@ The remote surgery makes aborting a pregnancy quick and efficient. $activeSlave.
 	<<set $activeSlave.trust -= 10, $activeSlave.devotion -= 25>>
 <<elseif $activeSlave.devotion < -20>>
 	@@.mediumorchid;afflicted by desperate, inconsolable sobbing@@. Even though she knew her baby was destined for a slave orphanage, it seems she cared for it. She is @@.gold;terrified of your power@@ over her body.
-	<<set  $activeSlave.trust -= 10, $activeSlave.devotion -= 10>>
+	<<set $activeSlave.trust -= 10, $activeSlave.devotion -= 10>>
 <<elseif $activeSlave.devotion <= 20>>
 	@@.mediumorchid;consumed by muted weeping and enduring sorrow@@. Even though she knew her baby was destined for a slave orphanage, it seems she cared for it. She is @@.gold;terrified of your power@@ over her body.
 	<<set $activeSlave.trust -= 10, $activeSlave.devotion -= 5>>
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index da9f6d4d0b30e386e6364b21ffaacc2c2a7ad42b..9f572b966ae7d287334f6c8d1bda2e6b9393383a 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -611,16 +611,8 @@ The previous owner seems to have left in something of a hurry.
 <<set _slavesContributing = 0>>
 <<for $i = 0; $i < $slaves.length; $i++>>
 	<<if $slaves[$i].relation != 0>>
-	<<set $seed = 0>>
-	<<for $j = 0; $j < $slaves.length; $j++>>
-		<<if $slaves[$i].relationTarget == $slaves[$j].ID>>
-		<<if $slaves[$j].relationTarget == $slaves[$i].ID>>
-		<<set $seed = 1>>
-		<<break>>
-		<</if>>
-		<</if>>
-	<</for>>
-	<<if $seed == 0>>
+	<<set $seed = $slaves.findIndex(function(s) { return $slaves[$i].relationTarget == s.ID && s.relationTarget == $slaves[$i].ID; })>>
+	<<if $seed == -1>>
 		<<set $slaves[$i].relation = 0>>
 		<<set $slaves[$i].relationTarget = 0>>
 		<<goto "Acquisition">>
diff --git a/src/npc/agent/agentCompany.tw b/src/npc/agent/agentCompany.tw
index e868f94cb8ae37577c4db787b57cdf9b664be008..61ce540009bf62bb27fb0176bc21776cce8888b2 100644
--- a/src/npc/agent/agentCompany.tw
+++ b/src/npc/agent/agentCompany.tw
@@ -1,6 +1,6 @@
 :: Agent Company [nobr]
 
-<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Neighbor Interact", _SL = $slaves.length, _ID = $activeSlave.ID>>
+<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Neighbor Interact", _ID = $activeSlave.ID>>
 
 <<assignJob $activeSlave "live with your agent">>
 
@@ -10,12 +10,12 @@
 <</if>>
 
 <<if $activeSlave.rivalry > 0>>
-	<<for _i = 0; _i < _SL; _i++>>
-		<<if _ID == $slaves[_i].rivalryTarget>>
-			<<set $slaves[_i].rivalry = 0, $slaves[_i].rivalryTarget = 0>>
-			<<break>>
-		<</if>>
-	<</for>>
+	<<set _i = $slaves.findIndex(function(s) { return s.rivalryTarget == _ID; })>>
+	<<if _i != -1>>
+		<<set $slaves[_i].rivalry = 0, $slaves[_i].rivalryTarget = 0>>
+	<<else>>
+		@@.red;Error, activeSlave rival not found.@@
+	<</if>>
 	<<set $activeSlave.rivalry = 0, $activeSlave.rivalryTarget = 0>>
 <</if>>
 
@@ -30,7 +30,7 @@ Working in $activeArcology.name's penthouse office, $subSlave.slaveName gets a v
 <br><br>
 
 Her question is answered when you bring $activeSlave.slaveName in close, putting her in $subSlave.slaveName's view. $subSlave.slaveName's $subSlave.eyeColor eyes fly open with pleased surprise, but before she can speak, $activeSlave.slaveName goes first.
-<<if canTalk($activeSlave) == false>>
+<<if !canTalk($activeSlave)>>
   Unable to speak herself, she simply makes a heart shape with her hands in view of the video call, and blows her <<if $activeSlave.relationship == 4>>lover<<else>>wife<</if>> a kiss.
 <<else>>
   <<Enunciate $activeSlave>>
diff --git a/src/npc/agent/agentWorkaround.tw b/src/npc/agent/agentWorkaround.tw
index 859280c64c0e5ef375b885799bdeb994737a0f33..53102f94d1f58c7ad703c759fe98f58b06d9244b 100644
--- a/src/npc/agent/agentWorkaround.tw
+++ b/src/npc/agent/agentWorkaround.tw
@@ -10,22 +10,22 @@
 <</if>>
 
 <<if $slaves[$i].rivalry > 0>>
-	<<for _i = 0; _i < _SL; _i++>>
-		<<if _ID == $slaves[_i].rivalryTarget>>
-			<<set $slaves[_i].rivalry = 0, $slaves[_i].rivalryTarget = 0>>
-			<<break>>
-		<</if>>
-	<</for>>
+	<<set _i = $slaves.findIndex(function(s) { return s.rivalryTarget == _ID; })>>
+	<<if _i != -1>>
+		<<set $slaves[_i].rivalry = 0, $slaves[_i].rivalryTarget = 0>>
+	<<else>>
+		@@.red;Error, rival not found.@@
+	<</if>>
 	<<set $slaves[$i].rivalry = 0, $slaves[$i].rivalryTarget = 0>>
 <</if>>
 
 <<if $slaves[$i].relationship > 0 && $slaves[$i].relationship < 4>>
-	<<for _i = 0;_i < _SL;_i++>>
-		<<if _ID == $slaves[_i].relationshipTarget>>
-			<<set $slaves[_i].relationship = 0, $slaves[_i].relationshipTarget = 0>>
-			<<break>>
-		<</if>>
-	<</for>>
+	<<set _i = $slaves.findIndex(function(s) { return s.relationshipTarget == _ID; })>>
+	<<if _i != -1>>
+		<<set $slaves[_i].relationship = 0, $slaves[_i].relationshipTarget = 0>>
+	<<else>>
+		@@.red;Error, relationshipTarget not found.@@
+	<</if>>
 	<<set $slaves[$i].relationship = 0, $slaves[$i].relationshipTarget = 0>>
 <</if>>
 
diff --git a/src/npc/descriptions/fAnus.tw b/src/npc/descriptions/fAnus.tw
index 02ad7633c84a1086b15cc6fbe6010129936da488..7fef9578a70cf089d45c70b6d228f278455d1b29 100644
--- a/src/npc/descriptions/fAnus.tw
+++ b/src/npc/descriptions/fAnus.tw
@@ -57,7 +57,7 @@ Her anus is invitingly bleached,
 		<<set $activeSlave.devotion += 4>>
 	<<elseif ($activeSlave.devotion >= -20)>>
 		She is clearly unhappy at the idea of taking a dick up her butt. She obeys orders anyway, and lies there wincing and moaning as you<<if ($PC.dick == 0)>> don a strap-on and<</if>> fuck her ass. You gently ease into her butthole and slowly accelerate your thrusting into her ass. However she still squeals in pain as you continue pounding. @@.lime;Her tight little ass has been broken in,@@ and she @@.gold;fears further anal pain.@@
-		<<set  $activeSlave.trust -= 5>>
+		<<set $activeSlave.trust -= 5>>
 	<<else>>
 		She is appalled at the idea of taking it up the ass<<if ($PC.dick == 0)>> and cries with fear as you don a strap-on<</if>>. She does anyway though, sobbing into the cushions<<if $activeSlave.amp != 1>> while you hold her arms behind her<</if>>. You force yourself into her butthole and continue thrusting your member into her ass. She sobs and cries with disgust while you pump into her rear. The painful anal rape @@.mediumorchid;decreases her devotion to you.@@ @@.lime;Her tight little ass has been broken in,@@ and she is @@.gold;terrified of further anal pain.@@
 		<<set $activeSlave.devotion -= 10, $activeSlave.trust -= 10>>
@@ -95,7 +95,7 @@ Her anus is invitingly bleached,
 	<</if>>
 <<elseif ($activeSlave.devotion <= 20) && ($activeSlave.vagina < 0)>>
 	<<if ($activeSlave.amp != 1)>>You instruct her to present her anus<<if ($PC.dick == 0)>> as you don a strap-on<</if>>. She knows a sissy slave takes it up the butt, and lies on the couch next to your desk with her legs in the air, spreading her buttocks with her hands.<<else>>You tell her it's time for an assfuck. She's hesitant, but as an amputee can do nothing about it.<</if>> You take your time and fuck her <<if $seeRace == 1>>$activeSlave.race <</if>>butthole for a good long while<<if ($activeSlave.dickAccessory != "chastity")>><<if ($activeSlave.dick != 0)>>so her limp dick flops around<<elseif ($activeSlave.balls != 0)>> as her erect dick waves in the air<</if>><</if>>. This gives you enough time to stroke her until she gets aroused despite her discomfort with anal. She doesn't orgasm, but she's getting accustomed to her asshole as a sexual organ.
-<<elseif  $activeSlave.devotion < 10>>
+<<elseif $activeSlave.devotion < 10>>
 	<<if ($activeSlave.amp != 1)>>You instruct her to present her <<if $seeRace == 1>>$activeSlave.race <</if>>anus<<if ($PC.dick == 0)>> as you don a strap-on<</if>>. She hesitates but eventually lies on the couch next to your desk with her legs in the air, spreading her buttocks with her hands.<<else>>You tell her it's time for an assfuck. She's hesitant, but as an amputee can do nothing about it.<</if>> You take your time and fuck her butthole for a good long while.
 	<<if ($activeSlave.anus == 1)>>
 		Her ass is so tight that she winces with anal pain
@@ -215,12 +215,7 @@ Her anus is invitingly bleached,
 <</if>>
 
 <<if passage() != "Slave Interact">>
-<<set _SL = $slaves.length>>
-<<for _i = 0; _i < _SL; _i++>>
-	<<if $slaves[_i].ID == $activeSlave.ID>>
+	<<set _i = $slaves.findIndex(function(s) { return s.ID == $activeSlave.ID; })>>
 	<<set $slaves[_i] = $activeSlave>>
-	<<break>>
-	<</if>>
-<</for>>
 <</if>>
 <<set _Anus = "">>
diff --git a/src/npc/descriptions/fBoobs.tw b/src/npc/descriptions/fBoobs.tw
index 1c9b2b4041a54c0bc74f66b8c59ea42c1c68d552..103653fc586c0ab1798a50e23595392b6e06da72 100644
--- a/src/npc/descriptions/fBoobs.tw
+++ b/src/npc/descriptions/fBoobs.tw
@@ -65,7 +65,7 @@ tits.
 		<<elseif ($activeSlave.boobs >= 650)>>
 		Her big breasts fill the area under your pregnancy nicely. You thrust between them and the underside of your middle, all the while rubbing your pussy into her face. With her licking, and all the flesh against your cock, it doesn't take long for you to soak her face and plant your seed deep into her cleavage.
 		<<elseif ($activeSlave.boobs >= 300)>>
-		You have to feel around under your pregnancy to hold your cock against her tiny breasts. You thrust against them and  your hand, while the other teases your middle, all the while rubbing your pussy against her face. Between her licking, and your own teasing, it doesn't take long for you to soak her face and splatter your seed across her front.
+		You have to feel around under your pregnancy to hold your cock against her tiny breasts. You thrust against them and your hand, while the other teases your middle, all the while rubbing your pussy against her face. Between her licking, and your own teasing, it doesn't take long for you to soak her face and splatter your seed across her front.
 		<<else>>
 		You have to lean forward and pin your cock against her flat chest with the underside of your own pregnancy to make any real channel to thrust into. You fondle your belly<<if $PC.boobs > 0>> and breasts<</if>>, all the while rubbing your pussy against her face. Between her licking, and your own teasing, it doesn't take long for you to soak her face and splatter your seed across your underbelly and her front. You turn around and have her lick you clean before pulling your gravid bulk off of her.
 		<</if>>
@@ -84,13 +84,13 @@ tits.
 		<<elseif ($activeSlave.boobs >= 300)>>
 		Her tiny breasts are completely covered by your pregnancy. You reach under yourself, grabbing what you can of her breasts and pushing them against your crotch. Between rubbing her breasts against your self and her tongue in your pussy, you quickly climax, thoroughly soaking her.
 		<<else>>
-		Her flat chest is completely covered by your pregnancy. Reach under yourself, you feel around until you find her nipples. You tease her flat chest until you're at you limit, thoroughly soaking her, before dimsounting and returning to your desk.
+		Her flat chest is completely covered by your pregnancy. Reach under yourself, you feel around until you find her nipples. You tease her flat chest until you're at you limit, thoroughly soaking her, before dismounting and returning to your desk.
 		<</if>>
 	<</if>>
 <<elseif ($activeSlave.amp == 1)>>
 	<<if $PC.dick == 1>>
 		Her limbless <<if $seeRace == 1>>$activeSlave.race <</if>>torso makes her a unique appliance for mammary intercourse. You lay her down on the ground on her back, lube her cleavage, and straddle her torso. With your cock between her breasts, you <<if ($activeSlave.boobs gt 650)>>squash her tits together to form a nice lubricated channel,<<else>>hold your cock in place,<</if>> and ride back and forth on her.<<if $PC.vagina == 1>> Your pussylips rub deliciously across her sternum.<</if>> She has some trouble breathing under the assault, but she manages. And for the finale, she's totally unable to avoid a perfect cumshot.
-	<<elseif $PC.boobs isnot 0>>
+	<<elseif $PC.boobs != 0>>
 		You set her limbless torso upright on your lap, facing you, so that your breasts and hers are resting heavily against one another. She turns her head to avoid getting splashed in the eyes as you add a generous coating of oil to the heaving breastflesh. You reach around to grab her by the hips and slide her up and down, giving you both a wonderful mammary oil massage.
 	<<else>>
 		You set her limbless torso on the floor, and tease her for a while until her nipples are rock hard. This done, you kneel down on her with each of your legs aside her torso, and hump your pussy back and forth on the stiff nub of one nipple. She lies there, unable to do anything but comply, squirming with the stimulation.
@@ -128,7 +128,7 @@ tits.
 	She comes over eagerly, with hunger in her eyes. She gives you a titjob with her lubricated cleavage while you sit at your desk. As a cumslut she's almost desperate to get your cum into her <<if $seeRace == 1>>$activeSlave.race <</if>>mouth and <<if canAchieveErection($activeSlave)>>jacks herself off<<else>>rubs her sadly limp member<</if>> in anticipation. When you finish, she sits back with an ecstatic look on her face and lets your cum rest in her mouth as she climaxes into her hand. She pours her own cum from her hand into her mouth so it can mingle with yours.
 <<elseif ($activeSlave.fetish == "cumslut") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1) && ($PC.dick == 1)>>
 	She comes over eagerly, with hunger in her eyes. She gives you a titjob with her lubricated cleavage while you sit at your desk. As a cumslut she's almost desperate to get your cum into her <<if $seeRace == 1>>$activeSlave.race <</if>>mouth and rubs herself in anticipation. When you finish, she <<if $PC.vagina == 1>>quickly swallows and then runs her hot tongue down to your wet pussy, eagerly licking your juices<<else>>sits back with an ecstatic look on her face and lets your cum rest in her mouth as she climaxes<</if>>.
-<<elseif  $activeSlave.devotion < -20>>
+<<elseif $activeSlave.devotion < -20>>
 	She tries to refuse you, so you throw her down on the couch next to your desk and
 	<<if $PC.dick == 1>>
 		squeeze lubricant between her $activeSlave.skin breasts. You straddle her torso, hold her boobs together, and fuck her cleavage<<if $PC.vagina == 1>>, grinding your hips down against her to stimulate your pussy<</if>>. Your cum splashes her crying face.
@@ -146,7 +146,7 @@ tits.
 	<<else>>
 		desk, and you've straddled her face before she can do anything more. You begin to grope her breasts and pinch her nipples to hardness as she eats you out, your ministrations producing prompt jets of creamy milk, straight up into the air. You milk her without mercy, shooting some of the stronger streams into your mouth as you ride her, leaving her to massage her breasts gingerly as you get off her face.
 	<</if>>
-<<elseif  $activeSlave.devotion <= 20>>
+<<elseif $activeSlave.devotion <= 20>>
 	She lies on the couch next to your
 	<<if $PC.dick == 1>>
 		desk and rubs lube over her <<if $seeRace == 1>>$activeSlave.race <</if>>chest so you can fuck her $activeSlave.skin tits. You straddle her torso, hold her boobs together, and fuck her cleavage. Your cum covers her reluctant face<<if $PC.vagina == 1>>, and you hike yourself up a little higher to grind your pussy against her mouth<</if>>.
@@ -213,10 +213,6 @@ tits.
 <</if>>
 
 <<if passage() !== "Slave Interact">>
-<<for _i = 0; _i < $slaves.length; _i++>>
-	<<if $slaves[_i].ID == $activeSlave.ID>>
+	<<set _i = $slaves.findIndex(function(s) { return s.ID == $activeSlave.ID; })>>
 	<<set $slaves[_i] = $activeSlave>>
-	<<break>>
-	<</if>>
-<</for>>
 <</if>>
diff --git a/src/npc/descriptions/fButt.tw b/src/npc/descriptions/fButt.tw
index 0065c85373112c7d7b4eeefc8ec611e152dc3b3b..fa4e073a72f6c5a16ba03bd9ae4b0c19ce928f19 100644
--- a/src/npc/descriptions/fButt.tw
+++ b/src/npc/descriptions/fButt.tw
@@ -182,7 +182,7 @@ Her anus is invitingly bleached,
 	<</if>>
 <<elseif (random(1,100) > (110-$activeSlave.devotion))>>
 	<<if ($activeSlave.fetish == "none") && ($activeSlave.sexualFlaw !== "hates penetration")>>
-		Orgasming to your use of her fuckhole @@.lightcoral;has her eager for more  buttsex.@@
+		Orgasming to your use of her fuckhole @@.lightcoral;has her eager for more buttsex.@@
 		<<set $activeSlave.fetish = "buttslut", $activeSlave.fetishKnown = 1>>
 	<</if>>
 <</if>>
diff --git a/src/npc/descriptions/fFuckdollWidgets.tw b/src/npc/descriptions/fFuckdollWidgets.tw
index 319a34038fa6cb4a03593584d92e75bb8858bf7f..169364f74053cee1ccc66fc137ffb8643cd736fa 100644
--- a/src/npc/descriptions/fFuckdollWidgets.tw
+++ b/src/npc/descriptions/fFuckdollWidgets.tw
@@ -10,7 +10,7 @@ You decide to use the Fuckdoll's <<if $activeSlave.lips > 95>>facepussy<<else>>f
 <<elseif $activeSlave.fuckdoll <= 80>>
 	It can follow intermediate commands, so you order it into a position for use of its face hole. It obediently <<if $activeSlave.amp == 0>>gets to its knees<<else>>cranes its neck up<</if>> and sticks its tongue out as far as it will go, wiggling it invitingly. You straddle its face.
 <<else>>
-	It can follow advanced commands, so you order it into a position for use of its face hole. It instantly <<if $activeSlave.amp == 0>><<if $PC.dick == 1>>bends at the waist and turns its head upward, placing its throat horizontally and at waist height.<<else>>gets to its knees and turns its head upward at just the right angle for a pussy to ride its face hole.<</if>><<else>>cranes its neck up  and sticks its tongue out as far as it will go, wiggling it invitingly.<</if>> You straddle its face.
+	It can follow advanced commands, so you order it into a position for use of its face hole. It instantly <<if $activeSlave.amp == 0>><<if $PC.dick == 1>>bends at the waist and turns its head upward, placing its throat horizontally and at waist height.<<else>>gets to its knees and turns its head upward at just the right angle for a pussy to ride its face hole.<</if>><<else>>cranes its neck up and sticks its tongue out as far as it will go, wiggling it invitingly.<</if>> You straddle its face.
 <</if>>
 <<if $activeSlave.fuckdoll <= 20>>
 	It's not fully used to being surprised with face rape, so it struggles, and its difficulty breathing <<if $PC.dick == 1>>makes its throat spasm around your dickhead<<else>>feels lovely on your cunt<</if>>.
@@ -32,13 +32,8 @@ You climax, <<if $PC.dick == 1>>blowing your load down its throat<<else>>giving
 <</if>>
 
 <<if passage() != "Slave Interact">>
-<<set _SL = $slaves.length>>
-<<for _i = 0; _i < _SL; _i++>>
-	<<if $slaves[_i].ID == $activeSlave.ID>>
+	<<set _i = $slaves.findIndex(function(s) { return s.ID == $activeSlave.ID; })>>
 	<<set $slaves[_i] = $activeSlave>>
-	<<break>>
-	<</if>>
-<</for>>
 <</if>>
 
 <</widget>>
@@ -94,13 +89,8 @@ You climax<<if $PC.dick == 1>>, your cum shooting forward to splash against its
 <</if>>
 
 <<if passage() != "Slave Interact">>
-<<set _SL = $slaves.length>>
-<<for _i = 0; _i < _SL; _i++>>
-	<<if $slaves[_i].ID == $activeSlave.ID>>
+	<<set _i = $slaves.findIndex(function(s) { return s.ID == $activeSlave.ID; })>>
 	<<set $slaves[_i] = $activeSlave>>
-	<<break>>
-	<</if>>
-<</for>>
 <</if>>
 
 <</widget>>
@@ -156,13 +146,8 @@ You climax<<if $PC.dick == 1>>, filling its rectum with your cum,<</if>> and ret
 <</if>>
 
 <<if passage() != "Slave Interact">>
-<<set _SL = $slaves.length>>
-<<for _i = 0; _i < _SL; _i++>>
-	<<if $slaves[_i].ID == $activeSlave.ID>>
+	<<set _i = $slaves.findIndex(function(s) { return s.ID == $activeSlave.ID; })>>
 	<<set $slaves[_i] = $activeSlave>>
-	<<break>>
-	<</if>>
-<</for>>
 <</if>>
 
 <</widget>>
\ No newline at end of file
diff --git a/src/npc/descriptions/fLips.tw b/src/npc/descriptions/fLips.tw
index 8c42ffe3ff6374185d71ab72020e5ec7410ca4ac..5a8c5d1d63b81e8c1b4545e9e6b3678434f529d2 100644
--- a/src/npc/descriptions/fLips.tw
+++ b/src/npc/descriptions/fLips.tw
@@ -133,7 +133,7 @@ You tell $activeSlave.slaveName to
 	<<else>>
 		seize her and throw her onto the couch face up, and then kneel on her with your legs on either side of her crying body, so your pussylips are hard against her <<if $seeRace == 1>>$activeSlave.race <</if>>mouth. She desperately eats you out, trying to get you off as fast as possible so she can get a bit more air, but you grind down without mercy, taking your pleasure.
 	<</if>>
-<<elseif  $activeSlave.devotion <= 20>>
+<<elseif $activeSlave.devotion <= 20>>
 	She comes over reluctantly and begins to
 	<<if ($PC.dick != 0)>>
 		give you a blowjob. Deciding that she isn't showing the necessary enthusiasm, you hold her head and fuck her <<if $seeRace == 1>>$activeSlave.race <</if>>face instead<<if $PC.vagina == 1>>, occasionally jerking your dick free to shove your pussy against her face instead<</if>>. She does her best to follow your motions but still splutters and gags. You pull free to cum across her $activeSlave.skin face and hair.
diff --git a/src/npc/fAbuse.tw b/src/npc/fAbuse.tw
index c182e7ec784fb81cc10afbf0bd466105648a6856..7de9d2184b979e61c6358557f7452be31a6dcab4 100644
--- a/src/npc/fAbuse.tw
+++ b/src/npc/fAbuse.tw
@@ -12,9 +12,9 @@
 	<<elseif ($activeSlave.muscles > 30) && ($activeSlave.combatSkill == 0)>>
 		Your bodyguard may look strong and powerful, you know she can't really handle her weapon. You order her to spar with you, and you use her own muscles against her, winning easily. Afterwards, you take the pretext of punishing her to satisfy your urges.
 	<<elseif ($activeSlave.muscles > 5) && ($activeSlave.combatSkill != 0)>>
-		Your bodyguard stands at your side. She is definetely a force to be reckoned with. You know you'd have a hard time besting her, and do not wish to get hurt, so you'll just inform her she'll be undertaking some particular training.
+		Your bodyguard stands at your side. She is definitely a force to be reckoned with. You know you'd have a hard time besting her, and do not wish to get hurt, so you'll just inform her she'll be undertaking some particular training.
 	<<elseif ($activeSlave.muscles > 5) && ($activeSlave.combatSkill == 0)>>
-		Your bodyguard may look fit, you know she can't really handle her weapon. You order her to spar with you; while she may be quick, she mostly just flails her weapon around allowing you an easy win . Afterwards, you take the pretext of punishing her to satisfy your urges.
+		Your bodyguard may look fit, you know she can't really handle her weapon. You order her to spar with you; while she may be quick, she mostly just flails her weapon around allowing you an easy win. Afterwards, you take the pretext of punishing her to satisfy your urges.
 	<</if>>
 <</if>>
 
@@ -82,87 +82,88 @@
 	<<if ($activeSlave.clothes !== "no clothing")>>
 		You tell her she has ten seconds to get naked.
 	<</if>>
-	<<if ($activeSlave.clothes == "uncomfortable straps")>>
+	<<switch $activeSlave.clothes>>
+	<<case "uncomfortable straps">>
 		In her haste to get out of her straps she trips and falls flat.
-	<<elseif ($activeSlave.clothes == "clubslut netting")>>
+	<<case "clubslut netting">>
 		In her haste to get out of her slutty netting she trips and falls flat.
-	<<elseif ($activeSlave.clothes == "shibari ropes")>>
+	<<case "shibari ropes">>
 		In her haste to get out of her shibari ropes she only manages to get tangled and fall over.
-	<<elseif ($activeSlave.clothes == "restrictive latex") || ($activeSlave.clothes == "a latex catsuit")>>
+	<<case "restrictive latex" "a latex catsuit">>
 		In her haste to get out of her clinging latex she trips and falls flat in a tangle of latex and trembling flesh.
-	<<elseif ($activeSlave.clothes == "a military uniform")>>
+	<<case "a military uniform">>
 		She's desperately torn between hurry to avoid punishment and fear she'll damage her shirt.
-	<<elseif ($activeSlave.clothes == "a nice nurse outfit")>>
+	<<case "a nice nurse outfit">>
 		She quickly tears off her loose scrubs.
-	<<elseif ($activeSlave.clothes == "a mini dress")>>
+	<<case "a mini dress">>
 		She struggles to take off her tight mini dress.
-	<<elseif ($activeSlave.clothes == "attractive lingerie")>>
+	<<case "attractive lingerie">>
 		She almost tears her delicate lingerie in her haste to avoid punishment.
-	<<elseif ($activeSlave.clothes == "a succubus outfit")>>
+	<<case "a succubus outfit">>
 		She struggles with her leather corset.
-	<<elseif ($activeSlave.clothes == "spats and a tank top")>>
+	<<case "spats and a tank top">>
 		She hastily slips her top off and struggles to get out of her clinging spats.
-	<<elseif ($activeSlave.clothes == "attractive lingerie for a pregnant woman")>>
+	<<case "attractive lingerie for a pregnant woman">>
 		She quickly sheds her vest and tight bra before panicking and resorting to ripping her silk panties off.
-	<<elseif ($activeSlave.clothes == "a maternity dress")>>
+	<<case "a maternity dress">>
 		She hastily pulls her dress down revealing her body.
-	<<elseif ($activeSlave.clothes == "stretch pants and a crop-top")>>
+	<<case "stretch pants and a crop-top">>
 		She hastily pulls her crop-top over her head and struggles to remove her stretch pants only to get tangled and fall over.
-	<<elseif ($activeSlave.clothes == "a cheerleader outfit")>>
+	<<case "a cheerleader outfit">>
 		She yanks her cheerleader skirt down and pulls her slutty top off.
-	<<elseif ($activeSlave.clothes == "a string bikini")>>
+	<<case "a string bikini">>
 		She gives herself a nasty pinch between the legs in her haste to get out of her string bottom.
-	<<elseif ($activeSlave.clothes == "a scalemail bikini")>>
+	<<case "a scalemail bikini">>
 		She gives herself a tiny cut on her breast in her haste to get out of her scalemail top.
-	<<elseif ($activeSlave.clothes == "a fallen nuns habit")>>
+	<<case "a fallen nuns habit">>
 		She tugs desperately at the laces of her tight latex nun getup.
-	<<elseif ($activeSlave.clothes == "a chattel habit")>>
+	<<case "a chattel habit">>
 		She shucks her habit off easily, since it was designed to be removed quickly.
-	<<elseif ($activeSlave.clothes == "a penitent nuns habit")>>
+	<<case "a penitent nuns habit">>
 		She pulls her coarse habit over her head, revealing her chafed flesh.
-	<<elseif ($activeSlave.clothes == "cutoffs and a t-shirt")>>
+	<<case "cutoffs and a t-shirt">>
 		She shimmies out of her cutoffs and whips her t-shirt over her head.
-	<<elseif ($activeSlave.clothes == "a slutty nurse outfit")>>
+	<<case "a slutty nurse outfit">>
 		Getting out of her tight nurse getup in that amount of time is impossible, but she tries anyway.
-	<<elseif ($activeSlave.clothes == "a schoolgirl outfit")>>
+	<<case "a schoolgirl outfit">>
 		Her schoolgirl outfit is easily stripped off: she pulls down her skimpy skirt and tears off her little blouse, and she's nude.
-	<<elseif ($activeSlave.clothes == "a kimono")>>
+	<<case "a kimono">>
 		Getting out of her kimono in that amount of time is flagrantly impossible, but she tries anyway.
-	<<elseif ($activeSlave.clothes == "a hijab and abaya")>>
+	<<case "a hijab and abaya">>
 		Because she's nude under her hijab and abaya, she simply lifts it over her head.
-	<<elseif ($activeSlave.clothes == "battledress")>>
+	<<case "battledress">>
 		She strips her tank top off in one motion, unfastens her belt, and pulls down her pants, though her boots defeat her and stay on.
-	<<elseif ($activeSlave.clothes == "a slutty outfit")>>
+	<<case "a slutty outfit">>
 		She hurriedly strips herself out of her carefully chosen outfit.
-	<<elseif ($activeSlave.clothes == "a slave gown")>>
+	<<case "a slave gown">>
 		She's desperately torn between hurry to avoid punishment and fear she'll rip her delicate gown.
-	<<elseif ($activeSlave.clothes == "a halter top dress")>>
+	<<case "a halter top dress">>
 		She's desperately torn between hurry to avoid punishment and fear she'll rip her delicate dress.
-	<<elseif ($activeSlave.clothes == "a ball gown")>>
+	<<case "a ball gown">>
 		She's desperately torn between hurry to avoid punishment and fear she'll rip her delicate silken ball gown.
-	<<elseif ($activeSlave.clothes == "nice business attire")>>
+	<<case "nice business attire">>
 		She's desperately torn between hurry to avoid punishment and fear she'll damage her blouse.
-	<<elseif ($activeSlave.clothes == "slutty business attire")>>
+	<<case "slutty business attire">>
 		She's desperately torn between hurry to avoid punishment and fear she'll tear her suit in her haste.
-	<<elseif ($activeSlave.clothes == "a nice maid outfit")>>
+	<<case "a nice maid outfit">>
 		She pulls her dress over her head and quickly undoes the buttons of her blouse, one after the other.
-	<<elseif ($activeSlave.clothes == "a slutty maid outfit")>>
+	<<case "a slutty maid outfit">>
 		Her short dress comes off easily, but she fumbles with the buttons on her tight blouse.
-	<<elseif ($activeSlave.clothes == "a comfortable bodysuit")>>
+	<<case "a comfortable bodysuit">>
 		She's desperately torn between hurry to avoid punishment and fear she'll stretch out her bodysuit.
-	<<elseif ($activeSlave.clothes == "a leotard")>>
+	<<case "a leotard">>
 		Her leotard is tight enough that she has to struggle mightily to get it off that quickly.
-	<<elseif ($activeSlave.clothes == "a bunny outfit")>>
+	<<case "a bunny outfit">>
 		She's desperately torn between hurry to avoid punishment and fear she'll put runs in her hose.
-	<<elseif ($activeSlave.clothes == "harem gauze")>>
+	<<case "harem gauze">>
 		She's desperately torn between hurry to avoid punishment and fear she'll tear her flimsy gauze.
-	<<elseif ($activeSlave.clothes == "slutty jewelry")>>
+	<<case "slutty jewelry">>
 		She hurriedly strips fine jewelry from her neck, wrists, and ankles.
-	<<elseif ($activeSlave.bellyAccessory == "a corset")>>
+	<<case "a corset">>
 		Her fingers fumble desperately with the straps of her corset.
-	<<elseif ($activeSlave.bellyAccessory == "an extreme corset")>>
+	<<case "an extreme corset">>
 		Her fingers fumble desperately with the bindings of her corset, and she hyperventilates within its embrace as she works.
-	<</if>>
+	<</switch>>
 <</if>>
 
 <<if ($activeSlave.fetish == "masochist") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
@@ -300,7 +301,7 @@ Even though she's in a somewhat bad shape, she still jumps back to her feet and
 
 <<if ($activeSlave.ID == $Bodyguard.ID)>>
 	<<if ($activeSlave.muscles <= 5) && ($activeSlave.combatSkill == 0)>>
-		Your bodyguard accepts this as a punishment for her uselesness.
+		Your bodyguard accepts this as a punishment for her uselessness.
 	<<elseif ($activeSlave.muscles <= 5) && ($activeSlave.combatSkill != 0)>>
 		Your bodyguard accepts this as a punishment for her lack of muscles
 	<<elseif ($activeSlave.muscles > 30) && ($activeSlave.combatSkill == 0)>>
diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw
index 2ec5faaf907d9503df113154f41697fae2cbbc05..15c37febf1fd5662ffb7c0f4f5e3e3be7baf7c6e 100644
--- a/src/npc/fFeelings.tw
+++ b/src/npc/fFeelings.tw
@@ -274,7 +274,7 @@ My favorite part of my body i<<s>>
 	<<if _lisping == 0>>
 		<<set _Amp = "rub myself against stuff,">>
 	<<else>>
-		<<set _Amp = "rub mythelf against thtuff,">>
+		<<set _Amp = "rub mythelf againtht thtuff,">>
 	<</if>>
 	<</if>>
 	<<if ($activeSlave.releaseRules == "permissive") || $activeSlave.releaseRules == "masturbation">>
@@ -374,7 +374,7 @@ My favorite part of my body i<<s>>
 				<<case "buttslut">>
 					I'm <<s>>o horny, <<Master>>. 
 					<<if (["plug", "long plug"].includes($activeSlave.buttplug) && $activeSlave.anus > 2) >>
-						I wear the buttplug you gave me, but it i<<s>> <<s>>o <<s>>mall... It remind<<s>> me of being fucked in the a<<ss>>, but I can bareley feel it. It drive<<s>> me crazy.
+						I wear the buttplug you gave me, but it i<<s>> <<s>>o <<s>>mall... It remind<<s>> me of being fucked in the a<<ss>>, but I can barely feel it. It drive<<s>> me crazy.
 					<<elseif (["plug", "long plug"].includes($activeSlave.buttplug) && $activeSlave.anus < 3) || (["large plug", "long, large plug"].includes($activeSlave.buttplug) && $activeSlave.anus == 3) || (["huge plug", "long, huge plug"].includes($activeSlave.buttplug) && $activeSlave.anus >= 4) >>
 						Thank you for the buttplug. It i<<s>> really fun to have my a<<ss>> filled all day long.
 					<<elseif (["large plug", "long, large plug"].includes($activeSlave.buttplug) && $activeSlave.anus < 3) || (["huge plug", "long, huge plug"].includes($activeSlave.buttplug) && $activeSlave.anus < 4) >>
@@ -435,7 +435,7 @@ My favorite part of my body i<<s>>
 		<<if $PC.dick == 1>>I love your cock, <<Master>>," she <<say>>s	eagerly. "I love it in my backdoor.<</if>>
 	<<elseif ($activeSlave.fetish == "pregnancy") && ($activeSlave.fetishStrength > 60)>>
 		<<if $PC.belly >= 10000>>
-			You, uh." She looks down, hesitating. "Your belly i<<s>> <<s>>o big and wonderful, I ju<<s>> want to feel it,
+			You, uh." She looks down, hesitating. "Your belly i<<s>> <<s>>o big and wonderful, I ju<<s>>t want to feel it,
 		<<elseif $PC.belly >= 5000>>
 			You, uh." She looks down, hesitating. "You have a really lovely belly,
 		<<elseif $PC.boobs == 1>>
@@ -602,9 +602,9 @@ My favorite part of my body i<<s>>
 	<</if>>
 	<<if $activeSlave.bellyFluid >= 10000>>
 		I feel really full, can I let the _fluid out now?
-	<<elseif  $activeSlave.bellyFluid >= 5000>>
+	<<elseif $activeSlave.bellyFluid >= 5000>>
 		I feel <<s>>o full, can I let the _fluid out now?
-	<<elseif  $activeSlave.bellyFluid >= 2000>>
+	<<elseif $activeSlave.bellyFluid >= 2000>>
 		I feel <<s>>o uncomfortable, can I let the _fluid out now?
 	<</if>>
 <</if>>
@@ -952,7 +952,7 @@ My favorite part of my body i<<s>>
 	<<set $partner = $slaves.findIndex(function(s) { return s.ID == $activeSlave.relationshipTarget; })>>
 	<<set _partnerName = $slaves[$partner].slaveName>>
 	<<if _lisping == 1>>
-	    <<set _partnerName = nameReplace(_partnerName)>>
+		<<set _partnerName = nameReplace(_partnerName)>>
 	<</if>>
 	<<if $activeSlave.relationship <= 2>>
 		I really like <<s>>eeing _partnerName every day, she'<<s>> a good friend." She blushes. "<<Sh>>e'<<s>> kind of hot, too.
diff --git a/src/npc/fKiss.tw b/src/npc/fKiss.tw
index 3a2bd01ab3691c0cf77c74386e37bcec454ff16a..f86cea9e17bba2687304b7a40cefa69ab113e251 100644
--- a/src/npc/fKiss.tw
+++ b/src/npc/fKiss.tw
@@ -68,7 +68,7 @@ You tell $activeSlave.slaveName to
 			upon her tear-streaked face. She finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> she's forcibly married to horrifying, and quickly turns her face away.
 		<</if>>
 	<<else>>
-		She complies obediantly. Once she's close, you take a moment to gaze deeply
+		She complies obediently. Once she's close, you take a moment to gaze deeply
 		<<if canSee($activeSlave)>>
 			into her $activeSlave.eyeColor eyes. She finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> she's married to reassuring, and looks down with a slight smile, running her eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>>.
 		<<else>>
diff --git a/src/npc/fSlaveImpregConsummate.tw b/src/npc/fSlaveImpregConsummate.tw
index 095f5c62862b7860749d498d2dba13d0f916be39..eec3a6ec26638f8302d3bd9686159ffa82d0b78b 100644
--- a/src/npc/fSlaveImpregConsummate.tw
+++ b/src/npc/fSlaveImpregConsummate.tw
@@ -117,11 +117,11 @@ Next, you see to $activeSlave.slaveName.
 	You set her up for $impregnatrix.slaveName, face down so the weight of her giant balls anchor her helplessly in place.
 <<elseif ($activeSlave.fetish == "submissive") && ($activeSlave.fetishStrength > 60) and ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)>>
 	She is accustomed to submit to you, but as a natural submissive she doesn't have much trouble submitting to $impregnatrix.slaveName's seed instead.
-<<elseif  $activeSlave.devotion < -20>>
+<<elseif $activeSlave.devotion < -20>>
 	She tries to refuse, so you restrain her despite her resistance to the idea of being made a breeder.
-<<elseif  $activeSlave.devotion <= 20>>
+<<elseif $activeSlave.devotion <= 20>>
 	She obeys your orders reluctantly, arranging herself for <<if $activeSlave.mpreg == 1>>anal<<else>>vaginal<</if>> sex despite her obvious hesitation to be made a breeder.
-<<elseif  $activeSlave.devotion < 10>>
+<<elseif $activeSlave.devotion < 10>>
 	She obeys your orders, arranging herself for <<if $activeSlave.mpreg == 1>>anal<<else>>vaginal<</if>> sex despite her slight hesitation at the idea of being made a breeder.
 <<else>>
 	She happily obeys your orders, getting ready to serve <<if def $PC.customTitle>>her $PC.customTitle by making you<<elseif $PC.title != 0>>her Master by making him<<else>>her Mistress by making her<</if>> another slave.
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index 7afaf888e781f569c8dd20c3842c9c740faae0ac..b2eadaafbb35b1a1c63764d09a90b126c2070cf0 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -193,10 +193,10 @@ __You are customizing this slave:__
 		<</if>>
 	<<elseif $PC.career == "mercenary">>
 		<<if $activeSlave.mother == -1 && $activeSlave.father == -1>>
-			<<set $activeSlave.origin = "Drugs and alcohol can be a potent mix; the night that followed it can sometimes be hard to remember. Needless to say, once your belly began swelling with her, you had to temporarily switch to a desk job for your mercanary group.">>
+			<<set $activeSlave.origin = "Drugs and alcohol can be a potent mix; the night that followed it can sometimes be hard to remember. Needless to say, once your belly began swelling with her, you had to temporarily switch to a desk job for your mercenary group.">>
 			<<set $activeSlave.customTat = "She has a small tattoo of a private military company's coat of arms on the nape of her neck.">>
 		<<elseif $activeSlave.mother == -1>>
-			<<set $activeSlave.origin = "Drugs and alcohol can be a potent mix; the night that followed it can sometimes be hard to remember. Needless to say, once your belly began swelling with her, you had to temporarily switch to a desk job for your mercanary group.">>
+			<<set $activeSlave.origin = "Drugs and alcohol can be a potent mix; the night that followed it can sometimes be hard to remember. Needless to say, once your belly began swelling with her, you had to temporarily switch to a desk job for your mercenary group.">>
 			<<set $activeSlave.customTat = "She has a small tattoo of a private military company's coat of arms on the nape of her neck.">>
 		<<elseif $activeSlave.father == -1>>
 			<<set $activeSlave.origin = "A trip to a brothel after a mission resulted in an unexpected surprise years later.">>
@@ -213,7 +213,7 @@ __You are customizing this slave:__
 			<<set $activeSlave.origin = "A fresh capture once overpowered you and had his way with you. You kept her as a painful reminder to never lower your guard again.">>
 			<<set $activeSlave.customTat = "She has your tiny slaving emblem tattooed behind her left ear.">>
 		<<elseif $activeSlave.father == -1>>
-			<<set $activeSlave.origin = "Your slaving troope kept several girls as fucktoys, you sired her in your favorite.">>
+			<<set $activeSlave.origin = "Your slaving troop kept several girls as fucktoys, you sired her in your favorite.">>
 			<<set $activeSlave.customTat = "She has your tiny slaving emblem tattooed behind her left ear.">>
 		<<else>>
 			<<set $activeSlave.origin = "You enslaved her personally during the last stages of your slaving career.">>
@@ -322,10 +322,10 @@ __You are customizing this slave:__
 		<</if>>
 	<<elseif $PC.career == "BlackHat">>
 		<<if $activeSlave.mother == -1 && $activeSlave.father == -1>>
-			<<set $activeSlave.origin = "She was the result of a night of hard celebration after a big score under the glow of monitors and the calming hum of 750 RPM fans. It took quite abit of alcohol to come to terms with drunkenly knocking yourself up.">>
+			<<set $activeSlave.origin = "She was the result of a night of hard celebration after a big score under the glow of monitors and the calming hum of 750 RPM fans. It took quite a bit of alcohol to come to terms with drunkenly knocking yourself up.">>
 			<<set $activeSlave.customTat = "She has your former digital calling card tattooed on her neck.">>
 		<<elseif $activeSlave.mother == -1>>
-			<<set $activeSlave.origin = "She was the result of an intruder brute forcing your firewall, overloading your pleasure sensors, and allowing a corrupted packet to slip by. With a quick wipe of your RAM and cache with some pwerful liquor, you have no idea who planted her in your womb.">>
+			<<set $activeSlave.origin = "She was the result of an intruder brute forcing your firewall, overloading your pleasure sensors, and allowing a corrupted packet to slip by. With a quick wipe of your RAM and cache with some powerful liquor, you have no idea who planted her in your womb.">>
 			<<set $activeSlave.customTat = "She has your former digital calling card tattooed on her neck.">>
 		<<elseif $activeSlave.father == -1>>
 			<<set $activeSlave.origin = "She was born out of a trade for secure data access. Nine months later, your daughter was born.">>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 93bf3e13a905a6254d47793a483e285410bba301..e9cc6daa41c244c6840f6ff9fd80e725ead0d666 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -1181,6 +1181,18 @@
 <<if ndef $arcologies[0].influenceBonus>>
 	<<set $arcologies[0].influenceBonus = -1>>
 <</if>>
+<<if ndef $arcologies[0].CyberEconomic>>
+	<<set $arcologies[0].CyberEconomic = 1>>
+<</if>>
+<<if ndef $arcologies[0].CyberEconomicTarget>>
+	<<set $arcologies[0].CyberEconomicTarget = -1>>
+<</if>>
+<<if ndef $arcologies[0].CyberReputation>>
+	<<set $arcologies[0].CyberReputation = 1>>
+<</if>>
+<<if ndef $arcologies[0].CyberReputationTarget>>
+	<<set $arcologies[0].CyberReputationTarget = -1>>
+<</if>>
 <<if ndef $arcologies[0].rival>>
 	<<set $arcologies[0].rival = 0>>
 <</if>>