diff --git a/game/scripts/characters/astoria/events/spells/imperio_susan.rpy b/game/scripts/characters/astoria/events/spells/imperio_susan.rpy
index 03a7d123..9a9ea3fc 100644
--- a/game/scripts/characters/astoria/events/spells/imperio_susan.rpy
+++ b/game/scripts/characters/astoria/events/spells/imperio_susan.rpy
@@ -510,7 +510,8 @@ label ag_se_imperio_sb_E2:
     call cum_block
     gen "{size=+10}AHHH... YESS!!!!{/size}" ("angry", xpos="far_left", ypos="head")
     call gen_chibi("cum_behind_desk_done")
-    pause.5
+    with d3
+    pause.2
     ast "Woah... I didn't think you'd have that much in you, sir..." ("clench", "base", "base", "mid")
 
     sus @ cheeks blush "{size=+10}*Hmph*! I hope you Enjoy Azkaban, perverts!{/size}" ("angry", "base", "angry", "mid")
@@ -916,7 +917,8 @@ label ag_se_imperio_sb_E3:
     nar "You give your cock a few final pumps, working out the last of your load onto Susan's waiting face..."
 
     call gen_chibi("cum_behind_desk_done")
-    pause.5
+    with d3
+    pause.2
     gen "There we go..." ("angry", xpos="far_left", ypos="head")
     ast "Nice work, [name_genie_astoria]..." ("open", "closed", "base", "mid")
     ast "You can come out now, Suzy..." ("smile", "narrow", "base", "down")
diff --git a/game/scripts/characters/cho/events/favors/talk_to_me.rpy b/game/scripts/characters/cho/events/favors/talk_to_me.rpy
index 80a6d92a..1be4e6b3 100644
--- a/game/scripts/characters/cho/events/favors/talk_to_me.rpy
+++ b/game/scripts/characters/cho/events/favors/talk_to_me.rpy
@@ -1027,6 +1027,7 @@ label cc_pf_talk_T2_intro_E2:
     pause .2
 
     call gen_chibi("cum_behind_desk_done")
+    with d3
     pause .8
 
     cho @ cheeks blush "" ("clench", "wide", "base", "mid")
@@ -1250,6 +1251,7 @@ label cc_pf_talk_T2_E3:
         pause .2
 
         call gen_chibi("cum_behind_desk_done")
+        with d3
         pause .8
 
         cho "And put a large bucket under her, so when they--" ("soft", "closed", "base", "mid")
diff --git a/game/scripts/characters/cho/wardrobe_reactions.rpy b/game/scripts/characters/cho/wardrobe_reactions.rpy
index 24cce4ac..e1f425be 100644
--- a/game/scripts/characters/cho/wardrobe_reactions.rpy
+++ b/game/scripts/characters/cho/wardrobe_reactions.rpy
@@ -1212,7 +1212,7 @@ label cho_reaction_equip_outfit_fail(item):
             cho "A what?!" ("angry", "wide", "base", "stare")
             gen "A bikini, that's sporty..." ("base", xpos="far_left", ypos="head")
             gen "You're into that sort of thing, are you not?" ("base", xpos="far_left", ypos="head")
-            cho "Bikinis?!" ("angry", "wide", "base", "mid")
+            cho "{shake}Bikinis?!{/shake}" ("angry", "wide", "base", "mid")
             cho "Why would you think a bikini is an appropriate gift?" ("angry", "wink", "angry", "mid")
             gen "Well, it said \"sporty\" in the name, so I thought you'd like it." ("base", xpos="far_left", ypos="head")
             cho "*Ugh*..." ("disgust", "narrow", "angry", "mid")
@@ -1222,7 +1222,7 @@ label cho_reaction_equip_outfit_fail(item):
             cho "Well, that's a bit of a weird gift, but I suppose it could be useful..." ("soft", "narrow", "base", "R")
             gen "That's what I figured." ("base", xpos="far_left", ypos="head")
             gen "Here you are." ("base", xpos="far_left", ypos="head")
-            cho "!!!" ("angry", "wide", "base", "down")
+            cho "{shudder}!!!{/shudder}" ("angry", "wide", "base", "down")
             cho "[name_genie_cho], what is up with these bikini bottoms!" ("angry", "narrow", "base", "mid")
             gen "Pretty cool, right?" ("base", xpos="far_left", ypos="head")
             gen "Now, if you could just put them--" ("base", xpos="far_left", ypos="head")
@@ -1310,7 +1310,7 @@ label cho_reaction_blacklist(item):
     gen "Come on Cho, you're my favourite {size=-6}snatch grabber{/size} in training!" ("base", xpos="far_left", ypos="head")
     cho "What was that?"
     gen "I said. You're my favourite snitch catcher in training." ("base", xpos="far_left", ypos="head")
-    cho "*Sigh* Alright, if it means this much to you [name_genie_cho]..."
+    cho "{bounce}*Sigh*{/bounce} Alright, if it means this much to you [name_genie_cho]..."
     gen "Hell yes!" ("grin", xpos="far_left", ypos="head")
 
     return
diff --git a/game/scripts/characters/hermione/wardrobe_reactions.rpy b/game/scripts/characters/hermione/wardrobe_reactions.rpy
index e1877593..7c538568 100644
--- a/game/scripts/characters/hermione/wardrobe_reactions.rpy
+++ b/game/scripts/characters/hermione/wardrobe_reactions.rpy
@@ -96,7 +96,7 @@ label her_reaction_touch(what):
             random:
                 her @ cheeks blush "*Mmm*...{w=0.4} Lower..." ("base", "closed", "base", "mid")
                 her @ cheeks blush "I'm glad you're enjoying them so much, [name_genie_hermione]." ("base", "narrow", "base", "mid")
-                her @ cheeks blush "*Ah*..." ("open", "closed", "base", "mid")
+                her @ cheeks blush "{bounce}*Ah*...{/bounce}" ("open", "closed", "base", "mid")
                 her @ cheeks blush "Please be gentle..." ("soft", "closed", "base", "mid")
         elif states.her.level >= 16:
             random:
@@ -128,7 +128,7 @@ label her_reaction_touch(what):
         else:
             # NO bottoms AND NO panties
             random:
-                her @ cheeks blush "*Ah*..." ("open_tongue", "closed", "base", "mid")
+                her @ cheeks blush "{bounce}*Ah*...{/bounce}" ("open_tongue", "closed", "base", "mid")
                 her @ cheeks blush "*Mmm*..." ("soft", "closed", "base", "mid")
                 her @ cheeks blush "More..." ("open", "closed", "base", "mid")
                 her @ cheeks blush "Keep going [name_genie_hermione]..." ("smile", "closed", "base", "mid")
@@ -261,7 +261,7 @@ label her_reaction_equip_outfit(item):
             her "It doesn't even show any skin!" ("clench", "closed", "annoyed", "mid")
             gen "(...)" ("base", xpos="far_left", ypos="head")
             her "It's an insult to my breast, [name_genie_hermione]!!!" ("open", "squint", "annoyed", "mid")
-            gen "*Gasps* {w=0.9}I would never... [name_hermione_genie]!" ("angry", xpos="far_left", ypos="head")
+            gen "{shake}*Gasps*{/shake} {w=0.9}I would never... [name_hermione_genie]!" ("angry", xpos="far_left", ypos="head")
 
             $ temp_word = renpy.random.choice(["marvellous", "magnificent", "breathtaking", "wonderful", "spectacular", "sensational", "glorious", "beautiful", "lovely", "bananas"])
 
@@ -359,7 +359,7 @@ label her_reaction_equip_outfit(item):
         gen "Could you put on your regular clothing, the one with the school skirt and pullover?" ("base", xpos="far_left", ypos="head")
         if states.her.level < 4:
             her "The pullover does go well with the school skirt, don't you think?" ("base", "squint", "base", "mid")
-            gen "It would look good even without the skirt on in my opinion." ("base", xpos="far_left", ypos="head")
+            gen "It would look good even without the skirt in my opinion." ("base", xpos="far_left", ypos="head")
             her @ cheeks blush "How nice, I'll let my mother know you said--" ("base", "closed", "base", "mid")
             her @ cheeks blush "Wait, what did you say?" ("soft", "wide", "base", "mid")
             gen "I said it looks good." ("base", xpos="far_left", ypos="head")
@@ -404,7 +404,7 @@ label her_reaction_equip_outfit(item):
             her "You suddenly want me to cover up now?" ("angry", "narrow", "base", "R")
             menu:
                 "\"Yes, your body disgusts me, and I'm doing everyone a favour...\"":
