diff --git a/game/scripts/characters/hermione/gifts.rpy b/game/scripts/characters/hermione/gifts.rpy
index 8d489b60..226b3188 100644
--- a/game/scripts/characters/hermione/gifts.rpy
+++ b/game/scripts/characters/hermione/gifts.rpy
@@ -9,23 +9,23 @@ label give_her_gift(gift_item):
     $ gave_hermione_gift = True
 
     if gift_item == lollipop_ITEM:
-        if her_whoring >= 0 and her_whoring <= 5: # Lv 1-2.
+        if her_whoring < 6: # Lv 1-2.
             her "A lollipop?" ("base", "base", "base", "mid")
             call give_gift(">You give the candy to Hermione...",gift_item)
             her "Thank you, [genie_name]." ("base", "base", "base", "mid")
             call her_mood(-5)
-        elif her_whoring >= 6 and her_whoring <= 11: # Lv 3-4.
+        elif her_whoring < 12: # Lv 3-4.
             her "Candy?" ("normal", "base", "base", "mid")
             her "Candy is for kids, [genie_name]." ("open", "base", "base", "mid")
             call give_gift(">You give the candy to Hermione...",gift_item)
             her "Thank you..." ("annoyed", "base", "worried", "R")
             call her_mood(-5)
-        elif her_whoring >= 12 and her_whoring <= 17: # Lv 5-6.
+        elif her_whoring < 18: # Lv 5-6.
             her "Candy?" ("normal", "base", "base", "mid")
             call give_gift(">You give the candy to Hermione...",gift_item)
             her "*Ehm*... Sure, thanks..." ("open", "squint", "base", "mid")
             call her_mood(-5)
-        elif her_whoring >= 18: # Lv 7+
+        else: # Lv 7+
             her "A lollipop?" ("base", "base", "base", "mid")
             her "Clever girls use candy like this as a \"weapon\"." ("smile", "base", "base", "R")
             call give_gift(">You give the candy to Hermione...",gift_item)
@@ -33,12 +33,12 @@ label give_her_gift(gift_item):
             call her_mood(-5)
 
     elif gift_item == chocolate_ITEM:
-        if her_whoring >= 0 and her_whoring <= 5: # Lv 1-2.
+        if her_whoring < 6: # Lv 1-2.
             her "A chocolate bar?" ("base", "base", "base", "mid")
             call give_gift(">You give the chocolate to Hermione...", gift_item)
             her "Thank you, [genie_name]." ("base", "base", "base", "mid")
             call her_mood(-10)
-        elif her_whoring >= 6 and her_whoring <= 11: # Lv 3-4.
+        elif her_whoring < 12: # Lv 3-4.
             her "A chocolate bar?" ("normal", "base", "base", "mid")
             her "*Hmm*..." ("annoyed", "squint", "angry", "mid")
             her "That thing about fairies..."
@@ -46,13 +46,13 @@ label give_her_gift(gift_item):
             call give_gift(">You give the chocolate to Hermione...", gift_item)
             her "Thank you..." ("soft", "base", "base", "mid")
             call her_mood(-10)
-        elif her_whoring >= 12 and her_whoring <= 17: # Lv 5-6.
+        elif her_whoring < 18: # Lv 5-6.
             her "A chocolate bar?" ("normal", "base", "base", "mid")
             her "I just like the way it crunches, [genie_name]! N-not the taste..." ("grin", "happyCl", "worried", "mid",emote="sweat")
             call give_gift(">You give the chocolate to Hermione...", gift_item)
             her "*Ehm*... Sure, thanks..." ("base", "base", "base", "mid")
             call her_mood(-10)
-        elif her_whoring >= 18: # Lv 7+
+        else: # Lv 7+
             her "A chocolate bar?" ("base", "base", "base", "mid")
             her "You spoil me, [genie_name]." ("smile", "base", "angry", "mid")
             call give_gift(">You give the chocolate to Hermione...", gift_item)
@@ -60,26 +60,26 @@ label give_her_gift(gift_item):
             call her_mood(-10)
 
     elif gift_item == plush_owl_ITEM:
-        if her_whoring >= 0 and her_whoring <= 5: # Lv 1-2.
+        if her_whoring < 6: # Lv 1-2.
             her "A stuffed owl?" ("base", "base", "base", "mid")
             her "It's cute..." ("base", "base", "base", "mid")
             call give_gift(">You give the owl to Hermione...",gift_item)
             her "Thank you, [genie_name]." ("base", "base", "base", "mid")
             call her_mood(-7)
-        elif her_whoring >= 6 and her_whoring <= 11: # Lv 3-4.
+        elif her_whoring < 12: # Lv 3-4.
             her "A plush toy?" ("open", "base", "worried", "mid")
             her "I like it!" ("base", "base", "base", "mid")
             call give_gift(">You give the owl to Hermione...",gift_item)
             her "Thank you, [genie_name]." ("base", "base", "base", "mid")
             call her_mood(-10)
-        elif her_whoring >= 12 and her_whoring <= 17: # Lv 5-6.
+        elif her_whoring < 18: # Lv 5-6.
             her "A toy?" ("base", "base", "base", "mid")
             her "Toys are for kids, [genie_name]." ("open", "base", "base", "mid")
             her "But I'll take it..." ("annoyed", "base", "worried", "R")
             call give_gift(">You give the owl to Hermione...",gift_item)
             her "Thank you, [genie_name]." ("base", "base", "base", "mid")
             call her_mood(-15)
