diff --git a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy
index 890051b6..b8c89e50 100644
--- a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy
+++ b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy
@@ -1981,24 +1981,24 @@ label gryffindor_match_return:
     gen "*Hngh*--" ("angry", xpos="far_left", ypos="head")
 
     #Cut to CG
-    show image "cho_under_desk_idle_snape_no_spit" as cg zorder 16
+    show image "cho_under_desk_idle_snape_no_spit" as cg_doll zorder 16
     with fade
     call ctc
 
-    ton "Professor?" ("soft", "narrow", "raised", "mid", ypos="head")
+    ton "Professor?" ("soft", "narrow", "raised", "mid", xpos="far_right", ypos="head")
 
     play sound "sounds/spit.ogg"
-    show image "cho_under_desk_idle_snape" as cg
+    show image "cho_under_desk_idle_snape" as cg_doll
 
     gen "..." ("angry", xpos="far_left", ypos="head")
     ton "Are you alright?" ("soft", "base", "raised", "mid")
 
     #Cho's head starts moving
     play background "sounds/slickloop.ogg" fadein 2
-    show image "cho_under_desk_blowjob" as cg
+    show image "cho_under_desk_blowjob" as cg_doll
     with d3
 
-    cho @ cheeks heavy_blush "*Slurp*...{w=0.4} *Gobble*...{w=0.4} *Slurp*" ("open_wide_tongue", "narrow", "base", "up", xpos="left", ypos="head", flip=False, trans=d3)
+    cho @ cheeks heavy_blush "*Slurp*...{w=0.4} *Gobble*...{w=0.4} *Slurp*" ("open_wide_tongue", "narrow", "base", "up", xpos="far_right", ypos="head", flip=False, trans=d3)
     gen "Oh, yes!{w=0.4} *Ahem*--{w=0.4} Sorry, I was just thinking how terrible that would be." ("grin", xpos="far_left", ypos="head")
     gen "(What the hell does she think she's doing!?)" ("angry", xpos="far_left", ypos="head")
     gen "Don't--{w=0.2} *Hngh*...{w=0.4} Don't worry about me, I'll be fine. Just taken by surprise by this whole ordeal, that's...{w=0.4} That's it." ("base", xpos="far_left", ypos="head")
@@ -2018,14 +2018,14 @@ label gryffindor_match_return:
     gen "Nah, it's just a sports--" ("base", xpos="far_left", ypos="head")
 
     play background "sounds/slickloopfast.ogg"
-    show image "cho_under_desk_blowjob_fast" as cg
+    show image "cho_under_desk_blowjob_fast" as cg_doll
 
     cho @ cheeks heavy_blush "*Gobble*...{w=0.2} *Slurp*...{w=0.2} *Gobble*" ("open_wide_tongue", "happyCl", "base", "mid")
     gen "*Ngh*...{w=0.4} sports drink." ("angry", xpos="far_left", ypos="head")
     hoo "I see." ("open", "base", "base", "mid")
     gen "Electrobytes or whatchamacallit." ("base", xpos="far_left", ypos="head")
     hoo "Well I suppose it could be, I can't say I've seen what a Gator Aid container looks like." ("normal", "narrow", "base", "downL")
-    sna "Now hold on just one second!" ("snape_10", ypos="head")
+    sna "Now hold on just one second!" ("snape_10", xpos="far_right", ypos="head")
     sna "Did you not see how fast she was going on that broom?" ("snape_32")
     sna "It has to have been a luck potion!" ("snape_32")
     sna "Such precise movements should be impossible on anything but a firebolt!" ("snape_17")
@@ -2044,11 +2044,11 @@ label gryffindor_match_return:
     #Cho stops moving
     stop background fadeout 2
     play sound "sounds/slick_pop.ogg"
-    show image "cho_under_desk_idle_snape" as cg
+    show image "cho_under_desk_idle_snape" as cg_doll
 
     cho @ cheeks heavy_blush "*Pwah*." ("open_tongue", "narrow", "base", "up")
 
-    show image "cho_under_desk_handjob" as cg
+    show image "cho_under_desk_handjob" as cg_doll
     with d3
 
     ton "The boys have a bet on which team would end up winning the Quidditch cup." ("open", "base", "base", "R")
@@ -2060,7 +2060,7 @@ label gryffindor_match_return:
     sna "*Hmph*... In that case, I'll just bring the vial to professor Slughorn and have him test it!" ("snape_16")
 
     #Snape's legs vanish from CG as he goes to grab the bottle.
-    show image "cho_under_desk_idle" as cg
+    show image "cho_under_desk_idle" as cg_doll
     with d3
 
     play sound "sounds/cloth_sound3.ogg"
@@ -2081,6 +2081,7 @@ label gryffindor_match_return:
     hoo "Oh, look at the time. I think I better get going--" ("open", "shocked", "shocked", "R")
 
     #hooch sprints out the office sound
+    $ hooch_chibi.hide()
     play sound "sounds/run_03.ogg"
     pause 1.0
     play sound "sounds/door.ogg"