-                    her "What!?" ("clench", "wide", "base", "mid")
+                    her "{shudder}What!?{/shudder}" ("clench", "wide", "base", "mid")
                 "\"Of course not...\"":
                     gen "I'd just like you to wear it... Is that so much to ask?" ("base", xpos="far_left", ypos="head")
                     her "I guess not..." ("upset", "base", "base", "R")
@@ -416,7 +416,7 @@ label her_reaction_equip_outfit(item):
             gen "Why's that?" ("base", xpos="far_left", ypos="head")
             gen "(As if I don't know the answer...)" ("base", xpos="far_left", ypos="head")
             her "It covers all the good bits!" ("soft", "closed", "annoyed", "mid")
-            gen "Really? It doesn't look like it does..." ("base", xpos="far_left", ypos="head")
+            gen "Really? It doesn't look like it would..." ("base", xpos="far_left", ypos="head")
             her "What do you mean? You can barely see any--" ("annoyed", "narrow", "annoyed", "mid")
             gen "Your face is perfectly visible..." ("base", xpos="far_left", ypos="head")
             her "Oh... Such a charmer..." ("base", "squint", "annoyed", "R")
@@ -534,11 +534,11 @@ label her_reaction_equip_outfit(item):
             her @ cheeks blush "Alright..." ("soft", "narrow", "base", "down")
             her @ cheeks blush "Well, I suppose I'll wear it if I have to..." ("base", "closed", "base", "mid")
         else: #22+
-            her @ cheeks blush "Lingerie?! How dare you [name_genie_hermione]!" ("angry", "narrow", "annoyed", "down")
+            her @ cheeks blush "{shake}Lingerie?!{/shake} How dare you [name_genie_hermione]!" ("angry", "narrow", "annoyed", "down")
             gen "..." ("angry", xpos="far_left", ypos="head")
             her @ cheeks blush "Why didn't you ask me to put this on sooner?" ("angry", "narrow", "annoyed", "mid")
             gen "Listen here you--" ("angry", xpos="far_left", ypos="head")
-            her @ cheeks blush "*Giggles*..." ("grin", "squint", "base", "mid")
+            her @ cheeks blush "*Giggles*" ("grin", "squint", "base", "mid")
 
     ##################
     ## Latex Outfit ##
@@ -734,11 +734,11 @@ label her_reaction_equip_outfit(item):
             gen "Sorry... I should've been more specific..." ("base", xpos="far_left", ypos="head")
             gen "Final Fantasy Seven is the one you'd probably know her from." ("base", xpos="far_left", ypos="head")
             her "*Ehm*..." ("clench", "squint", "base", "mid")
-            gen "Oh... Come on... it was so good it even got a remake!" ("base", xpos="far_left", ypos="head")
+            gen "Oh... Come on... It was so good it even got a remake!" ("base", xpos="far_left", ypos="head")
             gen "And let me tell you... They really did a great job on those assets..." ("base", xpos="far_left", ypos="head")
             her "I don't--" ("annoyed", "squint", "base", "mid")
             gen "...{w=0.4} Just put it on will you." ("base", xpos="far_left", ypos="head")
-            her "Oh-- Okay..." ("mad", "squint", "base", "mid")
+            her "Oh--{w=0.2} Okay..." ("mad", "squint", "base", "mid")
             her "One moment..." ("soft", "squint", "base", "mid")
         else: #19+
             her "A Cosplay outfit..." ("base", "squint", "base", "mid")
@@ -783,7 +783,7 @@ label her_reaction_equip_outfit(item):
             gen "Yep... Completely ordinary nightgown." ("base", xpos="far_left", ypos="head")
             her @ cheeks blush "Nice try... I can see it's see-through." ("angry", "narrow", "base", "mid")
             gen "Oh... Isn't that what they're like normally?" ("base", xpos="far_left", ypos="head")
-            her @ cheeks blush "*Sigh*... Whatever... Let's just get this over with..." ("normal", "closed", "annoyed", "mid")
+            her @ cheeks blush "{bounce}*Sigh*{/bounce} Whatever... Let's just get this over with..." ("normal", "closed", "annoyed", "mid")
             her @ cheeks blush "" ("normal", "base", "annoyed", "mid")
         elif states.her.level < 22:
             her "A nightie you say?" ("open", "squint", "worried", "mid")
@@ -944,7 +944,7 @@ label her_reaction_equip_outfit(item):
         gen "I got this Yennefer Cosplay that I'd like you to put on." ("base", xpos="far_left", ypos="head")
         if states.her.level < 22:
             her "Who?" ("normal", "squint", "base", "mid")
-            gen "*Sigh*...{w=0.4}  Yennefer... {w=0.4} From the witcher." ("base", xpos="far_left", ypos="head")
+            gen "{bounce}*Sigh*...{/bounce}{w=0.4}  Yennefer... {w=0.4} From the witcher." ("base", xpos="far_left", ypos="head")
             her "Oh...{w=0.4}  Her..." ("open", "squint", "base", "R")
             her "(No clue who that is, but I better not offend him...)" ("normal", "narrow", "base", "down")
             gen "(I guess she picked Triss.)" ("base", xpos="far_left", ypos="head")
@@ -986,7 +986,7 @@ label her_reaction_equip_outfit(item):
         else:
             gen "What did Hermione Granger say when she got to the ball?" ("base", xpos="far_left", ypos="head")
             her @ cheeks blush "{size=-4}This dress...{/size}" ("soft", "narrow", "base", "down")
-            gen "*Gag* *Cough* *Cough*" ("base", xpos="far_left", ypos="head")
+            gen "{shudder}*Gag*{/shudder} {shake}*Cough* *Cough*{/shake}" ("base", xpos="far_left", ypos="head")
             her @ cheeks blush "..." ("base", "narrow", "base", "down")
             gen "..." ("base", xpos="far_left", ypos="head")
             gen "Well, I thought it was funny..." ("base", xpos="far_left", ypos="head")
@@ -1034,7 +1034,7 @@ label her_reaction_equip_outfit(item):
         gen "Of course, 'Tis the season, after all." ("base", xpos="far_left", ypos="head")
         her "I just thought that you'd want me to wear something... You know..." ("annoyed", "base", "base", "R")
         gen "Here's the costume." ("base", xpos="far_left", ypos="head")
-        her @ cheeks blush "Oh, Now it makes sense..." ("open", "narrow", "base", "down")
+        her @ cheeks blush "Oh... Now it makes sense..." ("open", "narrow", "base", "down")
         gen "So you'll wear it?" ("base", xpos="far_left", ypos="head")
         her @ cheeks blush "If wearing it is what you want me to do..." ("soft", "narrow", "base", "R")
         gen "Yes please!" ("base", xpos="far_left", ypos="head")
@@ -1106,7 +1106,7 @@ label her_reaction_equip_outfit(item):
         her "They wear these on the Vegas strip do they?" ("open", "narrow", "annoyed", "mid")
         gen "Of course, it's pretty hot there so why wouldn't--" ("base", xpos="far_left", ypos="head")
         her "You're lying..." ("open", "closed", "annoyed", "mid")
-        gen "What?!" ("angry", xpos="far_left", ypos="head")
+        gen "{shudder}What?!{/shudder}" ("angry", xpos="far_left", ypos="head")
         gen "(She's seen through my clever ruse... Impossible!)" ("angry", xpos="far_left", ypos="head")
         her @ cheeks blush "Give me the real reason why you want me to wear this." ("upset", "base", "annoyed", "mid")
         gen "*Huh*?" ("base", xpos="far_left", ypos="head")
@@ -1121,7 +1121,7 @@ label her_reaction_equip_outfit(item):
         gen "(\"Genie fights Snape using magic... #TODO add explanation to this later...\")" ("base", xpos="far_left", ypos="head")
         gen "(That's the tutorial, so it must be further in...)" ("base", xpos="far_left", ypos="head")
         play sound "sounds/pageflipback.ogg"
-        gen "(Genie fucks Hermione in the Ass...)" ("base", xpos="far_left", ypos="head")
+        gen "(Genie fucks Hermione in the ass...)" ("base", xpos="far_left", ypos="head")
 
         if states.her.status.anal:
             gen "(*Heh-heh*... Why am I not doing this right now, exactly?)" ("base", xpos="far_left", ypos="head")