-        elif her_whoring >= 18: # Lv 7+
+        else: # Lv 7+
             her "This is one of those adult toys isn't it?" ("disgust", "narrow", "base", "mid_soft")
             her "There's got to be a switch or a button somewhere..." ("open", "narrow", "worried", "down")
             her "So... Does it vibrate or something?" ("base", "narrow", "worried", "down")
@@ -91,27 +91,27 @@ label give_her_gift(gift_item):
             call her_mood(-4)
 
     elif gift_item == butterbeer_ITEM:
-        if her_whoring >= 0 and her_whoring <= 5: # Lv 1-2.
+        if her_whoring < 6: # Lv 1-2.
             her "Butterbeer?" ("base", "base", "base", "mid")
             her "Are you sure about that, [genie_name]?" ("open", "squint", "base", "mid")
             her "It does contain alcohol, you know..." ("base", "base", "base", "mid")
             call give_gift(">You give the bottle to Hermione...",gift_item)
             her "Thank you." ("base", "base", "base", "mid")
             call her_mood(-3)
-        elif her_whoring >= 6 and her_whoring <= 11: # Lv 3-4.
+        elif her_whoring < 12: # Lv 3-4.
             her "Butterbeer, [genie_name]?" ("open", "base", "worried", "mid")
             her "To let you in on a little secret, [genie_name]..." ("open", "base", "base", "mid")
             her "I'm a big fan of this completely harmless beverage." ("base", "base", "base", "mid")
             call give_gift(">You give the bottle to Hermione...",gift_item)
             her "Thank you, [genie_name]." ("base", "base", "base", "mid")
             call her_mood(-10)
-        elif her_whoring >= 12 and her_whoring <= 17: # Lv 5-6.
+        elif her_whoring < 18: # Lv 5-6.
             her "Butterbeer?" ("base", "base", "base", "mid")
             her "Thank you, [genie_name]." ("grin", "happyCl", "worried", "mid",emote="sweat")
             call give_gift(">You give the bottle to Hermione...",gift_item)
             her "I shall drink this with the girls later." ("base", "base", "base", "mid")
             call her_mood(-15)
-        elif her_whoring >= 18: # Lv 7+
+        else: # Lv 7+
             her "Butterbeer...?" ("base", "base", "base", "mid")
             her "Thank you, [genie_name]." ("base", "base", "base", "mid")
             call give_gift(">You give the bottle to Hermione...",gift_item)
@@ -120,26 +120,26 @@ label give_her_gift(gift_item):
             call her_mood(-20)
 
     elif gift_item == science_mag_ITEM:
-        if her_whoring >= 0 and her_whoring <= 5: # Lv 1-2.
+        if her_whoring < 6: # Lv 1-2.
             her "\"Popular magic\" magazines?" ("base", "base", "base", "mid")
             call give_gift(">You give an assortment of educational magazines to Hermione...",gift_item)
             her "Thank you, [genie_name]!" ("base", "base", "base", "mid")
             her "I will use them for my research!"
             call her_mood(-15)
-        elif her_whoring >= 6 and her_whoring <= 11: # Lv 3-4.
+        elif her_whoring < 12: # Lv 3-4.
             her "Sometimes I find information in magazines that I could never find in a book..." ("base", "base", "base", "mid")
             call give_gift(">You give an assortment of educational magazines to Hermione...",gift_item)
             her "Thank you, [genie_name]!" ("base", "base", "base", "mid")
             her "I will use them for my research!"
             call her_mood(-10)
-        elif her_whoring >= 12 and her_whoring <= 17: # Lv 5-6.
+        elif her_whoring < 18: # Lv 5-6.
             her "Oh..." ("open", "base", "base", "mid")
             her "Yes, I used to read magazines like that a lot..." ("base", "base", "base", "mid")
             her "Lately not so much though..." ("open", "base", "worried", "R")
             call give_gift(">You give an assortment of educational magazines to Hermione...",gift_item)
             her "Thank you, [genie_name]!" ("base", "base", "base", "mid")
             call her_mood(-3)
-        elif her_whoring >= 18: # Lv 7+
+        else: # Lv 7+
             her "*Ehm*..." ("open", "base", "worried", "R")
             her "To be honest, magazines like that lost their appeal to me completely lately..." ("open", "squint", "base", "mid")
             her "But I don't mind taking them off you hands anyway, [genie_name]." ("open", "base", "worried", "mid")
@@ -148,25 +148,25 @@ label give_her_gift(gift_item):
             call her_mood(0)
 
     elif gift_item == girls_mag_ITEM:
-        if her_whoring >= 0 and her_whoring <= 5: # Lv 1-2.
+        if her_whoring < 6: # Lv 1-2.
             her "*Hmm*?" ("soft", "base", "base", "mid")
             her "This is the sort of press some Slytherin bimbo would appreciate." ("annoyed", "squint", "base", "mid")
             her "I am way above silly magazines like that, [genie_name]." ("open", "closed", "base", "mid")
             call her_mood(0)
