From 70bb93a1c5ef2d11655372f90493e41c72d7cccd Mon Sep 17 00:00:00 2001
From: deformedgodcomplex <hedonisticguilt@gmail.com>
Date: Mon, 9 Dec 2024 13:12:12 +0000
Subject: [PATCH] misc fixing

---
 game/base-combat/ejaculation-gloryhole.twee   |   3 +-
 game/base-combat/ejaculation-kylar.twee       |   2 +-
 game/base-combat/ejaculation-sydney.twee      |   2 +-
 game/base-combat/ejaculation.twee             |   2 +-
 game/base-system/mirror.twee                  |   4 +-
 game/base-system/orgasm.twee                  |  10 +
 .../pregnancy/children-events.twee            |   2 +-
 game/base-system/text.twee                    |  24 +-
 game/overworld-forest/loc-forest/events.twee  |   1 -
 .../overworld-forest/loc-wolfpack/events.twee |  37 ++-
 game/overworld-forest/loc-wolfpack/hunts.twee |   2 +-
 .../loc-wolfpack/pregnancyEvents.twee         |  27 +-
 .../loc-wolfpack/widgets.twee                 |   6 +-
 game/overworld-plains/loc-bird/hunts.twee     |   6 +-
 game/overworld-plains/loc-bird/main.twee      |   9 +-
 game/overworld-plains/loc-farm/meadow.twee    |  28 +-
 game/overworld-plains/loc-farm/work.twee      |   8 +-
 .../overworld-plains/loc-livestock/field.twee |   8 +-
 game/overworld-plains/loc-moor/events.twee    |  21 +-
 game/overworld-plains/loc-moor/widgets.twee   |   6 +-
 game/overworld-town/loc-alley/park.twee       |   4 +-
 game/overworld-town/loc-brothel/shows.twee    |   2 +-
 game/overworld-town/loc-cafe/main.twee        |  15 +-
 game/overworld-town/loc-cafe/widgets.twee     |   2 +-
 .../loc-danube-homes/skulduggery.twee         |  12 +-
 .../overworld-town/loc-danube-homes/work.twee | 310 +++++++++---------
 game/overworld-town/loc-domus-homes/work.twee |  38 +--
 game/overworld-town/loc-flats/work.twee       |  46 +--
 game/overworld-town/loc-home/main.twee        | 142 ++++----
 game/overworld-town/loc-home/ward.twee        |   1 +
 game/overworld-town/loc-home/widgets.twee     |   2 +-
 game/overworld-town/loc-park/run.twee         |  14 +-
 game/overworld-town/loc-pound/abduction.twee  |   4 +-
 game/overworld-town/loc-pound/main.twee       |   4 +-
 game/overworld-town/loc-school/detention.twee |   2 +-
 game/overworld-town/loc-school/widgets.twee   |   7 +-
 game/overworld-town/loc-street/widgets.twee   |   1 -
 .../overworld-town/special-leighton/main.twee |   4 +-
 .../special-nightmares/main.twee              |  30 +-
 .../loc-underground/events.twee               |   2 +-
 .../loc-underground/robin.twee                |   6 +-
 game/special-masturbation/main.twee           |  13 +-
 42 files changed, 459 insertions(+), 410 deletions(-)

diff --git a/game/base-combat/ejaculation-gloryhole.twee b/game/base-combat/ejaculation-gloryhole.twee
index fcb8c1579b..fdd23f716d 100644
--- a/game/base-combat/ejaculation-gloryhole.twee
+++ b/game/base-combat/ejaculation-gloryhole.twee
@@ -580,7 +580,6 @@
 				<<case 1 2 3>>
 					<<He>> groans as you fuck <<his>> ass.
 					<br><br>
-					<<bottomejacstat>><<ejacstat>><<set $hygiene += 500>><<bodyliquid "bottom" "semen">>
 				<<case 4 5>>
 					<<He>> moans as you pound <<his>> ass, and ejaculates on the ground.
 					<br><br>
@@ -631,7 +630,7 @@
 			<<elseif $NPCList[0].penis is "mouthentrance">>
 				<<switch $NPCList[0].penissize>>
 				<<case 4>>
-					<<He>> grips <<his>> $NPCList[0].penisdesc tightly, working it while aiming though the hold straight at your mouth. <span class="pink">You splutter and gag as thick ropes of cum push past your clenched lips and into your mouth.</span> "You need to learn to swallow, bitch."
+					<<He>> grips <<his>> $NPCList[0].penisdesc tightly, working it while aiming though the hole straight at your mouth. <span class="pink">You splutter and gag as thick ropes of cum push past your clenched lips and into your mouth.</span> "You need to learn to swallow, bitch."
 					<<faceejacstat>><<ejacstat>><<set $hygiene += 500>><<bodyliquid "face" "semen">>
 					<<cumswallow `$NPCList[0].type` null "large">>
 					<br><br>
diff --git a/game/base-combat/ejaculation-kylar.twee b/game/base-combat/ejaculation-kylar.twee
index 0baaf67d85..942d7a6737 100644
--- a/game/base-combat/ejaculation-kylar.twee
+++ b/game/base-combat/ejaculation-kylar.twee
@@ -1049,7 +1049,7 @@
 		<<elseif $NPCList[_nn].penis is "otheranus">>
 			<<switch random(1, 7)>>
 			<<case 1 2 3>>
-				<<He>> groans as you fuck <<his>> ass; ejaculating on the ground. "I love how you make me feel."
+				<<He>> groans as you fuck <<his>> ass; <<he>> catches <<his>> ejaculate in <<his>> hand and wipes it on your face. "I have to m-mark you as mine."
 
 				<<faceejacstat>><<ejacstat>><<set $hygiene += 500>><<bodyliquid "face" "semen">>
 			<<case 4 5>>
diff --git a/game/base-combat/ejaculation-sydney.twee b/game/base-combat/ejaculation-sydney.twee
index 647dcef6e4..4837938760 100644
--- a/game/base-combat/ejaculation-sydney.twee
+++ b/game/base-combat/ejaculation-sydney.twee
@@ -1366,7 +1366,7 @@
 		<<elseif $NPCList[_nn].penis is "otheranus">>
 			<<switch random(1, 7)>>
 			<<case 1 2 3>>
-				<<He>> groans as you fuck <<his>> ass, and <<he>> ejaculates on the ground. "Good <<girl>>."
+				<<He>> groans as you fuck <<his>> ass; <<he>> catches <<his>> ejaculate in <<his>> hand and wipes it on your face. "Good <<girl>>."
 				<br><br>
 				<<faceejacstat>><<ejacstat>><<set $hygiene += 500>><<bodyliquid "face" "semen">>
 			<<case 4 5>>
diff --git a/game/base-combat/ejaculation.twee b/game/base-combat/ejaculation.twee
index c368bca2e7..235c90081c 100644
--- a/game/base-combat/ejaculation.twee
+++ b/game/base-combat/ejaculation.twee
@@ -3192,7 +3192,7 @@
 			<<elseif _ejaculation_volume lte 100>>
 				<span class="lewd">Your cheeks puff out as you swallow your semen, downing it in several noisy gulps. You sigh <<if $ejactrait gte 1>>contentedly <<else>>in relief<</if>> once you manage to get it all.</span>
 			<<else>>
-				<span class="lewd">You swallow as much of your massive load as you can, struggling to contain its sheer volume.<<if $ejactrait gte 1 and $leftarm isnot "bound" and $rightarm isnot "bound">> You cup your hands beneath your chin to catch the overflow, not wanting to let any go to waste.<<else>> Some of it overflows, running down your chin and neck. <</if>></span>
+				<span class="lewd">You swallow as much of your massive load as you can, struggling to contain its sheer volume.<<if $ejactrait gte 1 and $leftarm isnot "bound" and $rightarm isnot "bound" and $fingersInVagina is 0>> You cup your hands beneath your chin to catch the overflow, not wanting to let any go to waste.<<else>> Some of it overflows, running down your chin and neck. <<bodyliquid "neck" "semen">><</if>></span>
 			<</if>>
 		<<else>>
 			<span class="red">Tears run down <<print either("your cheeks as you struggle to", "your face as you force yourself to")>> swallow your own cum.</span>
diff --git a/game/base-system/mirror.twee b/game/base-system/mirror.twee
index aecc43a7e9..7b5c1dd2f1 100644
--- a/game/base-system/mirror.twee
+++ b/game/base-system/mirror.twee
@@ -975,8 +975,8 @@
 		<<set _bodyWritingOptions.Submission["Pet"] to "pet">>
 
 			<<if hasSexStat("deviancy", 3)>>
-			<<set _bodyWritingOptions.Submission["Public pet"] to "public_pet">>
-		<</if>>
+				<<set _bodyWritingOptions.Submission["Public pet"] to "public_pet">>
+			<</if>>
 
 		<<if hasSexStat("promiscuity", 4)>>
 			<<set _bodyWritingOptions.Submission["Free use"] to "free_use">>
diff --git a/game/base-system/orgasm.twee b/game/base-system/orgasm.twee
index 374fe7bac8..f66d51189c 100644
--- a/game/base-system/orgasm.twee
+++ b/game/base-system/orgasm.twee
@@ -303,6 +303,16 @@
 					<</if>>
 				<</if>>
 			<</for>>
+		<<elseif $masturbating and $mouthaction is "mbreastsuck" or $mouthaction is "mbreastlick">>
+			<<if $milk_amount gte (($milk_volume / 3) * 2) and $milk_amount gte 2500>>
+				<<if $milk_amount gte 2500>>
+					<span class="pink">A surge of milk floods your mouth. You disengage temporaily to gasp and cough after managing to swallow it all.</span>
+				<<else>>
+					<span class="pink">Milk sprays into your mouth. You struggle to drink it all down in one gulp.</span>
+				<</if>>
+			<<else>>
+				<span class="pink">You quickly drink down the thin stream of milk flowing into your mouth.</span>
+			<</if>>
 		<<else>>
 			<<if $milk_amount gte (($milk_volume / 3) * 2) and $milk_amount gte 2500>>
 				<<if $leftarm is "mbreastpump" and $rightarm is "mbreastpump">>
diff --git a/game/base-system/pregnancy/children-events.twee b/game/base-system/pregnancy/children-events.twee
index 38f32d559d..a86559bf79 100644
--- a/game/base-system/pregnancy/children-events.twee
+++ b/game/base-system/pregnancy/children-events.twee
@@ -813,7 +813,7 @@ You leave behind $donatedMilk bottles of milk for your children with one of Bail
 			<</if>>
 			<br><br>
 
-			You can feel its palpable love for <<childname>>. Your heart almost skips a beat as the baby yawns and clings to the pale figure as <<childhe>> would to you. You're filled with relief. <<llstress>>
+			You can feel its palpable love for <<childname>>. Your heart almost skips a beat as the baby yawns and clings to the pale figure as <<childhe>> would to you. You're filled with relief. <<llstress>><<stress -12>>
 			<br><br>
 
 			The pale figure leans down, gingerly pressing a kiss to each of <<childhis>> cheeks. You can hear <<childhim>> giggle as <<childhe>> toys with a strand of the pale figure's silver hair.
diff --git a/game/base-system/text.twee b/game/base-system/text.twee
index 852afb14bc..fc445d1d41 100644
--- a/game/base-system/text.twee
+++ b/game/base-system/text.twee
@@ -5381,17 +5381,19 @@ Argument 2, where appropriate, determines whether it's the player undressing the
 
 <<widget "npcGenitalReaction">>
 	<<set $_npc to _args[0]>>
-	<<if $_npc.penis isnot "none">>
-		<<switch $_npc.penissize>>
-			<<case 4>>
-				<span class="red"> <<print setup.npcPenisRemarks["big"].random()>></span>
-			<<case 1>>
-				<span class="green"> <<print setup.npcPenisRemarks["small"].random()>></span>
-			<<default>>
-		<</switch>>
-	<</if>>
-	<<if $_npc.vagina isnot "none">>
-		<!-- Placeholder -->
+	<<if !$worn.face.type.includes("blindfold")>>
+		<<if $_npc.penis isnot "none">>
+			<<switch $_npc.penissize>>
+				<<case 4>>
+					<span class="red"> <<print setup.npcPenisRemarks["big"].random()>></span>
+				<<case 1>>
+					<span class="green"> <<print setup.npcPenisRemarks["small"].random()>></span>
+				<<default>>
+			<</switch>>
+		<</if>>
+		<<if $_npc.vagina isnot "none">>
+			<!-- Placeholder -->
+		<</if>>
 	<</if>>
 <</widget>>
 
diff --git a/game/overworld-forest/loc-forest/events.twee b/game/overworld-forest/loc-forest/events.twee
index a9b470a5b4..7202e98e4c 100644
--- a/game/overworld-forest/loc-forest/events.twee
+++ b/game/overworld-forest/loc-forest/events.twee
@@ -1611,7 +1611,6 @@ They growl at each other. After a brief tussle, with many scratches and bites, t
 <<else>>
 	<<exhibitionism3>>
 <</if>>
-<br><br>
 
 <<link [[Flaunt|Forest Cutter Flaunt]]>><<arousal 600>><<trauma -6>><<stress -12>><</link>><<garousal>><<ltrauma>><<lstress>>
 <br>
diff --git a/game/overworld-forest/loc-wolfpack/events.twee b/game/overworld-forest/loc-wolfpack/events.twee
index 738d24cdac..57f38311cd 100644
--- a/game/overworld-forest/loc-wolfpack/events.twee
+++ b/game/overworld-forest/loc-wolfpack/events.twee
@@ -919,12 +919,14 @@ One of the hunters, a <<beasttype>>,
 			"<<pPackbrother>> may take <<pher>> reward."
 		<</if>>
 		<br><br>
-		<<if hasSexStat("deviancy", 3)>>
-			<<link [[Accept the invitation|Wolf Cave Spar Sex]]>><<set $sexstart to 1>><<set $phase to 0>><</link>><<deviant3>>
-		<<else>>
-			<<insufficientStat "deviancy" "to accept such an offer">>
+		<<if $bestialitydisable is "f" or $monster is 1>>
+			<<if hasSexStat("deviancy", 3)>>
+				<<link [[Accept the invitation|Wolf Cave Spar Sex]]>><<set $sexstart to 1>><<set $phase to 0>><</link>><<deviant3>>
+			<<else>>
+				<<insufficientStat "deviancy" "to accept such an offer">>
+			<</if>>
+			<br>
 		<</if>>
-		<br>
 		<<link [[Refuse|Wolf Cave Clearing]]>><<endevent>><</link>>
 	<<elseif $wolfpackferocity gte 10>>
 		Yelping from pain, the <<beasttype>> takes a few steps back and growls. <<bHe>> bares <<bhis>> fangs when you try to approach to make sure <<bhe>> isn't hurt.
@@ -942,18 +944,25 @@ One of the hunters, a <<beasttype>>,
 	<<if $wolfpackferocity gte 10>>
 		The <<beasttype>> bares <<bhis>> fangs and pins you to the ground. <<bHes>> not satisfied with just beating you in a fight.
 		<br><br>
-		<<if hasSexStat("deviancy", 3)>>
-			<<link [[Submit|Wolf Cave Spar Sex]]>><<set $sexstart to 1>><<set $phase to 1>><<sub 1>><</link>><<deviant3>>
-			<br>
+		<<if $bestialitydisable is "f" or $monster is 1>>
+			<<if hasSexStat("deviancy", 3)>>
+				<<link [[Submit|Wolf Cave Spar Sex]]>><<set $sexstart to 1>><<set $phase to 1>><<sub 1>><</link>><<deviant3>>
+				<br>
+			<</if>>
+			<<link [[Struggle|Wolf Cave Spar Sex]]>><<set $molestationstart to 1>><<def 1>><</link>>
+		<<else>>
+			You manage to squirm out from under its weight. It growls, snapping at your heels as you flee.<<beastescape>><<pass 5>>
+			<br><br>
+
+			<<link [[Next (0:05)|Wolf Cave Clearing]]>><<endevent>><</link>>
 		<</if>>