@@ -1137,7 +1137,7 @@ label her_reaction_equip_outfit(item):
         pause .3
         gen "(There we go... The wardrobe section...)" ("base", xpos="far_left", ypos="head")
         her @ cheeks blush "Still waiting... I'm going to need a real reason soon, or I'm not putting it on..." ("angry", "closed", "annoyed", "mid")
-        gen "(*Aha*! I knew it!)" ("grin", xpos="far_left", ypos="head")
+        gen "(Aha! I knew it!)" ("grin", xpos="far_left", ypos="head")
         gen "(Genie comes up with another bullshit reason... Hermione thinks for a moment and then accepts it as the truth!)" ("grin", xpos="far_left", ypos="head")
         her @ cheeks blush "Three...{w=1} Two--" ("open", "closed", "annoyed", "mid")
         gen "Wait a minute, the script says--" ("angry", xpos="far_left", ypos="head")
@@ -1192,7 +1192,7 @@ label her_reaction_equip_outfit(item):
         her @ cheeks blush "And here I thought bikinis were supposed to protect your modesty..." ("open", "closed", "base", "mid")
         gen "(Your modesty went out the window a long time ago.)" ("base", xpos="far_left", ypos="head")
         her @ cheeks blush "Well... I suppose it does cover the important bits..." ("soft", "narrow", "base", "down")
-        gen "(Is she trying to convince herself out of it or the other way around?)" ("base", xpos="far_left", ypos="head")
+        gen "(Is she trying to convince herself out of it, or the other way around?)" ("base", xpos="far_left", ypos="head")
         her @ cheeks blush "Just give me a moment to put it on, [name_genie_hermione]..." ("normal", "narrow", "base", "R")
 
     ################################
@@ -1262,7 +1262,7 @@ label her_reaction_equip_outfit(item):
             gen "Specifically designed to jingle some balls." ("base", xpos="far_left", ypos="head")
             her @ cheeks blush "Charming..." ("open", "narrow", "base", "R")
             her @ cheeks blush "Is this really what you imagine a proper Christmas-themed outfit is?" ("angry", "narrow", "base", "down")
-            gen "I mean... Mrs Claus probably doesn't wear it... Although she probably should." ("base", xpos="far_left", ypos="head")
+            gen "I mean... Mrs Claus might not wear it... Although she probably should." ("base", xpos="far_left", ypos="head")
             her @ cheeks blush "Why would I even ask..." ("disgust", "closed", "base", "mid")
             gen "Because if she did, then Santa would probably come more than once a--" ("grin", xpos="far_left", ypos="head")
             her @ cheeks blush "Fine!" ("clench", "narrow", "base", "mid")
@@ -1287,7 +1287,7 @@ label her_reaction_equip_outfit(item):
             her "Wrestling robes?" ("soft", "base", "base", "mid")
             her "Why do you want me to wear wrestling robes, exactly?" ("disgust", "narrow", "base", "mid")
             gen "Wrestle obviously, let me just call for your opponent." ("base", xpos="far_left", ypos="head")
-            her "What?!" ("mad", "wide", "base", "mid")
+            her "{shudder}What?!{/shudder}" ("mad", "wide", "base", "mid")
             gen "No, while that would be fun, I'd just like you to wear it." ("base", xpos="far_left", ypos="head")
             her "..." ("disgust", "narrow", "base", "mid")
             her "Alright, as long as you don't make me wrestle..." ("open", "narrow", "base", "mid")
@@ -1357,7 +1357,7 @@ label her_reaction_equip_outfit_fail(item):
             gen "Yes, glad you noticed! Now if you don't mind just--" ("grin", xpos="far_left", ypos="head")
             her "I'm not going to wear it! You can see everything in this! My nipples would poke right through it!!!" ("scream", "base", "angry", "mid")
             gen "I wouldn't mind if they did..." ("base", xpos="far_left", ypos="head")
-            her "That's just... typical!" ("clench", "base", "angry", "R")
+            her "That's just... {shake}typical!{/shake}" ("clench", "base", "angry", "R")
             her "You disgust me, [name_genie_hermione]!" ("disgust", "base", "angry", "mid")
             gen "Alright-- Yeesh... Forget I said anything." ("base", xpos="far_left", ypos="head")
         else: # < 19
@@ -1381,7 +1381,7 @@ label her_reaction_equip_outfit_fail(item):
         gen "Could you put on the fishnet one-piece for me?" ("base", xpos="far_left", ypos="head")
         her "The what?" ("angry", "squint", "base", "mid")
         if states.her.level < 4:
-            her "What on earth is this!?" ("scream", "base", "angry", "down")
+            her "{shake}What on earth is this!?{/shake}" ("scream", "base", "angry", "down")
             gen "Fishnet... One-piece?" ("base", xpos="far_left", ypos="head")
             her "Are you actually expecting me to wear this?" ("angry", "base", "angry", "mid")
             gen "*Err*... No, I wanted to have you convert it into a fishnet for me!" ("angry", xpos="far_left", ypos="head")
@@ -1446,7 +1446,7 @@ label her_reaction_equip_outfit_fail(item):
             her "Most certainly... The school uniform is a staple within this institution, and I'll wear it with--" ("open", "closed", "base", "mid")
             gen "Here you go." ("base", xpos="far_left", ypos="head")
             her "Pride..." ("normal", "squint", "base", "down")
-            her "What have you done?!" ("shock", "wide", "base", "mid")
+            her "{shake}What have you done?!{/shake}" ("shock", "wide", "base", "mid")
             gen "What?" ("base", xpos="far_left", ypos="head")
             her @ cheeks blush "It's cut all weird... Wait, what's wrong with this skirt?" ("clench", "base", "base", "down")
             gen "You like it?" ("base", xpos="far_left", ypos="head")
@@ -1466,7 +1466,7 @@ label her_reaction_equip_outfit_fail(item):
             gen "(Looks like I crossed some arbitrary line with this one...)" ("base", xpos="far_left", ypos="head")
         else: # < 19
             her "This..." ("angry", "base", "base", "down")
-            gen "I know it's great isn't it?" ("base", xpos="far_left", ypos="head")
+            gen "I know, it's great isn't it?" ("base", xpos="far_left", ypos="head")
             her "This..." ("mad", "narrow", "base", "down")
             her "Why would you do this to our school uniform?" ("soft", "closed", "base", "mid")
             her @ cheeks blush "The students wear this with pride... It's a staple of our great institution." ("normal", "squint", "base", "mid")
@@ -1552,7 +1552,7 @@ label her_reaction_equip_outfit_fail(item):
             her @ cheeks blush "..." ("disgust", "squint", "worried", "stare")
             gen "You see, if you move your breasts in a circulation motion, these little things spin around." ("base", xpos="far_left", ypos="head")
             with hpunch
-            her @ cheeks blush "What?!" ("shock", "wide", "angry", "mid")
+            her @ cheeks blush "{shudder}What?!{/shudder}" ("shock", "wide", "angry", "mid")
             gen "I know!" ("grin", xpos="far_left", ypos="head")
             gen "Pretty clever, right?" ("grin", xpos="far_left", ypos="head")
             her @ cheeks blush "Sir, how could you ask me to wear something like this?!" ("angry", "happy", "angry", "R")
@@ -1563,7 +1563,7 @@ label her_reaction_equip_outfit_fail(item):
             gen "A piece of art is it not?" ("base", xpos="far_left", ypos="head")
             her @ cheeks blush "You're expecting me to wear this?" ("clench", "wide", "base", "mid")
             gen "Heck yes!" ("base", xpos="far_left", ypos="head")
-            her @ cheeks blush "Well you can take that expectation and.... and..." ("open", "closed", "annoyed", "mid")
+            her @ cheeks blush "Well, you can take that expectation and.... and..." ("open", "closed", "annoyed", "mid")
             gen "And what?" ("base", xpos="far_left", ypos="head")
             her @ cheeks blush "I am not wearing this for you..." ("clench", "closed", "base", "mid")
             her @ cheeks blush "" ("normal", "base", "base", "mid")
@@ -1627,7 +1627,7 @@ label her_reaction_equip_outfit_fail(item):
             gen "What's a-- Who doesn't know--" ("base", xpos="far_left", ypos="head")
             gen "Tifa Lockheart!" ("base", xpos="far_left", ypos="head")
             her "Who?" ("upset", "squint", "worried", "mid")