-        elif her_whoring >= 6 and her_whoring <= 11: # Lv 3-4.
+        elif her_whoring < 12: # Lv 3-4.
             her "I don't read magazines of that nature, [genie_name]..." ("open", "closed", "angry", "mid")
             her "................" ("soft", "base", "base", "R")
             her "But I could give it a try just to humour you I suppose..." ("open", "closed", "angry", "mid")
             call give_gift(">You give an assortment of rather girly magazines to Hermione...",gift_item)
             her "Thank you, [genie_name]!" ("open", "squint", "base", "mid")
             call her_mood(-5)
-        elif her_whoring >= 12 and her_whoring <= 17: # Lv 5-6.
+        elif her_whoring < 18: # Lv 5-6.
             her "I ashamed to admit this, but..." ("open", "base", "worried", "R")
             her "I really enjoy reading magazines like that lately..." ("grin", "happyCl", "worried", "mid",emote="sweat")
             call give_gift(">You give an assortment of rather girly magazines to Hermione...",gift_item)
             her "Thank you, [genie_name]." ("open", "squint", "base", "mid")
             call her_mood(-15)
-        elif her_whoring >= 18: # Lv 7+
+        else: # Lv 7+
             her "The Latest edition of \"Girlz\"?!" ("angry", "wide", "base", "stare")
             her "I can't have enough of that brilliant magazine!" ("grin", "happyCl", "worried", "mid",emote="sweat")
             call give_gift(">You give an assortment of rather girly magazines to Hermione...",gift_item)
@@ -174,25 +174,25 @@ label give_her_gift(gift_item):
             call her_mood(-15)
 
     elif gift_item == adult_mag_ITEM:
-        if her_whoring >= 0 and her_whoring <= 5: # Lv 1-2.
+        if her_whoring < 6: # Lv 1-2.
             her "Are that...?" ("open", "base", "base", "mid")
             her "Adult magazines, [genie_name]?" ("open", "base", "base", "mid")
             her "Given to me by An esteemed wizard of your status?" ("annoyed", "narrow", "angry", "R")
             her "[genie_name], surely you could find a more productive way to spend your free time." ("disgust", "narrow", "base", "mid_soft")
             her "And I most definitely would not have use for those..." ("angry", "base", "angry", "mid")
             call her_mood(7)
-        elif her_whoring >= 6 and her_whoring <= 11: # Lv 3-4.
+        elif her_whoring < 12: # Lv 3-4.
             her "Adult magazines?" ("angry", "base", "angry", "mid")
             her "[genie_name], I have no interest in things like that." ("annoyed", "narrow", "angry", "R")
             her "And how is this an appropriate present for one of your students, [genie_name]?" ("angry", "base", "angry", "mid")
             call her_mood(3)
-        elif her_whoring >= 12 and her_whoring <= 17: # Lv 5-6.
+        elif her_whoring < 18: # Lv 5-6.
             her "Adult magazines?" ("open", "base", "base", "mid")
             her "[genie_name], this is such an inappropriate present for a girl like me..." ("angry", "happyCl", "worried", "mid",emote="sweat")
             call give_gift(">You give an assortment of adult magazines to Hermione...",gift_item)
             her "I shall throw these away myself..." ("annoyed", "narrow", "annoyed", "mid")
             call her_mood(-8)
-        elif her_whoring >= 18: # Lv 7+
+        else: # Lv 7+
             her "The New edition of \"L.o.v.e.\"!!!" ("smile", "happyCl", "base", "mid")
             her "Err.. I mean, adult magazines?" ("angry", "wink", "base", "mid")
             her "This is a little inappropriate..."
@@ -202,18 +202,18 @@ label give_her_gift(gift_item):
             call her_mood(-15)
 
     elif gift_item == porn_mag_ITEM:
-        if her_whoring >= 0 and her_whoring <= 5: # Lv 1-2.
+        if her_whoring < 6: # Lv 1-2.
             her "*Hmm*... What is this?" ("base", "base", "base", "mid")
             her "[genie_name], those are porn magazines!" ("scream", "wide", "base", "stare")
             her "Shame on you, [genie_name]!" ("angry", "base", "angry", "mid",cheeks="blush")
             call her_mood(15)
-        elif her_whoring >= 6 and her_whoring <= 11: # Lv 3-4.
+        elif her_whoring < 12: # Lv 3-4.
             her "Porn magazines?" ("shock", "wide", "base", "stare")
             her "[genie_name], what do you expect me to do with those?" ("open", "narrow", "worried", "down")
             her "Research them?" ("annoyed", "narrow", "annoyed", "mid")
             her "Despicable!" ("scream", "base", "angry", "mid",emote="angry")
             call her_mood(8)
-        elif her_whoring >= 12 and her_whoring <= 17: # Lv 5-6.
+        elif her_whoring < 18: # Lv 5-6.
             her "That's hardcore porn, [genie_name]." ("open", "base", "base", "mid")
             her "Which is a completely inappropriate gift for a girl like me!" ("angry", "happyCl", "worried", "mid",emote="sweat")
             her ".............." ("angry", "narrow", "base", "down")
@@ -221,7 +221,7 @@ label give_her_gift(gift_item):
             call give_gift(">You give an assortment of porn magazines to Hermione...",gift_item)
             her "And I shall throw them in the trash, where they and... girls who like these things belong..." ("annoyed", "narrow", "annoyed", "mid")
             call her_mood(0)