-		<<link [[Struggle|Wolf Cave Spar Sex]]>><<set $molestationstart to 1>><<def 1>><</link>>
 	<<elseif $wolfpackharmony gte 10>>
 		The <<beasttype>> lets out a satisfied chuff and nudges you with <<bhis>> <<if $monster is 1>>hand<<else>>nose<</if>>. <<bHis>> tail wags affectionately.
-		<br><br>
-		<<if hasSexStat("deviancy", 3)>>
+		<br><br>	
+		<<if hasSexStat("deviancy", 3) and ($bestialitydisable is "f" or $monster is 1)>>
 			<<link [[Reward|Wolf Cave Spar Sex]]>><<set $sexstart to 1>><<set $phase to 2>><<sub 1>><</link>><<deviant3>>
 			<br>
-		<</if>>
+		<</if>>		
 		<<link [[Take a breather (0:05)|Wolf Cave Clearing]]>><<endevent>><<pass 5>><</link>>
 	<<else>>
 		The <<beasttype>> lets out a satisfied chuff and returns to <<bhis>> resting spot.
@@ -1168,7 +1177,7 @@ An alarmed yelp <<if $outside>>outside<<else>>from the treeline<</if>> attracts
 
 <<set $bus to "wolfcaveclearing">> /* when event is resolved, player will be deposited in the clearing regardless of where they started */
 <<link [[Try to calm the <<beasttype>>|Wolf Cave Bear Calm]]>><</link>><<tendingdifficulty 600 1200>><br>
-<<if $monster or (!$monster and $bestialitydisable is "f")>>
+<<if $monster is 1 or $bestialitydisable is "f">>
 	<<link [[Fight|Wolf Cave Bear Fight]]>><<set $phase to 0>><<set $molestationstart to 1>><</link>><br>
 <<else>>
 	<<link [[Fight|Wolf Cave Bear Fight Finish]]>><<set $phase to 1>><</link>><br> /* autoresolve */
@@ -1202,7 +1211,7 @@ An alarmed yelp <<if $outside>>outside<<else>>from the treeline<</if>> attracts
 	Your words only seem to enrage <<bhim>> further. With a snarl, the <<beasttype>> leaps forwards, intent on taking <<bhis>> anger out on you.
 	<br><br>
 
-	<<if $monster or (!$monster and $bestialitydisable is "f")>>
+	<<if $monster is 1 or $bestialitydisable is "f">>
 		<<link [[Fight|Wolf Cave Bear Fight]]>><<set $phase to 0>><<set $molestationstart to 1>><</link>><br>
 	<<else>>
 		<<link [[Fight|Wolf Cave Bear Finish]]>><<set $phase to 1>><</link>><br> /* autoresolve */
diff --git a/game/overworld-forest/loc-wolfpack/hunts.twee b/game/overworld-forest/loc-wolfpack/hunts.twee
index 1db2ccf730..dce009424f 100644
--- a/game/overworld-forest/loc-wolfpack/hunts.twee
+++ b/game/overworld-forest/loc-wolfpack/hunts.twee
@@ -422,6 +422,7 @@ A frontal attack would be very risky.
 <<location "forest">><<effects>>
 <<npc "Black Wolf">>
 <<if $phase is 0>><<set $wolfpackshroom to "none">>
+	<<wearProp "wolfshroom">>
 	You crumble the red mushroom onto the Black Wolf's food. <<bHe>> spots you and growls, but relents when <<bhe>> sees you carry nothing away. <<bHe>> returns to <<bhis>> place and continues eating. Over the next few hours <<bhe>> becomes more territorial, glaring at other <<wolf_cave_plural>> who approach the deer.
 	<<gferocity>>
 	<br><br>
@@ -435,7 +436,6 @@ A frontal attack would be very risky.
 You lie on the grass with your head resting on a <<beasttype>>. All that running is tiring. You close your eyes and sleep. You're awoken when the <<beasttype>> you were resting on stands up.
 <br><br>
 <<endevent>>
-<<if $phase is 0>><<wearProp "wolfshroom">><<else>><<wearProp "pinkshroom">><</if>>
 
 <<set $huntstate to "success">>
 <<wolfhuntevents>>
diff --git a/game/overworld-forest/loc-wolfpack/pregnancyEvents.twee b/game/overworld-forest/loc-wolfpack/pregnancyEvents.twee
index b7a74a545b..5f3c5e1488 100644
--- a/game/overworld-forest/loc-wolfpack/pregnancyEvents.twee
+++ b/game/overworld-forest/loc-wolfpack/pregnancyEvents.twee
@@ -322,19 +322,14 @@ You sit and wait near the tunnel entrance, with only the sound of whimpering to
 	<br><br>
 	
 	<<if pregnancyCountBetweenParents("Black Wolf", "pc") gte 2 or $knowsAboutDen is 1>>
-
 		"Come," <<bhe>> says. "Visit pups den now." Cradling the bundle of pups, the Black Wolf leads you through the tunnel to the pups den, where the newborns join the rest of the young pups in the pack. "Will rest here for a while," the Black Wolf says. "Won't leave their side."
-		<br><br>
 
 	<<else>>
-
+		<<set $knowsAboutDen to 1>>
 		"Come," <<bhe>> says. "Show <<ppackbrother>> pups den." Cradling the bundle of pups, the Black Wolf leads you through the tunnel to another secluded chamber. The den appears to house all the young and newborn pups from the pack, as well as the <<wolf_cave_plural>> who look after them. "Will rest here for a while," the Black Wolf says. "Won't leave their side."
 		<br><br>
 
 		<span class="gold">You can now access the pups den.</span>
-		<br><br>
-
-		<<set $knowsAboutDen to 1>>
 
 	<</if>>
 
@@ -344,22 +339,19 @@ You sit and wait near the tunnel entrance, with only the sound of whimpering to
 	<br><br>
 
 	<<if pregnancyCountBetweenParents("Black Wolf", "pc") gte 2 or $knowsAboutDen is 1>>
-
 		The Black Wolf leads you through the tunnel to the pups den, where the newborns will join the rest of the young pups in the pack. The Black Wolf lies down once more and looks up at you expectantly. You give the pups back to the Black Wolf, who chooses to remain in the den, seemingly content with resting for now.
 
 	<<else>>
-
+		<<set $knowsAboutDen to 1>>
 		The Black Wolf leads you through the tunnel to another secluded chamber. This part of the cave appears to house all the young and newborn pups from the pack, as well as the <<wolf_cave_plural>> who look after them. The Black Wolf lies down once more and looks up at you expectantly. You give the pups back to the Black Wolf, who chooses to remain in the den, seemingly content with resting for now.
 		<br><br>
 
-		<span class="gold">You can now access the pups den.</span>
-		<br><br>
-
-		<<set $knowsAboutDen to 1>>
+		<span class="gold">You can now access the pups den.</span>		
 
 	<</if>>
 
 <</if>>
+<br><br>
 
 <<link [[Next|Wolf Cave]]>><<set $eventskip to 1>><<set $wolfevent to 0>><<endevent>><</link>>
 
@@ -497,16 +489,13 @@ Having named them, you gather your children.
 
 	<<if pregnancyCountBetweenParents("pc", "Black Wolf") gte 1 or $knowsAboutDen is 1>>
 		"Come," <<bhe>> says. "Visit pups den now." Hovering close to you as you cradle your pups in your arms, <<bhe>> leads you through the tunnel to the pups den, where the newborns join the rest of the young pups in the pack.
-		<br><br>
 
 	<<else>>
+		<<set $knowsAboutDen to 1>>
 		"Come," the Black Wolf says. "Show <<ppackbrother>> pups den." Hovering close to you as you cradle your pups in your arms, <<bhe>> leads you through the tunnel to another secluded chamber. The den appears to house all the young and newborn pups from the pack. Your own children are accepted into the group by the other pups, as well as the <<wolf_cave_plural>> who look after them.
 		<br><br>
 
 		<span class="gold">You can now access the pups den.</span>
-		<br><br>
-
-		<<set $knowsAboutDen to 1>>
 
 	<</if>>
 
@@ -514,20 +503,18 @@ Having named them, you gather your children.
 
 	<<if pregnancyCountBetweenParents("pc", "Black Wolf") gte 1 or $knowsAboutDen is 1>>
 		The Black Wolf circles your body and herds you to the tunnel entrance. Hovering close to you as you cradle your pups in your arms, <<bhe>> leads you through the tunnel to the pups den, where the newborns join the rest of the young pups in the pack.
-		<br><br>
 
 	<<else>>
+		<<set $knowsAboutDen to 1>>
 		The Black Wolf circles your body and herds you to the tunnel entrance. Hovering close to you as you cradle your pups in your arms, <<bhe>> leads you through the tunnel to another secluded chamber. The den appears to house all the young and newborn pups from the pack. Your own children are accepted into the group by the other pups, as well as the <<wolf_cave_plural>> who look after them.
 		<br><br>
 
 		<span class="gold">You can now access the pups den.</span>
-		<br><br>
-
-		<<set $knowsAboutDen to 1>>
 
 	<</if>>
 
 <</if>>
+<br><br>
 
 <<if $syndromewolves isnot 1>>
 	<<if $bestialitydisable is "f">>
diff --git a/game/overworld-forest/loc-wolfpack/widgets.twee b/game/overworld-forest/loc-wolfpack/widgets.twee
index 7dbda38ed1..a1da6dbf03 100644
--- a/game/overworld-forest/loc-wolfpack/widgets.twee
+++ b/game/overworld-forest/loc-wolfpack/widgets.twee
@@ -10,11 +10,11 @@
 			One of the younger <<beastsplural>> approaches you. <<bHe>> wants to play fight.
 			<br><br>
 			<<link [[Play (0:20)|Wolf Cave Play Fight]]>><<pass 20>><<stress -4>><</link>><<lstress>>
-			<br>
-			<<if hasSexStat("deviancy", 2)>>
+			<br>			
+			<<if hasSexStat("deviancy", 2) and ($bestialitydisable is "f" or $monster is 1)>>
 				<<link [[Lewd play|Wolf Cave Lewd Play]]>><<set $sexstart to 1>><</link>><<deviant2>>
 				<br>
-			<</if>>
+			<</if>>		
 			<<if $bus is "wolfcave">>
 				<<link [[Ignore|Wolf Cave]]>><<endevent>><</link>>
 				<br>
diff --git a/game/overworld-plains/loc-bird/hunts.twee b/game/overworld-plains/loc-bird/hunts.twee
index f0ab581d9b..4a48907445 100644
--- a/game/overworld-plains/loc-bird/hunts.twee
+++ b/game/overworld-plains/loc-bird/hunts.twee
@@ -2894,7 +2894,7 @@ You fly lower to the ground and spend some time watching the <<beasttype>> from
 				<<link [[Take the object|Bird Hunt Fox Take]]>><</link>>
 				<br>
 			<</if>>
-			<<if $bestialitydisable is "f" and hasSexStat("deviancy", 3)>>
+			<<if ($bestialitydisable is "f" or $monster is 1) and hasSexStat("deviancy", 3)>>
 				<<link [[Push over|Bird Hunt Fox Sex]]>><<set $sexstart to 1>><</link>><<deviant3>>
 				<br>
 			<</if>>
@@ -3019,8 +3019,8 @@ You hold out your hand, motioning for <<bhim>> to give you whatever <<bhes>> hid
 <<wearProp _prop>>
 <br><br>
 
-<<if $bestialitydisable is "f" and hasSexStat("deviancy", 3)>>
-	<<link [[Reward|Bird Hunt Fox Sex]]>><<handheldon>><<set $sexstart to 1>><</link>><<deviant3>>
+<<if ($bestialitydisable is "f" or $monster is 1) and hasSexStat("deviancy", 3)>>
+	<<link [[Reward|Bird Hunt Fox Sex]]>><<set $sexstart to 1>><</link>><<deviant3>>
 	<br>
 <</if>>
 <<link [[Pet|Bird Hunt Fox Pet]]>><<handheldon>><<stress -3>><</link>><<lstress>>
diff --git a/game/overworld-plains/loc-bird/main.twee b/game/overworld-plains/loc-bird/main.twee
index 3cff488d04..9a91293faa 100644
--- a/game/overworld-plains/loc-bird/main.twee
+++ b/game/overworld-plains/loc-bird/main.twee
@@ -2055,6 +2055,7 @@ You have <span class="gold"><<number $bird.materials.fabric>></span><<birdicon "
 	<<else>>
 		Your wings would carry you down, if you had a better jumping point. <span class="blue">The perch might be perfect.</span>
 	<</if>>
+	<br><br>
 <</if>>
 <<if $bird.rope lt 7>>
 	<<if $bird.materials.fabric gte 1>>
@@ -2982,7 +2983,7 @@ You sit by the rainwater pool.
 	<<skinicon "wash">><<link [[Wash (0:30)|Bird Tower Bathe]]>><<bird_pass 30>><</link>>
 	<br>
 	<<if $bird.upgrades.pot is 3 and getBirdBurnTime() gt 0>>
-		<<skinicon "masturbate">><<link [[Masturbate in the rainwater pool|Bird Tower Masturbation]]>><<set $masturbationstart to 1>><</link>>
+		<<skinicon "masturbate">><<link [[Masturbate in the rainwater pool|Bird Tower Masturbation]]>><<set $masturbationstart to 1>><<strip>><</link>>
 		<br>
 	<</if>>
 <</if>>
@@ -3712,8 +3713,10 @@ The <<beasttype>> shakes <<bhis>> feathers, and lets you stroke <<bhis>> wings.
 <</if>>
 <br><br>
 
-<<link [[Rub lewdly|Bird Tower Groom Lewd]]>><<npcincr "Great Hawk" love 1>><</link>><<deviant1>><<glove>>
-<br>
+<<if $bestialitydisable is "f" or $monster is 1>>
+	<<link [[Rub lewdly|Bird Tower Groom Lewd]]>><<npcincr "Great Hawk" love 1>><</link>><<deviant1>><<glove>>
+	<br>
+<</if>>
 <<link [[Stay on the perch|Bird Tower Perch]]>><<endevent>><</link>>
 <br>
 <<link [[Go back inside|Bird Tower]]>><<endevent>><</link>>
diff --git a/game/overworld-plains/loc-farm/meadow.twee b/game/overworld-plains/loc-farm/meadow.twee
index f69ed8e813..35eb460f9d 100644
--- a/game/overworld-plains/loc-farm/meadow.twee
+++ b/game/overworld-plains/loc-farm/meadow.twee
@@ -427,12 +427,14 @@ Your eyes were so drawn by the water that it takes you a moment to notice the <<
 
 	<<link [[Forgive|Meadow Cave Accept]]>><</link>>
 	<br>
-	<<if $fox gte 3>>
-		<<link [[Present yourself|Meadow Cave Sex]]>><<set $sexstart to 1>><</link>><<deviant1>><<fox>>
-		<br>
-	<<elseif hasSexStat("deviancy", 4)>>
-		<<link [[Present yourself|Meadow Cave Sex]]>><<set $sexstart to 1>><</link>><<deviant4>>
-		<br>
+	<<if $bestialitydisable is "f">>
+		<<if $fox gte 3>>
+			<<link [[Present yourself|Meadow Cave Sex]]>><<set $sexstart to 1>><</link>><<deviant1>><<fox>>
+			<br>
+		<<elseif hasSexStat("deviancy", 4)>>
+			<<link [[Present yourself|Meadow Cave Sex]]>><<set $sexstart to 1>><</link>><<deviant4>>
+			<br>
+		<</if>>
 	<</if>>
 <</if>>
 
@@ -637,12 +639,14 @@ You keep low as you move, though you see no one else around.
 
 			<<link [[Forgive|Meadow Chase Hill Accept]]>><</link>>
 			<br>