-            gen "*sigh*... I can't believe it..." ("base", xpos="far_left", ypos="head")
+            gen "{bounce}*Sigh*...{/bounce} I can't believe it..." ("base", xpos="far_left", ypos="head")
             her "Is that a relative of Gilderoy Lockhart?" ("open", "squint", "base", "mid")
             gen "*Huh*?" ("base", xpos="far_left", ypos="head")
             her "Gilderoy... One of the teachers..." ("angry", "squint", "base", "mid")
@@ -1700,7 +1700,7 @@ label her_reaction_equip_outfit_fail(item):
             her "Latex dress?" ("angry", "squint", "base", "stare")
             her "I didn't know you could make a dress out of--" ("open", "squint", "worried", "mid")
             gen "Here you go." ("base", xpos="far_left", ypos="head")
-            her "Are you crazy?!" ("clench", "wide", "base", "down")
+            her "{shake}Are you crazy?!{/shake}" ("clench", "wide", "base", "down")
             her "What's wrong with you, [name_genie_hermione]?!" ("scream", "squint", "annoyed", "mid")
             gen "What do you--" ("base", xpos="far_left", ypos="head")
             her @ cheeks blush "I am not putting that thing on..." ("disgust", "happyCl", "base", "mid")
@@ -1711,9 +1711,9 @@ label her_reaction_equip_outfit_fail(item):
             gen "Pretty unique isn't it?" ("base", xpos="far_left", ypos="head")
             her "This looks like someone ripped an oversized balloon." ("disgust", "squint", "annoyed", "mid")
             gen "Balloon? I was going to say it looks more like a--" ("base", xpos="far_left", ypos="head")
-            her "... {w} Like a what?" ("angry", "squint", "annoyed", "mid")
+            her "...{w} Like a what?" ("angry", "squint", "annoyed", "mid")
             gen "Never mind..." ("base", xpos="far_left", ypos="head")
-            gen "So will you wear--" ("base", xpos="far_left", ypos="head")
+            gen "So, will you wear--" ("base", xpos="far_left", ypos="head")
             her "No!" ("scream", "closed", "annoyed", "mid")
             her "" ("normal", "squint", "annoyed", "mid")
         else: # < 19
@@ -1771,7 +1771,7 @@ label her_reaction_equip_outfit_fail(item):
             her "A swimsuit?" ("angry", "happy", "base", "mid")
             her "Am I expected to go swimming with you?" ("clench", "squint", "base", "mid")
             gen "I just thought you'd look good in one." ("base", xpos="far_left", ypos="head")
-            her "What?!" ("clench", "squint", "worried", "mid")
+            her "{shake}What?!{/shake}" ("clench", "squint", "worried", "mid")
             her "You want me to wear it in here?" ("disgust", "squint", "base", "mid")
             gen "Yes, I'd like you to put it on for when you're--" ("base", xpos="far_left", ypos="head")
             her "Why would I stand around in a swimsuit in your office?" ("angry", "happy", "annoyed", "mid")
@@ -1854,7 +1854,7 @@ label her_reaction_equip_outfit_fail(item):
         her "You know..." ("clench", "narrow", "worried", "R")
         gen "Oh... I see..." ("base", xpos="far_left", ypos="head")
         gen "Well, your breasts should do, shouldn't they?" ("base", xpos="far_left", ypos="head")
-        her "What?!" ("angry", "wide", "base", "mid")
+        her "{shudder}What?!{/shudder}" ("angry", "wide", "base", "mid")
         her "Sir, I'm not putting on some dress without my bra..." ("angry", "squint", "annoyed", "mid")
         gen "Why not?" ("base", xpos="far_left", ypos="head")
         gen "It's all covered, isn't it?" ("base", xpos="far_left", ypos="head")
@@ -1916,8 +1916,8 @@ label her_reaction_equip_outfit_fail(item):
             gen "*Err*... It was a joke, since it's a Christmas costume. Of course elves didn't make it!" ("angry", xpos="far_left", ypos="head")
             her "..." ("disgust", "narrow", "angry", "mid")
             gen "I mean, if elves had made it, I'm sure they wouldn't have missed this giant hole." ("base", xpos="far_left", ypos="head")
-            her "*Sigh*..." ("disgust", "narrow", "angry", "R")
-            gen "(Crisis averted)." ("base", xpos="far_left", ypos="head")
+            her "{bounce}*Sigh*...{/bounce}" ("disgust", "narrow", "angry", "R")
+            gen "(Crisis averted.)" ("base", xpos="far_left", ypos="head")
 
     ###############################
     ## Poker Outfit (token shop) ##
@@ -1976,13 +1976,13 @@ label her_reaction_equip_outfit_fail(item):
             gen "Oh, those!" ("base", xpos="far_left", ypos="head")
             gen "They are the straps I believe." ("base", xpos="far_left", ypos="head")
             gen "Pretty cool, right?" ("base", xpos="far_left", ypos="head")
-            her "Cool?!" ("angry", "wide", "angry", "mid")
+            her "{shake}Cool?!{/shake}" ("angry", "wide", "angry", "mid")
             gen "Is that not how you say it anymore?" ("base", xpos="far_left", ypos="head")
             gen "I'm not really up to date with the \"lingo\" these days." ("base", xpos="far_left", ypos="head")
             her "Are you crazy?!" ("scream", "squint", "annoyed", "mid")
             gen "I mean... at least I didn't say \"Tubular\"." ("base", xpos="far_left", ypos="head")
             her "Asking me to wear a normal bikini is bad enough, but this..." ("disgust", "closed", "angry", "mid")
-            gen "*Huh*? Looks pretty normal to me... From where I'm from--" ("base", xpos="far_left", ypos="head")
+            gen "*Huh*? Looks pretty normal to me... Where I'm from--" ("base", xpos="far_left", ypos="head")
             gen "I mean--" ("angry", xpos="far_left", ypos="head")
             her "Then you probably need to get your eyes checked..." ("angry", "base", "angry", "mid")
             her "Because this bikini you got me would surely never be an appropriate--" ("angry", "base", "angry", "R")
@@ -1995,7 +1995,7 @@ label her_reaction_equip_outfit_fail(item):
             gen "About what? It's a bikini, is it not?" ("base", xpos="far_left", ypos="head")
             her @ cheeks blush "These straps are made of chains! Surely that wouldn't even help to keep them on..." ("angry", "narrow", "annoyed", "down")
             gen "I'm sure you'll find a way..." ("base", xpos="far_left", ypos="head")
-            her "I won't!" ("scream", "closed", "annoyed", "mid")
+            her "{shake}I won't!{/shake}" ("scream", "closed", "annoyed", "mid")
             gen "Don't put yourself down like that... I'm sure some spell would--" ("base", xpos="far_left", ypos="head")
             her "I won't, because I'm not putting it on..." ("angry", "narrow", "angry", "mid")
             gen "Oh...{w=0.4} Right..." ("base", xpos="far_left", ypos="head")
@@ -2063,7 +2063,7 @@ label her_reaction_equip_outfit_fail(item):
             gen "What do you mean the rest? Isn't a bikini supposed to only come in two pieces?" ("base", xpos="far_left", ypos="head")
             her @ cheeks blush "Isn't a bikini supposed to-- Oh... I don't know..." ("angry", "squint", "annoyed", "mid")
             with hpunch
-            her @ cheeks blush "Cover your privates?!" ("scream", "closed", "annoyed", "mid")
+            her @ cheeks blush "{shake}Cover your privates?!{/shake}" ("scream", "closed", "annoyed", "mid")
             gen "Doesn't it do that?" ("base", xpos="far_left", ypos="head")
             her @ cheeks blush "There's barely any fabric to cover anything!" ("disgust", "base", "annoyed", "mid")
             gen "Very environmentally friendly isn't it?" ("base", xpos="far_left", ypos="head")
@@ -2154,7 +2154,7 @@ label her_reaction_equip_outfit_fail(item):
             her "..." ("clench", "wide", "base", "mid")
             her "You want me to what?!" ("disgust", "base", "annoyed", "mid")
             gen "Take your clothes--" ("base", xpos="far_left", ypos="head")
-            her "[name_genie_hermione], are you crazy?!" ("scream", "happyCl", "annoyed", "mid")
+            her "[name_genie_hermione], {shake}are you crazy?!{/shake}" ("scream", "happyCl", "annoyed", "mid")
             gen "You've learnt how to tie a knot, have you not?" ("base", xpos="far_left", ypos="head")
             gen "If it's an issue I suppose I could--" ("base", xpos="far_left", ypos="head")
             her "You want me to take my clothes off and only wear a ribbon?!" ("clench", "base", "annoyed", "mid")