-        elif her_whoring >= 18: # Lv 7+
+        else: # Lv 7+
             her "Pornography?" ("shock", "wide", "base", "stare")
             her "................" ("angry", "narrow", "base", "down")
             her "How can women even agree to do things like that, [genie_name]?" ("angry", "base", "base", "mid")
@@ -232,25 +232,25 @@ label give_her_gift(gift_item):
             call her_mood(-15)
 
     elif gift_item == krum_poster_ITEM:
-        if her_whoring >= 0 and her_whoring <= 5: # Lv 1-2.
+        if her_whoring < 6: # Lv 1-2.
             her "A Quidditch poster?" ("annoyed", "narrow", "worried", "down")
             her "What am I supposed to do with it, [genie_name]?" ("annoyed", "narrow", "annoyed", "mid")
             her "No, thank you." ("annoyed", "closed", "base", "mid")
             call her_mood(0)
-        elif her_whoring >= 6 and her_whoring <= 11: # Lv 3-4.
+        elif her_whoring < 12: # Lv 3-4.
             her "A Quidditch poster?" ("annoyed", "narrow", "worried", "down")
             her "*Hmm*..." ("annoyed", "narrow", "annoyed", "mid")
             her "I think I saw this player once or twice..." ("annoyed", "narrow", "worried", "down")
             her "He is that Durmstrang student, right?" ("base", "base", "base", "mid")
             call give_gift(">You give the poster to Hermione...",gift_item)
             call her_mood(-5)
-        elif her_whoring >= 12 and her_whoring <= 17: # Lv 5-6.
+        elif her_whoring < 18: # Lv 5-6.
             her "A Viktor Krum poster, [genie_name]?" ("annoyed", "narrow", "worried", "down")
             her "Can't say that I care much for Quidditch, but..." ("open", "squint", "base", "mid")
             her "I can see why the girls find the brutish physique of some players appealing..." ("open", "narrow", "worried", "down")
             call give_gift(">You give the poster to Hermione...",gift_item)
             call her_mood(-15)
-        elif her_whoring >= 18: # Lv 7+
+        else: # Lv 7+
             her "A Viktor Krum poster?!" ("scream", "wide", "base", "mid")
             her "Thank you, [genie_name]!" ("grin", "happyCl", "worried", "mid",emote="sweat")
             call give_gift(">You give the poster to Hermione...",gift_item)
@@ -259,22 +259,22 @@ label give_her_gift(gift_item):
             call her_mood(-25)
 
     elif gift_item == sexy_lingerie_ITEM:
-        if her_whoring >= 0 and her_whoring <= 5: # Lv 1-2.
+        if her_whoring < 6: # Lv 1-2.
             her "lingerie?" ("angry", "narrow", "base", "down")
             her "[genie_name], I cannot accept a gift like this from you..." ("upset", "closed", "base", "mid")
             call her_mood(10)
-        elif her_whoring >= 6 and her_whoring <= 11: # Lv 3-4.
+        elif her_whoring < 12: # Lv 3-4.
             her "sexy lingerie?" ("angry", "narrow", "base", "down")
             her "You know I cannot possibly accept a gift like that from you, [genie_name]." ("angry", "base", "base", "mid")
             her "(It's pretty though)........." ("angry", "narrow", "base", "down")
             call her_mood(0)
-        elif her_whoring >= 12 and her_whoring <= 17: # Lv 5-6.
+        elif her_whoring < 18: # Lv 5-6.
             her "sexy lingerie?" ("base", "narrow", "worried", "down")
             her "[genie_name] that is so inappropriate..." ("angry", "wink", "base", "mid")
             call give_gift(">You give the lingerie to Hermione...",gift_item)
             her "Thank you, [genie_name]." ("base", "base", "base", "R",cheeks="blush")
             call her_mood(-7)
-        elif her_whoring >= 18: # Lv 7+
+        else: # Lv 7+
             her "sexy lingerie?" ("base", "narrow", "worried", "down")
             her "Do You think it will make me look like one of the witches in those adult magazines, [genie_name]?" ("grin", "narrow", "base", "dead")
             her "Oh... I mean, thank you, [genie_name]." ("angry", "wink", "base", "mid")
@@ -282,50 +282,50 @@ label give_her_gift(gift_item):
             call her_mood(-15)
 
     elif gift_item == sexy_stockings_ITEM :
-        if her_whoring >= 0 and her_whoring <= 5: # Lv 1-2.
+        if her_whoring < 6: # Lv 1-2.
             her "Stockings?" ("base", "narrow", "worried", "down")
             her "[genie_name], are you insinuating that I wear these?" ("angry", "closed", "base", "mid")
             call her_mood(8)
-        elif her_whoring >= 6 and her_whoring <= 11: # Lv 3-4.
+        elif her_whoring < 12: # Lv 3-4.
             her "Sexy stockings?" ("angry", "narrow", "base", "down")
             her "Isn't this a bit inappropriate, [genie_name]?" ("annoyed", "base", "base", "mid")
             call her_mood(0)
-        elif her_whoring >= 12 and her_whoring <= 17: # Lv 5-6.
+        elif her_whoring < 18: # Lv 5-6.
             her "Sexy stockings?" ("base", "narrow", "worried", "down")
             her "Thank you I guess..." ("base", "wink", "base", "mid",cheeks="blush")
             call give_gift(">You give the stockings to Hermione...",gift_item)
             her "Thank you, [genie_name]." ("base", "base", "base", "R",cheeks="blush")
             call her_mood(-8)
