diff --git a/game/overworld-town/loc-school/maths-project.twee b/game/overworld-town/loc-school/maths-project.twee
index 0d5acd7d47a436ec7d5aa005ba09eb12e2e02247..88ba48813dbd482a071b3da6d3233efd6ec1c91e 100644
--- a/game/overworld-town/loc-school/maths-project.twee
+++ b/game/overworld-town/loc-school/maths-project.twee
@@ -2001,7 +2001,7 @@ Leighton, River and the two guests confer on stage for a moment.
<<set $mathsproject to "won">><<set $mathsprojectwon to 1>><<earnFeat "Maths Competition Winner">>
<<mathsprojectfinish>>
- <<link [[Next|Cliff Street]]>><<endevent>><<set $eventskip to 1>><</link>>
+ <<link [[Next|Cliff Street]]>><<unset $mathsexposed>><<endevent>><<set $eventskip to 1>><</link>>
<br>
<<else>>
<<generate2>>
@@ -2023,6 +2023,6 @@ Leighton, River and the two guests confer on stage for a moment.
<<set $mathsproject to "done">>
<<mathsprojectfinish>>
- <<link [[Next|Cliff Street]]>><<endevent>><<set $eventskip to 1>><</link>>
+ <<link [[Next|Cliff Street]]>><<unset $mathsexposed>><<endevent>><<set $eventskip to 1>><</link>>
<br>
<</if>>
diff --git a/game/overworld-town/loc-school/widgets-events.twee b/game/overworld-town/loc-school/widgets-events.twee
index 518b81d5f9c4fb4248d74bba78f2ac3fff1d07aa..718f62c7a83b1577b9706256a366a0b37fc86d03 100644
--- a/game/overworld-town/loc-school/widgets-events.twee
+++ b/game/overworld-town/loc-school/widgets-events.twee
@@ -2002,7 +2002,7 @@
<<else>>
<<set $bullyevent to 4>>
Someone grabs your hair from behind, tugging your head back. It's Whitney. <<He>> grins as <<his>> friends laugh.
- <<npcincr Whitney lust 5>><<glust>><<gstress>><<stress 6>><<gtrauma>><<trauma -6>>
+ <<npcincr Whitney lust 5>><<glust>><<gstress>><<stress 6>><<gtrauma>><<trauma 6>>
<br><br>
<<link [[Endure|Bully Hair]]>><<npcincr Whitney dom 1>><</link>><<gdom>>
diff --git a/game/overworld-town/loc-temple/confess.twee b/game/overworld-town/loc-temple/confess.twee
index 5f4dfedc0d81ac0f0bf89fc62ee5cdc09d1d95c4..25a6499cef5c79f244553fadaf5a1a0212dd28c7 100644
--- a/game/overworld-town/loc-temple/confess.twee
+++ b/game/overworld-town/loc-temple/confess.twee
@@ -178,7 +178,7 @@ A <<personsimple>>'s voice greets you.
<</if>>
<br><br>
- <<link [[Leave|Temple]]>><<endconfession>><</link>>
+ <<link [[Leave|Temple]]>><<endconfessionself>><</link>>
<br>
<<else>>
<<He>> lends a patient ear all the while, saying nothing until you're finished.
@@ -978,13 +978,13 @@ You share your various affairs and escapades, and the amount of partners you've
"Your beloved will be summoned, and punished alongside you. I'm sorry," you hear. You turn to see Jordan leaving the confessional.
<br><br>
- <<link [[Next|Sydney Temple Punish Intro Confession]]>><<endconfession>><</link>>
+ <<link [[Next|Sydney Temple Punish Intro Confession]]>><<endconfessionself>><</link>>
<br>
<<else>>
You look back to see Jordan leaving the confessional. <<He>> doesn't look at you.
<br><br>
- <<link [[Next|Temple Arcade Intro]]>><<endconfession>><</link>>
+ <<link [[Next|Temple Arcade Intro]]>><<endconfessionself>><</link>>
<br>
<</if>>
<<case "Sydney">>
@@ -1004,18 +1004,18 @@ You share your various affairs and escapades, and the amount of partners you've
<<He>> freezes, but starts to chuckle. "Trying to rat out our screw-up, huh? You had me scared for a moment."
<br><br>
- <<link [[Tell Sydney you want to face your punishment|Sydney Temple Punish Intro Early]]>><<endconfession>><</link>>
+ <<link [[Tell Sydney you want to face your punishment|Sydney Temple Punish Intro Early]]>><<endconfessionself>><</link>>
<br>
- <<link [[Ask Sydney not to tell anyone|Sydney Temple Punish Intro Cancel]]>><<endconfession>><</link>>
+ <<link [[Ask Sydney not to tell anyone|Sydney Temple Punish Intro Cancel]]>><<endconfessionself>><</link>>
<br>
<<else>>
<<He>> freezes. "W-well. Shit." <<He>> shuffles in place awkwardly. "Thanks for... telling me, I guess. Even if you weren't really meaning to."
<<npcincr Sydney love -10>><<lllove>>
<br><br>
- <<link [[Apologise|Sydney Temple Punish Intro Apologise]]>><<endconfession>><</link>>
+ <<link [[Apologise|Sydney Temple Punish Intro Apologise]]>><<endconfessionself>><</link>>
<br>
- <<link [[Ask Sydney not to tell anyone|Sydney Temple Punish Intro Forget]]>><<endconfession>><</link>>
+ <<link [[Ask Sydney not to tell anyone|Sydney Temple Punish Intro Forget]]>><<endconfessionself>><</link>>
<br>
<</if>>
<<else>>
@@ -1023,18 +1023,18 @@ You share your various affairs and escapades, and the amount of partners you've
<<He>> looks relieved after a moment. "If you wanted to face penance for our... carelessness... you could have warned me beforehand."
<br><br>
- <<link [[Tell Sydney you want to face your punishment|Sydney Temple Punish Intro Early]]>><<endconfession>><</link>>
+ <<link [[Tell Sydney you want to face your punishment|Sydney Temple Punish Intro Early]]>><<endconfessionself>><</link>>
<br>
- <<link [[Ask Sydney not to tell anyone|Sydney Temple Punish Intro Cancel]]>><<endconfession>><</link>>
+ <<link [[Ask Sydney not to tell anyone|Sydney Temple Punish Intro Cancel]]>><<endconfessionself>><</link>>
<br>
<<else>>
<<He>> freezes. "N-no. No no no... tell me it isn't true!" <<He>> starts to tear up.
<<npcincr Sydney love -10>><<lllove>>
<br><br>
- <<link [[Apologise|Sydney Temple Punish Intro Apologise]]>><<endconfession>><</link>>
+ <<link [[Apologise|Sydney Temple Punish Intro Apologise]]>><<endconfessionself>><</link>>
<br>
- <<link [[Ask Sydney not to tell anyone|Sydney Temple Punish Intro Forget]]>><<endconfession>><</link>>
+ <<link [[Ask Sydney not to tell anyone|Sydney Temple Punish Intro Forget]]>><<endconfessionself>><</link>>
<br>
<</if>>
<</if>>
@@ -1042,7 +1042,7 @@ You share your various affairs and escapades, and the amount of partners you've
<<He>> looks at you for a long moment, before averting <<his>> gaze and ringing the bell on the confessional.
<br><br>
- <<link [[Next|Temple Arcade Intro]]>><<endconfession>><</link>>
+ <<link [[Next|Temple Arcade Intro]]>><<endconfessionself>><</link>>
<br>
<</if>>
<<case "Confessor">>
@@ -1053,13 +1053,13 @@ You share your various affairs and escapades, and the amount of partners you've
"Your beloved will be summoned, and punished alongside you," you hear. <<He>> exits the booth behind you, placing <<his>> hands on your shoulders. <<He>> wears dark robes.
<br><br>
- <<link [[Next|Sydney Temple Punish Intro Confession]]>><<endconfession>><</link>>
+ <<link [[Next|Sydney Temple Punish Intro Confession]]>><<endconfessionself>><</link>>
<br>
<<else>>
<<He>> exits the booth behind you, placing <<his>> hands on your shoulders. <<He>> wears dark robes.
<br><br>
- <<link [[Next|Temple Arcade Intro]]>><<endconfession>><</link>>
+ <<link [[Next|Temple Arcade Intro]]>><<endconfessionself>><</link>>
<br>
<</if>>
<<default>>
@@ -1070,13 +1070,13 @@ You share your various affairs and escapades, and the amount of partners you've
"Your beloved will be summoned, and punished alongside you," you hear. <<He>> swiftly exits the booth, avoiding eye contact with you.
<br><br>
- <<link [[Next|Sydney Temple Punish Intro Confession]]>><<endconfession>><</link>>
+ <<link [[Next|Sydney Temple Punish Intro Confession]]>><<endconfessionself>><</link>>
<br>
<<else>>
<<He>> swiftly exits the booth, avoiding eye contact with you.
<br><br>
- <<link [[Next|Temple Arcade Intro]]>><<endconfession>><</link>>
+ <<link [[Next|Temple Arcade Intro]]>><<endconfessionself>><</link>>
<br>
<</if>>
<</switch>>
@@ -1221,7 +1221,7 @@ You continue talking with <<him>> about it. <<tearful>> you say goodbye,
leaving shortly after <<him>>.
<br><br>
-<<link [[Leave|Temple]]>><<endconfession>><</link>>
+<<link [[Leave|Temple]]>><<endconfessionself>><</link>>
<br>
:: Temple Confess Self End Alone
@@ -1235,7 +1235,7 @@ leaving shortly after <<him>>.
<</if>>
<br><br>
-<<link [[Leave|Temple]]>><<endconfession>><</link>>
+<<link [[Leave|Temple]]>><<endconfessionself>><</link>>
<br>
:: Temple Confess Self Refuse
@@ -1244,7 +1244,7 @@ leaving shortly after <<him>>.
You refuse, and opt to leave the confessional. "You remain unforgiven," you hear from behind you.
<br><br>
-<<link [[Next|Temple]]>><<endconfession>><</link>>
+<<link [[Next|Temple]]>><<endconfessionself>><</link>>
<br>
:: Temple Confess Self Sex
diff --git a/game/overworld-town/loc-temple/widgets.twee b/game/overworld-town/loc-temple/widgets.twee
index 9bbc20f659ba493140ec76951c4520b3d13cce85..0d1ab2ecc3f70b00f9087d4bf8d4ec0aa9fcfa3f 100644
--- a/game/overworld-town/loc-temple/widgets.twee
+++ b/game/overworld-town/loc-temple/widgets.twee
@@ -733,12 +733,16 @@
<</silently>><<print _text_output>><</widget>>
<<widget "endconfession">>
- <<set $daily.confessed to $confession>>
<<unset $attendant>>
<<unset $confession>>
<<endevent>>
<</widget>>
+<<widget "endconfessionself">>
+ <<set $daily.confessed to $confession>>
+ <<endconfession>>
+<</widget>>
+
<<widget "temple_bailey_options">>
<<babyRent>>
<<if $money gte $rentmoney + ($babyRent or 0)>>
diff --git a/game/overworld-town/special-whitney/main.twee b/game/overworld-town/special-whitney/main.twee
index 920dbacd333d9c6f24c2ffd6f323121076062770..e04988f2002e06a157a5c041119825a86784a164 100644
--- a/game/overworld-town/special-whitney/main.twee
+++ b/game/overworld-town/special-whitney/main.twee
@@ -1522,25 +1522,7 @@ You stand on the other side. You're in an open space behind a large building. Th
<<link [[Next|Elk Street]]>><<endevent>><<set $eventskip to 1>><</link>>
<br>
-<<else>>
-
- You hear movement behind you. Whitney sighs. "God, you suck at this," <<he>> says, reaching down and yanking you free after a moment. <<He>> pulls you to your feet, dragging you along behind <<him>> as <<he>> and <<his>> friends flee around a corner into the alleyways.
- <br><br>
-
- <<He>> shoves you ahead of <<him>>, pinning you against a wall from behind. "You need more practice. Maybe next time I'll let my friends have a go before I pull you free--bet you'd learn something useful for a change."
- <br><br>
-
- <<He>> throws a glance back at you over <<his>> shoulder as <<he>> and <<his>> friends walk off. "Later, slut."
- <br><br>
-
- <<clotheson>>
- <<endcombat>>
-
- <<link [[Next|Industrial alleyways]]>><<endevent>><<set $eventskip to 1>><</link>>
-
-<</if>>
-
-<<if $finish is 1>>
+<<elseif $finish is 1>>
Whitney rolls <<his>> eyes. "Why the fuck'd you agree to it, then? Maybe I should leave you in there, dumbass."
@@ -1561,6 +1543,7 @@ You stand on the other side. You're in an open space behind a large building. Th
<</if>>
"Yeah, yeah," <<he>> grumbles. "You owe me, slut."<<llove>><<glust>><<npcincr Whitney love -1>><<npcincr Whitney lust 1>>
+ <br><br>
Whitney and <<his>> friends stalk off, leaving you alone on Elk Street.
@@ -1569,6 +1552,22 @@ You stand on the other side. You're in an open space behind a large building. Th
<<link [[Next|Elk Street]]>><<endevent>><<set $eventskip to 1>><</link>>
+<<else>>
+
+ You hear movement behind you. Whitney sighs. "God, you suck at this," <<he>> says, reaching down and yanking you free after a moment. <<He>> pulls you to your feet, dragging you along behind <<him>> as <<he>> and <<his>> friends flee around a corner into the alleyways.
+ <br><br>
+
+ <<He>> shoves you ahead of <<him>>, pinning you against a wall from behind. "You need more practice. Maybe next time I'll let my friends have a go before I pull you free--bet you'd learn something useful for a change."
+ <br><br>
+
+ <<He>> throws a glance back at you over <<his>> shoulder as <<he>> and <<his>> friends walk off. "Later, slut."
+ <br><br>
+
+ <<clotheson>>
+ <<endcombat>>
+
+ <<link [[Next|Industrial alleyways]]>><<endevent>><<set $eventskip to 1>><</link>>
+
<</if>>
:: Bully Theft Refuse