diff --git a/game/scripts/characters/luna/events/favors/inspect_her_body.rpy b/game/scripts/characters/luna/events/favors/inspect_her_body.rpy
index eaf4a620..b2928869 100644
--- a/game/scripts/characters/luna/events/favors/inspect_her_body.rpy
+++ b/game/scripts/characters/luna/events/favors/inspect_her_body.rpy
@@ -238,8 +238,9 @@ label ll_pf_inspect_T2_E1_intro:
     lun @ cheeks blush "I can't believe it!" ("grin", "base", "base", "mid")
 
     call cum_block
-    pause .5
     call gen_chibi("cum_behind_desk_done")
+    with d3
+    pause.2
 
     gen "{bounce}*Ah*...{w=0.4}*Ah*...{/bounce}{w=0.4} What..." ("base", xpos="far_left", ypos="head")
     lun @ cheeks blush "Cumming...{w=0.4} You came again!" ("base", "happyCl", "base", "mid")
diff --git a/game/scripts/characters/luna/events/spectrespecs/spectrespecs.rpy b/game/scripts/characters/luna/events/spectrespecs/spectrespecs.rpy
index a386d948..8abb1a11 100644
--- a/game/scripts/characters/luna/events/spectrespecs/spectrespecs.rpy
+++ b/game/scripts/characters/luna/events/spectrespecs/spectrespecs.rpy
@@ -287,7 +287,8 @@ label spectrespecs_E4:
 
     pause 1.5
     call gen_chibi("cum_behind_desk_done")
-    pause .8
+    with d3
+    pause.2
 
     gen "{bounce}*Ah*...{w=0.4} *Ah*...{w=0.4} *Ah*...{/bounce}" ("base", xpos="far_left", ypos="head")
     lun "I saw them!" ("clench", "wide", "base", "mid")
diff --git a/game/scripts/characters/luna/wardrobe_reactions.rpy b/game/scripts/characters/luna/wardrobe_reactions.rpy
index 5b1bb68f..bd3f2c91 100644
--- a/game/scripts/characters/luna/wardrobe_reactions.rpy
+++ b/game/scripts/characters/luna/wardrobe_reactions.rpy
@@ -59,7 +59,7 @@ label lun_reaction_touch(what):
                 lun @ cheeks blush "*Hmm*... I could've sworn you said that we should focus on more sensitive areas..." ("base", "narrow", "base", "down")
 
                 block:
-                    lun @ cheeks blush "*Ah*..." ("open", "closed", "base", "mid")
+                    lun @ cheeks blush "{bounce}*Ah*...{/bounce}" ("open", "closed", "base", "mid")
                     lun @ cheeks blush "Sorry, you just took me by surprise..." ("base", "narrow", "base", "mid")
 
         elif states.lun.tier == 4:
@@ -107,7 +107,7 @@ label lun_reaction_touch(what):
         if states.lun.tier == 5:
             random:
                 lun @ cheeks blush "Don't forget to kiss the other one too! She gets awfully jealous if her sister gets all the attention." ("base", "base", "base", "down")
-                lun @ cheeks blush "*Ah*... Thank you for helping me [name_genie_luna]..." ("soft", "closed", "base", "mid")
+                lun @ cheeks blush "{bounce}*Ah*...{/bounce} Thank you for helping me [name_genie_luna]..." ("soft", "closed", "base", "mid")
                 block:
                     lun "*Mmm*... Why does something so bad feel so good?" ("grin", "closed", "base", "mid")
                     gen "The backsprats?" ("base", xpos="far_left", ypos="head")
@@ -122,7 +122,7 @@ label lun_reaction_touch(what):
                     gen "*Err*..." ("base", xpos="far_left", ypos="head")
                     lun @ cheeks blush "It feels really good so why aren't any of them coming out?" ("annoyed", "base", "base", "mid")
                 block:
-                    lun @ cheeks blush "*Ah*... {w=0.4} Your methods are quite the something [name_genie_luna]..." ("open", "closed", "base", "mid")
+                    lun @ cheeks blush "{bounce}*Ah*...{/bounce}{w=0.4} Your methods are quite the something [name_genie_luna]..." ("open", "closed", "base", "mid")
                     lun @ cheeks blush "I could never have imagined that getting rid of those pests would end up being so..." ("base", "closed", "base", "mid")
                     lun @ cheeks blush "Enjoyable..." ("grin", "narrow", "base", "mid")
 
@@ -132,7 +132,7 @@ label lun_reaction_touch(what):
                     lun "You really were right about these things being sensitive..." ("open", "base", "base", "down")
                     lun "Can't believe I hadn't figured this out earlier." ("base", "base", "base", "downR")
                 block:
-                    lun @ cheeks blush "*Ah*... Is everyone this sensitive in around this spot?" ("soft", "closed", "base", "mid")
+                    lun @ cheeks blush "{bounce}*Ah*...{/bounce} Is everyone this sensitive in around this spot?" ("soft", "closed", "base", "mid")
                     gen "Women are a lot more sensitive than men most of the time..." ("base", xpos="far_left", ypos="head")
                     lun "Oh... That's so sad..." ("angry", "base", "base", "mid")
                 block:
@@ -153,20 +153,20 @@ label lun_reaction_touch(what):
 
         if states.lun.tier == 5:
             random:
-                lun @ cheeks blush "*Ah*... S-so good... How did I ever live without this?" ("normal", "closed", "base", "mid")
+                lun @ cheeks blush "{bounce}*Ah*...{/bounce} S-so good... How did I ever live without this?" ("normal", "closed", "base", "mid")
                 lun @ cheeks blush "*Mmm*... Nasty... wrackspurts..." ("base", "closed", "base", "mid")
                 lun @ cheeks blush "Please... Help me get rid of them again..." ("crooked_smile", "narrow", "base", "mid")
         elif states.lun.tier == 4:
             random:
                 lun @ cheeks blush "Whoa... I didn't think just using your mouth could produce such a strong response." ("open", "wide", "base", "mid")
-                lun @ cheeks blush "*Ah*... It's almost like a ripple of water... Except running through my body..." ("soft", "closed", "base", "mid")
+                lun @ cheeks blush "{bounce}*Ah*...{/bounce} It's almost like a ripple of water... Except running through my body..." ("soft", "closed", "base", "mid")
                 lun @ cheeks blush "*Mmm*... Those nasty wrackspurts... I can feel them getting agitated already..." ("grin", "narrow", "base", "downR")
         elif states.lun.tier == 3:
             random:
-                lun @ cheeks blush "*Ohhhh*... This is going to be my new happy memory when I have to summon a patronus!" ("base", "narrow", "base", "down")
+                lun @ cheeks blush "{bounce}*Ohhhh*...{/bounce} This is going to be my new happy memory when I have to summon a patronus!" ("base", "narrow", "base", "down")
                 lun "Weren't I supposed to be learning how to do this myself?" ("angry", "base", "raised", "mid")
                 block:
-                    lun "*Oohhh*... Why are your lips cold?" ("clench", "wide", "base", "mid")
+                    lun "{bounce}*Oohhh*...{/bounce} Why are your lips cold?" ("clench", "wide", "base", "mid")
                     gen "Why are your lips cold?" ("base", xpos="far_left", ypos="head")
                     lun "*Huh*?" ("upset", "base", "raised", "mid")
         # elif states.lun.tier == 2:This would only be useful if there was another check if you've done event 2 to have it show before T3
@@ -179,7 +179,7 @@ label lun_reaction_touch(what):
                     lun "Is this a lesson on the dementor's kiss?" ("open", "base", "raised", "mid")
                     lun "I always thought it was done through the mouth." ("soft", "base", "base", "downR")
                 block:
-                    lun "*Ooohh*..." ("grin", "base", "base", "up")
+                    lun "{bounce}*Ooohh*...{/bounce}" ("grin", "base", "base", "up")
                     lun "I don't think anyone has ever kissed me there before... How strange..." ("grin", "closed", "base", "mid")
     return
 
@@ -440,7 +440,7 @@ label lun_reaction_equip_outfit(item):
         lun "Oh... Alright then." ("angry", "base", "base", "mid")
         lun "..." ("base", "base", "base", "R")
         gen "I still want you to put it on though..." ("base", xpos="far_left", ypos="head")