-        elif her_whoring >= 18: # Lv 7+
+        else: # Lv 7+
             her "Sexy stockings?" ("base", "narrow", "worried", "down")
             her "These are almost completely transparent, [genie_name]!" ("grin", "wide", "base", "mid")
             call give_gift(">You give the stockings to Hermione...",gift_item)
             call her_mood(-10)
 
     elif gift_item == pink_condoms_ITEM:
-        if her_whoring >= 0 and her_whoring <= 5: # Lv 1-2.
+        if her_whoring < 6: # Lv 1-2.
             her "Condoms?!" ("angry", "wide", "base", "stare")
             her "[genie_name], I wouldn't even know what to do with them..." ("scream", "closed", "angry", "mid")
             call her_mood(6)
-        elif her_whoring >= 6 and her_whoring <= 11: # Lv 3-4.
+        elif her_whoring < 12: # Lv 3-4.
             her "... Condoms?" ("normal", "squint", "angry", "mid")
             her "*Ehm*... Is this a part of some new Hogwarts sex ed program or something?" ("open", "closed", "angry", "mid")
             her "No, [genie_name]... It feels wrong to accept a thing like this from you..." ("open", "base", "base", "R",cheeks="blush")
             call her_mood(0)
-        elif her_whoring >= 12 and her_whoring <= 17: # Lv 5-6.
+        elif her_whoring < 18: # Lv 5-6.
             her "A pack of condoms?" ("normal", "base", "base", "mid")
             her "[genie_name], what possible use could I have for those?"
             her "Well, I shall accept them simply because it is rude to refuse a gift..." ("open", "closed", "angry", "mid")
             call give_gift(">You give a pack of condoms to Hermione...", gift_item)
             call her_mood(-3)
-        elif her_whoring >= 18: # Lv 7+
+        else: # Lv 7+
             her "A pack of condoms?" ("open", "squint", "base", "mid")
             her "I appreciate your concern, [genie_name]. Thank you." ("base", "narrow", "base", "mid_soft")
             call give_gift(">You give a pack of condoms to Hermione...", gift_item)
             call her_mood(-4)
 
     elif gift_item == vibrator_ITEM:
-        if her_whoring >= 0 and her_whoring <= 5: # Lv 1-2.
+        if her_whoring < 6: # Lv 1-2.
             her "A magic wand?" ("base", "base", "base", "mid")
             her "No, it doesn't look like--" ("soft", "base", "base", "mid")
             her ".........?"
@@ -333,12 +333,12 @@ label give_her_gift(gift_item):
             her "[genie_name]!" ("angry", "base", "angry", "mid",cheeks="blush")
             her "This is just beyond inappropriate!" ("scream", "closed", "angry", "mid")
             call her_mood(10)
-        elif her_whoring >= 6 and her_whoring <= 11: # Lv 3-4.
+        elif her_whoring < 12: # Lv 3-4.
             her "Is this what I think it is?" ("angry", "narrow", "base", "down")
             her "[genie_name], let me remind you that I belong to the noble house of Gryffindor." ("open", "narrow", "annoyed", "mid", cheeks="blush")
             her "A present like that would be appropriate for a girl from Slytherin, [genie_name]." ("upset", "closed", "base", "mid")
             call her_mood(10)
-        elif her_whoring >= 12 and her_whoring <= 17: # Lv 5-6.
+        elif her_whoring < 18: # Lv 5-6.
             her "Is that a... vibrator?" ("angry", "narrow", "base", "down")
             her "The design..."
             her "it reminds me of my wand..."
@@ -347,7 +347,7 @@ label give_her_gift(gift_item):
             her "But I shall take it nonetheless..." ("annoyed", "base", "worried", "R")
             call give_gift(">You give the vibrator to Hermione...",gift_item)
             call her_mood(0)
-        elif her_whoring >= 18: # Lv 7+
+        else: # Lv 7+
             her "This vibrator..." ("open", "base", "worried", "mid")
             her "It's... calling out for me..." ("open", "base", "worried", "R")
             her "But not in a dirty way, [genie_name]." ("disgust", "narrow", "base", "mid_soft")
@@ -356,18 +356,18 @@ label give_her_gift(gift_item):
             call her_mood(-10)
 
     elif gift_item == anal_lube_ITEM:
-        if her_whoring >= 0 and her_whoring <= 5: # Lv 1-2.
+        if her_whoring < 6: # Lv 1-2.
             her "I don't know what this is..." ("open", "base", "base", "mid")
             her "But I have the feeling that the jar is full of something vile and inappropriate..." ("angry", "base", "angry", "mid")
             her "No, thank you, [genie_name]."
             call her_mood(6)
-        elif her_whoring >= 6 and her_whoring <= 11: # Lv 3-4.
+        elif her_whoring < 12: # Lv 3-4.
             her "*Hmm*..." ("annoyed", "narrow", "worried", "down")
             her "I think I know what this is..." ("disgust", "narrow", "base", "mid_soft")
             her "But why would you give something like this to one of your pupils, [genie_name]?"
             her "No, thank you." ("annoyed", "narrow", "angry", "R")
             call her_mood(2)