-			<<if $fox gte 3>>
-				<<link [[Present yourself|Meadow Chase Hill Sex]]>><<set $sexstart to 1>><</link>><<deviant1>><<fox>>
-				<br>
-			<<elseif hasSexStat("deviancy", 4)>>
-				<<link [[Present yourself|Meadow Chase Hill Sex]]>><<set $sexstart to 1>><</link>><<deviant4>>
-				<br>
+			<<if $bestialitydisable is "f">>
+				<<if $fox gte 3>>
+					<<link [[Present yourself|Meadow Chase Hill Sex]]>><<set $sexstart to 1>><</link>><<deviant1>><<fox>>
+					<br>
+				<<elseif hasSexStat("deviancy", 4)>>
+					<<link [[Present yourself|Meadow Chase Hill Sex]]>><<set $sexstart to 1>><</link>><<deviant4>>
+					<br>
+				<</if>>
 			<</if>>
 		<</if>>
 	<<else>>
diff --git a/game/overworld-plains/loc-farm/work.twee b/game/overworld-plains/loc-farm/work.twee
index c6f04ce122..de3d69dd1c 100644
--- a/game/overworld-plains/loc-farm/work.twee
+++ b/game/overworld-plains/loc-farm/work.twee
@@ -2665,9 +2665,11 @@ You carry the feed to the field. Some of the younger <<farm_text_many dog>> beg
 	<br>
 	<<link [[Endure|Farm Dogs Endure]]>><<sub 1>><<farm_dogs -1>><<trauma 6>><<stress 6>><</link>><<lrespect>><<gtrauma>><<gstress>>
 	<br>
-	<<if hasSexStat("deviancy", 2)>>
-		<<link [[Drop to your knees|Farm Dogs Drop]]>><</link>><<deviant2>>
-		<br>
+	<<if $bestialitydisable is "f" or $monster is 1>>
+		<<if hasSexStat("deviancy", 2)>>
+			<<link [[Drop to your knees|Farm Dogs Drop]]>><</link>><<deviant2>>
+			<br>
+		<</if>>
 	<</if>>
 <<elseif $danger gte (9900 - $allure)>>
 	One of the younger <<farm_text dog>>s growls at you, but its elder keeps it in check.<<gstress>><<stress 6>>
diff --git a/game/overworld-plains/loc-livestock/field.twee b/game/overworld-plains/loc-livestock/field.twee
index 3aa43f4e0e..8970a9ff34 100644
--- a/game/overworld-plains/loc-livestock/field.twee
+++ b/game/overworld-plains/loc-livestock/field.twee
@@ -1021,7 +1021,7 @@ You approach Remy's steeds.
 	<br>
 
 	<!-- Modified for Monster People -->
-	<<if $awareness gte 200 and $horsedisable is "f" and $bestialitydisable is "f">>
+	<<if $awareness gte 200 and $horsedisable is "f" and ($bestialitydisable is "f" or $monster is 1)>>
 		<br>
 		<<beastNEWinit 1 horse>>
 		One <<beasttype>> seems agitated in the back. <<bHe>> stomps at the others, and is 
@@ -1197,8 +1197,10 @@ You approach Remy's steeds.
 		<br><br>
 
 		<!-- Modified for Monster People -->
-		<<link [[Look beneath <<bhim>>|Livestock Field Deviancy]]>><<set $phase to 1>><</link>><<deviant1>>
-		<br>
+		<<if $bestialitydisable is "f" or $monster is 1>>
+			<<link [[Look beneath <<bhim>>|Livestock Field Deviancy]]>><<set $phase to 1>><</link>><<deviant1>>
+			<br>
+		<</if>>
 		<<link [[Ignore|Livestock Field Horse]]>><<endevent>><</link>>
 		<br>
 	<</if>>
diff --git a/game/overworld-plains/loc-moor/events.twee b/game/overworld-plains/loc-moor/events.twee
index 5b96ad5548..9ac1e7e6ab 100644
--- a/game/overworld-plains/loc-moor/events.twee
+++ b/game/overworld-plains/loc-moor/events.twee
@@ -160,6 +160,7 @@ You tear free from the thorny bush.
 		<<covered>>
 	<<else>>
 		Your <<bottoms>> <<is _bottom>> left worse for wear.
+		<br><br>
 	<</if>>
 <<else>>
 	<<set _top.integrity -= 10>>
@@ -170,9 +171,9 @@ You tear free from the thorny bush.
 		<<covered>>
 	<<else>>
 		Your _top.name <<is _top>> left worse for wear.
+		<br><br>
 	<</if>>
 <</if>>
-<br><br>
 
 <<link [[Next|Moor]]>><<set $eventskip to 1>><</link>>
 <br>
@@ -4084,12 +4085,14 @@ You slowly hold out your hands toward the <<beasttype>>, doing your best to appe
 
 	<<link [[Pet <<bhim>>|Moor Fox Pet]]>><</link>><<tendingdifficulty _tendingMin _tendingMax>>
 	<br>
-	<<if hasSexStat("deviancy", 3)>>
-		<<link [["Pet" <<bhim>>|Moor Fox Deviant Pet]]>><<transform fox 1>><</link>><<deviant3>>
-	<<else>>
-		<<insufficientStat "deviancy" "to take things further">>
+	<<if $bestialitydisable is "f" or $monster is 1>>
+		<<if hasSexStat("deviancy", 3)>>
+			<<link [["Pet" <<bhim>>|Moor Fox Deviant Pet]]>><<transform fox 1>><</link>><<deviant3>>
+		<<else>>
+			<<insufficientStat "deviancy" "to take things further">>
+		<</if>>
+		<br>
 	<</if>>
-	<br>
 <<else>>
 	<<bHe>> looks at you for a moment before bolting away. <<trauma 2>><<gtrauma>>
 	<br><br>
@@ -4313,7 +4316,7 @@ You slowly hold out your hands toward the <<beasttype>>, doing your best to appe
 <<if $enemyarousal gte $enemyarousalmax>>
 	<<beastejaculation>>
 	<<if $consensual is 1>>
-		Now sated, the <<beasttype>> leans in against you. It licks your cheek, and you pet <<bhim>> for a few minutes. <<stress -2>><<lstress>>
+		Now sated, the <<beasttype>> leans in against you. <<bHe>> licks your cheek, and you pet <<bhim>> for a few minutes. <<stress -2>><<lstress>>
 		<br><br>
 
 		Your impromptu cuddling session can't last forever, though, and eventually you manage to disentangle yourself from <<bhim>>.
@@ -4793,7 +4796,7 @@ You slowly hold out your hands toward the <<beasttype>>, doing your best to appe
 	<<link [[Next|Moor]]>><<set $eventskip to 1>><</link>>
 	<br>
 <<elseif $enemyarousal gte $enemyarousalmax>>
-	<<ejaculation>>
+	<<beastejaculation>>
 
 	<<if $monster is 1>>
 		"Fuck, that was amazing... Say, do you need a ride?" the <<beasttype>> pants.
@@ -4892,7 +4895,7 @@ You slowly hold out your hands toward the <<beasttype>>, doing your best to appe
 	<<link [[Next|Moor]]>><<set $eventskip to 1>><</link>>
 	<br>
 <<elseif $enemyarousal gte $enemyarousalmax>>
-	<<ejaculation>>
+	<<beastejaculation>>
 
 	The <<beasttype>> leaves you battered and bruised on the ground. <<bHe>> spits on you before galloping away.<<trauma 6>><<gtrauma>>
 	<br><br>
diff --git a/game/overworld-plains/loc-moor/widgets.twee b/game/overworld-plains/loc-moor/widgets.twee
index 884585d561..bdf1dafe2c 100644
--- a/game/overworld-plains/loc-moor/widgets.twee
+++ b/game/overworld-plains/loc-moor/widgets.twee
@@ -208,7 +208,7 @@
 			<br>
 			<<link [[Approach carefully and mount|Moor Horse]]>><<set $phase to 1>><</link>><<tendingdifficulty 1 1200>>
 			<br>
-			<<if hasSexStat("deviancy", 5)>>
+			<<if hasSexStat("deviancy", 5) ($bestialitydisable is "f" or $monster is 1)>>
 				<<link [[Let <<bhim>> mount you|Moor Horse]]>><<set $phase to 2>><</link>><<deviant5>>
 				<br>
 			<</if>>
@@ -281,11 +281,11 @@
 	<</if>>
 	<<if random(1, 8) is 8 or ($moormove is "quick_search" or $moormove is "normal_search" or $moormove is "careful_search" or $moormove is "fly_search") and random(1, 4) is 4>>
 		<<rng 2>>
-		<<if $rng is 2>>
-			<<wearProp "artillery">>
+		<<if $rng is 2>>			
 			You spot a black shape, half-buried in mud. It's an artillery shell. It looks old.
 
 			<<if currentSkillValue('history') gte 500>>
+				<<wearProp "artillery">>
 				<span class="green">It can't still be active,</span> and it might be worth something to a collector.
 				<<set $antiquemoney += 100>><<museumAntiqueStatus "antiqueshell" "found">>
 				<br><br>
diff --git a/game/overworld-town/loc-alley/park.twee b/game/overworld-town/loc-alley/park.twee
index 6fae3c5bea..91dc4f3144 100644
--- a/game/overworld-town/loc-alley/park.twee
+++ b/game/overworld-town/loc-alley/park.twee
@@ -191,9 +191,9 @@ Tulips grow in great patches near the riverbank.
 				<br><br>
 			<</if>>
 		<</if>>
-		<<maleicon>><<link [[Men's toilets (0:01)|Men's Toilets]]>><<pass 1>><</link>>
+		<<maleicon>><<link [[Men's toilets (0:01)|Men's Toilets]]>><<pass 1>><<endevent>><</link>>
 		<br>
-		<<femaleicon>><<link [[Women's toilets (0:01)|Women's Toilets]]>><<pass 1>><</link>>
+		<<femaleicon>><<link [[Women's toilets (0:01)|Women's Toilets]]>><<pass 1>><<endevent>><</link>>
 		<<if $leftleg is "bound" or $rightleg is "bound">>
 			<br>
 			<<set $_boundType to ($leftleg is "bound" ? ($rightleg is "bound" ? "both legs" : "your left leg") : "your right leg")>>
diff --git a/game/overworld-town/loc-brothel/shows.twee b/game/overworld-town/loc-brothel/shows.twee
index 33d6b6458b..e1d4d7abf8 100644
--- a/game/overworld-town/loc-brothel/shows.twee
+++ b/game/overworld-town/loc-brothel/shows.twee
@@ -1287,7 +1287,7 @@ You leave the stage, and find Briar waiting for you.
 <</if>>
 <br><br>
 <<if $brothel_show_bukkake gte 1>>
-	You make <<printmoney `$brothel_show_bukkake * 5000`>><<money `$brothel_show_bukkake * 5000` "brothelShow">>
+	You make <<printmoney `$brothel_show_bukkake * 5000`>><<money `$brothel_show_bukkake * 5000` "brothelShow">>.
 <</if>>
 <br><br>
 
diff --git a/game/overworld-town/loc-cafe/main.twee b/game/overworld-town/loc-cafe/main.twee
index ec5de8ff6f..70aeb925ef 100644
--- a/game/overworld-town/loc-cafe/main.twee
+++ b/game/overworld-town/loc-cafe/main.twee
@@ -1559,9 +1559,9 @@ It arrives promptly, wafting the delicious smell of fresh coffee up your nose.
 	<</if>>
 <<else>>
 	You take your time with your coffee, enjoying the indulgent richness of it one sip at a time.
+	<br><br>
 <</if>>
 
-<br><br>
 <<link [[Finish your drink|Cafe Coffee Finish]]>><</link>>
 
 :: Cafe Coffee Flash
@@ -1592,9 +1592,10 @@ It arrives promptly, wafting the delicious smell of fresh coffee up your nose.
 	<<if $resting>>
 		You take a sip of your coffee, savouring the warm caffeiny goodness.
 		<<cafecoffeesip>>
+		<br><br>
 	<<elseif $arousal gte $arousalmax - 20>>
 		<<orgasm>>
-		Still hazy from your orgasm you look up to see the strangers outside grinning at you, a few of them are giggling and gossiping with each other.
+		Still hazy from your orgasm, you look up to see the strangers outside grinning at you, a few of them are giggling and gossiping with each other.
 		You've been caught, given away by your own body no less.
 		<<if $cameras_raised gte 1>>
 			<span class="pink">
@@ -1606,11 +1607,12 @@ It arrives promptly, wafting the delicious smell of fresh coffee up your nose.
 			<<else>>
 				Your tummy flutters in delight at having an audience for your public orgasm.
 				It doesn't hurt that you managed to get off purely from exposing yourself either.
-				<<stress -5>><<exhibitionism4>>
+				<<stress -5>><<lstress>>
 			<</if>>
 			<<fameexhibitionism 50>>
 		<</if>>
 		<<set _caught to 1>>
+		<br><br>
 	<<else>>
 		<<switch $phase>>
 			<<case 0>>
@@ -1724,7 +1726,7 @@ It arrives promptly, wafting the delicious smell of fresh coffee up your nose.
 					<<He>> brings <<his>> phone to <<his>> face and frowns, seemingly unhappy with the photo <<he>> got of your exposed <<undies>>.
 					Raising it again <<he>> takes another photo of your exposed <<undies>>.
 					<<if random(0,2) gte 1>>
-						<<He>> brings <<his>> phone to <<his>> face and grins, seemingly happy with the photo <<he>> got of your exposed <<undies>>.
+						<<He>> brings <<his>> phone to <<his>> face and grins this time, seemingly happy with the photo <<he>> got of your exposed <<undies>>.
 						<<set _photos_taken +=1>>
 					<<else>>
 						<<He>> brings <<his>> phone to <<his>> face again and frowns, before pocketing <<his>> phone in frustration.
@@ -1747,7 +1749,7 @@ It arrives promptly, wafting the delicious smell of fresh coffee up your nose.
 					<<He>> brings <<his>> phone to <<his>> face and frowns, seemingly unhappy with the photo <<he>> got of your exposed <<undies>>.
 					Raising it again <<he>> takes another photo of your exposed <<undies>>.
 					<<if random(0,2) gte 1>>
-						<<He>> brings <<his>> phone to <<his>> face and grins, seemingly happy with the photo <<he>> got of your exposed <<undies>>.
+						<<He>> brings <<his>> phone to <<his>> face and grins this time, seemingly happy with the photo <<he>> got of your exposed <<undies>>.
 						<<set _photos_taken +=1>>
 					<<else>>
 						<<He>> brings <<his>> phone to <<his>> face again and frowns, before pocketing <<his>> phone in frustration.
@@ -1770,7 +1772,7 @@ It arrives promptly, wafting the delicious smell of fresh coffee up your nose.
 					<<He>> brings <<his>> phone to <<his>> face and frowns, seemingly unhappy with the photo <<he>> got of your exposed <<undies>>.
 					Raising it again <<he>> takes another photo of your exposed <<undies>>.
 					<<if random(0,2) gte 1>>
-						<<He>> brings <<his>> phone to <<his>> face and grins, seemingly happy with the photo <<he>> got of your exposed <<undies>>.
+						<<He>> brings <<his>> phone to <<his>> face and grins this time, seemingly happy with the photo <<he>> got of your exposed <<undies>>.
 						<<set _photos_taken +=1>>
 					<<else>>
 						<<He>> brings <<his>> phone to <<his>> face again and frowns, before pocketing <<his>> phone in frustration.
@@ -1799,7 +1801,6 @@ It arrives promptly, wafting the delicious smell of fresh coffee up your nose.
 	/* action choices */
 	<<set $still to 0>>
 
-	<br><br>
 	<<if $resting>>
 		<<link [[Part your legs again (0:01)|Cafe Coffee Flash]]>>
 			<<set $phase to 0>>