-        lun "Oh, Alright!" ("grin", "base", "base", "mid")
+        lun "Oh, alright!" ("grin", "base", "base", "mid")
 
     ############
     ## Summer ##
@@ -624,7 +624,7 @@ label lun_reaction_equip_outfit(item):
         pause .8
 
         lun "*Hmm*... It doesn't stretch that much, does it?"
-        lun "*Ngh*!!"
+        lun "{shudder}*Ngh*!!{/shudder}"
         play sound "sounds/creaking02.ogg"
         pause 1
         lun "Alright, there's one leg..."
@@ -634,7 +634,7 @@ label lun_reaction_equip_outfit(item):
         play sound "sounds/creaking01.ogg"
         pause 2
         play sound "sounds/slap_04.ogg"
-        lun "Ouchie!"
+        lun "{shake}Ouchie!{/shake}"
 
     ####################
     ## Flasher Outfit ##
@@ -799,7 +799,7 @@ label lun_reaction_equip_outfit_fail(item):
         gen "I've got this summer outfit for you to put on." ("base", xpos="far_left", ypos="head")
         gen "Since it's pretty hot you should probably wear it without your bra on." ("base", xpos="far_left", ypos="head")
         lun "Take off my bra?" ("soft", "base", "base", "mid")
-        lun "Well that might be a problem..." ("upset", "base", "base", "down")
+        lun "That might be a problem..." ("upset", "base", "base", "down")
         gen "Why's that?" ("base", xpos="far_left", ypos="head")
         lun "Well... It's a bit embarrassing actually..." ("angry", "narrow", "base", "R")
         lun "My latch got stuck on it..." ("disgust", "base", "base", "downL")
@@ -835,7 +835,7 @@ label lun_reaction_equip_outfit_fail(item):
     ## Bimbo Outfit ##
     ##################
     elif item == lun_outfit_bimbo: #Req 10 (top)
-        gen "I've got this cute outfit for you to wear." ("base", xpos="far_left", ypos="head")
+        gen "I've got a cute outfit for you to wear." ("base", xpos="far_left", ypos="head")
         lun "Acute?" ("open", "base", "raised", "mid")
         gen "*Huh*?" ("base", xpos="far_left", ypos="head")
         lun "How is it acute?" ("soft", "base", "raised", "mid")
@@ -945,7 +945,7 @@ label lun_reaction_equip_outfit_fail(item):
         gen "No--{w=0.2} It's not that kind of costume!" ("base", xpos="far_left", ypos="head")
         lun "Oh..." ("upset", "narrow", "worried", "down")
         gen "So, will you--" ("base", xpos="far_left", ypos="head")
-        lun "*Sigh*..." ("upset", "narrow", "worried", "down") #Sad
+        lun "{bounce}*Sigh*{/bounce}" ("upset", "narrow", "worried", "down") #Sad
         gen "(I'll just ask again some other time...)" ("base", xpos="far_left", ypos="head")
 
     ######################
diff --git a/game/scripts/characters/susan/wardrobe_reactions.rpy b/game/scripts/characters/susan/wardrobe_reactions.rpy
index 0ad7efa2..d8f93912 100644
--- a/game/scripts/characters/susan/wardrobe_reactions.rpy
+++ b/game/scripts/characters/susan/wardrobe_reactions.rpy
@@ -71,7 +71,7 @@ label sus_reaction_touch_fail(what):
     if what == "head":
         $ mouse_slap()
 
-        sus @ cheeks blush "*Eeek*!" ("angry", "happyCl", "sad", "mid")
+        sus @ cheeks blush "{shake}*Eeek*!{/shake}" ("angry", "happyCl", "sad", "mid")
         sus @ cheeks blush "I'm sorry sir, you scared me..." ("angry", "base", "sad", "mid")
         gen "(Poor thing isn't used to human touch...)" ("base", xpos="far_left", ypos="head")
 
@@ -203,7 +203,7 @@ label sus_reaction_equip_outfit_fail(item):
     ########################
     if item == sus_outfit_lace1:
         gen "Could you put on this lingerie for me please?" ("base", xpos="far_left", ypos="head")
-        sus @ cheeks blush "L--{w=0.2} Lingerie!?" ("angry", "wide", "shocked", "mid")
+        sus @ cheeks blush "L--{w=0.2} {shake}Lingerie!?{/shake}" ("angry", "wide", "shocked", "mid")
         gen "Yep." ("base", xpos="far_left", ypos="head")
         sus @ cheeks blush "I--{w=0.2} I--{w=0.2} Why would you ask me to--" ("angry", "happyCl", "worried", "mid")
         gen "...{w=0.4} Maybe some other time then." ("base", xpos="far_left", ypos="head")
@@ -213,7 +213,7 @@ label sus_reaction_equip_outfit_fail(item):
     ##############################
     elif item ==sus_outfit_latex1:
         gen "Put your latex underwear on for me." ("base", xpos="far_left", ypos="head")
-        sus @ cheeks blush "The-- The what?!?" ("angry", "wide", "shocked", "mid")
+        sus @ cheeks blush "The-- {shake}The what?!?{/shake}" ("angry", "wide", "shocked", "mid")
         gen "These!" ("grin", xpos="far_left", ypos="head")
         sus @ cheeks blush "Oh, by Merlin's beard!" ("clench", "wide", "base", "down")
         sus @ cheeks blush "I can't wear these!" ("open", "happyCl", "worried", "mid")
diff --git a/game/scripts/characters/tonks/wardrobe_reactions.rpy b/game/scripts/characters/tonks/wardrobe_reactions.rpy
index 58c62e93..af4da862 100644
--- a/game/scripts/characters/tonks/wardrobe_reactions.rpy
+++ b/game/scripts/characters/tonks/wardrobe_reactions.rpy
@@ -57,9 +57,10 @@ label ton_reaction_touch(what):
         random:
             ton "Is this what you do to our students? A bit tame, don't you think?" ("soft", "narrow", "base", "mid")
             ton "Surely this is not an appropriate method of rewarding your subordinate..." ("horny", "narrow", "base", "R")
-            ton "Does this mean I'm your favourite student?" ("grin", "base", "raised", "mid")
-            ton "Teacher, I mean..." ("base", "narrow", "base", "downR")
             ton "Such a weird custom, but I'll allow it..." ("horny", "closed", "base", "mid")
+            block:
+                ton "Does this mean I'm your favourite student?" ("grin", "base", "raised", "mid")
+                ton "Teacher, I mean..." ("base", "narrow", "base", "downR")
             block:
                 ton "How naughty... How could I have ever allowed such indecent behaviour..." ("disgust", "narrow", "base", "mid")
                 ton "Don't you dare touch my elbows next..." ("soft", "narrow", "base", "mid")
@@ -224,9 +225,9 @@ label ton_reaction_equip_outfit(item):
     ##################
     elif item == ton_outfit_bikini_1:
         gen "You know what would be kinda crazy?" ("base", xpos="far_left", ypos="head")
-        ton "what?" ("base", "base", "base", "mid")
+        ton "What?" ("base", "base", "base", "mid")
         gen "If you like... Just stood in my office wearing this bikini..." ("base", xpos="far_left", ypos="head")
-        ton "Are you asking or is this a hypothetical?" ("base", "narrow", "base", "R")
+        ton "Are you asking, or is this a hypothetical?" ("base", "narrow", "base", "R")
         gen "What if I'm hypothetically asking?" ("base", xpos="far_left", ypos="head")
         ton "Well if you were then I'd probably say yes, that is a pretty crazy thing to ask." ("soft", "base", "base", "mid")
         gen "But you'd still do it, right?" ("base", xpos="far_left", ypos="head")
diff --git a/game/scripts/events/ending.rpy b/game/scripts/events/ending.rpy
index 690702de..defc03ee 100644
--- a/game/scripts/events/ending.rpy
+++ b/game/scripts/events/ending.rpy
@@ -522,7 +522,7 @@ label ball_ending_E2:
     gen "Shush! Keep your voice down and follow me." ("base", xpos="far_left", ypos="head")
     her "Oh?" ("open", "base", "base", "mid")
 
-    show her_ball wall -h1 as cg
+    show her_ball wall -h1 -crowd as cg
     call hide_blktone_top
     call ctc
 
diff --git a/game/scripts/rooms/main_room/objects/jerk_off.rpy b/game/scripts/rooms/main_room/objects/jerk_off.rpy
index c3fc59ef..468541ad 100644
--- a/game/scripts/rooms/main_room/objects/jerk_off.rpy
+++ b/game/scripts/rooms/main_room/objects/jerk_off.rpy
@@ -1,78 +1,214 @@
+
+
+### Genie jerk off ###
+
 label jerk_off:
+
     call gen_chibi("jerk_off_behind_desk")
     with d3
     pause 1
 
+    nar "You decide to spend some time by jerking off..."
     gen "(How should I finish this thing?)" ("base", xpos="far_left", ypos="head")
 
-    $ renpy.dynamic(jerk_off_choice=None)
-
     menu .choice:
-        "-Hermione's panties!-" if states.her.ev.panty_thief.acquired:
-            $ jerk_off_choice = "hermione"
-            $ states.her.ev.panty_thief.soaked = True
+        "-Think about Hermione!-" if not states.her.ev.panty_thief.acquired and states.her.unlocked:
+            nar "You fantasise about Hermione."
+            random:
+                gen "(Ah, yes... Spread that pussy for me, you know-it-all whore!)" ("angry", xpos="far_left", ypos="head")
+                gen "(That's it... Let's cover that bushy little head of yours in spunk, shall we?)" ("grin", xpos="far_left", ypos="head")
+                gen "(Yes! Take my seed, you Gryffindor whore!)" ("angry", xpos="far_left", ypos="head")
+                gen "(That's right, slut... I'll fuck your brains out so hard you'll forget how to read!)" ("angry", xpos="far_left", ypos="head")
+                gen "(Yes! Feel the power of the most cunning linguist!)" ("angry", xpos="far_left", ypos="head")
+                gen "(You may think you're clever, but I can read you like an open book... Now spread those pages for me!)" ("angry", xpos="far_left", ypos="head")
+                gen "(Gryffindor's pride... Yes, you'll wear my cum with honour...)" ("grin", xpos="far_left", ypos="head")
+                gen "(Such a bright witch you are... Although you'd look even brighter with your body glazed in cum.)" ("grin", xpos="far_left", ypos="head")
+                gen "(Let's do a practical lesson, where we find out just how far down your throat my cock can reach...)" ("grin", xpos="far_left", ypos="head")
+                gen "(I've heard you're hungry for knowledge... Let me teach you a few positions.)" ("grin", xpos="far_left", ypos="head")
+
+            call gen_chibi("cum_behind_desk")
+            with hpunch
+            pause 1
+
+            nar "You cum on the floor..."
+        "-Use Hermione's panties!-" if states.her.ev.panty_thief.acquired:
+            nar "You wrap Hermione's panties around your cock and begin stroking..."
+            gen "That's it..."
+            gen "Suck my almighty cock, you little whore!!!" ("angry", xpos="far_left", ypos="head")
+
+            call gen_chibi("cum_behind_desk")
+            with hpunch
+            pause 1
 
         "-LOCKED-" (style="disabled") if not states.her.ev.panty_thief.acquired:
             nar "You lack the item required for this option."
             jump .choice
 
-        "-Cho's panties!-" if states.cho.ev.panty_thief.acquired:
-            $ jerk_off_choice = "cho"
-            $ states.cho.ev.panty_thief.soaked = True
+            nar "You cum all over Hermione's panties, and then use them to wipe the cum off the floor..."
+        "-Think about Cho!-" if not states.cho.ev.panty_thief.acquired and states.cho.unlocked:
+            nar "You fantasise about Cho."
+            random:
+                gen "(After a single taste, they will all beg for more... You're no different, you Ravenclaw whore!)" ("angry", xpos="far_left", ypos="head")
+                gen "(That's it... Cum for me, cum as my hard piece of wood rubs against your snitch!)" ("angry", xpos="far_left", ypos="head")
+                gen "(*Mmm*... You better think again, if you believe the speed of your broomstick can compare to the swiftness of my fingers...)" ("base", xpos="far_left", ypos="head")
+                gen "(Yes... My dick will take you higher than any broomstick ever could...)" ("base", xpos="far_left", ypos="head")
+                gen "(Today's match has been cancelled due to slippery conditions!)" ("grin", xpos="far_left", ypos="head")
+                gen "(Let's break some speed-records together... You'll be the rider, I'll be the broomstick.)" ("grin", xpos="far_left", ypos="head")
 
+            call gen_chibi("cum_behind_desk")
+            with hpunch
+            pause 1
+
+            nar "You cum on the floor..."
+        "-Use Cho's panties!-" if states.cho.ev.panty_thief.acquired:
+            nar "You wrap Cho's panties around your cock and begin stroking..."
+            gen "That's it..."
+            gen "Suck my almighty cock, you hot-headed slut!!!" ("angry", xpos="far_left", ypos="head")
+
+            call gen_chibi("cum_behind_desk")
+            with hpunch
+            pause 1
         "-LOCKED-" (style="disabled") if not states.cho.ev.panty_thief.acquired:
             nar "You lack the item required for this option."
             jump .choice
 
-        "-On the floor!-":
-            $ jerk_off_choice = renpy.random.choice(["jasmine", "lara"])
+            nar "You cum all over Cho's panties, and then use them to wipe the cum off the floor..."
+        "-Think about Luna!-" if states.lun.unlocked:
+            nar "You fantasise about Luna."
+            random:
+                gen "(Yes... Bounce on my cock, you crazy bitch!)" ("angry", xpos="far_left", ypos="head")
+                gen "(Once I'm done with you, it won't just be nonsense flowing out of your mouth.)" ("grin", xpos="far_left", ypos="head")
+                gen "(You better be careful girl... If you flick my wand a certain way, it'll make you moan like a lunatic...)" ("grin", xpos="far_left", ypos="head")
+                gen "(Yes... My cock will surely bring you back from dreamland to reality...)" ("grin", xpos="far_left", ypos="head")
+                gen "(Damn... The wild look in those eyes could easily turn me into a lunatic...)" ("grin", xpos="far_left", ypos="head")
+                gen "(That's it... I'll fuck you so hard, the silly gets fucked out of you!)" ("angry", xpos="far_left", ypos="head")
 
-    nar "You decide to spend some time by jerking off..."
+            call gen_chibi("cum_behind_desk")
+            with hpunch
+            pause 1
 
-    if jerk_off_choice == "hermione":
-        nar "You fantasise about Hermione..."
-    elif jerk_off_choice == "cho":
-        nar "You fantasise about Cho..."
-    elif jerk_off_choice == "jasmine":
-        nar "You fantasise about Princess Jasmine..."
-    elif jerk_off_choice == "lara":
-        nar "You fantasise about Lara Croft..."
+            nar "You cum on the floor..."
+        "-Think about Tonks!-" if states.ton.unlocked:
+            nar "You fantasise about Tonks."
+            random:
+                gen "(Now, let me show you how I use my genie magic!)" ("grin", xpos="far_left", ypos="head")
+                gen "({bounce}*Ah*...{/bounce} Yes... It's time for you to receive a magic facial, containing the power drawn from my balls!)" ("grin", xpos="far_left", ypos="head")
+                gen "(Yes... Teach me how a professional witch handles a wand...)" ("grin", xpos="far_left", ypos="head")
+                gen "(That's it... Let me teach you a lesson you'll never forget!)" ("grin", xpos="far_left", ypos="head")
+                gen "(That's it... Swish and flick my wand with your tongue.)" ("grin", xpos="far_left", ypos="head")
+                gen "(Praise my cock and I'll drown your sorrows in cum rather than Firewhisky...)" ("grin", xpos="far_left", ypos="head")
 
-    gen "Yes... That's a good slut!" ("angry", xpos="far_left", ypos="head")
-    pause.5
+            call gen_chibi("cum_behind_desk")
+            with hpunch
+            pause 1
 
-    nar "You are ready to cum..."
-    pause.2
+            nar "You cum on the floor..."
+        "-Think about Susan!-" if states.sus.unlocked:
+            nar "You fantasise about Susan."
+            random:
+                gen "(Yes... Make those fun-bags bounce for me, you big-titted harlot!)" ("angry", xpos="far_left", ypos="head")
+                gen "(That's it... Feel my magic power sliding down your tits!)" ("grin", xpos="far_left", ypos="head")
+                gen "(Don't be shy, girl... Spread that pussy wide...)" ("grin", xpos="far_left", ypos="head")
+                gen "(Yes... Now use those magical titties to make my cock disappear...)" ("grin", xpos="far_left", ypos="head")
+                gen "(Distracting titties... Yes, that's at least a week worth of detentions...)" ("grin", xpos="far_left", ypos="head")
 