-        elif her_whoring >= 12 and her_whoring <= 17: # Lv 5-6.
+        elif her_whoring < 18: # Lv 5-6.
             her "Anal lubricant?" ("angry", "narrow", "base", "down")
             her "*Ehm*.. well... I know this girl..." ("open", "base", "base", "R",cheeks="blush")
             her "I mean I don't know her, she is a friend of a friend..."
@@ -375,7 +375,7 @@ label give_her_gift(gift_item):
             call give_gift(">You give the jar to Hermione...",gift_item)
             her "Still, I think you should not give presents like this to your pupils, [genie_name]." ("open", "narrow", "annoyed", "mid", cheeks="blush")
             call her_mood(0)
-        elif her_whoring >= 18: # Lv 7+
+        else: # Lv 7+
             her "Anal lubricant, [genie_name]?" ("base", "narrow", "worried", "down")
             her "I know a couple of girls who would do anything for a commodity like that." ("open", "narrow", "annoyed", "mid", cheeks="blush")
             her "Thank for looking out for us, [genie_name]." ("base", "narrow", "base", "mid_soft")
@@ -383,14 +383,14 @@ label give_her_gift(gift_item):
             call her_mood(-5)
 
     elif gift_item == ballgag_and_cuffs_ITEM:
-        if her_whoring >= 0 and her_whoring <= 5: # Lv 1-2.
+        if her_whoring < 6: # Lv 1-2.
             her "What is this?" ("angry", "narrow", "base", "down")
             her "Is this like one of those adult toys?" ("angry", "squint", "base", "mid",cheeks="blush")
             her "What woman in her right mind would subject herself to a humiliation like that?" ("scream", "closed", "angry", "mid")
             her "And what possible use could I have for such objects?" ("open", "narrow", "annoyed", "mid", cheeks="blush")
             her "This is just insulting, [genie_name]..." ("angry", "base", "angry", "mid",cheeks="blush")
             call her_mood(10)
-        elif her_whoring >= 6 and her_whoring <= 11: # Lv 3-4.
+        elif her_whoring < 12: # Lv 3-4.
             her "[genie_name], do you not realise how inappropriate it would be for me to accept a present like that?" ("open", "narrow", "annoyed", "mid", cheeks="blush")
             her "And I would not even know what to do with them anyway..." ("open", "base", "base", "R",cheeks="blush")
             her "I mean these fluffy things are obviously handcuffs..." ("angry", "narrow", "base", "down")
@@ -398,7 +398,7 @@ label give_her_gift(gift_item):
             her "[genie_name], please..." ("upset", "closed", "base", "mid")
             her "Just put them away."
             call her_mood(5)
-        elif her_whoring >= 12 and her_whoring <= 17: # Lv 5-6.
+        elif her_whoring < 18: # Lv 5-6.
             her "A month ago I would've felt insulted to receive a gift like this..." ("upset", "closed", "base", "mid")
             her "But by now I know that some girls really do find pleasure in toys like..." ("angry", "narrow", "base", "down")
             her "But I assure you that I am not one of them, [genie_name]." ("upset", "closed", "base", "mid")
@@ -406,7 +406,7 @@ label give_her_gift(gift_item):
             her "Yes, I shall take these to her..." ("base", "base", "base", "R",cheeks="blush")
             call give_gift(">You give the ball gag and cuffs to Hermione...",gift_item)
             call her_mood(-9)
-        elif her_whoring >= 18: # Lv 7+
+        else: # Lv 7+
             her "A ball gag and handcuffs?" ("open", "happy", "base", "mid",cheeks="blush")
             her "This is completely inappropriate, [genie_name]." ("angry", "wink", "base", "mid") # :)
             her "But a gift is a gift, right?" ("base", "squint", "base", "mid")
@@ -414,25 +414,25 @@ label give_her_gift(gift_item):
             call her_mood(-15)
 
     elif gift_item == anal_plugs_ITEM:
-        if her_whoring >= 0 and her_whoring <= 5: # Lv 1-2.
+        if her_whoring < 6: # Lv 1-2.
             her "*Hmm*...?" ("base", "base", "base", "mid")
             her "Are those like key chain toys?" ("soft", "base", "base", "mid")
             call give_gift(">You give the anal plugs to Hermione...",gift_item)
             her "Thank you, [genie_name]." ("annoyed", "narrow", "annoyed", "mid")
             call her_mood(-8)
-        elif her_whoring >= 6 and her_whoring <= 11: # Lv 3-4.
+        elif her_whoring < 12: # Lv 3-4.
             her "[genie_name], are those adult toys of some sort?" ("open", "narrow", "annoyed", "mid", cheeks="blush")
             her "those are some of those anal things, aren't they?" ("angry", "base", "angry", "mid",cheeks="blush")
             her "[genie_name] this is nothing but a weapon meant to oppress women!"
             her "Despicable!" ("upset", "closed", "base", "mid")
             call her_mood(15)
-        elif her_whoring >= 12 and her_whoring <= 17: # Lv 5-6.
+        elif her_whoring < 18: # Lv 5-6.
             her "Yes, I know that some girls have *uhm*..." ("upset", "closed", "base", "mid")
             her "Have use for things such as these..." ("open", "narrow", "annoyed", "mid", cheeks="blush")
             her "But not me, [genie_name]."
             her "No, thank you." ("upset", "closed", "base", "mid")
             call her_mood(0)