diff --git a/game/overworld-town/loc-cafe/widgets.twee b/game/overworld-town/loc-cafe/widgets.twee
index 4537ac3437..6035c6b831 100644
--- a/game/overworld-town/loc-cafe/widgets.twee
+++ b/game/overworld-town/loc-cafe/widgets.twee
@@ -262,7 +262,7 @@
 		extremely embarrassed letting so many strangers see your <<undies>> in public like this, but despite the feeling of <<print ["embarrassment", "humiliation", "vulnerability", "exposure"].pluck()>> you crave more.
 	<<else>>
 		<<print ["excited", "exhillerated", "turned on", "thrilled", "horny", "lewd"].pluck()>> showing so many strangers your <<undies>> in public like this.
-		<<if $assertiveaction is "trauma">> You're so naughty. <<trauma -2>><<ltrauma>> <</if>>
+		<<if $assertiveaction is "trauma">> You're so naughty. <<trauma -2>><<ltrauma>><<if $phase isnot 4>><br><br><</if>><</if>>
 	<</if>>
 
 	<<switch $phase>>
diff --git a/game/overworld-town/loc-danube-homes/skulduggery.twee b/game/overworld-town/loc-danube-homes/skulduggery.twee
index 29aa4d961e..4b0c28b7a5 100644
--- a/game/overworld-town/loc-danube-homes/skulduggery.twee
+++ b/game/overworld-town/loc-danube-homes/skulduggery.twee
@@ -53,11 +53,11 @@ You sneak around the mansion and look for anything of value.
 		"Intruder! Masters won't be pleased." <<bHe>> flicks <<bhis>> tail.
 	<</if>>
 	<br><br>
-	<<if $monster is 1 or $bestialitydisable is "f">>
-		<<if $cat gte 6>>
-			<<link [[Meow|Danube House Meow]]>><</link>><<cat>>
-			<br>
-		<</if>>
+	<<if $cat gte 6>>
+		<<link [[Meow|Danube House Meow]]>><</link>><<cat>>
+		<br>
+	<</if>>
+	<<if $monster is 1 or $bestialitydisable is "f">>		
 		<<if hasSexStat("deviancy", 2)>>
 			<<link [[Try to calm <<bhim>>|Danube House Cat]]>><<set $sexstart to 1>><<generate2>><</link>><<deviant2>>
 			<br>
@@ -76,7 +76,7 @@ You sneak around the mansion and look for anything of value.
 	<<generate1>><<person1>>You find a <<person>> dozing on a large sofa. <<He>> <<if $rng % 2>>is wearing expensive jewellery.<<else>>has fallen asleep holding some kind of tablet computer.<</if>>
 	<br><br>
 	<<set $skulduggerydifficulty to 400>>
-	<<link [[Rob them|Danube House Rob]]>><</link>><<skulduggerydifficulty>><<crime "thievery">>
+	<<link [[Rob <<him>>|Danube House Rob]]>><</link>><<skulduggerydifficulty>><<crime "thievery">>
 	<br>
 	<<link [[Leave|Danube Street]]>><<endevent>><</link>>
 	<br>
diff --git a/game/overworld-town/loc-danube-homes/work.twee b/game/overworld-town/loc-danube-homes/work.twee
index eb61ce273c..f4815f0c65 100644
--- a/game/overworld-town/loc-danube-homes/work.twee
+++ b/game/overworld-town/loc-danube-homes/work.twee
@@ -122,209 +122,209 @@ You walk up to one of the mansions and knock on the door.
 :: Danube Party Intro
 <<set $outside to 0>><<set $location to "town">><<effects>><<set $bus to "danube">>
 
-	<<if $rng gte 1>>
+<<if $rng gte 1>>
 
-		<<He>> pauses for a moment, considering. "Our help hasn't arrived, but you look... fit," <<he>> says.
-		"I'm throwing a party and need someone to distribute refreshments. You'll get <<printmoney 6000>> for two hours work."
-		<<He>> rummages in something to <<his>> left, out of your view, before producing a small waist apron. "<<printmoney 15000>>, if you wear this."
-		<br><br>
+	<<He>> pauses for a moment, considering. "Our help hasn't arrived, but you look... fit," <<he>> says.
+	"I'm throwing a party and need someone to distribute refreshments. You'll get <<printmoney 6000>> for two hours work."
+	<<He>> rummages in something to <<his>> left, out of your view, before producing a small waist apron. "<<printmoney 15000>>, if you wear this."
+	<br><br>
 
-		You look more closely at the apron. It's such a slight thing it would be little protection against spillages, and would barely cover more than your crotch.
-		<br><br>
+	You look more closely at the apron. It's such a slight thing it would be little protection against spillages, and would barely cover more than your crotch.
+	<br><br>
 
-		"It wouldn't do much to protect your other clothes, which is why you shouldn't wear any." <<He>> smiles. "Hence the extra pay. So what do you think?"
-		<br><br>
+	"It wouldn't do much to protect your other clothes, which is why you shouldn't wear any." <<He>> smiles. "Hence the extra pay. So what do you think?"
+	<br><br>
 
-		<<if hasSexStat("exhibitionism", 4)>>
-			<<link [[Agree to work in the apron|Danube Apron]]>><<housekeeping 1 400>><</link>><<exhibitionist4>><<ghousekeeping 400>>
-			<br>
-		<<else>>
-			<<insufficientStat "exhibitionism" "to take up the scandalous offer">>
-			<br><br>
-		<</if>>
-		<<link [[Agree to work in normal clothes|Danube Party]]>><<housekeeping 1 400>><</link>><<ghousekeeping 400>>
+	<<if hasSexStat("exhibitionism", 4)>>
+		<<getinicon>><<link [[Agree to work in the apron|Danube Apron]]>><<housekeeping 1 400>><</link>><<exhibitionist4>><<ghousekeeping 400>>
 		<br>
-		<<refuseicon>><<link [[Refuse|Danube Street]]>><<endevent>><</link>>
-		<br>
-
 	<<else>>
-
-		"There's nothing," <<he>> says. "Now if you'll excuse me, I have a party to get back to." <<He>> shuts the door.
+		<<insufficientStat "exhibitionism" "to take up the scandalous offer">>
 		<br><br>
+	<</if>>
+	<<getinicon>><<link [[Agree to work in normal clothes|Danube Party]]>><<housekeeping 1 400>><</link>><<ghousekeeping 400>>
+	<br>
+	<<refuseicon>><<link [[Refuse|Danube Street]]>><<endevent>><</link>>
+	<br>
 
-		<<link [[Try another house|Danube House Knock]]>><<endevent>><</link>>
-		<br>
-		<<link [[Stop|Danube Street]]>><<endevent>><</link>>
-		<br>
+<<else>>
 
-	<</if>>
+	"There's nothing," <<he>> says. "Now if you'll excuse me, I have a party to get back to." <<He>> shuts the door.
+	<br><br>
+
+	<<link [[Try another house|Danube House Knock]]>><<endevent>><</link>>
+	<br>
+	<<link [[Stop|Danube Street]]>><<endevent>><</link>>
+	<br>
+
+<</if>>
 
 :: Danube Attic Intro
 <<set $outside to 0>><<set $location to "town">><<effects>><<set $bus to "danube">>
-	<<if $rng gte 1>>
+<<if $rng gte 1>>
 
-		"You're an insolent little thing," <<he>> says.
-		"But as it happens I do need something. There's a family heirloom in my attic I need retrieved.
-		I can't do it myself, it's too dusty up there. It will take up to an hour and I'll give you <<printmoney 2500>> for finding it."
-		<br><br>
+	"You're an insolent little thing," <<he>> says.
+	"But as it happens I do need something. There's a family heirloom in my attic I need retrieved.
+	I can't do it myself, it's too dusty up there. It will take up to an hour and I'll give you <<printmoney 2500>> for finding it."
+	<br><br>
 
-		<<link [[Accept|Danube Attic]]>><<housekeeping 1 400>><</link>><<ghousekeeping 400>>
-		<br>
-		<<refuseicon>><<link [[Refuse|Danube Street]]>><<endevent>><</link>>
-		<br>
+	<<getinicon>><<link [[Accept|Danube Attic]]>><<housekeeping 1 400>><</link>><<ghousekeeping 400>>
+	<br>
+	<<refuseicon>><<link [[Refuse|Danube Street]]>><<endevent>><</link>>
+	<br>
 
-	<<else>>
+<<else>>
 
-		"Insolent whelp," <<he>> says. "Begone."
-		<br><br>
+	"Insolent whelp," <<he>> says. "Begone."
+	<br><br>
 
-		<<link [[Try another house|Danube House Knock]]>><<housekeeping 1 400>><<endevent>><</link>><<ghousekeeping 400>>
-		<br>
-		<<link [[Stop|Danube Street]]>><<endevent>><</link>>
-		<br>
+	<<link [[Try another house|Danube House Knock]]>><<housekeeping 1 400>><<endevent>><</link>><<ghousekeeping 400>>
+	<br>
+	<<link [[Stop|Danube Street]]>><<endevent>><</link>>
+	<br>
 
-	<</if>>
+<</if>>
 
 :: Danube Tea Intro
 <<set $outside to 0>><<set $location to "town">><<effects>><<set $bus to "danube">>
-	<<if $rng gte 1>>
+<<if $rng gte 1>>
 
-		The <<person>> smiles. "There's nothing I need," <<he>> says. "But I'll give you <<printmoney 2500>> to join me for tea. It will take about an hour."
-		<br><br>
+	The <<person>> smiles. "There's nothing I need," <<he>> says. "But I'll give you <<printmoney 2500>> to join me for tea. It will take about an hour."
+	<br><br>
 
-		<<link [[Accept|Danube Tea]]>><<housekeeping 1 400>><</link>><<ghousekeeping 400>>
-		<br>
-		<<refuseicon>><<link [[Refuse|Danube Street]]>><<endevent>><</link>>
-		<br>
+	<<getinicon>><<link [[Accept|Danube Tea]]>><<housekeeping 1 400>><</link>><<ghousekeeping 400>>
+	<br>
+	<<refuseicon>><<link [[Refuse|Danube Street]]>><<endevent>><</link>>
+	<br>
 
-	<<else>>
+<<else>>
 
-		"There's nothing I need," <<he>> says, "But don't be afraid to call again, sweetie."
-		<br><br>
+	"There's nothing I need," <<he>> says, "But don't be afraid to call again, sweetie."
+	<br><br>
 
-		<<link [[Try another house|Danube House Knock]]>><<housekeeping 1 400>><<endevent>><</link>><<ghousekeeping 400>>
-		<br>
-		<<link [[Stop|Danube Street]]>><<endevent>><</link>>
-		<br>
+	<<link [[Try another house|Danube House Knock]]>><<housekeeping 1 400>><<endevent>><</link>><<ghousekeeping 400>>
+	<br>
+	<<link [[Stop|Danube Street]]>><<endevent>><</link>>
+	<br>
 
-	<</if>>
+<</if>>
 
 :: Danube Garden Intro
 <<set $outside to 0>><<set $location to "town">><<effects>><<set $bus to "danube">>
-	<<if $rng gte 1>>
+<<if $rng gte 1>>
 
-		<<person1>><<He>> stares down <<his>> nose at you.
-		"There is something," <<he>> says, "We have a problem with weeds growing and strangling our other plants. We would give you <<printmoney 12000>> for four hours work."
-		<br><br>
+	<<person1>><<He>> stares down <<his>> nose at you.
+	"There is something," <<he>> says, "We have a problem with weeds growing and strangling our other plants. We would give you <<printmoney 12000>> for four hours work."
+	<br><br>
 
-		<<link [[Enter|Danube Garden]]>><<tending 1>><</link>><<gtending>>
-		<br>
-		<<refuseicon>><<link [[Refuse|Danube Street]]>><<endevent>><</link>>
-		<br>
+	<<getinicon>><<link [[Accept|Danube Garden]]>><<tending 1>><</link>><<gtending>>
+	<br>
+	<<refuseicon>><<link [[Refuse|Danube Street]]>><<endevent>><</link>>
+	<br>
 
-	<<else>>
+<<else>>
 
-		"No," <<he>> says, and slams the door shut.
-		<br><br>
+	"No," <<he>> says, and slams the door shut.
+	<br><br>
 
-		<<link [[Try another house|Danube House Knock]]>><<endevent>><</link>>
-		<br>
-		<<link [[Stop|Danube Street]]>><<endevent>><</link>>
-		<br>
+	<<link [[Try another house|Danube House Knock]]>><<endevent>><</link>>
+	<br>
+	<<link [[Stop|Danube Street]]>><<endevent>><</link>>
+	<br>
 
-	<</if>>
+<</if>>
 
 :: Danube Doll Intro
 <<set $outside to 0>><<set $location to "town">><<effects>><<set $bus to "danube">>
-	<<if $rng gte 1>>
+<<if $rng gte 1>>
 
-		<<His>> demeanour changes. "I'm hosting a tea party and there's a spare seat," <<he>> says with enthusiasm.
-		"I'll give you <<printmoney 2500>> if you fill in for the missing guest. It will take forty minutes."
-		<br><br>
+	<<His>> demeanour changes. "I'm hosting a tea party and there's a spare seat," <<he>> says with enthusiasm.
+	"I'll give you <<printmoney 2500>> if you fill in for the missing guest. It will take forty minutes."
+	<br><br>
 
-		<<link [[Accept (0:40)|Danube Doll]]>><<housekeeping 1 400>><</link>><<ghousekeeping 400>>
-		<br>
-		<<refuseicon>><<link [[Refuse|Danube Street]]>><<endevent>><</link>>
-		<br>
+	<<getinicon>><<link [[Accept (0:40)|Danube Doll]]>><<housekeeping 1 400>><</link>><<ghousekeeping 400>>
+	<br>
+	<<refuseicon>><<link [[Refuse|Danube Street]]>><<endevent>><</link>>
+	<br>
 
-	<<else>>
+<<else>>
 
-		<<He>> wordlessly slams the door shut.
-		<br><br>
+	<<He>> wordlessly slams the door shut.
+	<br><br>
 
-		<<link [[Try another house|Danube House Knock]]>><<endevent>><</link>>
-		<br>
-		<<link [[Stop|Danube Street]]>><<endevent>><</link>>
-		<br>
+	<<link [[Try another house|Danube House Knock]]>><<endevent>><</link>>
+	<br>
+	<<link [[Stop|Danube Street]]>><<endevent>><</link>>
+	<br>
 
-	<</if>>
+<</if>>
 
 :: Danube Tutor Intro
 <<set $outside to 0>><<set $location to "town">><<effects>><<set $bus to "danube">>
-	<<if $rng gte 1>>
-		<<schooleffects>>
-		<<if !["first","second","third","lunch","fourth","fifth"].includes($schoolstate)>>
-			<<set $rng1 to random(3)>>
-			<<He>> looks at you with interest. "Our <<person1>><<daughter>> is preparing for
-			<<switch $rng1>>
-				<<case 0>>a science
-				<<case 1>>a maths
-				<<case 2>>an English
-				<<case 3>>a history
-			<</switch>>
-			exam. Perhaps you could tutor <<him>> for an hour? We'll pay between <<printmoney 1000>> and <<printmoney 15000>>. Depends how good you are."
-			<br><br>
-
-			<<link [[Accept (1:00)|Danube Tutor]]>><<pass 60>><<housekeeping 1 400>><</link>><<ghousekeeping 400>>
-			<br>
-			<<refuseicon>><<link [[Refuse|Danube Street]]>><<endevent>><</link>>
-			<br>
-		<<else>>
-			"I'm interested in a tutor, but I'm afraid my <<person1>><<daughter>> is in school at the moment." <<person2>><<He>> pauses and looks you over. "Shouldn't you be in school yourself?" <<gstress>><<stress 2>>
-			<br><br>
-
-			<<link [[Try another house|Danube House Knock]]>><<endevent>><</link>>
-			<br>
-			<<link [[Stop|Danube Street]]>><<endevent>><</link>>
-			<br>
-		<</if>>
+<<if $rng gte 1>>
+	<<schooleffects>>
+	<<if !["first","second","third","lunch","fourth","fifth"].includes($schoolstate)>>
+		<<set $rng1 to random(3)>>
+		<<He>> looks at you with interest. "Our <<person1>><<daughter>> is preparing for
+		<<switch $rng1>>
+			<<case 0>>a science
+			<<case 1>>a maths
+			<<case 2>>an English
+			<<case 3>>a history
+		<</switch>>
+		exam. Perhaps you could tutor <<him>> for an hour? We'll pay between <<printmoney 1000>> and <<printmoney 15000>>. Depends how good you are."
+		<br><br>
 