-    if jerk_off_choice == "hermione":
-        gen "Suck my almighty cock, you little whore!!!" ("angry", xpos="far_left", ypos="head")
-    elif jerk_off_choice == "cho":
-        gen "Suck my almighty cock, you exotic goddess!!!" ("angry", xpos="far_left", ypos="head")
-    elif jerk_off_choice == "jasmine":
-        gen "Suck my almighty cock, you princess-whore!!!" ("angry", xpos="far_left", ypos="head")
-    elif jerk_off_choice == "lara":
-        gen "Suck my almighty cock, you whore!!!" ("angry", xpos="far_left", ypos="head")
+            call gen_chibi("cum_behind_desk")
+            with hpunch
+            pause 1
 
-    hide screen blktone
-    call gen_chibi("cum_behind_desk")
-    with hpunch
-    pause 1
+            nar "You cum on the floor..."
+        "-Think about Astoria!-" if states.ast.unlocked:
+            nar "You fantasise about Astoria."
+            random:
+                gen "(Time for you to be put in your place, you bully! Get on top of this dick!)" ("grin", xpos="far_left", ypos="head")
+                gen "(Students don't usually ask for a spanking, but I'll make an exception...)" ("grin", xpos="far_left", ypos="head")
+                gen "(I've got the prefect liquid to wash that filthy mouth with.)" ("grin", xpos="far_left", ypos="head")
+                gen "(Time for you to get a taste of my medicine...)" ("grin", xpos="far_left", ypos="head")
+                gen "(Yes... Moan the most unforgivable of curses as I cum inside you...)" ("grin", xpos="far_left", ypos="head")
+                gen "(Let me show you how I cast the curse of uncontrollable wetness without using my hands...)" ("grin", xpos="far_left", ypos="head")
+                gen "(You must not have been spanked enough yet... Let me fix that...)" ("grin", xpos="far_left", ypos="head")
+                gen "(Let's break some rules together, shall we?)" ("grin", xpos="far_left", ypos="head")
 
-    if jerk_off_choice == "hermione":
-        nar "You cum all over Hermione's panties, and then use them to wipe the cum off the floor..."
-        call gen_chibi("cum_behind_desk_done")
-    elif jerk_off_choice == "cho":
-        nar "You cum all over Cho's panties, and then use them to wipe the cum off the floor..."
-        call gen_chibi("cum_behind_desk_done")
-    else:
-        nar "You cum on the floor."
+            call gen_chibi("cum_behind_desk")
+            with hpunch
+            pause 1
 
+            nar "You cum on the floor..."
+        "-Think about that one specific girl!-":
+            random:
+                block:
+                    nar "You fantasise about Eden."
+                    gen "({bounce}*Ah*...{/bounce} Yes... Sway that tail for me, you green-skinned beauty!)" ("base", xpos="far_left", ypos="head")
+                    gen "(See you in a lifetime!)" ("grin", xpos="far_left", ypos="head")
+                block:
+                    nar "You fantasise about a crafty woman..."
+                    gen "(That's it... Poke me with those triangle-shaped titties...)" ("grin", xpos="far_left", ypos="head")
+                block:
+                    nar "You fantasise about a princess of Hylian origins."
+                    gen "(*Mmm*... Yes, that's a good princess...)" ("base", xpos="far_left", ypos="head")
+                    gen "(I'm gonna...{w=0.4} {shake}HYAH!{/shake})" ("angry", xpos="far_left", ypos="head")
+                block:
+                    nar "You fantasise about that nerdy girl who wears a turtleneck."
+                    gen "(Oh yes... I'll solve the mystery of your wet panties for you...)" ("base", xpos="far_left", ypos="head")
+                    gen "(Let's find out what's hiding underneath...)" ("grin", xpos="far_left", ypos="head")
+                block:
+                    nar "You fantasise about a superheroine with the power of storms."
+                    gen "(Your powers are nothing compared to the thunderous claps I'm about to unleash against your ass!)" ("angry", xpos="far_left", ypos="head")
+                block:
+                    nar "You fantasise about Jasmine."
+                    gen "(Princess... I'm coming--{w=0.4} {shudder}home!{/shudder})" ("angry", xpos="far_left", ypos="head")
+                block:
+                    nar "You fantasise about an avatar... Not the blue one..."
+                    gen "(What do you mean, you've never heard of cum-bending? Just give it a try...)" ("grin", xpos="far_left", ypos="head")
+                block:
+                    nar "You fantasise about a damsel in distress."
+                    gen "(I'll fuck your peachy behind so hard your castle will crumble under the weight of my orgasm!)" ("grin", xpos="far_left", ypos="head")
+                block:
+                    nar "You fantasise about a British time-traveller with a pulse pistol."
+                    gen "(Hold onto something love, because I'm about to teleport my dick inside you.)" ("grin", xpos="far_left", ypos="head")
+                block:
+                    nar "You fantasise about a badass zombie slayer."
+                    gen "(Oh yes... Once I've finished fucking your brains out, no zombie will come for you.)" ("grin", xpos="far_left", ypos="head")
+                block:
+                    nar "You fantasise about a blonde woman wearing a power-suit."
+                    gen "(I hope that suit of yours has stabilizers, because my meat roid's primed.)" ("grin", xpos="far_left", ypos="head")
+                block:
+                    nar "You fantasise about a sexy android."
+                    gen "(Once I get my hand on a Senzu Bean, I'll have you screaming for eight episodes straight!)" ("grin", xpos="far_left", ypos="head")
+                block:
+                    nar "You fantasise about a busty Shinigami Lieutenant."
+                    gen "(I'm gonna senbonzakura your petals until you turn hollow.)" ("grin", xpos="far_left", ypos="head")
+                block:
+                    nar "You fantasise about an android girl with a phat butt and a blindfold."
+                    gen "(To cum, or not to cum, that is the question.)" ("base", xpos="far_left", ypos="head")
+                block:
+                    nar "You fantasise about one of the witches of sin."
+                    gen "(Once I'm done with you, all other witches will envy you instead.)" ("grin", xpos="far_left", ypos="head")
+
+            call gen_chibi("cum_behind_desk")
+            with hpunch
+            pause 1
+
+            nar "You cum on the floor..."
+
+
+
+    #Finished cumming
     call gen_chibi("cum_behind_desk_done")
+    with d3
     pause.2
 
-    gen "(...)" ("base", xpos="far_left", ypos="head")
-    gen "(This was a pretty sweet jerk-off session...)" ("base", xpos="far_left", ypos="head")
-    gen "(Back to being productive!)" ("base", xpos="far_left", ypos="head")
+    random: #Post orgasm dialogue
+        gen "(That's the stuff...)" ("grin", xpos="far_left", ypos="head")
+        gen "(There we go... One nut a day keeps the existential dread at bay..." ("base", xpos="far_left", ypos="head")
+        block:
+            gen "(...)" ("base", xpos="far_left", ypos="head")
+            gen "(This was a pretty sweet jerk-off session...)" ("base", xpos="far_left", ypos="head")
+            gen "(Back to being productive!)" ("base", xpos="far_left", ypos="head")
+        block:
+            gen "({bounce}*Ah*...{/bounce} Nothing beats that moment of pure bliss...)" ("base", xpos="far_left", ypos="head")
+            gen "(Aaaand it's gone...)" ("base", xpos="far_left", ypos="head")
+        block:
 
     call gen_chibi("sit_behind_desk")
 
diff --git a/game/scripts/shops/dress/chitchats.rpy b/game/scripts/shops/dress/chitchats.rpy
index 1df5c6c7..f44078a0 100644
--- a/game/scripts/shops/dress/chitchats.rpy
+++ b/game/scripts/shops/dress/chitchats.rpy
@@ -20,7 +20,7 @@ label purchase_outfit(item):
         gen "Thank you." ("base", xpos="far_left", ypos="head")
     elif item == her_outfit_nightie:
         gen "I'd like to order a custom outfit today." ("base", xpos="far_left", ypos="head")
-        maf "Certainly honey... Repairing these conservative school clothes all day has been quite dull, to say the least."
+        maf "Certainly honey... Repairing these conservative school uniforms all day has been quite dull, to say the least."
         gen "Well, I can assure you that this outfit is not conservative." ("base", xpos="far_left", ypos="head")
         maf "*Hmm*?"
         gen "I'd like to order a girl's Nightgown." ("base", xpos="far_left", ypos="head")