-        elif her_whoring >= 18: # Lv 7+
+        else: # Lv 7+
             her "Anal plugs?" ("angry", "narrow", "base", "down")
             her "I have no use for things like that, [genie_name]..." ("angry", "base", "base", "mid")
             her "They are so pretty though..." ("angry", "wink", "base", "mid")
@@ -444,7 +444,7 @@ label give_her_gift(gift_item):
             call her_mood(-10)
 
     elif gift_item == testral_strapon_ITEM:
-        if her_whoring >= 0 and her_whoring <= 5: # Lv 1-2.
+        if her_whoring < 6: # Lv 1-2.
             her "What is that?" ("angry", "wide", "base", "stare")
             her "An artefact of some sort or a trophy?" ("open", "base", "base", "mid")
             her "So well-crafted..." ("base", "base", "base", "mid")
@@ -452,7 +452,7 @@ label give_her_gift(gift_item):
             call give_gift(">You give the strap-on to Hermione...",gift_item)
             her "Thank you very much, [genie_name]. I promise to take good care of it." ("open", "closed", "base", "mid")
             call her_mood(-20)
-        elif her_whoring >= 6 and her_whoring <= 11: # Lv 3-4.
+        elif her_whoring < 12: # Lv 3-4.
             her "!!!" ("angry", "wide", "base", "stare")
             her "That is..." ("angry", "narrow", "base", "down")
             her "But it doesn't even look... human..."
@@ -462,7 +462,7 @@ label give_her_gift(gift_item):
             her ".................." ("open", "narrow", "worried", "down")
             her "Please put it away, [genie_name]." ("angry", "base", "angry", "mid")
             call her_mood(15)
-        elif her_whoring >= 12 and her_whoring <= 17: # Lv 5-6.
+        elif her_whoring < 18: # Lv 5-6.
             her "That thing..." ("angry", "narrow", "base", "down")
             her "Is that the actual size of the... of the real \"thing\"?" ("angry", "base", "base", "mid")
             her "I mean..." ("open", "base", "base", "R",cheeks="blush")
@@ -472,7 +472,7 @@ label give_her_gift(gift_item):
             her "I will take it..." ("normal", "happyCl", "worried", "mid")
             call give_gift(">You give the strap-on to Hermione...",gift_item)
             call her_mood(-10)
-        elif her_whoring >= 18: # Lv 7+
+        else: # Lv 7+
             her "It's... It's magnificent, [genie_name]..." ("shock", "wide", "base", "stare")
             her "Is it really modelled after a thestral?" ("open", "base", "base", "R",cheeks="blush")
             her "But the creatures are invisible..." ("open", "happy", "base", "mid",cheeks="blush")
@@ -485,7 +485,7 @@ label give_her_gift(gift_item):
             call her_mood(-30)
 
     elif gift_item == broom_2000_ITEM:
-        if her_whoring >= 0 and her_whoring <= 5: # Lv 1-2.
+        if her_whoring < 6: # Lv 1-2.
             her "A broom...?" ("base", "base", "base", "mid")
             her "*Hmm*..." ("normal", "base", "base", "mid")
             her "What is that silly-looking thing attached to it?" ("normal", "squint", "angry", "mid")
@@ -493,7 +493,7 @@ label give_her_gift(gift_item):
             call give_gift(">You give the broom to Hermione...",gift_item)
             her "Thank you for the gift, [genie_name]." ("open", "base", "worried", "mid")
             call her_mood(-20)
-        elif her_whoring >= 6 and her_whoring <= 11: # Lv 3-4.
+        elif her_whoring < 12: # Lv 3-4.
             her "A broom...?" ("base", "base", "base", "mid")
             her "*Hmm*..." ("normal", "squint", "angry", "mid")
             her "It's a sex-toy of some sort, isn't it?" ("angry", "base", "angry", "mid")
@@ -501,7 +501,7 @@ label give_her_gift(gift_item):
             call give_gift(">You give the broom to Hermione...",gift_item)
             her "Thank you, [genie_name]." ("upset", "closed", "base", "mid")
             call her_mood(-20)
-        elif her_whoring >= 12 and her_whoring <= 17: # Lv 5-6.
+        elif her_whoring < 18: # Lv 5-6.
             her "A broom...?" ("angry", "narrow", "base", "down")
             her "*Hmm*..."
             her "What kind of saddle is that...?" ("disgust", "narrow", "base", "mid_soft")
@@ -510,7 +510,7 @@ label give_her_gift(gift_item):
             call give_gift(">You give the broom to Hermione...",gift_item)
             her "Thank you, [genie_name]." ("upset", "closed", "base", "mid")
             call her_mood(-30)
-        elif her_whoring >= 18: # Lv 7+
+        else: # Lv 7+
             her "A broom..." ("base", "narrow", "worried", "down")
             her "*Hmm*..."
             her "That saddle, [genie_name]..." ("open", "base", "base", "R",cheeks="blush")
@@ -522,23 +522,23 @@ label give_her_gift(gift_item):
             call her_mood(-30)
 
     elif gift_item == sexdoll_ITEM:
-        if her_whoring >= 0 and her_whoring <= 5: # Lv 1-2.
+        if her_whoring < 6: # Lv 1-2.
             her "Is this..." ("shock", "wide", "base", "stare")
             her "A sex doll?!" ("angry", "happyCl", "worried", "mid",emote="sweat")
             her "[genie_name]!!!" ("scream", "happyCl", "worried", "mid")
             call her_mood(20)