+		<<getinicon>><<link [[Accept (1:00)|Danube Tutor]]>><<pass 60>><<housekeeping 1 400>><</link>><<ghousekeeping 400>>
+		<br>
+		<<refuseicon>><<link [[Refuse|Danube Street]]>><<endevent>><</link>>
+		<br>
 	<<else>>
-
-		<<He>> shakes <<his>> head. "There's nothing we need, thanks."
+		"I'm interested in a tutor, but I'm afraid my <<person1>><<daughter>> is in school at the moment." <<person2>><<He>> pauses and looks you over. "Shouldn't you be in school yourself?" <<gstress>><<stress 2>>
 		<br><br>
 
 		<<link [[Try another house|Danube House Knock]]>><<endevent>><</link>>
 		<br>
 		<<link [[Stop|Danube Street]]>><<endevent>><</link>>
 		<br>
-
 	<</if>>
 
-:: Danube Breast Intro
-<<set $outside to 0>><<set $location to "town">><<effects>><<set $bus to "danube">>
+<<else>>
 
-	<<He>> smiles. "You look thirsty," <<he>> says. "And my chest is so heavy." <<He>> cups <<his>> $NPCList[0].breastdesc. "Take the burden off me and I'll give you <<printmoney 500>>."
+	<<He>> shakes <<his>> head. "There's nothing we need, thanks."
 	<br><br>
 
-	<<if $awareness gte 200>>
-		<span class="blue"><<He>> wants you to drink from <<his>> breast.</span>
-		<br><br>
-	<<else>>
-		You aren't sure what <<he>> means. <<He>> recognises your confusion. "I want you to suckle from my breast," <<he>> adds.
-		<br><br>
-	<</if>>
+	<<link [[Try another house|Danube House Knock]]>><<endevent>><</link>>
+	<br>
+	<<link [[Stop|Danube Street]]>><<endevent>><</link>>
+	<br>
 
-	<<if hasSexStat("promiscuity", 3)>>
-		<<link [[Accept (0:15)|Danube Breast]]>><<pass 15>><<breastfed>><</link>><<promiscuous3>><<lpurity>>
-		<br>
-	<<else>>
-		<<insufficientStat "promiscuity" "to accept such an offer">>
-		<br><br>
-	<</if>>
+<</if>>
+
+:: Danube Breast Intro
+<<set $outside to 0>><<set $location to "town">><<effects>><<set $bus to "danube">>
+
+<<He>> smiles. "You look thirsty," <<he>> says. "And my chest is so heavy." <<He>> cups <<his>> $NPCList[0].breastdesc. "Take the burden off me and I'll give you <<printmoney 500>>."
+<br><br>
+
+<<if $awareness gte 200>>
+	<span class="blue"><<He>> wants you to drink from <<his>> breast.</span>
+	<br><br>
+<<else>>
+	You aren't sure what <<he>> means. <<He>> recognises your confusion. "I want you to suckle from my breast," <<he>> adds.
+	<br><br>
+<</if>>
 
-	<<link [[Refuse|Danube Street]]>><<endevent>><</link>>
+<<if hasSexStat("promiscuity", 3)>>
+	<<getinicon>><<link [[Accept (0:15)|Danube Breast]]>><<pass 15>><<breastfed>><</link>><<promiscuous3>><<lpurity>>
 	<br>
+<<else>>
+	<<insufficientStat "promiscuity" "to accept such an offer">>
+	<br><br>
+<</if>>
+
+<<refuseicon>><<link [[Refuse|Danube Street]]>><<endevent>><</link>>
+<br>
 
 :: Danube House Intro
 <<effects>>
@@ -334,7 +334,7 @@ You walk up to one of the mansions and knock on the door.
 <<He>> narrows <<his>> eyes. "My guests have certain expectations, however," <<he>> continues. "High expectations. I hope you know your way around a table."
 <br><br>
 
-<<link [[Accept (0:15)|Danube House Intro 2]]>><<pass 15>><</link>>
+<<getinicon>><<link [[Accept (0:15)|Danube House Intro 2]]>><<pass 15>><</link>>
 <br>
 <<refuseicon>><<link [[Refuse|Danube Street]]>><<endevent>><</link>>
 <br>
