diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index 8e1137294fcf09040805e5d0525d9bcf7081c928..a665bad1d4c69a92d1e17ff1e60d0329d954f26a 100644
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw
@@ -35,7 +35,7 @@
 
 <span id="walk">
 
-if(State.variables.partner !== "relationship") || (State.variables.activeSlave.relationship == 1) || (State.variables.activeSlave.relationship == 2) || (State.variables.activeSlave.releaseRules == "restrictive") {
+<<if ($partner !== "relationship") || ($activeSlave.relationship == 1) || ($activeSlave.relationship == 2) || ($activeSlave.releaseRules == "restrictive")>>
 	$activeSlave.slaveName
 	<<switch $activeSlave.assignment>>
 	<<case "work in the dairy">>
@@ -352,10 +352,10 @@ if(State.variables.partner !== "relationship") || (State.variables.activeSlave.r
 		<</if>>
 	<</switch>>
 	/* WALKPASTS END */
-}
+<</if>>
 /* TIME TOGETHER EXCEPTION ENDS */
 
-if(State.variables.partner == "rivalry") {
+<<if ($partner == "rivalry")>>
 	<<set _partnerSlave = null>>
 	<<for _i = 0; _i < $slaves.length; _i++>>
 		<<if $slaves[_i].ID == $activeSlave.rivalryTarget>>
@@ -523,9 +523,8 @@ if(State.variables.partner == "rivalry") {
 	<</if>>
 
 	<</switch>>
-}
 	<<set $target = "FRival", _partnerSlave = null>>
-else if(State.variables.partner == "relationship") && (State.variables.activeSlave.relationship >= 3) && (State.variables.activeSlave.relationship !== "restrictive") || (State.variables.activeSlave.releaseRules !== "masturbation") {
+<<elseif ($partner == "relationship") && ($activeSlave.relationship >= 3) && ($activeSlave.releaseRules !== "restrictive") && ($activeSlave.releaseRules !== "masturbation")>>
 	<<set _partnerSlave = null>>
 	<<for _i = 0; _i < $slaves.length; _i++>>
 		<<if $slaves[_i].ID == $activeSlave.relationshipTarget>>
@@ -829,7 +828,7 @@ else if(State.variables.partner == "relationship") && (State.variables.activeSla
 		eating a quiet meal together.
 	<</if>>
 
-}
+	<</if>>
 	/* CLOSE SEXY/CUDDLE/TOGETHER TIME */
 
 	<<if $slaves[_i].ID == _partnerSlave.ID>>
@@ -850,7 +849,7 @@ else if(State.variables.partner == "relationship") && (State.variables.activeSla
 	<</for>>
 	<<set $target = "FRelation", _partnerSlave = null>>
 
-else if(State.variables.partner == "relationship") || (State.variables.partner == "relation") {
+<<elseif ($partner == "relationship") || ($partner == "relation")>>
 	<<set _partnerSlave = null>>
 	<<if ($partner == "relation")>>
 		<<if $familyTesting == 1>>
@@ -1038,8 +1037,7 @@ else if(State.variables.partner == "relationship") || (State.variables.partner =
 
 	<</switch>>
 	<<set $target = "FRelation", _partnerSlave = null>>
-}
-else if(SugarCube.State.temporary.seed > 80) && (State.variables.activeSlave.fuckdoll == 0) {
+<<elseif (_seed > 80) && ($activeSlave.fuckdoll == 0)>>
 	<<BoobsDescription>>
 	<<switch $activeSlave.clothes>>
 	<<case "uncomfortable straps">>
@@ -1195,8 +1193,7 @@ else if(SugarCube.State.temporary.seed > 80) && (State.variables.activeSlave.fuc
 		<</if>>
 	<</switch>>
 	<<set $target = "FBoobs">>
-}
-else if(SugarCube.State.temporary.seed > 60) {
+<<elseif (_seed > 60)>>
 	<<ButtDescription>>
 	<<switch $activeSlave.clothes>>
 	<<case "a Fuckdoll suit">>
@@ -1329,8 +1326,7 @@ else if(SugarCube.State.temporary.seed > 60) {
 		<</if>>
 	<</switch>>
 	<<set $target = "FButt">>
-}
-else if(SugarCube.State.temporary.seed > 40) {
+<<elseif (_seed > 40)>>
 	<<if $activeSlave.inflation == 0>>
 	<<if $activeSlave.bellyImplant < 2000>>
 	<<if $activeSlave.belly >= 600000>>
@@ -2140,8 +2136,8 @@ else if(SugarCube.State.temporary.seed > 40) {
 			With every motion she makes; her buttplug shifts, bulging out her stomach.
 		<</if>>
 	<</if>>
-	} /* implant descs */
-	if(State.variables.activeSlave.bellyImplant >= 32000) {
+	<<else>> /* implant descs */
+	<<if $activeSlave.bellyImplant >= 32000>>
 		<<BellyImplantDescription>>
 		<<switch $activeSlave.clothes>>
 		<<case "a very tight corset">>
@@ -2181,8 +2177,7 @@ else if(SugarCube.State.temporary.seed > 40) {
 		<<default>>
 			Her bare enormous stomach catches your eye.
 		<</switch>>
-	}
-	else if(State.variables.activeSlave.bellyImplant >= 16000) {
+	<<elseif $activeSlave.bellyImplant >= 16000>>
 		<<BellyImplantDescription>>
 		<<switch $activeSlave.clothes>>
 		<<case "a very tight corset">>
@@ -2226,8 +2221,7 @@ else if(SugarCube.State.temporary.seed > 40) {
 		<<default>>
 			Her bare giant belly catches your eye.
 		<</switch>>
-	}
-	else if(State.variables.activeSlave.weight > 190) {
+	<<elseif $activeSlave.weight > 190>>
 		<<BellyDescription>>
 		<<switch $activeSlave.clothes>>
 		<<case "a Fuckdoll suit">>
@@ -2283,8 +2277,7 @@ else if(SugarCube.State.temporary.seed > 40) {
 		<<default>>
 			Her massive bare jiggling gut catches your eye.
 		<</switch>>
-	}
-	else if(State.variables.activeSlave.bellyImplant >= 8000) {
+	<<elseif $activeSlave.bellyImplant >= 8000>>
 		<<BellyImplantDescription>>
 		<<switch $activeSlave.clothes>>
 		<<case "conservative clothing">>
@@ -2350,8 +2343,7 @@ else if(SugarCube.State.temporary.seed > 40) {
 		<<default>>
 			Her bare huge belly catches your eye.
 		<</switch>>
-	}
-	else if(State.variables.activeSlave.weight > 160) {
+	<<elseif $activeSlave.weight > 160>>
 		<<BellyDescription>>
 		<<switch $activeSlave.clothes>>
 		<<case "a Fuckdoll suit">>
@@ -2413,8 +2405,7 @@ else if(SugarCube.State.temporary.seed > 40) {
 		<<default>>
 			Her giant bare jiggling gut catches your eye.
 		<</switch>>
-	}
-	else if(State.variables.activeSlave.weight > 130) {
+	<<elseif $activeSlave.weight > 130>>
 		<<BellyDescription>>
 		<<switch $activeSlave.clothes>>
 		<<case "a Fuckdoll suit">>
@@ -2478,8 +2469,7 @@ else if(SugarCube.State.temporary.seed > 40) {
 		<<default>>
 			Her big bare jiggling gut catches your eye.
 		<</switch>>
-	}
-	else if(State.variables.activeSlave.bellyImplant >= 4000) {
+	<<elseif $activeSlave.bellyImplant >= 4000>>
 		<<BellyImplantDescription>>
 		<<switch $activeSlave.clothes>>
 		<<case "conservative clothing">>
@@ -2541,8 +2531,7 @@ else if(SugarCube.State.temporary.seed > 40) {
 		<<default>>
 			Her bare belly catches your eye.
 		<</switch>>
-	}
-	else if(State.variables.activeSlave.weight >= 95) {
+	<<elseif $activeSlave.weight >= 95>>
 		<<BellyImplantDescription>>
 		<<switch $activeSlave.clothes>>
 		<<case "a Fuckdoll suit">>
@@ -2606,8 +2595,7 @@ else if(SugarCube.State.temporary.seed > 40) {
 		<<default>>
 			Her bare, jiggling, fat gut catches your eye.
 		<</switch>>
-	}
-	else if(State.variables.activeSlave.bellyImplant >= 2000) {
+	<<elseif $activeSlave.bellyImplant >= 2000>>
 		<<BellyImplantDescription>>
 		<<switch $activeSlave.clothes>>
 		<<case "a Fuckdoll suit">>
@@ -2675,8 +2663,10 @@ else if(SugarCube.State.temporary.seed > 40) {
 		<<default>>
 			Her slightly rounded belly catches your eye.
 		<</switch>>
-	}/* inflation descs */
-	if(State.variables.activeSlave.weight > 190) {
+	<</if>>
+	<</if>>
+	<<else>> /* inflation descs */
+	<<if $activeSlave.weight > 190>>
 		<<BellyDescription>>
 		<<switch $activeSlave.clothes>>
 		<<case "a Fuckdoll suit">>
@@ -2732,8 +2722,7 @@ else if(SugarCube.State.temporary.seed > 40) {
 		<<default>>
 			Her massive bare jiggling gut catches your eye.
 		<</switch>>
-	}
-	else if(State.variables.activeSlave.inflation == 3) {
+	<<elseif $activeSlave.inflation == 3>>
 		<<BellyInflationDescription>>
 		<<switch $activeSlave.clothes>>
 		<<case "a Fuckdoll suit">>
@@ -2801,8 +2790,7 @@ else if(SugarCube.State.temporary.seed > 40) {
 		<<default>>
 			Her bare, taut, sloshing belly catches your eye.
 		<</switch>>
-	}
-	else if(State.variables.activeSlave.weight > 160) {
+	<<elseif $activeSlave.weight > 160>>
 		<<BellyDescription>>
 		<<switch $activeSlave.clothes>>
 		<<case "a Fuckdoll suit">>
@@ -2864,8 +2852,7 @@ else if(SugarCube.State.temporary.seed > 40) {
 		<<default>>
 			Her giant bare jiggling gut catches your eye.
 		<</switch>>
-	}
-	else if(State.variables.activeSlave.weight > 130) {
+	<<elseif $activeSlave.weight > 130>>
 		<<BellyDescription>>
 		<<switch $activeSlave.clothes>>
 		<<case "a Fuckdoll suit">>
@@ -2929,8 +2916,7 @@ else if(SugarCube.State.temporary.seed > 40) {
 		<<default>>
 			Her big bare jiggling gut catches your eye.
 		<</switch>>
-	}
-	else if(State.variables.activeSlave.inflation == 2) {
+	<<elseif $activeSlave.inflation == 2>>
 		<<BellyInflationDescription>>
 		<<switch $activeSlave.clothes>>
 		<<case "a Fuckdoll suit">>
@@ -2998,8 +2984,7 @@ else if(SugarCube.State.temporary.seed > 40) {
 		<<default>>
 			Her bare, rounded, sloshing belly catches your eye.
 		<</switch>>
-	}
-	else if(State.variables.activeSlave.weight >= 95) {
+	<<elseif $activeSlave.weight >= 95>>
 		<<BellyDescription>>
 		<<switch $activeSlave.clothes>>
 		<<case "a Fuckdoll suit">>
@@ -3063,8 +3048,7 @@ else if(SugarCube.State.temporary.seed > 40) {
 		<<default>>
 			Her bare, jiggling, fat gut catches your eye.
 		<</switch>>
-	}
-	else if(State.variables.activeSlave.inflation == 1) {
+	<<elseif $activeSlave.inflation == 1>>
 		<<BellyInflationDescription>>
 		<<switch $activeSlave.clothes>>
 		<<case "a Fuckdoll suit">>
@@ -3132,9 +3116,10 @@ else if(SugarCube.State.temporary.seed > 40) {
 		<<default>>
 			Her distended belly catches your eye.
 		<</switch>>
+	<</if>>
+	<</if>>
 	<<set $target = "FVagina">>
-	}
-else if(State.variables.temporary.seed > 20) {
+<<elseif (_seed > 20)>>
 	<<AnusDescription>>
 	<<switch $activeSlave.clothes>>
 	<<case "a Fuckdoll suit">>
@@ -3261,8 +3246,7 @@ else if(State.variables.temporary.seed > 20) {
 		<</if>>
 	<</switch>>
 	<<set $target = "FAnus">>
-	}
-else if(State.variables.temporary.seed > 0) {
+<<elseif (_seed > 0)>>
 	<<faceDescription>>
 	<<mouthDescription>>
 	<<switch $activeSlave.collar>>
@@ -3310,9 +3294,9 @@ else if(State.variables.temporary.seed > 0) {
 	<<else>>
 		<<set $target = "FLips">>
 	<</if>>
-}
+<</if>>
 
-if(State.variables.activeSlave.fuckdoll == 0) {
+<<if $activeSlave.fuckdoll == 0>>
 	<<if (_seed <= 80) && (_seed > 40) && ($activeSlave.vaginalAccessory == "chastity belt")>>
 		//If you wish to have vanilla intercourse with her you must order her to remove her chastity belt.//
 	<<elseif _seed > 100>>
@@ -3338,6 +3322,6 @@ if(State.variables.activeSlave.fuckdoll == 0) {
 	<<default>>
 		<span id="walkpast"><<link "Fuck it">><<replace "#walk">><<FFuckdollOral>><</replace>><</link>></span>
 	<</switch>>
-}
+<</if>>
 </span>
 //