-        elif her_whoring >= 6 and her_whoring <= 11: # Lv 3-4.
+        elif her_whoring < 12: # Lv 3-4.
             her "A sex doll?" ("shock", "wide", "base", "stare")
             her "This is just so unbecoming for an esteemed wizard such as yourself, [genie_name]..." ("upset", "closed", "base", "mid")
             call her_mood(20)
-        elif her_whoring >= 12 and her_whoring <= 17: # Lv 5-6.
+        elif her_whoring < 18: # Lv 5-6.
             her "A sex doll..." ("angry", "narrow", "base", "down")
             her "This is a little inappropriate..." ("upset", "closed", "base", "mid")
             her "But maybe we could use it for a prank or something..." ("base", "narrow", "worried", "down")
             call give_gift(">You give the blow-up doll to Hermione...",gift_item)
             her "Thank you, [genie_name]." ("base", "narrow", "worried", "down")
             call her_mood(-10)
-        elif her_whoring >= 18: # Lv 7+
+        else: # Lv 7+
             her "the Joanne sex doll?" ("annoyed", "narrow", "worried", "down")
             her "I Can't say that I approve of this..." ("open", "base", "base", "R",cheeks="blush")
             her "But I know Harry would love to have a go at it..." ("base", "narrow", "worried", "down")
@@ -547,24 +547,24 @@ label give_her_gift(gift_item):
             call her_mood(-30)
 
     elif gift_item == anal_beads_ITEM:
-        if her_whoring >= 0 and her_whoring <= 5: # Lv 1-2.
+        if her_whoring < 6: # Lv 1-2.
             her "*Hmm*...?" ("base", "base", "base", "mid")
             her "Is this a necklace?" ("soft", "base", "base", "mid")
             call give_gift(">You give the anal beads to Hermione...",gift_item)
             her "Thank you, [genie_name]." ("base", "base", "base", "mid")
             call her_mood(-8)
-        elif her_whoring >= 6 and her_whoring <= 11: # Lv 3-4.
+        elif her_whoring < 12: # Lv 3-4.
             her "[genie_name], are those adult toys of some sort?" ("open", "narrow", "annoyed", "mid", cheeks="blush")
             her "This is one of those butt... bead things, aren't they?" ("angry", "base", "angry", "mid",cheeks="blush")
             her "[genie_name] get them away from me!"
             her "Gross!" ("upset", "closed", "base", "mid")
             call her_mood(15)
-        elif her_whoring >= 12 and her_whoring <= 17: # Lv 5-6.
+        elif her_whoring < 17: # Lv 5-6.
             her "That's not a necklace..." ("upset", "closed", "base", "mid")
             her "I wouldn't have any use for this..." ("open", "narrow", "annoyed", "mid", cheeks="blush")
             her "Thanks but no thanks [genie_name]." ("upset", "closed", "base", "mid")
             call her_mood(0)
-        elif her_whoring >= 18: # Lv 7+
+        else: # Lv 7+
             her "Anal beads?" ("angry", "narrow", "base", "down")
             her "Obviously I don't need this sort of thing, [genie_name]..." ("angry", "base", "base", "mid")
             her "Although it's got a nice colour..." ("angry", "wink", "base", "mid")
@@ -576,25 +576,25 @@ label give_her_gift(gift_item):
             call her_mood(-10)
 
     elif gift_item == wine_ITEM or gift_item == firewhisky_ITEM:
-        if her_whoring <= 6  and her_whoring <= 11:
+        if her_whoring < 7:
+            call give_gift(">You give the "+str(gift_item.name)+" bottle to Hermione...", gift_item)
+            her "Thank you, [genie_name], I'll ask Ginny to drink some with me later." ("soft", "base", "base", "mid", cheeks="blush")
+            call her_mood(-20)
+        elif her_whoring < 12:
             her "[genie_name]?! Drinking alcohol on school grounds is forbidden.." ("open", "base", "angry", "mid")
             her "And you as a headmaster should know it!" ("upset", "base", "angry", "mid")
             call her_mood(10)
-        elif her_whoring <= 12 and her_whoring <= 17:
+        elif her_whoring < 18:
             her "But, [genie_name].. I can't drink alcohol." ("base", "narrow", "worried", "down")
             her "I guess I could use it for some potion mixing though.." ("open", "base", "base", "R")
             call give_gift(">You give the "+str(gift_item.name)+" bottle to Hermione...", gift_item)
             her "" ("base", "base", "base", "R")
             call her_mood(-5)
-        elif her_whoring >= 18:
+        else:
             her "But, [genie_name].. You know I can't drink.." ("soft","base", "base", "mid", cheeks="blush")
             her "I get drunk too fast and I might do something I'll regret later." ("open", "base", "base", "R", cheeks="blush")
             her "" ("base", "base", "base", "R", cheeks="blush")
             call her_mood(0)
-        else:
-            call give_gift(">You give the "+str(gift_item.name)+" bottle to Hermione...", gift_item)
-            her "Thank you, [genie_name], I'll ask Ginny to drink some with me later." ("soft", "base", "base", "mid", cheeks="blush")
-            call her_mood(-20)
 
     her "" (xpos="base",ypos="base")
     hide hermione_main