@@ -2170,9 +2170,11 @@ You rush in to find <<print ($NPCList[0].pronoun isnot $NPCList[1].pronoun and $
 You were told not to feed them, but they look hungry.
 <br><br>
 
-<<if hasSexStat("deviancy", 3)>>
-	<<link [[Satisfy a different appetite|Danube Catperson Feed]]>><<set $phase to 3>><</link>><<deviant3>>
-	<br>
+<<if $bestialitydisable is "f" or $monster is 1>>
+	<<if hasSexStat("deviancy", 3)>>
+		<<link [[Satisfy a different appetite|Danube Catperson Feed]]>><<set $phase to 3>><</link>><<deviant3>>
+		<br>
+	<</if>>
 <</if>>
 <<link [[Tell them no|Danube Catperson Feed]]>><<set $phase to 2>><</link>><<difficulty 65>>
 <br>
@@ -2276,10 +2278,11 @@ You flop down on the sofa. An hour passes. As you await the owner's return, a <<
 
 You don't pay <<bhim>> any mind, until <<bhe>> creeps closer. With a hiss, <<bhe>> unsheathes <<bhis>> claws.<<stress 5>><<gstress>>
 <br><br>
-
-<<if hasSexStat("deviancy", 2)>>
-	<<link [[Seduce|Danube Catperson Claws Sex]]>><<set $sexstart to 1>><</link>><<deviant2>>
-	<br>
+<<if $bestialitydisable is "f" or $monster is 1>>
+	<<if hasSexStat("deviancy", 2)>>
+		<<link [[Seduce|Danube Catperson Claws Sex]]>><<set $sexstart to 1>><</link>><<deviant2>>
+		<br>
+	<</if>>
 <</if>>
 <<link [[Soothe|Danube Catperson Claws]]>><<set $phase to 2>><</link>><<tendingdifficulty 1 300>>
 <br>
@@ -2414,10 +2417,17 @@ You don't pay <<bhim>> any mind, until <<bhe>> creeps closer. With a hiss, <<bhe
 	<<set _consensual to $consensual>>
 
 	<<if $enemywounded is 0 and $enemyejaculated gte 2>>
-		The <<beasttype>> kicks <<bhis>> <<if $monster isnot 1>>hind<</if>> leg at you as they prowl out of the kitchen. You're left spent and shivering on the tile.
-		<br><br>
+		<<if $consensual is 1>>
+			The <<beastsplural>> purr in contentment and prance out of the kitchen.
+			<br><br>
 
-		<<tearful>> you struggle to your feet.
+			<<tearful>> you rise to your feet and leave after them.
+		<<else>>
+			The <<beasttype>> kicks <<bhis>> <<if $monster isnot 1>>hind<</if>> leg at you as they prowl out of the kitchen. You're left spent and shivering on the tile.
+			<br><br>
+
+			<<tearful>> you struggle to your feet.
+		<</if>>
 	<<elseif $enemywounded is 1 and $enemyejaculated is 1>>
 		The <<beasttype>> takes cover behind the other. <<bHe>> hisses, and the pair retreat, leaving you spent.
 		<br><br>
diff --git a/game/overworld-town/loc-domus-homes/work.twee b/game/overworld-town/loc-domus-homes/work.twee
index a567951c4e..dadd673c67 100644
--- a/game/overworld-town/loc-domus-homes/work.twee
+++ b/game/overworld-town/loc-domus-homes/work.twee
@@ -212,7 +212,7 @@ The <<personsimple>> looks hesitant at first,
 	"I have a job, last minute shit. My children are too young to stay alone but I don't trust any of my neighbours. Can you watch them for about three hours? <<printmoney 300>> each. Can't go any higher than that."
 	<br><br>
 
-	<<ind>><<link [[Accept (3:00)|Domus Babysitting Accept]]>><</link>>
+	<<getinicon>><<link [[Accept (3:00)|Domus Babysitting Accept]]>><</link>>
 	<br>
 	<<refuseicon>><<link [[Refuse|Domus Babysitting Refuse]]>><</link>>
 
@@ -280,7 +280,7 @@ You accept the <<moneyGain 11>>. As you're leaving the house, you catch yourself
 "Something's wrong with my television," <<he>> explains. "<<printmoney 1000>> in it for you if you can figure it out."
 <br><br>
 
-<<ind>><<link [[Accept (0:15)|Domus Tech Support Accept]]>><</link>>
+<<getinicon>><<link [[Accept (0:15)|Domus Tech Support Accept]]>><</link>>
 <br>
 <<refuseicon>><<link [[Refuse|Domus Street]]>><<endevent>><</link>>
 
@@ -488,10 +488,10 @@ You've made <<moneyGain 15>>.
 :: Domus Gutters Intro
 <<set $outside to 0>><<set $location to "town">><<effects>><<set $bus to "domus">>
 <<if $rng gte 1>>
-	"I do need some help actually," <<he>> says. "My gutters need cleaning out. Should take a few hours. I'll give you £25 for it."
+	"I do need some help actually," <<he>> says. "My gutters need cleaning out. Should take a few hours. I'll give you <<printmoney 2500>> for it."
 	<br><br>
 
-	<<ind>><<link [[Accept|Domus Gutters]]>><<housekeeping 1 100>><</link>><<ghousekeeping 100>>
+	<<getinicon>><<link [[Accept|Domus Gutters]]>><<housekeeping 1 100>><</link>><<ghousekeeping 100>>
 	<br>
 	<<refuseicon>><<link [[Refuse|Domus Street]]>><<endevent>><</link>>
 	<br>
@@ -508,10 +508,10 @@ You've made <<moneyGain 15>>.
 :: Domus Lounge Intro
 <<set $outside to 0>><<set $location to "town">><<effects>><<set $bus to "domus">>
 <<if $rng gte 1>>
-	"Yeah, I got something I need doing," <<he>> says. "I'll give you £10 if you clean my lounge. Might take an hour."
+	"Yeah, I got something I need doing," <<he>> says. "I'll give you <<printmoney 1000>> if you clean my lounge. Might take an hour."
 	<br><br>
 
-	<<ind>><<link [[Accept|Domus Lounge]]>><<housekeeping 1 100>><</link>><<ghousekeeping 100>>
+	<<getinicon>><<link [[Accept|Domus Lounge]]>><<housekeeping 1 100>><</link>><<ghousekeeping 100>>
 	<br>
 	<<refuseicon>><<link [[Refuse|Domus Street]]>><<endevent>><</link>>
 	<br>
@@ -528,10 +528,10 @@ You've made <<moneyGain 15>>.
 :: Domus Delivery Intro
 <<set $outside to 0>><<set $location to "town">><<effects>><<set $bus to "domus">>
 <<if $rng gte 1>>
-	The <<person>> thinks for a moment. "I need something delivered," <<he>> says. "Should only take ten minutes to get there and back, and you'll get £5."
+	The <<person>> thinks for a moment. "I need something delivered," <<he>> says. "Should only take ten minutes to get there and back, and you'll get <<printmoney 500>>."
 	<br><br>
 
-	<<ind>><<link [[Accept|Domus Delivery]]>><<housekeeping 1 100>><</link>><<ghousekeeping 100>>
+	<<getinicon>><<link [[Accept|Domus Delivery]]>><<housekeeping 1 100>><</link>><<ghousekeeping 100>>
 	<br>
 	<<refuseicon>><<link [[Refuse|Domus Street]]>><<endevent>><</link>>
 	<br>
@@ -554,10 +554,10 @@ You've made <<moneyGain 15>>.
 	"You still haven't painted that room, have you?" the <<person2>><<person>> responds. "Should have <<phim>> do that."
 	<br><br>
 
-	The <<person1>><<person>> looks back to you. "That's an idea. We'll give you £50 to paint the spare room. Should take six hours."
+	The <<person1>><<person>> looks back to you. "That's an idea. We'll give you <<printmoney 5000>> to paint the spare room. Should take six hours."
 	<br><br>
 
-	<<ind>><<link [[Accept|Domus Painting]]>><<housekeeping 1 100>><</link>><<ghousekeeping 100>>
+	<<getinicon>><<link [[Accept|Domus Painting]]>><<housekeeping 1 100>><</link>><<ghousekeeping 100>>
 	<br>
 	<<refuseicon>><<link [[Refuse|Domus Street]]>><<endevent>><</link>>
 	<br>
@@ -580,10 +580,10 @@ You've made <<moneyGain 15>>.
 :: Domus Homework Intro
 <<set $outside to 0>><<set $location to "town">><<effects>><<set $bus to "domus">>
 <<if $rng gte 1>>
-	"I'm having trouble with homework," <<he>> says. "I'll give you £5 if you help."
+	"I'm having trouble with homework," <<he>> says. "I'll give you <<printmoney 500>> if you help."
 	<br><br>
 
-	<<ind>><<link [[Accept (1:00)|Domus Homework]]>><<housekeeping 1 100>><</link>><<ghousekeeping 100>>
+	<<getinicon>><<link [[Accept (1:00)|Domus Homework]]>><<housekeeping 1 100>><</link>><<ghousekeeping 100>>
 	<br>
 	<<refuseicon>><<link [[Refuse|Domus Street]]>><<endevent>><</link>>
 	<br>
@@ -601,7 +601,7 @@ You've made <<moneyGain 15>>.
 <<set $outside to 0>><<set $location to "town">><<effects>><<set $bus to "domus">>
 <<if $rng gte 1>>
 	"You sounded older on the phone," <<he>> says.
-	"But whatever. It's all as we agreed. £30 for two hours life-modelling. Nude of course. You can leave your clothes in the bathroom there.
+	"But whatever. It's all as we agreed. <<printmoney 3000>> for two hours life-modelling. Nude of course. You can leave your clothes in the bathroom there.
 	<<if $exhibitionism lte 35>>
 		The artists are waiting in the studio through that door."
 		<br><br>
@@ -629,7 +629,7 @@ You've made <<moneyGain 15>>.
 		<span class="blue">You cannot go nude while wearing a $worn.genitals.name.</span>
 		<br>
 	<<else>>
-		<<ind>><<link [[Accept and go nude (2:00)|Domus Model]]>><</link>>
+		<<getinicon>><<link [[Accept and go nude (2:00)|Domus Model]]>><</link>>
 	<</if>>
 	<br>
 	<<sneakicon>><<link [[Sneak away|Domus Street]]>><<endevent>><</link>>
@@ -648,10 +648,10 @@ You've made <<moneyGain 15>>.
 <<set $outside to 0>><<set $location to "town">><<effects>><<set $bus to "domus">>
 <<if $rng gte 1>>
 	"Great timing," <<he>> says. "I ordered some beers at the corner shop. It's all paid for, but they haven't got anyone to run it over and the game's on now.
-	No one wants to miss it. Be an angel and grab them for us. Shouldn't take 10 minutes. I'll pay you £5."
+	No one wants to miss it. Be an angel and grab them for us. Shouldn't take 10 minutes. I'll pay you <<printmoney 500>>."
 	<br><br>
 
-	<<ind>><<link [[Accept (0:10)|Domus Errand]]>><<housekeeping 1 100>><</link>><<ghousekeeping 100>>
+	<<getinicon>><<link [[Accept (0:10)|Domus Errand]]>><<housekeeping 1 100>><</link>><<ghousekeeping 100>>
 	<br>
 	<<refuseicon>><<link [[Refuse|Domus Street]]>><<endevent>><</link>>
 	<br>
@@ -668,10 +668,10 @@ You've made <<moneyGain 15>>.
 :: Domus Shy Intro
 <<set $outside to 0>><<set $location to "town">><<effects>><<set $bus to "domus">>
 <<if $rng gte 1>>
-	"My kid's shy," <<he>> says. "I'll give you £10 if you can help out for an hour or so. More if you actually do some good."
+	"My kid's shy," <<he>> says. "I'll give you <<printmoney 1000>> if you can help out for an hour or so. More if you actually do some good."
 	<br><br>
 
-	<<ind>><<link [[Accept (1:00)|Domus Shy]]>><</link>>
+	<<getinicon>><<link [[Accept (1:00)|Domus Shy]]>><</link>>
 	<br>
 	<<refuseicon>><<link [[Refuse|Domus Street]]>><<endevent>><</link>>
 	<br>
@@ -2498,7 +2498,7 @@ You present the order slip to the <<person>> behind the counter.
 
 	The <<person1>><<person>> points at a door.
 	<br>
-	"Through there. Seduce <<person2>><<him>>. Help <<him>>. I'll give you £20 now and another £100 if you show <<him>> a good time. Deal?"
+	"Through there. Seduce <<person2>><<him>>. Help <<him>>. I'll give you <<printmoney 2000>> now and another <<printmoney 10000>> if you show <<him>> a good time. Deal?"
 	<br><br>
 
 	<<link [[Agree|Domus Shy Seduce]]>><<money 2000>><</link>>
diff --git a/game/overworld-town/loc-flats/work.twee b/game/overworld-town/loc-flats/work.twee
index 44bcd7f391..fa9772b0e0 100644
--- a/game/overworld-town/loc-flats/work.twee
+++ b/game/overworld-town/loc-flats/work.twee
@@ -104,12 +104,12 @@ The lotus rattles as you knock. Footsteps thud closer, and the door swings open.
 :: Flats Lecherous Ask
 <<effects>>
 
-"I do, as a matter of fact," the <<person1>><<person>> says, making room for you to pass. "Threw a party last night, and the balcony is a mess. There'll be <span class="gold">£10</span> in it for you."
+"I do, as a matter of fact," the <<person1>><<person>> says, making room for you to pass. "Threw a party last night, and the balcony is a mess. There'll be <<printmoney 1000>> in it for you."
 <br><br>
 
-<<link [[Accept (1:00)|Flats Lecherous]]>><<housekeeping 1 200>><</link>><<ghousekeeping 200>>
+<<getinicon>><<link [[Accept (1:00)|Flats Lecherous]]>><<housekeeping 1 200>><</link>><<ghousekeeping 200>>
 <br>
-<<link [[Refuse|Flats]]>><<endevent>><</link>>
+<<refuseicon>><<link [[Refuse|Flats]]>><<endevent>><</link>>
 <br>
 
 :: Flats Lecherous
@@ -182,7 +182,7 @@ You sweep up the remains of broken glass, take the bottles to recycling, and thr
 	<<link [[Next|Flats]]>><<pass 60>><<endevent>><</link>>
 	<br>
 <<else>>
-	"Surely a smart <<girl>> like you knows how these things work," <<he>> says, reaching into <<his>> pocket. <<He>> waves another <span class="gold">£10</span> in front of your face. "You wanted money, right?"
+	"Surely a smart <<girl>> like you knows how these things work," <<he>> says, reaching into <<his>> pocket. <<He>> waves another <<printmoney 1000>> in front of your face. "You wanted money, right?"
 	<br><br>
 
 	<<link [[Endure|Flats Lecherous Endure]]>><<sub 1>><</link>>
@@ -222,7 +222,7 @@ You finish the last of your drink, and leave the flat.
 :: Flats Lecherous Rub
 <<effects>>
 
-You rest your hands on <<his>>, and push your <<bottom>> into <<his>> crotch. "This sort of cleaning is extra," you say. "<span class="gold">£20</span> extra."
+You rest your hands on <<his>>, and push your <<bottom>> into <<his>> crotch. "This sort of cleaning is extra," you say. "<<printmoney 2000>> extra."
 <<promiscuity2>>
 
 "S-sounds good to me," <<he>> says.
@@ -243,12 +243,12 @@ You rest your hands on <<his>>, and push your <<bottom>> into <<his>> crotch. "T
 :: Flats Dog Ask
 <<effects>>
 
-The <<person>> strokes <<his>> chin in thought. You hear the barking again, from behind another closed door. The <<person>> turns to face it. "I said shut it!" <<he>> shouts. "Tell you what, I'll give you <span class="gold">£10</span> if you clear the mess the mutt made of my furniture."
+The <<person>> strokes <<his>> chin in thought. You hear the barking again, from behind another closed door. The <<person>> turns to face it. "I said shut it!" <<he>> shouts. "Tell you what, I'll give you <<printmoney 1000>> if you clear the mess the mutt made of my furniture."
 <br><br>
 
-<<link [[Accept (1:00)|Flats Dog]]>><<housekeeping 1 200>><</link>><<ghousekeeping 200>>
+<<getinicon>><<link [[Accept (1:00)|Flats Dog]]>><<housekeeping 1 200>><</link>><<ghousekeeping 200>>
 <br>
-<<link [[Refuse|Flats]]>><<endevent>><</link>>
+<<refuseicon>><<link [[Refuse|Flats]]>><<endevent>><</link>>
 <br>
 
 :: Flats Dog
@@ -658,12 +658,12 @@ The <<beasttype>> pulls you in front of <<bhis>> shocked master.
 :: Flats Kitchen Ask
 <<effects>>
 
-"The kitchen's a tip," the <<person>> says. "I'll give you <span class="gold">£15</span> if you tidy it up. What do you say?"
+"The kitchen's a tip," the <<person>> says. "I'll give you <<printmoney 1500>> if you tidy it up. What do you say?"
 <br><br>
 
-<<link [[Accept (1:00)|Flats Kitchen]]>><<housekeeping 1 200>><</link>><<ghousekeeping 200>>
+<<getinicon>><<link [[Accept (1:00)|Flats Kitchen]]>><<housekeeping 1 200>><</link>><<ghousekeeping 200>>
 <br>
-<<link [[Refuse|Flats]]>><<endevent>><</link>>
+<<refuseicon>><<link [[Refuse|Flats]]>><<endevent>><</link>>
 <br>
 
 :: Flats Kitchen
@@ -749,7 +749,7 @@ The <<person>> hands you a five-pound note. You make <<printmoney 500>><<money 5
 
 <<if $seductionrating gte $seductionrequired>>
 
-	<span class="green">"I-I might have some cash after all,"</span> <<he>> says, fumbling in <<his>> pocket. The notes tumble out, but it looks like there's <span class="gold">£50</span> there. You push <<him>> onto the sofa.
+	<span class="green">"I-I might have some cash after all,"</span> <<he>> says, fumbling in <<his>> pocket. The notes tumble out, but it looks like there's <<printmoney 5000>> there. You push <<him>> onto the sofa.
 	<br><br>
 
 	<<link [[Next|Flats Kitchen Sex]]>><<set $sexstart to 1>><</link>>
@@ -759,7 +759,7 @@ The <<person>> hands you a five-pound note. You make <<printmoney 500>><<money 5
 	The <<person1>><<person>> looks away. "Fuck," <<he>> says. <span class="red">"Now I really wish I wasn't skint. Sorry love."</span> <<He>> holds out a five pound note. You take it and leave.
 	<br><br>
 
-	You make <<printmoney 500>><<money 500 "flatsCleaning">>
+	You make <<printmoney 500>><<money 500 "flatsCleaning">>.
 	<br><br>
 
 	<<link [[Next|Flats]]>><<pass 60>><<endevent>><</link>>
@@ -811,7 +811,7 @@ You make <<printmoney 1500>><<money 1500 "flatsCleaning">>.
 	<<ejaculation>>
 	You gather the fallen cash, leaving the <<person>> sprawling, spent, on the sofa.
 	<br><br>
-	<<tearful>> you leave the flat. You make <<printmoney 5000>><<money 5000 "prostitution">>
+	<<tearful>> you leave the flat. You make <<printmoney 5000>><<money 5000 "prostitution">>.
 	<br><br>
 	<<clotheson>>
 	<<endcombat>>
@@ -828,12 +828,12 @@ You make <<printmoney 1500>><<money 1500 "flatsCleaning">>.
 :: Flats Laundry Ask
 <<effects>>
 
-"You're timely," <<he>> says. "My clothes need ironing. I'll give you <span class="gold">£20</span> if you do the lot."
+"You're timely," <<he>> says. "My clothes need ironing. I'll give you <<printmoney 2000>> if you do the lot."
 <br><br>
 
-<<link [[Accept (1:00)|Flats Laundry]]>><<housekeeping 1 200>><</link>><<ghousekeeping 200>>
+<<getinicon>><<link [[Accept (1:00)|Flats Laundry]]>><<housekeeping 1 200>><</link>><<ghousekeeping 200>>
 <br>
-<<link [[Refuse|Flats]]>><<endevent>><</link>>
+<<refuseicon>><<link [[Refuse|Flats]]>><<endevent>><</link>>
 <br>
 
 :: Flats Laundry
@@ -960,7 +960,7 @@ You refuse the drink, and get to work ironing the clothes and folding them neatl
 	You leave <<him>> leaning against the kitchen counter, rubbing <<his>> eyes.
 	<br><br>
 
-	You make <<printmoney 2000>><<money 2000 "flatsCleaning">>
+	You make <<printmoney 2000>><<money 2000 "flatsCleaning">>.
 	<br><br>
 
 	<<link [[Next|Flats]]>><<pass 60>><<endevent>><</link>>
@@ -1024,14 +1024,14 @@ You refuse the drink, and get to work ironing the clothes and folding them neatl
 
 "I don't think we need anything," the <<person1>><<person>> says.
 <br><br>
-"Wait!" shouts the other voice. "Offer <<phim>> <span class="gold">£10</span> to clean up in here. Because I know your lazy arse won't do it."
+"Wait!" shouts the other voice. "Offer <<phim>> <<printmoney 1000>> to clean up in here. Because I know your lazy arse won't do it."
 <br><br>
 The <<person1>><<person>> looks ready to argue, but relents. "Fine." <<He>> turns to you. "I think you heard the offer."
 <br><br>
 
-<<link [[Accept (1:00)|Flats Pair]]>><<housekeeping 1 200>><</link>><<ghousekeeping 200>>
+<<getinicon>><<link [[Accept (1:00)|Flats Pair]]>><<housekeeping 1 200>><</link>><<ghousekeeping 200>>
 <br>
-<<link [[Refuse|Flats]]>><<endevent>><</link>>
+<<refuseicon>><<link [[Refuse|Flats]]>><<endevent>><</link>>
 <br>
 
 :: Flats Pair
@@ -1064,7 +1064,7 @@ The <<person1>><<person>> and <<person2>><<person>> remain motionless as you wor
 	<br>
 	"You were already finished."
 	<br>
-	The <<person>> flips the board, scattering the pieces. The <<person2>><<person>> laughs. "Sorry for more work <<girl>>. I'll give you an extra <span class="gold">£10</span> if you clean this up as well."
+	The <<person>> flips the board, scattering the pieces. The <<person2>><<person>> laughs. "Sorry for more work <<girl>>. I'll give you an extra <<printmoney 1000>> if you clean this up as well."
 	<br><br>
 	The <<person1>><<person>> paces up and down the room, furious.
 	<br><br>
@@ -1103,7 +1103,7 @@ The <<person1>><<person>> grabs your hair, and turns your head to face <<him>>.
 <br>
 "I know what will cheer me up," the <<person1>><<person>> says, leering at your body.
 <br>
-The <<person2>><<person>> sighs. "I'll throw an extra <span class="gold">£50</span> in if you let my friend vent <<person1>><<his>> frustrations."
+The <<person2>><<person>> sighs. "I'll throw an extra <<printmoney 5000>> in if you let my friend vent <<person1>><<his>> frustrations."
 <br><br>
 
 <<if hasSexStat("promiscuity", 3)>>
diff --git a/game/overworld-town/loc-home/main.twee b/game/overworld-town/loc-home/main.twee
index ea736127c7..8eef32e045 100644
--- a/game/overworld-town/loc-home/main.twee
+++ b/game/overworld-town/loc-home/main.twee
@@ -1665,12 +1665,12 @@ The water's getting cold. "I'm squeaky clean," you say. "Thanks for the help." T
     <br>
     <<link [[Shove Kylar Away|Kylar Bath Shove]]>><<npcincr Kylar love -1>><<npcincr Kylar rage 3>><</link>><<llove>><<gksuspicion>>
 <<else>>
-You wash until you're squeaky clean.<<wash>>
-<br><br>
+	You wash until you're squeaky clean.<<wash>>
+	<br><br>
 
-<<getouticon>><<link [[Get out->Bath Finish]]>><</link>>
-<br>
-<<skinicon "masturbate">><<link [[Masturbate|Bath Masturbation]]>><<set $masturbationstart to 1>><</link>>
+	<<getouticon>><<link [[Get out|Bath Finish]]>><</link>>
+	<br>
+	<<skinicon "masturbate">><<link [[Masturbate|Bath Masturbation]]>><<set $masturbationstart to 1>><</link>>
 <</if>>
 
 :: Kylar Bath Help
@@ -1685,8 +1685,8 @@ You give a slow nod. <<He>> gives you a smile as <<he>> pulls <<his>> hand back.
 "I'm gonna wash them off of you," <<he>> mutters, leaning into you slightly. You feel <<his>> hands groping your body as <<he>> washes you.
 <br><br>
 
- <<He>> seems satisfied once finished, you feel a slight tremble from <<him>>.
-"Wait," <<he>> says. "There's...more." You give <<him>> a confused glance. You feel <<his>> hands slide further down and grope you.
+<<He>> seems satisfied once finished, you feel a slight tremble from <<him>>.
+"Wait," <<he>> says. "There's... more." You give <<him>> a confused glance. You feel <<his>> hands slide further down and grope you.
 
 <br><br>
 <<link [[Next|Kylar Bath Sex]]>><<set $sexstart to 1>><</link>>
@@ -1694,37 +1694,31 @@ You give a slow nod. <<He>> gives you a smile as <<he>> pulls <<his>> hand back.
 :: Kylar Bath Shove
 <<run statusCheck("Kylar")>><<effects>>
 
-<<if _kylarStatus.includes("Calm") or _kylarStatus.includes("Sus")>>
-	You push your hands against <<him>> and shove <<him>> away.<<npcincr Kylar love -1>><<llove>>
-	<br><br>
-
-	Surprised by your sudden movement, <<he>> glances around nervously. "There's...It's still dirty! They're still all over you!"
-	<br><br>
-
-	You tell <<him>> to get out.
-	<br><br>
-
-	<<He>> stares down at the water and slowly starts to back away. "P-Please..clean them off," <<he>> whimpers, redressing with haste. <<He>> gives you one last glance, crawling through the window again.<br><br>
-
-	<<link [[Next|Bath Finish]]>><<endevent>><</link>>
-	<<exit>>
-<</if>>
-
 You push your hands against <<him>> and shove <<him>> away.<<npcincr Kylar love -1>><<llove>>
 <br><br>
 
-Surprised by your sudden movement, <<he>> glances around nervously. "There's...It's still dirty! They're still all over you!"
+Surprised by your sudden movement, <<he>> glances around nervously. "There's... It's still dirty! They're still all over you!"
 <br><br>
 
 You tell <<him>> to get out.
 <br><br>
 
-<<He>> stares down at the water and slowly starts to raise <<his>> hands again. "P-please..let me clean you off. You're dirty. At least let me be sure." <<He>> stares at you, as if waiting to see what you'll do.
-<br><br>
+<<if _kylarStatus.includes("Calm") or _kylarStatus.includes("Sus")>>
 
-<<link [[Let Kylar watch|Kylar Bath Watch]]>><<npcincr Kylar rage -3>><</link>><<lksuspicion>>
-<br>
-<<link [[Tell Kylar to leave|Kylar Bath End 2]]>><<npcincr Kylar rage 5>><</link>><<ggksuspicion>>
+	<<He>> stares down at the water and slowly starts to back away. "P-Please... clean them off," <<he>> whimpers, redressing with haste. <<He>> gives you one last glance, crawling through the window again.
+	<br><br>
+
+	<<link [[Next|Bath Finish]]>><<endevent>><</link>>
+	<<exit>>
+<<else>>
+
+	<<He>> stares down at the water and slowly starts to raise <<his>> hands again. "P-please... let me clean you off. You're dirty. At least let me be sure." <<He>> stares at you, as if waiting to see what you'll do.
+	<br><br>
+
+	<<link [[Let Kylar watch|Kylar Bath Watch]]>><<npcincr Kylar rage -3>><</link>><<lksuspicion>>
+	<br>
+	<<link [[Tell Kylar to leave|Kylar Bath End 2]]>><<npcincr Kylar rage 5>><</link>><<ggksuspicion>>
+<</if>>
 
 :: Kylar Bath Watch
 <<wash>>
@@ -1775,8 +1769,8 @@ Once finished, you look back up to Kylar. <<His>> eyes lock onto your body. A lo
 <<run statusCheck("Kylar")>><<effects>>
 
 <<if $enemyarousal gte $enemyarousalmax>>
+	<<ejaculation>>
 	<<if $consensual is 0>>
-		<<ejaculation>>
 
 		<<He>> leans back with heavy breathing, staring down at your body. <<He>> has a firm grip on your legs.<<npcincr Kylar lust -20>><<lllust>>
 		<br><br>
@@ -1784,12 +1778,10 @@ Once finished, you look back up to Kylar. <<His>> eyes lock onto your body. A lo
 		<<His>> eyes make contact with yours once again, giving you a warm smile before looking outside the nearby window.
 		<br><br>
 
-		"I...have to go. D-don't let them touch you again," <<he>> says, hands already reaching for <<his>> clothes. <<He>> leaves the same way <<he>> arrived
-		<br><br>
+		"I... have to go. D-don't let them touch you again," <<he>> says, hands already reaching for <<his>> clothes. <<He>> leaves the same way <<he>> arrived.
 	<<else>>
-		<<ejaculation>>
 
-		<<He>> leans back with heavy breaths, sliding <<his>> hands back into the water. "Y-you're mine," <<he>> mumbles, looking you over with loving eyes.
+		<<He>> leans back with heavy breaths, sliding <<his>> hands back into the water. "Y-you're mine," <<he>> mumbles, looking you over with loving eyes.<<npcincr Kylar lust -20>><<lllust>>
 		<br><br>
 
 		<<He>> jolts up and looks out the window. "I have to go," <<he>> says while crawling out of the tub. "Sorry- I'll see you soon!" <<He>> gives you one last glance as <<he>> dresses, then soon departs the same way <<he>> came.
@@ -1797,13 +1789,21 @@ Once finished, you look back up to Kylar. <<His>> eyes lock onto your body. A lo
 
 <<elseif $enemyhealth lte 0>>
 
-	<<He>> stammers back, staring up at you with wide eyes.
+	<<He>> staggers back, staring up at you with wide eyes.
 	<br><br>
 
-	"I...I'm helping. I'm helping!"
+	"I... I'm helping. I'm helping!"
 	<br><br>
 
 	With tears in <<his>> eyes, <<he>> scrambles out of the water, reaching for <<his>> clothes. You hear <<him>> sniffle as <<he>> dresses with haste, soon slipping out of the window.
+<<else>>
+	<<He>> disengages from you, staring at you with sad eyes.
+	<br><br>
+
+	"B-but you're still..." <<He>> shakes <<his>> head, droplets of water fly off <<his>> fringe. <<He>> whimpers, "Just don't let them touch you again, p-please."
+	<br><br>
+
+	<<He>> shambles out of the tub, hastily redressing <<himself>> before leaving the same way <<he>> entered.
 <</if>>
 <br><br>
 
@@ -1818,16 +1818,16 @@ Once finished, you look back up to Kylar. <<His>> eyes lock onto your body. A lo
 <<wash>>
 <<run statusCheck("Kylar")>><<effects>>
 
-	You shake your head, raising a hand to the window. You tell <<him>> to leave.
-	<br><br>
+You shake your head, raising a hand to the window. You tell <<him>> to leave.
+<br><br>
 
-	<<He>> stares at you for a few moments, bewildered. "Wash it off," <<he>> says, stepping out of the water. The look in <<his>> eye gives you a shiver up your spine. You watch <<him>> dress. <<He>> crawls out of the window afterward. You don't like the feeling left behind as <<he>> leaves.<<gstress>><<stress 2>>
-	<br><br>
+<<He>> stares at you for a few moments, bewildered. "Wash it off," <<he>> says, stepping out of the water. The look in <<his>> eye gives you a shiver up your spine. You watch <<him>> dress. <<He>> crawls out of the window afterward. You don't like the feeling left behind as <<he>> leaves.<<gstress>><<stress 2>>
+<br><br>
 
-	Once <<he>> is out of sight, you slip out of the water to redress.
-	<br><br>
+Once <<he>> is out of sight, you slip out of the water to redress.
+<br><br>
 
-	<<link [[Next|Bath Finish]]>><<endevent>><</link>>
+<<link [[Next|Bath Finish]]>><<endevent>><</link>>
 
 :: Bath Finish
 <<effects>><<set $location to "home">><<set $outside to 0>>
@@ -3715,37 +3715,33 @@ You open the locket around your neck.
 		</span>
 	</div>
 	<div id="locket-txt">
-		<<if !$carried.neck.photo>>
-			It's empty, but there's space for a single photograph.
-			<br><br>
-		<<elseif $carried.neck.photo is "Robin">>
-			A photo of Robin smiles back.
-			<br><br>
-		<<elseif $carried.neck.photo is "Whitney">>
-			A photo of Whitney grins back.
-			<br><br>
-		<<elseif $carried.neck.photo is "Kylar">>
-			A photo of Kylar gazes back.
-			<br><br>
-		<<elseif $carried.neck.photo is "Eden">>
-			Eden's stern expression greets you.
-			<br><br>
-		<<elseif $carried.neck.photo is "Avery">>
-			In the photo, Avery looks to the side, head tilted up.
-			<br><br>
-		<<elseif $carried.neck.photo is "Alex">>
-			A photo of Alex on a steed greets you.
-			<br><br>
-		<<elseif $carried.neck.photo is "Sydney">>
-			A photo of Sydney deep in prayer greets you.
-			<br><br>
-		<<elseif $carried.neck.photo is "Black Wolf">>
-			There's a photo inside of the Black Wolf, sleeping peacefully.
-			<br><br>
-		<<elseif $carried.neck.photo is "Great Hawk">>
-			There's a photo inside of the Great Hawk, looking statuesque.
-			<br><br>
+		<<if !$worn.neck.photo>>
+			<<set _locket_text to "It's empty, but there's space for a single photograph.">>
+		<<elseif $worn.neck.photo is "Robin">>
+			<<set _locket_text to "A photo of Robin smiles back.">>
+		<<elseif $worn.neck.photo is "Whitney">>
+			<<set _locket_text to "A photo of Whitney grins back.">>
+		<<elseif $worn.neck.photo is "Kylar">>
+			<<set _locket_text to "A photo of Kylar gazes back.">>
+		<<elseif $worn.neck.photo is "Eden">>
+			<<set _locket_text to "Eden's stern expression greets you.">>
+		<<elseif $worn.neck.photo is "Avery">>
+			<<set _locket_text to "In the photo, Avery looks to the side, head tilted up.">>
+		<<elseif $worn.neck.photo is "Alex">>
+			<<set _locket_text to "A photo of Alex on a steed greets you.">>
+		<<elseif $worn.neck.photo is "Sydney">>
+			<<set _locket_text to "A photo of Sydney deep in prayer greets you.">>
+		<<elseif $worn.neck.photo is "Black Wolf">>
+			<<set _locket_text to "There's a photo inside of the Black Wolf, sleeping peacefully.">>
+		<<elseif $worn.neck.photo is "Great Hawk">>
+			<<set _locket_text to "There's a photo inside of the Great Hawk, looking statuesque.">>		
 		<</if>>
+		<<if C.npc["Ivory Wraith"].love gte 10 and (["haunt", "despair"].includes($wraith.state) or C.npc["Ivory Wraith"].lust gt 10) and $hallucinations gte 1 and ((random(1, 100) is 1) or ($controlled is 0 and random(1, 100) lte 5))>>
+			<<fadeText "<span class='wraith'>A pale figure's <<wraithEyes>> gaze pierces you.</span>" "<<print _locket_text>>">>
+		<<else>>
+			<<print _locket_text>>
+		<</if>>
+		<br><br>
 	</div>
 </div>
 
diff --git a/game/overworld-town/loc-home/ward.twee b/game/overworld-town/loc-home/ward.twee
index 50ec260863..dfc764784d 100644
--- a/game/overworld-town/loc-home/ward.twee
+++ b/game/overworld-town/loc-home/ward.twee
@@ -119,6 +119,7 @@ You blink. You're back in the main hall. You feel dizzy.
 
 :: Orphanage Ward Wraith Sing
 <<set $outside to 0>><<set $location to "home">><<home_effects>><<effects>>
+<<set $daily.wraithNursery to 1>>
 <<getChildrenIds `{location:"home", father:"Ivory Wraith"}`>>
 <<set _childNumber to _childrenIds.length>>
 As you make your way to the nursery, you think you can hear singing. As you get closer, you make out what sounds like the words of a long forgotten lullaby.
diff --git a/game/overworld-town/loc-home/widgets.twee b/game/overworld-town/loc-home/widgets.twee
index b22a61e905..126857ee72 100644
--- a/game/overworld-town/loc-home/widgets.twee
+++ b/game/overworld-town/loc-home/widgets.twee
@@ -171,7 +171,7 @@
 
 <<widget "orphanageWardOptions">>
 	<<getChildrenIds `{location:"home", father:"Ivory Wraith"}`>><<rngWraith 1 "night">>
-	<<if _childrenIds.length gte 1 and _wraithEvent and !$possessed>>
+	<<if _childrenIds.length gte 1 and _wraithEvent and !$possessed and !$daily.wraithNursery>>
 		<<childicon "crib">><<link [[Nursery|Orphanage Ward Wraith Sing]]>><<set $exitPassage to $passage>><</link>>
 		<br>
 	<<else>>
diff --git a/game/overworld-town/loc-park/run.twee b/game/overworld-town/loc-park/run.twee
index a4312677eb..17a3423f5b 100644
--- a/game/overworld-town/loc-park/run.twee
+++ b/game/overworld-town/loc-park/run.twee
@@ -399,7 +399,7 @@ Your heart is pounding with the thrill as you quietly move on.
 		<<set $park_run_seen_by.pushUnique("whitney")>>
 	<</if>>
 <<elseif $phase is 2>><<npc Leighton>><<person1>>
-	<<if Time.hour gte 21>>"Evening,<<else>>"Morning,<</if>> <<sir>>," you cheerily call out as you pass.
+	"<<if Time.hour gte 21 or Time.hour lte 3>>Evening<<else>>Morning<</if>>, <<sir>>," you cheerily call out as you pass.
 	<br>
 	<<if $park_run_seen_by.includes("leighton")>>
 		Leighton jerks upright. "You again? Why don't you come a little closer? I've got something for you."
@@ -433,15 +433,15 @@ Your heart is pounding with the thrill as you quietly move on.
 	<<if $park_run_seen_by.includes("doren")>>
 		This time Doren spots you approaching and averts <<his>> eyes, shaking <<his>> head in disbelief.
 		<br><br>
-		<<if Time.hour gte 21>>"Evening,<<else>>"Morning,<</if>> <<sir>>," you call out.
+		"<<if Time.hour gte 21 or Time.hour lte 3>>Evening<<else>>Morning<</if>>, <<sir>>," you call out.
 		<br>
 		"Aye," <<he>> says. "You be careful now <<lass>>."
 	<<else>>
 		A few steps away, Doren seems to notice the exposed runner approaching and looks away, moving to avoid you. You're not sure, but you don't think <<he>> recognised you.
 		<br>
-		<<if Time.hour gte 21>>"Evening,<<else>>"Morning,<</if>> <<sir>>," you cheerily call out as you pass.
+		"<<if Time.hour gte 21 or Time.hour lte 3>>Evening<<else>>Morning<</if>>, <<sir>>," you cheerily call out as you pass.
 		<br>
-		Doren double-takes, staring back at you in disbelief. <<if $player.gender_appearance is "m">>"Lad?<<else>>"Lass?<</if>> Is that..? What are you doing?!"
+		Doren double-takes, staring back at you in disbelief. "<<if $player.gender_appearance is "m">>Lad<<else>>Lass<</if>>? Is that..? What are you doing?!"
 		<br><br>
 		You run on. As you go around the next corner, you look back to see Doren clutching <<his>> face and looking troubled.
 		<<set $park_run_seen_by.pushUnique("doren")>>
@@ -450,7 +450,7 @@ Your heart is pounding with the thrill as you quietly move on.
 	Harper seems utterly absorbed in <<his>> paperwork, staring at it intently.
 	<br><br>
 	<<if $park_run_seen_by.includes("harper")>>
-		<<if Time.hour gte 21>>"Evening,<<else>>"Morning,<</if>> Doctor," you call out.
+		"<<if Time.hour gte 21 or Time.hour lte 3>>Evening<<else>>Morning<</if>>, Doctor," you call out.
 		<br>
 		"Hello," Harper looks up. You wave as you run past.
 		<br><br>
@@ -459,7 +459,7 @@ Your heart is pounding with the thrill as you quietly move on.
 		You faintly see your silhouette light up in the bushes ahead. Camera flash?
 		<<fameexhibitionism 1>>
 	<<else>>
-		<<if Time.hour gte 21>>"Evening,<<else>>"Morning,<</if>> Doctor," you call out.
+		"<<if Time.hour gte 21 or Time.hour lte 3>>Evening<<else>>Morning<</if>>, Doctor," you call out.
 		<br>
 		"Hello," Harper continues to stare at the page. "I'm busy now, but if you need an appointment the..."
 		<br>
@@ -467,7 +467,7 @@ Your heart is pounding with the thrill as you quietly move on.
 		<br>
 		Harper looks up. "Stay heal-"
 		<br>
-		Harper stares after you as you run into the night.
+		Harper stares after you as you run into the <<if Time.hour gte 21 or Time.hour lte 3>>night<<else>>faint day light<</if>>.
 		<<set $park_run_seen_by.pushUnique("harper")>>
 	<</if>>
 <<elseif $phase is 6>><<npc Bailey>><<person1>>
diff --git a/game/overworld-town/loc-pound/abduction.twee b/game/overworld-town/loc-pound/abduction.twee
index 2cb299bd87..3964d06cb0 100644
--- a/game/overworld-town/loc-pound/abduction.twee
+++ b/game/overworld-town/loc-pound/abduction.twee
@@ -693,7 +693,7 @@ You're forced to crawl to the <<beasttype>>, then drop to a submissive position.
 		<br>
 
 	<<else>>
-		Satisfied, the <<beasttype>> licks <<bhimself>>, leaving you be. <<tearful>> you put some distance between you.<<lpound_status>><<pound_status -3>>
+		Satisfied, the <<beasttype>> licks <<bhimself>>, leaving you be. <<tearful>> you put some distance between you and the <<beasttype>>.<<lpound_status>><<pound_status -3>>
 		<br><br>
 		<<clotheson>>
 		<<endcombat>>
@@ -706,7 +706,7 @@ You're forced to crawl to the <<beasttype>>, then drop to a submissive position.
 		<br>
 		<<link [[Whack the hand away|Pound Food Whack]]>><<ltrauma>><<gpain>><<def 1>><<pound_status 3>><</link>><<gpain>><<gpound_status>>
 		<br>
-		<<if $wolfgirl gte 6>>
+		<<if $wolfgirl gte 6 and !$worn.face.type.includes("gag")>>
 			<<link [[Bite|Pound Food Bite]]>><<trauma -6>><<transform wolf 1>><<def 1>><<pound_status 3>><</link>><<gpound_status>><<ltrauma>><<wolfgirl>>
 			<br>
 		<</if>>
diff --git a/game/overworld-town/loc-pound/main.twee b/game/overworld-town/loc-pound/main.twee
index a056ce95ae..03548ac6b0 100644
--- a/game/overworld-town/loc-pound/main.twee
+++ b/game/overworld-town/loc-pound/main.twee
@@ -1444,7 +1444,7 @@ The <<person2>><<person>> leers at you from the front. "We'll let you cover," <<
 	<<clotheson>>
 	<<endcombat>>
 	<<dry_towel>>
-	You make <<moneyGain $pound.money>><<pass 60>>
+	You make <<moneyGain $pound.money>>.<<pass 60>>
 	<br><br>
 
 	<<link [[Next|Pound]]>><</link>>
@@ -1458,7 +1458,7 @@ The <<person2>><<person>> leers at you from the front. "We'll let you cover," <<
 	<<clotheson>>
 	<<endcombat>>
 	<<dry_towel>>
-	You make <<moneyGain $pound.money>><<pass 60>>
+	You make <<moneyGain $pound.money>>.<<pass 60>>
 	<br><br>
 	<<link [[Next|Pound]]>><</link>>
 	<br>
diff --git a/game/overworld-town/loc-school/detention.twee b/game/overworld-town/loc-school/detention.twee
index c134d27297..3a50105055 100644
--- a/game/overworld-town/loc-school/detention.twee
+++ b/game/overworld-town/loc-school/detention.twee
@@ -529,11 +529,11 @@ You shake off <<his>> hand and run for the exit, escaping onto the street.
 		<<He>> shouts after you as you flee down the corridor. "Hey, <<bitch>>, forget something?"
 		<br>
 		You were unable to rescue your clothes on the way out. <<tearful>> you keep running.
+		<br><br>
 	<<else>>
 		<<He>> shouts after you as you flee down the corridor. "You've made things much worse for yourself, <<bitch>>. Mark my words." <<tearful>> you keep running.
 		<<clotheson>>
 	<</if>>
-	<br><br>
 	<<endcombat>>
 
 	<<link [[Next|Hallways]]>><</link>>
diff --git a/game/overworld-town/loc-school/widgets.twee b/game/overworld-town/loc-school/widgets.twee
index 923f8cc8e6..6ee83934c9 100644
--- a/game/overworld-town/loc-school/widgets.twee
+++ b/game/overworld-town/loc-school/widgets.twee
@@ -906,9 +906,10 @@
 			<</if>>
 			<<He>> tugs painfully.<<gpain>><<gstress>><<pain 2>><<stress 1>>
 			<br><br>
-
-			<<link [[Bite|Maths Event Bite]]>><<npcincr River dom -1>><<npcincr River love -1>><<detention 6>><<stress -12>><<trauma -6>><<def 3>><</link>><<ggdelinquency>><<ltrauma>><<lstress>>
-			<br>
+			<<if !$worn.face.type.includes("gag")>>
+				<<link [[Bite|Maths Event Bite]]>><<npcincr River dom -1>><<npcincr River love -1>><<detention 6>><<stress -12>><<trauma -6>><<def 3>><</link>><<ggdelinquency>><<ltrauma>><<lstress>>
+				<br>
+			<</if>>
 			<<link [[Endure|Maths Event Endure]]>><<npcincr River dom 1>><<stress 6>><<trauma 6>><<pain 5>><<sub 2>><</link>><<gpain>><<gtrauma>><<gstress>>
 			<br>
 		<</addinlineevent>>
diff --git a/game/overworld-town/loc-street/widgets.twee b/game/overworld-town/loc-street/widgets.twee
index 8b841d371f..4f3d04d804 100644
--- a/game/overworld-town/loc-street/widgets.twee
+++ b/game/overworld-town/loc-street/widgets.twee
@@ -1790,7 +1790,6 @@
 			<<link [[Ignore|Street Exhibitionism Fame Shamed]]>><<unset $earSlimeForcedExposure>><</link>><<gtrauma>><<gstress>>
 		<</if>>
 	<</if>>
-	<br>
 	<<if !$earSlimeForcedExposure>>
 		<<if _avaliableActions.includes("flaunt")>>
 			<<link [[Flaunt|Street Exhibitionism Fame Flaunt]]>><<set $flaunt_type to 'words'>><<set $flaunt_part to 'none'>><</link>><<lstress>>
diff --git a/game/overworld-town/special-leighton/main.twee b/game/overworld-town/special-leighton/main.twee
index 3d3243292c..a6a67f4261 100644
--- a/game/overworld-town/special-leighton/main.twee
+++ b/game/overworld-town/special-leighton/main.twee
@@ -14,8 +14,8 @@
 	<br><br>
 
 	<<if hasSexStat("deviancy", 4)>>
-	<<link [[Perform|Leighton Club Blackmail Beast]]>><</link>><<deviant4>>
-	<br><br>
+		<<link [[Perform|Leighton Club Blackmail Beast]]>><</link>><<deviant4>>
+		<br><br>
 	<</if>>
 	<<link [[Refuse|Leighton Club Blackmail Beast Refuse]]>><</link>>
 	<br><br>
diff --git a/game/overworld-town/special-nightmares/main.twee b/game/overworld-town/special-nightmares/main.twee
index 92628d0284..4b40402020 100644
--- a/game/overworld-town/special-nightmares/main.twee
+++ b/game/overworld-town/special-nightmares/main.twee
@@ -1249,7 +1249,11 @@ The room is empty. There is no door beside the one you just came in from.
 
 <<link [[Investigate the laugh|Nightmare Corrupt Sydney 4]]>><</link>>
 <br>
-<<fadeText "<span class='linkBlue' style= 'cursor: pointer'>(2) Run</span>" "<<link [[Investigate the laugh|Nightmare Corrupt Sydney 4]]>><</link>>">>
+<<if $numberify_enabled is 1>>
+	<<fadeText "<span class='linkBlue' style= 'cursor: pointer'>(2) Run</span>" "<<link [[Investigate the laugh|Nightmare Corrupt Sydney 4]]>><</link>>">>
+<<else>>
+	<<fadeText "<span class='linkBlue' style= 'cursor: pointer'>Run</span>" "<<link [[Investigate the laugh|Nightmare Corrupt Sydney 4]]>><</link>>">>
+<</if>>
 <br>
 
 :: Nightmare Corrupt Sydney 4
@@ -1270,7 +1274,11 @@ The room is empty. There is no door beside the one you just came in from.
 
 <<link [[Call out|Nightmare Corrupt Sydney 5]]>><<set $phase to 0>><</link>>
 <br>
-<<fadeText "<span class='linkBlue' style= 'cursor: pointer'>(2) Run</span>" "<<link [[Reach out|Nightmare Corrupt Sydney 5]]>><<set $phase to 1>><</link>>">>
+<<if $numberify_enabled is 1>>
+	<<fadeText "<span class='linkBlue' style= 'cursor: pointer'>(2) Run</span>" "<<link [[Reach out|Nightmare Corrupt Sydney 5]]>><<set $phase to 1>><</link>>">>
+<<else>>
+	<<fadeText "<span class='linkBlue' style= 'cursor: pointer'>Run</span>" "<<link [[Reach out|Nightmare Corrupt Sydney 5]]>><<set $phase to 1>><</link>>">>
+<</if>>
 <br>
 
 :: Nightmare Corrupt Sydney 5
@@ -1287,7 +1295,11 @@ The room is empty. There is no door beside the one you just came in from.
 
 <<link [[Jump|Nightmare Corrupt Sydney 6]]>><</link>>
 <br>
-<<fadeText "<span class='linkBlue' style= 'cursor: pointer'>(2) Yell louder</span>" "<<link [[Jump|Nightmare Corrupt Sydney 6]]>><</link>>">>
+<<if $numberify_enabled is 1>>
+	<<fadeText "<span class='linkBlue' style= 'cursor: pointer'>(2) Yell louder</span>" "<<link [[Jump|Nightmare Corrupt Sydney 6]]>><</link>>">>
+<<else>>
+	<<fadeText "<span class='linkBlue' style= 'cursor: pointer'>Yell louder</span>" "<<link [[Jump|Nightmare Corrupt Sydney 6]]>><</link>>">>
+<</if>>
 <br>
 
 :: Nightmare Corrupt Sydney 6
@@ -1316,7 +1328,11 @@ Jumping up, you desperately cling to the smooth surface and try to pull yourself
 
 <<link [[Go back|Nightmare Corrupt Sydney 7]]>><</link>>
 <br>
-<<fadeText "<span class='linkBlue' style= 'cursor: pointer'>(2) Investigate further</span>" "<<link [[Go back|Nightmare Corrupt Sydney 7]]>><</link>>">>
+<<if $numberify_enabled is 1>>
+	<<fadeText "<span class='linkBlue' style= 'cursor: pointer'>(2) Investigate further</span>" "<<link [[Go back|Nightmare Corrupt Sydney 7]]>><</link>>">>
+<<else>>
+	<<fadeText "<span class='linkBlue' style= 'cursor: pointer'>Investigate further</span>" "<<link [[Go back|Nightmare Corrupt Sydney 7]]>><</link>>">>
+<</if>>
 <br>
 
 :: Nightmare Corrupt Sydney 7
@@ -1339,7 +1355,11 @@ Jumping up, you desperately cling to the smooth surface and try to pull yourself
 
 <<link [[Chase Sydney|Nightmare Corrupt Sydney 8]]>><</link>>
 <br>
-<<fadeText "<span class='linkBlue' style= 'cursor: pointer'>(2) Look for the door</span>" "<<link [[Chase Sydney|Nightmare Corrupt Sydney 8]]>><</link>>">>
+<<if $numberify_enabled is 1>>
+	<<fadeText "<span class='linkBlue' style= 'cursor: pointer'>(2) Look for the door</span>" "<<link [[Chase Sydney|Nightmare Corrupt Sydney 8]]>><</link>>">>
+<<else>>
+	<<fadeText "<span class='linkBlue' style= 'cursor: pointer'>Look for the door</span>" "<<link [[Chase Sydney|Nightmare Corrupt Sydney 8]]>><</link>>">>
+<</if>>
 <br>
 
 :: Nightmare Corrupt Sydney 8
diff --git a/game/overworld-underground/loc-underground/events.twee b/game/overworld-underground/loc-underground/events.twee
index 35438f3e8a..cffbec6047 100644
--- a/game/overworld-underground/loc-underground/events.twee
+++ b/game/overworld-underground/loc-underground/events.twee
@@ -770,7 +770,7 @@ You've barely reached the trees when the second shot rings out. You run as fast
 		"I bet <<pshe>> is enjoying it."
 		<br><br>
 
-		The jeers and comments continue as the <<beasttype>> forces you prone on the forest ground with <<bhis>> weight. At last, the knot empties enough for the <<bhim>> to wriggle it out with a plop. Semen oozes down your thighs.
+		The jeers and comments continue as the <<beasttype>> forces you prone on the forest ground with <<bhis>> weight. At last, the knot empties enough for <<bhim>> to wriggle it out with a plop. Semen oozes down your <<if $pain gte 60 or $arousal gte ($arousalmax / 5) * 4>>trembling<</if>> thighs.
 		<br><br>
 	<</if>>
 	The <<beasttype 0>> barks happily. "Good dog," says the <<person2>><<person>>.
diff --git a/game/overworld-underground/loc-underground/robin.twee b/game/overworld-underground/loc-underground/robin.twee
index 1b932aace9..38f02a4fd2 100644
--- a/game/overworld-underground/loc-underground/robin.twee
+++ b/game/overworld-underground/loc-underground/robin.twee
@@ -227,7 +227,7 @@
 					"Thank you," Robin says. "I don't know what I'd do if I was here alone."
 				<</if>>
 			<<case "cold">>
-				"H-hey, how are you h-holding up?" You can hear Robin shiver as <<he>> talks.
+				"H-hey, how are you h-holding up?" You can hear Robin's teeth chatter as <<he>> talks.
 				<br><br>
 
 				<<if $speech_attitude is "meek">>
@@ -274,7 +274,7 @@
 				<br><br>
 
 				<<if $speech_attitude is "meek">>
-					"I don't think I can look at dice the same way," you whisper.
+					"I don't think I can look at dice the same way either," you whisper.
 				<<elseif $speech_attitude is "bratty">>
 					"Would've loved to clock them with those giant dice," you mutter.
 				<<else>>
@@ -1517,7 +1517,7 @@ You've barely reached the trees when the second shot rings out.
 		The jeers and comments continue as the <<beasttype>> forces you prone on the forest ground with <<bhis>> weight. You can't see Robin from this angle, but you hear <<nnpc_him "Robin">> cry out in horror.<<grtrauma>><<npcincr Robin trauma 1>>
 		<br><br>
 
-		At last, the knot empties enough for the <<bhim>> to wriggle it out with a plop. Semen oozes down your thighs.
+		At last, the knot empties enough for <<bhim>> to wriggle it out with a plop. Semen oozes down your <<if $pain gte 60 or $arousal gte ($arousalmax / 5) * 4>>trembling<</if>> thighs.
 		<br><br>		
 	<</if>>
 
diff --git a/game/special-masturbation/main.twee b/game/special-masturbation/main.twee
index d41b4f4894..dc48f1c2be 100644
--- a/game/special-masturbation/main.twee
+++ b/game/special-masturbation/main.twee
@@ -1207,10 +1207,6 @@ You fondle yourself. <<if $phase2 is 1>>They watch<<else>>The <<person1>><<perso
 <<set $outside to 0>><<set $location to "home">><<effects>><<set _robin to statusCheck("Robin")>>
 
 <<if $masturbationstart is 1>>
-	<<set $masturbationstart to 0>>
-	<<set $masturbationstat += 1>>
-	<<masturbationstart>>
-
 	You sink into the plush mattress and let your hands roam.
 	<<if hasSexStat("exhibitionism", 3)>>
 		You wonder how thin the walls are.
@@ -1218,6 +1214,10 @@ You fondle yourself. <<if $phase2 is 1>>They watch<<else>>The <<person1>><<perso
 		Hopefully no one barges in.
 	<</if>>
 	<br><br>
+	
+	<<set $masturbationstart to 0>>
+	<<set $masturbationstat += 1>>
+	<<masturbationstart>>
 <</if>>
 <<masturbationeffects>>
 <<if C.npc.Robin.init is 1 and !$daily.robin.masturbation and $rng gte 91 and _robin_location is "orphanage" and _robin.lust gte 2 and _robin.love gte 50 and _robin.trauma lt 20>>
@@ -1383,7 +1383,8 @@ You pull yourself away from the wall on unsteady legs and wash until you're sque
 :: Bird Tower Masturbation
 <<effects>><<set _enableSexToys to true>>
 <<if $masturbationstart is 1>>
-	You slip into the water, the gentle warmth enveloping you, and you let your hands wander.
+	<<noClothingCheck>>
+	You <<if !_nude>>remove your clothing and <</if>>slip into the water, the gentle warmth enveloping you. You let your hands wander.
 	<<set $masturbationstart to 0>>
 	<<set $masturbationstat += 1>>
 	<<masturbationstart>>
@@ -1396,6 +1397,6 @@ You pull yourself away from the wall on unsteady legs and wash until you're sque
 <<effects>>
 <<endmasturbation>>
 <<endcombat>>
-You clean yourself up and climb out of the rainwater pool.
+You clean yourself up and climb out of the rainwater pool.<<wash>>
 <br><br>
 <<link [[Next|Bird Tower]]>><<clotheson>><</link>>
-- 
GitLab