@@ -2090,7 +2091,7 @@ label gryffindor_match_return:
 
     #fade to black
     #fade back to office
-    hide cg
+    hide cg_doll
     hoo "" (xpos="base", ypos="base") # This will ensure her character has correct positioning in the future events.
     hide hooch
     hide hooch_main
@@ -2257,8 +2258,8 @@ label gryffindor_match_return:
     play sound "sounds/08_hop_on_desk.ogg"
     pause 3
 
-    show image "cho_sex idle" as cg zorder 16
-    show image "dustfloating" as cg_effects zorder 17
+    show image "cho_sex idle" as cg_doll zorder 16
+    show image "dustfloating" as cg_doll_effects zorder 17
     hide screen blkfade
     hide cho_main
     with d9
@@ -2291,7 +2292,7 @@ label gryffindor_match_return:
     cho @ cheeks heavy_blush "That I'd end up winning the cup before ever knowing what my coach's thick beater's bat would feel like inside my tight little... Snitch." ("horny", "narrow", "base", "down")
 
     #Cho up position dick in front of body
-    show image "cho_sex up" as cg
+    show image "cho_sex up" as cg_doll
     with d3
 
     gen "Miss Chang!"
@@ -2300,7 +2301,7 @@ label gryffindor_match_return:
     cho @ cheeks heavy_blush "Although it's quite fitting to have this be part of my reward, don't you think?" ("smile", "narrow", "base", "down")
 
     #Cho positioning dick against pussy pose
-    show image "cho_sex insert" as cg
+    show image "cho_sex insert" as cg_doll
     with d3
 
     cho @ cheeks heavy_blush "As much as it is a reward for you..." ("base", "narrow", "base", "down")
@@ -2313,15 +2314,15 @@ label gryffindor_match_return:
     cho @ cheeks heavy_blush "And it's about to get even better..." ("crooked_smile", "narrow", "base", "down")
 
     #Cho sits down on genie's dick and gets fully penetrated
-    show image "cho_sex up inside" as cg
+    show image "cho_sex up inside" as cg_doll
     with d3
     pause 0.25
     cho @ cheeks heavy_blush "*Nnngh--{w=0.40}{nw}" ("angry", "closed", "angry", "mid")
-    show image "cho_sex middle" as cg
+    show image "cho_sex middle" as cg_doll
     with d3
     pause 0.25
     play sound "sounds/slick_02.ogg"
-    show image "cho_sex down" as cg
+    show image "cho_sex down" as cg_doll
     with d3
     pause 0.25
 
@@ -2333,7 +2334,7 @@ label gryffindor_match_return:
 
     #Cho starts moving
     play background "sounds/slickloop.ogg"
-    show image "cho_sex loop slow" as cg
+    show image "cho_sex loop slow" as cg_doll
     with d3
 
     gen "*Hngh*!"
@@ -2389,7 +2390,7 @@ label gryffindor_match_return:
 
     #sexloop fast. #speedlines
     play background "sounds/sexloopfast.ogg"
-    show image "cho_sex loop fast" as cg
+    show image "cho_sex loop fast" as cg_doll
     with d1
 
     gen "*Argh*...{w=0.4} You little--"
@@ -2419,26 +2420,26 @@ label gryffindor_match_return:
             #Cho standing pose, genie body 3 (cho normal up, jacking it)
             stop background fadeout 2
             play sound "sounds/slick_02.ogg"
-            show image "cho_sex up jerking" as cg
+            show image "cho_sex up jerking" as cg_doll
             with d3
 
             pause .5
             gen "*Aaargh*!!"
             #Genie cums
             play sound "sounds/slick_01.ogg"
-            show image "cho_sex up cum outside stage0" as cg
+            show image "cho_sex up cum outside stage0" as cg_doll
             with d3
             pause 0.66
-            show image "cho_sex up cum outside stage1" as cg
+            show image "cho_sex up cum outside stage1" as cg_doll
             with d3
 
             pause 0.66
             play sound "sounds/slick_01.ogg"
-            show image "cho_sex up cum outside stage2" as cg
+            show image "cho_sex up cum outside stage2" as cg_doll
             with d3
             pause 0.66
 
-            show image "cho_sex up cum outside stage3" as cg
+            show image "cho_sex up cum outside stage3" as cg_doll
             with d3
 
             gen "Ah..."
@@ -2454,7 +2455,7 @@ label gryffindor_match_return:
             #Cho standing tasting cum pose, dick outside (cum on dick)
 
             #TODO change for variant with cum on her chest included
-            show image "cho_sex up taste outside" as cg
+            show image "cho_sex up taste outside" as cg_doll
             with d2
 
             cho @ cheeks heavy_blush "*Mmm*..." ("base", "closed", "base", "stare")
@@ -2467,9 +2468,9 @@ label gryffindor_match_return:
             cho @ cheeks heavy_blush "My--" ("smile", "narrow", "base", "up")
             gen "*Aaaargh*!!!"
 
-            show image "cho_sex middle" as cg
+            show image "cho_sex middle" as cg_doll
             pause 0.25
-            show image "cho_sex down" as cg
+            show image "cho_sex down" as cg_doll
             play sound "sounds/slick_01.ogg"
             with kissiris
             stop background fadeout 1
@@ -2479,28 +2480,28 @@ label gryffindor_match_return:
 
             with flashbulb
             play sound "sounds/slick_02.ogg"
-            show image "cho_sex idle creampie" as cg
+            show image "cho_sex idle creampie" as cg_doll
             with d3
             gen "Ah...."
             cho @ cheeks heavy_blush "*Ah*...{w=0.4} *Ah*...{w=0.4} *Ah*..." ("grin", "narrow", "base", "up", trans=d3)
 
             #Cho moves to stand pose (cycle images?)
-            show image "cho_sex middle cum inside" as cg
+            show image "cho_sex middle cum inside" as cg_doll
             with d2
             pause 0.25
-            show image "cho_sex up cum inside" as cg
+            show image "cho_sex up cum inside" as cg_doll
             with d2
             pause 0.25
             play sound "sounds/slick_02.ogg"
-            show image "cho_sex up cum outside" as cg
+            show image "cho_sex up cum outside" as cg_doll
             with d2
 
             cho @ cheeks heavy_blush "I think--{w=0.4} *Ah*...{w=0.4} I think I've finally found a fun activity to put into my workout routine..." ("smile", "narrow", "base", "stare")
 
-            show image "cho_sex insert cum inside" as cg
+            show image "cho_sex insert cum inside" as cg_doll
             with d2
             pause 0.25
-            show image "cho_sex up taste" as cg
+            show image "cho_sex up taste" as cg_doll
             with d2
 
             #Cum sound
@@ -2518,8 +2519,8 @@ label gryffindor_match_return:
 
     stop music fadeout 1.0
 
-    hide image cg
-    hide image cg_effects
+    hide image cg_doll
+    hide image cg_doll_effects
     call cho_chibi(xpos="desk", ypos="base", flip=False)
     with fade
 
diff --git a/game/scripts/characters/hermione/events/favors/suck_it.rpy b/game/scripts/characters/hermione/events/favors/suck_it.rpy
index cc86850e..12a8561b 100644
--- a/game/scripts/characters/hermione/events/favors/suck_it.rpy
+++ b/game/scripts/characters/hermione/events/favors/suck_it.rpy
@@ -105,7 +105,7 @@ label hg_pf_blowjob_T4_fail_intro:
     her "Suck you...{w=0.3} off?" ("disgust", "wide", "base", "mid")
     her "With my mouth?!" ("disgust", "wide", "base", "stare")
 
-    if states.her.ev.suck_it.cock_kiss:
+    if states.her.ev.give_me_a_handy.cock_kiss:
         gen "Wouldn't even be the first time you've done it!" ("grin", xpos="far_left", ypos="head")
         her "Yes, but..." ("disgust", "narrow", "worried", "down")
         her "That was something different entirely..." ("disgust", "happyCl", "worried", "mid")
@@ -143,7 +143,7 @@ label hg_pf_blowjob_T4_fail_repeat:
     her "I refuse..." ("open", "closed", "base", "mid")
     gen "It's only a blowjob, girl..." ("base", xpos="far_left", ypos="head")
 
-    if states.her.ev.suck_it.cock_kiss:
+    if states.her.ev.give_me_a_handy.cock_kiss:
         gen "It's not like you haven't done it before..." ("base", xpos="far_left", ypos="head")
         her "Are you talking about the kiss I gave it?" ("open", "base", "angry", "mid")
         her "That was something different entirely..." ("open", "closed", "base", "mid")
diff --git a/game/scripts/wardrobe/wardrobe.rpy b/game/scripts/wardrobe/wardrobe.rpy
index 93163227..d5ab6e62 100644
--- a/game/scripts/wardrobe/wardrobe.rpy
+++ b/game/scripts/wardrobe/wardrobe.rpy
@@ -860,6 +860,7 @@ screen wardrobe_outfit_menuitem(xx, yy):
                     $ is_modded = item.is_modded()
                     $ is_equipped = bool(current_item == item)
                 $ is_inadequate = (current_subcategory in {"save", "load", "schedule"} and not wardrobe_check_equip_outfit(item))
+                $ has_schedule = any(item.schedule.values())
 
                 $ warnings = []
 
@@ -895,7 +896,11 @@ screen wardrobe_outfit_menuitem(xx, yy):
                     tooltip warnings
                     action action
                     alternate alternate
-                    if is_inadequate:
+                    if current_subcategory == "schedule" and not has_schedule:
+                        foreground "#00000040"
+                        hover_foreground "#80808040"
+                        selected_foreground "#80808040"
+                    elif is_inadequate:
                         foreground "#b2000040"
                         hover_foreground "#CD5C5C40"
                         selected_foreground "#CD5C5C40"