diff --git a/game/scripts/characters/astoria/gifts.rpy b/game/scripts/characters/astoria/gifts.rpy
index 4ac20832..8cd47bef 100644
--- a/game/scripts/characters/astoria/gifts.rpy
+++ b/game/scripts/characters/astoria/gifts.rpy
@@ -11,20 +11,20 @@ label give_ast_gift(gift_item):
         if states.ast.level < 6:
             ast "A lollipop?" (mouth="open", face="neutral")
             ast "Why are you giving me sweets, I'm not a kid!" (face="angry")
-            call states.ast.mood(1)
+            call ast_mood(1)
         elif states.ast.level > 5 and states.ast.level < 12:
             ast "A lollipop?" (mouth="open", face="neutral")
             call give_gift("You give the lollipop to Astoria...", gift_item)
             ast "why are you being so nice to me..." (face="angry")
             ast "Although... the other students haven't had any left since the last Hogsmeade trip." (mouth="open", face="neutral")
             ast "They'll be so jealous!" (mouth="grin", face="happy")
-            call states.ast.mood(-1)
+            call ast_mood(-1)
         else:
             ast "A lollipop?" (mouth="open", face="neutral")
             call give_gift("You give the lollipop to Astoria...", gift_item)
             ast "That's going to take all day to suck on..."
             ast "I guess my mouth will be too busy to do anything else for the entire day!"
-            call states.ast.mood(-2)
+            call ast_mood(-2)
 
     elif gift_item == chocolate_ITEM:
 
@@ -32,21 +32,21 @@ label give_ast_gift(gift_item):
             ast "Some chocolate?" (mouth="open", face="neutral")
             ast "Don't you have any dung-bombs?"
             ast "They're way more fun!"
-            call states.ast.mood(0)
+            call ast_mood(0)
         elif states.ast.level > 5 and states.ast.level < 12:
             ast "Some chocolate?" (mouth="open", face="neutral")
             call give_gift("You give the chocolate to Astoria...", gift_item)
             ast "Thank you, [name_genie_astoria]." (mouth="open", face="neutral")
             ast "I don't know what I did to deserve it." (mouth="annoyed", pupils="R", face="neutral")
             ast "But I'm not going to say no..." (face="happy")
-            call states.ast.mood(-1)
+            call ast_mood(-1)
         else:
             ast "Some chocolate?" (mouth="open", face="neutral")
             call give_gift("You give the chocolate to Astoria...", gift_item)
             ast "Did you hear chocolate is supposed to be an aphrodisiac?"
             ast "Although it was a muggle that came up with that one so I doubt there's any truth to it."
             ast "Oh well, that sucks doesn't it?"
-            call states.ast.mood(-2)
+            call ast_mood(-2)
 
     elif gift_item == plush_owl_ITEM:
 
@@ -54,27 +54,27 @@ label give_ast_gift(gift_item):
             ast "An owl plushie?" (mouth="open", face="neutral")
             ast "Why are you giving me this?"
             ast "Toys are for children..."
-            call states.ast.mood(1)
+            call ast_mood(1)
         elif states.ast.level > 5 and states.ast.level < 12:
             ast "An owl plushie?" (mouth="open", face="neutral")
             call give_gift("You give the stuffed toy to Astoria...", gift_item)
             ast "I don't use stuffed toys..." (mouth="open", face="annoyed")
             ast "I know someone that hates owls though... I'll put this in front of her face when she's waking up..." (mouth="annoyed", pupils="R", face="neutral")
-            call states.ast.mood(-1)
+            call ast_mood(-1)
         elif states.ast.level > 11 and states.ast.level < 18:
             ast "An owl plushie?" (mouth="open", face="neutral")
             call give_gift("You give the stuffed toy to Astoria...", gift_item)
             ast "Do I look like a girl that plays with toys?"
             ast "Actually, don't answer that..."
             ast "Guess it'd be rude not to take it..."
-            call states.ast.mood(-1)
+            call ast_mood(-1)
         else:
             ast "An owl plushie?" (mouth="open", face="neutral")
             call give_gift("You give the stuffed toy to Astoria...", gift_item)
             ast "If you want to give me toys you better be prepared for me to call you daddy..."
             ast "So, thank you..."
             ast "Daddy..."
-            call states.ast.mood(-3)
+            call ast_mood(-3)
 
     elif gift_item == butterbeer_ITEM:
 
@@ -83,26 +83,26 @@ label give_ast_gift(gift_item):
             call give_gift("You give the bottle to Astoria...", gift_item)
             ast "Time to get smashed!" (face="happy")
             ast "The other students will be so jealous I got beer into the school..." (mouth="annoyed", face="angry")
-            call states.ast.mood(-2)
+            call ast_mood(-2)
         elif states.ast.level > 5 and states.ast.level < 12:
             ast "Butterbeer?" (mouth="smile", face="happy")
             call give_gift("You give the bottle to Astoria...", gift_item)
             ast "Don't you have something stronger?" (pupils="mid", face="annoyed")
             ast "Like something you can't get in the school usually?" (pupils="R", face="annoyed")
             ast "Fine, I'll take it!" (mouth="smile", face="happy")
-            call states.ast.mood(-1)
+            call ast_mood(-1)
         elif states.ast.level > 11 and states.ast.level < 18:
             ast "Butterbeer?" (face="annoyed")
             call give_gift("You give the bottle to Astoria...", gift_item)
             ast "This watered down piss-water can barely get a house elf tipsy."
             ast "Actually, that gives me an idea..."
-            call states.ast.mood(-1)
+            call ast_mood(-1)
         else:
             ast "Butterbeer?" (mouth="open", face="neutral")
             call give_gift("You give the bottle to Astoria...", gift_item)
             ast "It's more of a cider really isn't it?" (face="neutral")
             ast "Thanks!" (mouth="smile", face="happy")
-            call states.ast.mood(-2)
+            call ast_mood(-2)
 
     elif gift_item == science_mag_ITEM:
         if states.ast.level < 6:
@@ -110,63 +110,63 @@ label give_ast_gift(gift_item):
             ast "Creating your own itch powder using household ingredients?" (mouth="open", pupils="down", face="annoyed")
             ast "Is the kitchen even open to students?" (pupils="down", face="annoyed")
             ast "What am I supposed to do with this, [name_genie_astoria]?" (face="annoyed")
-            call states.ast.mood(0)
+            call ast_mood(0)
         elif states.ast.level > 5 and states.ast.level < 12:
             ast "Magazines?" (mouth="open", face="annoyed")
             call give_gift("You give an assortment of educational magazines to Astoria...", gift_item)
             ast "Making your own stink bombs..." (face="annoyed")
             ast "Looks like I might be able to make these in potions class..."
             ast "If Snape doesn't catch me doing it." (mouth="clench", face="annoyed")
-            call states.ast.mood(-1)
+            call ast_mood(-1)
         elif states.ast.level > 11 and states.ast.level < 18:
             ast "Magazines?" (mouth="angry", face="angry")
             ast "You want me to do more school work?" (mouth="annoyed", face="angry")
-            call states.ast.mood(1)
+            call ast_mood(1)
         else:
             ast "magazines?" (mouth="open", face="annoyed")
             call give_gift("You give an assortment of educational magazines to Astoria...", gift_item)
             ast "I was hoping for something a bit more risqué..." (face="annoyed")
-            call states.ast.mood(0)
+            call ast_mood(0)
 
     elif gift_item == girls_mag_ITEM:
         if states.ast.level < 6:
             ast "Girl magazines?" (mouth="open", face="annoyed")
             ast "This is that trash my sister reads." (mouth="clench", pupils="down", face="annoyed")
             ast "Such a massive waste of time..." (face="annoyed")
-            call states.ast.mood(0)
+            call ast_mood(0)
         elif states.ast.level > 5 and states.ast.level < 12:
             ast "Girl magazines?" (face="disgusted")
             call give_gift("You give an assortment of rather girly magazines to Astoria...", gift_item)
             ast "I'll take it for the free mascara sample. I once drew a uni-brow on someone with it." (face="happy")
-            call states.ast.mood(-1)
+            call ast_mood(-1)
         elif states.ast.level > 11 and states.ast.level < 18:
             ast "Girl magazines?" (face="annoyed")
             call give_gift("You give an assortment of rather girly magazines to Astoria...", gift_item)
             ast "Well, I am a girl so of course I'd want it!" (face="annoyed")
-            call states.ast.mood(-1)
+            call ast_mood(-1)
         else:
             ast "Girl magazines?" (face="annoyed")
             call give_gift("You give an assortment of rather girly magazines to Astoria...", gift_item)
             ast "Don't I look hot enough for you [name_genie_astoria]?" (mouth="open", eyes="closed", face="annoyed")
             ast "I'm just teasing you, I'll have it." (face="happy")
-            call states.ast.mood(-1)
+            call ast_mood(-1)
 
     elif gift_item == adult_mag_ITEM:
         if states.ast.level < 6:
             ast "Adult magazines?" (mouth="clench", face="disgusted")
             ast "I'm good thanks." (face="disgusted")
-            call states.ast.mood(0)
+            call ast_mood(0)
         elif states.ast.level > 5 and states.ast.level < 12:
             ast "Adult magazines?" (face="annoyed")
             call give_gift("You give an assortment of adult magazines to Astoria...", gift_item)
             ast "Of course I read them. I'm an adult after all, it's in the name." (mouth="annoyed", pupils="R", face="angry")
-            call states.ast.mood(-1)
+            call ast_mood(-1)
         else:
             ast "Adult magazines?" (face="annoyed")
             call give_gift("You give an assortment of adult magazines to Astoria...", gift_item)
             ast "This is that magazine Tonks was reading during our writing test..." (pupils="down", face="annoyed")
             ast "Perhaps I'll wave it at her so she thinks I stole it..." (mouth="smile", pupils="mid", face="angry")
-            call states.ast.mood(-1)
+            call ast_mood(-1)
 
     elif gift_item == porn_mag_ITEM:
         if states.ast.level < 6:
@@ -175,12 +175,12 @@ label give_ast_gift(gift_item):
             ast "I'll take it!" (mouth="grin", face="happy")
             ast "I'll put one in Susan's bag when she's not looking. Can't wait to see that cows face when her friends notice." (mouth="open", face="angry")
             ast "Thank you, [name_genie_astoria]." (face="happy")
-            call states.ast.mood(-1)
+            call ast_mood(-1)
         elif states.ast.level > 5 and states.ast.level < 12:
             ast "Porn magazines?" (face="annoyed")
             ast "Why do you have these?" (face="annoyed")
             ast "Give them to Susan..." (pupils="R", face="annoyed")
-            call states.ast.mood(0)
+            call ast_mood(0)
         elif states.ast.level > 11 and states.ast.level < 18:
             ast "Porn magazines?" (face="annoyed")
             call give_gift("You give an assortment of pornographic magazines to Astoria...", gift_item)
@@ -188,14 +188,14 @@ label give_ast_gift(gift_item):
             ast "BDSM, what does that stand for..." (pupils="down", face="disgusted")
             ast "She looks like she's enjoying it. That's not fun..."
             ast "Although..."
-            call states.ast.mood(-1)
+            call ast_mood(-1)
         else:
             ast "Porn magazines?" (face="happy")
             call give_gift("You give an assortment of pornographic magazines to Astoria...", gift_item)
             ast "Is this where you get your ideas from?" (face="angry")
             ast "A swing? Why would you have that in a porn ma... oh there's the next page." (pupils="down", face="disgusted")
             ast "Yeah fuck it, give it here..." (mouth="grin", face="angry")
-            call states.ast.mood(-2)
+            call ast_mood(-2)
 
     elif gift_item == krum_poster_ITEM:
         if states.ast.level < 6:
@@ -203,63 +203,63 @@ label give_ast_gift(gift_item):
             ast "Is that the Quidditch player everyone seems to fancy?" (mouth="open", pupils="mid", face="annoyed")
             call give_gift("You give the poster to Astoria...", gift_item)
             ast "*Hmph*, I guess I'll take it if he's that popular..." (mouth="annoyed", pupils="R", face="neutral")
-            call states.ast.mood(0)
+            call ast_mood(0)
         elif states.ast.level > 5 and states.ast.level < 12:
             ast "Viktor Krum?" (face="annoyed")
             ast "Bet he could crush m... someone with his bare hands." (face="disgusted")
             ast "Give it here..." (face="happy")
             call give_gift("You give the poster to Astoria...", gift_item)
-            call states.ast.mood(-1)
+            call ast_mood(-1)
         else:
             ast "Viktor Krum?" (face="happy")
             ast "His trousers aren't even off. What's the point..." (face="angry")
-            call states.ast.mood(1)
+            call ast_mood(1)
 
     elif gift_item == sexy_lingerie_ITEM:
         if states.ast.level < 6:
             ast "Lingerie?" (face="disgusted")
             ast "Sexy Lingerie?!?"
             ast "Why do you care so much about what I wear? Isn't this shitty school uniform enough for you?" (face="angry")
-            call states.ast.mood(2)
+            call ast_mood(2)
         elif states.ast.level > 5 and states.ast.level < 12:
             ast "Lingerie?" (mouth="open", face="neutral")
             ast "I... No, I'd just end up looking like a tramp!" (face="angry")
-            call states.ast.mood(0)
+            call ast_mood(0)
         elif states.ast.level > 11 and states.ast.level < 18:
             ast "Lingerie?" (face="annoyed")
             ast "Sexy..." (pupils="down", face="annoyed")
             ast "Why not, I don't know if you could tell but I'm a bit of a rebel. Might even wear these in class." (mouth="grin", face="angry")
             call give_gift("You give the sexy lingerie to Astoria...", gift_item)
-            call states.ast.mood(-1)
+            call ast_mood(-1)
         else:
             ast "Lingerie?" (face="annoyed")
             call give_gift("You give the sexy lingerie to Astoria...", gift_item)
             ast "Is this is the kind of clothes you want your students to dress in from now on?" (face="annoyed")
             ast "*Heh*- I don't blame you, the school uniform is the most basic piece of trash ever without some spice..." (face="annoyed")
-            call states.ast.mood(-1)
+            call ast_mood(-1)
 
     elif gift_item == sexy_stockings_ITEM :
         if states.ast.level < 6:
             ast "Stockings?" (face="disgusted")
             ast "What happened to the dress code at this place?"
             ast "What next, shorter skirts?" (face="angry")
-            call states.ast.mood(1)
+            call ast_mood(1)
         elif states.ast.level > 5 and states.ast.level < 12:
             ast "Stockings?" (mouth="open", face="neutral")
             call give_gift("You give the stockings to Astoria...", gift_item)
             ast "Seems pretty elastic... I could totally lob some stink bombs with these." (mouth="grin", face="angry")
-            call states.ast.mood(-1)
+            call ast_mood(-1)
         elif states.ast.level > 11 and states.ast.level < 18:
             ast "Stockings?" (face="annoyed")
             ast "Hah, you fool! With these you wont be able to stare at my legs anymore!" (mouth="grin", face="angry")
             call give_gift("You give the stockings to Astoria...", gift_item)
-            call states.ast.mood(-2)
+            call ast_mood(-2)
         else:
             ast "Stockings?" (face="annoyed")
             ast "These are almost as see-through as your wicked intentions..." (mouth="grin", face="angry")
             call give_gift("You give the stockings to Astoria...", gift_item)
             ast "Disgusting..." (face="angry")
-            call states.ast.mood(-1)
+            call ast_mood(-1)
 
     elif gift_item == pink_condoms_ITEM:
         if states.ast.level < 6:
@@ -268,7 +268,7 @@ label give_ast_gift(gift_item):
             ast "These will be the perfect thing to fill with water and drop down the staircase..." (mouth="smile", face="angry")
             call give_gift("You give the pack of Condoms to Astoria...", gift_item)
             ast "Cheers for the ammo, [name_genie_astoria]." (face="happy")
-            call states.ast.mood(-2)
+            call ast_mood(-2)
         elif states.ast.level > 5 and states.ast.level < 12:
             ast "Condoms?" (face="neutral")
             ast "Oh, thank you so much! I'll prick some holes in these and hand them out at once!" (mouth="grin", face="angry")
@@ -276,39 +276,39 @@ label give_ast_gift(gift_item):
             ast "I see your concern... They probably would be able to trace it back to me." (face="annoyed")
             ast "Oh well, a gift is a gift." (face="neutral")
             call give_gift("You give the pack of Condoms to Astoria...", gift_item)
-            call states.ast.mood(0)
+            call ast_mood(0)
         else:
             ast "Condoms?" (face="annoyed")
             ast "Why would I need condoms when I could just go in raw?" (mouth="grin", face="angry")
             ast "*Ha-Ha-Hah* The look on your face, now that's something money can't buy." (face="happy")
             call give_gift("You sheepishly give the pack of Condoms to Astoria...", gift_item)
             ast "*Hmm*.... yeah why not." (face="neutral")
-            call states.ast.mood(-1)
+            call ast_mood(-1)
 
     elif gift_item == vibrator_ITEM:
         if states.ast.level < 6:
             ast "A vibrator?" (face="disgusted")
             ast "Gross, where did you even get that from?" (face="angry")
-            call states.ast.mood(2)
+            call ast_mood(2)
         elif states.ast.level > 5 and states.ast.level < 12:
             ast "A vibrator?" (face="disgusted")
             ast "Get the fuck out..." (face="angry")
             ast "Oh right, I'm in your office... yeah that's going to be solid no on that one." (face="annoyed")
-            call states.ast.mood(1)
+            call ast_mood(1)
         elif states.ast.level > 11 and states.ast.level < 18:
             ast "A vibrator?" (face="disgusted")
             ast "Hold on a second, that's the noise I've been hearing in the girls chambers!" (face="happy")
             ast "Do they work?" (face="happy")
             ast "I mean, I'll take it I guess." (face="neutral")
             call give_gift("You give the vibrator to Astoria...",gift_item)
-            call states.ast.mood(-1)
+            call ast_mood(-1)
         else:
             ast "A vibrator?" (face="neutral")
             call give_gift("You give the vibrator to Astoria...",gift_item)
             ast "That's disgusting! What a disgusting old man you are. Well aren't you being disgusting..." (face="angry")
             ast "Disgusting..." (face="angry")
             ast "Give it here." (face="happy")
-            call states.ast.mood(-2)
+            call ast_mood(-2)
 
     elif gift_item == anal_lube_ITEM:
         if states.ast.level < 6:
@@ -316,7 +316,7 @@ label give_ast_gift(gift_item):
             ast "I know the perfect staircase for this!" (face="happy")
             call give_gift("You give the jar of lube to Astoria...", gift_item)
             ast "Thank you, [name_genie_astoria]." (face="happy")
-            call states.ast.mood(-1)
+            call ast_mood(-1)
         elif states.ast.level > 5 and states.ast.level < 12:
             ast "Anal Lube?" (mouth="smile", face="happy")
             ast "Swiggity swooty I'm coming for that booty!" (mouth="smile", face="angry")
@@ -324,14 +324,14 @@ label give_ast_gift(gift_item):
             call give_gift("You cautiously give the jar of lube to Astoria...", gift_item)
             ast "Boo!" (face="annoyed")
             ast "*ha-ha-ha*!" (face="happy")
-            call states.ast.mood(-2)
+            call ast_mood(-2)
         else:
             ast "Anal Lube?" (face="happy")
             call give_gift("You give the jar of lube to Astoria...", gift_item)
             ast "Why would I need this, surely the initial pain is the best part..." (face="angry")
             ast "Oh, for me? Duh!" (face="annoyed")
             ast "Yeah, actually I'll take it..." (face="happy")
-            call states.ast.mood(-2)
+            call ast_mood(-2)
 
     elif gift_item == ballgag_and_cuffs_ITEM:
         if states.ast.level < 6:
@@ -339,7 +339,7 @@ label give_ast_gift(gift_item):
             ast "I don't know what you're trying to insinuate." (face="angry")
             ast "The cuffs could be useful but why the ball gag?" (face="disgusted")
             ast "I'd rather not." (face="annoyed")
-            call states.ast.mood(1)
+            call ast_mood(1)
         elif states.ast.level > 5 and states.ast.level < 12:
             ast "Handcuffs? And a Ball gag?" (face="annoyed")
             call give_gift("You give the handcuffs to Astoria...", gift_item)
@@ -347,37 +347,37 @@ label give_ast_gift(gift_item):
             ast "*HNNNNNGH!" (face="angry")
             ast "I can't break those cuffs..." (face="annoyed")
             ast "Do you have a key?" (face="annoyed")
-            call states.ast.mood(0)
+            call ast_mood(0)
         else:
             ast "Handcuffs? And a Ball gag?" (face="happy")
             call give_gift("You give the handcuffs to Astoria...", gift_item)
             ast "So I guess these are one of those BDSM items?" (face="neutral")
             ast "Colour me intrigued..." (face="happy")
-            call states.ast.mood(-1)
+            call ast_mood(-1)
 
     elif gift_item == anal_plugs_ITEM:
         if states.ast.level < 6:
             ast "anal plugs?" (face="disgusted")
             ast "Yuck, what the hell is wrong with you... do you know where these go?" (face="angry")
             ast "Of course you do... you detestable dingbat." (face="angry")
-            call states.ast.mood(2)
+            call ast_mood(2)
         elif states.ast.level > 5 and states.ast.level < 12:
             ast "anal plugs?" (face="disgusted")
             ast "Why don't you try and sit on one yourself..." (face="angry")
-            call states.ast.mood(1)
+            call ast_mood(1)
         elif states.ast.level > 11 and states.ast.level < 18:
             ast "anal plugs?" (face="disgusted")
             call give_gift("You give the anal plugs to Astoria...", gift_item)
             ast "Why are you giving me this?" (face="annoyed")
             ast "I'll take it I guess..." (face="annoyed")
-            call states.ast.mood(0)
+            call ast_mood(0)
         else:
             ast "anal plugs?" (face="neutral")
             call give_gift("You give the anal plugs to Astoria...", gift_item)
             ast "You do know these hurts a bit if you're not used to them?" (face="annoyed")
             nar "Astoria absent-mindedly pockets the anal plug."
             ast "Don't see why you'd give these out as if they were sweets..." (mouth="annoyed", face="neutral")
-            call states.ast.mood(-1)
+            call ast_mood(-1)
 
 
     elif gift_item == testral_strapon_ITEM:
@@ -385,20 +385,20 @@ label give_ast_gift(gift_item):
             ast "A strap-on?" (face="disgusted")
             ast "Why would you give me this... it's so ribbed..." (face="angry")
             ast "As if anyone would want something like that!" (face="angry")
-            call states.ast.mood(1)
+            call ast_mood(1)
         elif states.ast.level > 5 and states.ast.level < 12:
             ast "A strap-on?" (face="disgusted")
             ast "What do you want me to do with this?" (face="annoyed")
             ast "Well I know what you want me to do with it." (face="annoyed")
             ast "It's not happening..." (face="angry")
-            call states.ast.mood(0)
+            call ast_mood(0)
         elif states.ast.level > 11 and states.ast.level < 18:
             ast "A strap-on?" (face="angry")
             call give_gift("You give the strap-on to Astoria...", gift_item)
             ast "I'll strap it on your forehead and make you into a sex unicorn!" (mouth="grin", face="angry")
             ast "I read about people having sex on top of a unicorn..." (face="disgusted")
             ast "Bit of an odd segment that one was..." (face="annoyed")
-            call states.ast.mood(-1)
+            call ast_mood(-1)
         else:
             ast "A strap-on?" (face="annoyed")
             call give_gift("You give the strap-on to Astoria...", gift_item)
@@ -406,19 +406,19 @@ label give_ast_gift(gift_item):
             ast "Isn't' that the creature only people that has seen someone die can see?"
             ast "That makes the person who made he mould kinda fucked up if you think about it..." (face="disgusted")
             ast "I like it..." (face="happy")
-            call states.ast.mood(-2)
+            call ast_mood(-2)
 
     elif gift_item == broom_2000_ITEM:
         if states.ast.level < 6:
             ast "A broom?" (face="neutral")
             ast "What's that sticking out on the top? That's not going to help me fly!" (face="annoyed")
-            call states.ast.mood(1)
+            call ast_mood(1)
         elif states.ast.level > 5 and states.ast.level < 12:
             ast "A broom?" (face="neutral")
             call give_gift("You give the broom to Astoria...", gift_item)
             ast "Now if anything will motivate you to fly, that will..." (mouth="grin", face="angry")
             ast "Bit awkward during broom care though..." (face="annoyed")
-            call states.ast.mood(0)
+            call ast_mood(0)
         else:
             ast "A broom?" (face="happy")
             call give_gift("You give the broom to Astoria...", gift_item)
@@ -426,52 +426,52 @@ label give_ast_gift(gift_item):
             ast "What a depraved little invention..." (mouth="smile", face="angry")
             ast "Totally something I'd come up with!"
             ast "You look sceptical..." (face="annoyed")
-            call states.ast.mood(-1)
+            call ast_mood(-1)
 
     elif gift_item == sexdoll_ITEM:
         if states.ast.level < 6:
             ast "A sex doll?" (face="disgusted")
             ast "That's gross [name_genie_astoria]!" (face="angry")
             ast "Yuck, it smells gross too!" (face="angry")
-            call states.ast.mood(2)
+            call ast_mood(2)
         elif states.ast.level > 5 and states.ast.level < 12:
             ast "A sex doll?" (face="disgusted")
             ast "This is literally worthless to me, why would you even consider this a good gift?" (face="angry")
-            call states.ast.mood(1)
+            call ast_mood(1)
         elif states.ast.level > 11 and states.ast.level < 18:
             ast "A sex doll?" (face="angry")
             call give_gift("You give the doll to Astoria...", gift_item)
             ast "I hope you got this for cheap. It looks awful..." (face="annoyed")
             ast "I mean... why thank you, I shall cherish this forever!" (face="annoyed")
-            call states.ast.mood(0)
+            call ast_mood(0)
         else:
             ast "A sex doll?" (face="disgusted")
             call give_gift("You give the doll to Astoria...", gift_item)
             ast "But I'm a girl..." (face="annoyed")
             ast "I'll leave it in the Slytherin common room to see if anyone has balls enough to takes it..." (mouth="grin", face="angry")
-            call states.ast.mood(-1)
+            call ast_mood(-1)
 
     elif gift_item == anal_beads_ITEM:
         if states.ast.level < 6:
             ast "Anal beads?" (face="disgusted")
             ast "Like, ones that you putt in your ass?" (face="angry")
             ast "What... the hell!" (face="angry")
-            call states.ast.mood(2)
+            call ast_mood(2)
         elif states.ast.level > 5 and states.ast.level < 12:
             ast "Anal beads?" (face="disgusted")
             ast "Put it up your own ass and I'll let er rip!" (face="angry")
-            call states.ast.mood(1)
+            call ast_mood(1)
         elif states.ast.level > 11 and states.ast.level < 18:
             ast "Anal beads?" (face="disgusted")
             ast "Why would I need these?" (face="annoyed")
             ast "I'll pass..." (face="annoyed")
-            call states.ast.mood(0)
+            call ast_mood(0)
         else:
             ast "Anal beads?" (face="neutral")
             ast "Looks painful." (face="annoyed")
             call give_gift("You give the anal beads to Astoria...", gift_item)
             ast "And they're green... Did you get these made just for me?" (mouth="annoyed", face="neutral")
-            call states.ast.mood(-1)
+            call ast_mood(-1)
 
     elif gift_item == wine_ITEM:
         if states.ast.level < 6:
@@ -481,14 +481,14 @@ label give_ast_gift(gift_item):
             ast "Snape would murder me if he saw me bringing alcohol into the common room." (face="angry")
             ast "I can't make you shut up after hours even without alcohol in your system..." (face="annoyed")
             ast "Such a slimy slithering killjoy..." (face="annoyed")
-            call states.ast.mood(0)
+            call ast_mood(0)
         else:
             ast "Wine?" (face="happy")
             ast "Well aren't we fancy?" (face="neutral")
             call give_gift("You give the wine to Astoria...", gift_item)
             ast "This is the real shit. Look at the date on that." (face="neutral")
             ast "You really are ancient if you bought it new..." (face="happy")
-            call states.ast.mood(-1)
+            call ast_mood(-1)
 
     elif gift_item == firewhisky_ITEM:
         if states.ast.level < 6:
@@ -496,7 +496,7 @@ label give_ast_gift(gift_item):
             ast "That's the stuff Tonks always reeks off." (face="disgusted")
             ast "I'm not gonna drink whatever she does." (face="annoyed")
             ast "It'd be like wearing old peoples perfume!" (face="annoyed")
-            call states.ast.mood(0)
+            call ast_mood(0)
         else:
             ast "Firewhisky?" (face="happy")
             ast "Fine, I'll give in. If Tonks likes it so much it can't be that bad..." (face="happy")
@@ -505,7 +505,7 @@ label give_ast_gift(gift_item):
             ast "Might experience a slight pain and burning sensation when consuming..." (face="disgusted")
             ast "Why didn't you say so before!" (face="angry")
             ast "I might even take a sip or two myself..." (face="happy")
-            call states.ast.mood(-1)
+            call ast_mood(-1)
 
     ast "" (xpos="base",ypos="base")
     hide astoria_main
@@ -514,7 +514,7 @@ label give_ast_gift(gift_item):
     return
 
 
-label states.ast.mood(value=0):
+label ast_mood(value=0):
 
     if value > 0:
         if value == 1:
diff --git a/game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy b/game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy
index 3d2b6bb4..a99c967a 100644
--- a/game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy
+++ b/game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy
@@ -28,7 +28,7 @@ label cc_pf_strip_T3_tonks:
     cho "" ("base", "base", "base", "mid", xpos="mid", ypos="base", flip=False, trans=fade)
 
     # Intro
-    if states.cho.ev.inspect_her_body.tonks_doppler_encounter  == False and states.cho.ev.inspect_her_body.tonks_succubus_encounter  == False: # First time only.
+    if states.cho.ev.inspect_her_body.tonks_doppler_encounter == False and states.cho.ev.inspect_her_body.tonks_succubus_encounter == False: # First time only.
         gen "About your teacher, Professor Tonks..." ("base", xpos="far_left", ypos="head")
         gen "That ability she has, it's quite... interesting, don't you think?" ("base", xpos="far_left", ypos="head")
         cho "It is! And exceptionally rare as well!" ("grin", "happyCl", "base", "mid")
@@ -91,7 +91,7 @@ label cc_pf_strip_T3_tonks:
     ton "Miss Chang." ("base", "narrow", "raised", "L")
 
     # Intro
-    if states.cho.ev.inspect_her_body.tonks_doppler_encounter  == False and states.cho.ev.inspect_her_body.tonks_succubus_encounter  == False: # First time only.
+    if states.cho.ev.inspect_her_body.tonks_doppler_encounter == False and states.cho.ev.inspect_her_body.tonks_succubus_encounter == False: # First time only.
         gen "Didn't fancy taking the fireplace this time?" ("base", xpos="far_left", ypos="head")
         ton "Not today... I only use floo powder when I'm in a hurry." ("open", "base", "base", "mid")
 
@@ -104,7 +104,7 @@ label cc_pf_strip_T3_tonks:
     gen "Don't see why not..." ("grin", xpos="far_left", ypos="head")
     cho "Of course, Sir." ("soft", "narrow", "base", "downR")
 
-    if states.cho.ev.inspect_her_body.tonks_doppler_encounter  == False and states.cho.ev.inspect_her_body.tonks_succubus_encounter  == False: # First time only.
+    if states.cho.ev.inspect_her_body.tonks_doppler_encounter == False and states.cho.ev.inspect_her_body.tonks_succubus_encounter == False: # First time only.
         cho "..." ("annoyed", "narrow", "worried", "down", cheeks="blush") # Embarrassed look down.
         cho "The headmaster wanted to see us strip for him again..." ("open", "narrow", "worried", "L", cheeks="blush")
         if cho.is_worn("robe") or ( cho.is_worn("top") and cho.is_worn("bottom") ):
@@ -192,7 +192,7 @@ label cc_pf_strip_T3_tonks:
 
             jump cc_pf_strip_T3_tonks.strip_tonks
 
-        #"\"How about Miss Granger?\"" if states.cho.ev.inspect_her_body.tonks_doppler_encounter  == True and states.cho.ev.inspect_her_body.tonks_succubus_encounter  == True:
+        #"\"How about Miss Granger?\"" if states.cho.ev.inspect_her_body.tonks_doppler_encounter == True and states.cho.ev.inspect_her_body.tonks_succubus_encounter == True:
             #jump cc_pf_strip_T3_tonks.strip_hermione
 
 
@@ -766,12 +766,12 @@ label .transformations:
     with d5
 
     ## Intro Events 1 and 2:
-    if states.cho.ev.inspect_her_body.tonks_doppler_encounter  == False or states.cho.ev.inspect_her_body.tonks_succubus_encounter  == False:
+    if states.cho.ev.inspect_her_body.tonks_doppler_encounter == False or states.cho.ev.inspect_her_body.tonks_succubus_encounter == False:
 
         # Ask Tonks if she's a Doppler or a Succubus.
         # After asking her both questions, the next time you do the event she'll do some tranformations.
 
-        if states.cho.ev.inspect_her_body.tonks_doppler_encounter  == True or states.cho.ev.inspect_her_body.tonks_succubus_encounter  == True: # You have asked her if she was one of these before.
+        if states.cho.ev.inspect_her_body.tonks_doppler_encounter == True or states.cho.ev.inspect_her_body.tonks_succubus_encounter == True: # You have asked her if she was one of these before.
             ton "You're getting quite good at this, Miss Chang." ("base", "narrow", "base", "L")
             cho "Thank you, Professor." ("base", "narrow", "base", "L", cheeks="blush")
             gen "She's learning from the best." ("base", xpos="far_left", ypos="head")
@@ -809,9 +809,9 @@ label .transformations:
 
         menu:
             gen "(...)" ("base", xpos="far_left", ypos="head")
-            "\"A Doppler!\"" if states.cho.ev.inspect_her_body.tonks_doppler_encounter  == False:
+            "\"A Doppler!\"" if states.cho.ev.inspect_her_body.tonks_doppler_encounter == False:
                 jump .doppler_E1
-            "\"A Succubus!\"" if states.cho.ev.inspect_her_body.tonks_succubus_encounter  == False:
+            "\"A Succubus!\"" if states.cho.ev.inspect_her_body.tonks_succubus_encounter == False:
                 jump .succubus_E1
 
 
@@ -838,7 +838,7 @@ label .transformations:
 
 ## Doppler Event 1 ##
 label cc_pf_strip_T3_tonks.doppler_E1:
-    if states.cho.ev.inspect_her_body.tonks_doppler_encounter  == False:
+    if states.cho.ev.inspect_her_body.tonks_doppler_encounter == False:
         # Intro
         ton "*Hmmm?*... What's a \"doppler\"?" ("upset", "base", "base", "mid")
         gen "What do you mean, what's a doppler?!" ("base", xpos="far_left", ypos="head")
@@ -856,7 +856,7 @@ label cc_pf_strip_T3_tonks.doppler_E1:
         cho "What kind of \"games\" is he talking about, Professor?" ("soft", "base", "worried", "L") # looking at Tonks. Small text
         ton "I haven't the foggiest..." ("mad", "base", "raised", "L") # looking back. Small text
 
-    $ states.cho.ev.inspect_her_body.tonks_doppler_encounter  = True
+    $ states.cho.ev.inspect_her_body.tonks_doppler_encounter = True
     gen "Dopplers are hideous creatures, you see... Both in character, and in appearance." ("angry", xpos="far_left", ypos="head")
     cho "" ("annoyed", "base", "base", "mid")
     ton "" ("upset", "narrow", "base", "mid")
@@ -917,7 +917,7 @@ label cc_pf_strip_T3_tonks.doppler_E1:
 
 ## Succubus Event 1 ##
 label cc_pf_strip_T3_tonks.succubus_E1:
-    if states.cho.ev.inspect_her_body.tonks_succubus_encounter  == False:
+    if states.cho.ev.inspect_her_body.tonks_succubus_encounter == False:
         # Intro
         ton "*snort!*... For real?" ("crooked_smile", "happyCl", "shocked", "mid")
         cho "Oh, I've heard of those, Professor!" ("grin", "happyCl", "base", "mid")
@@ -927,7 +927,7 @@ label cc_pf_strip_T3_tonks.succubus_E1:
         $ ravenclaw += 10
         cho "Thank you." ("smile", "narrow", "base", "downR", cheeks="blush") # happy
 
-    $ states.cho.ev.inspect_her_body.tonks_succubus_encounter  = True
+    $ states.cho.ev.inspect_her_body.tonks_succubus_encounter = True
     ton "I mean... I'm quite flattered, Professor..." ("open", "narrow", "raised", "mid")
     ton "Who doesn't want to be compared to a demonic, sex-driven temptress!" ("soft", "narrow", "base", "mid", hair="horny")
     cho "" ("annoyed", "base", "base", "mid", cheeks="blush")
diff --git a/game/scripts/characters/cho/events/quidditch/intros.rpy b/game/scripts/characters/cho/events/quidditch/intros.rpy
index 905bdb73..48a3b725 100644
--- a/game/scripts/characters/cho/events/quidditch/intros.rpy
+++ b/game/scripts/characters/cho/events/quidditch/intros.rpy
@@ -331,7 +331,7 @@ label cho_quid_E3:
         "\"Hermione\"":
             pass
 
-        "\"Astoria\"" if astoria_unlocked and not _selected[0]:
+        "\"Astoria\"" if states.ast.unlocked and not _selected[0]:
             $ _selected[0] = True
 
             cho "That mischievous little..." ("clench", "wide", "raised", "mid")
diff --git a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy
index 4ff56267..00648612 100644
--- a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy
+++ b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy
@@ -1615,7 +1615,7 @@ label slytherin_match_return:
     cho "Want to give this snatch a little lick?" ("soft", "narrow", "base", "mid")
     gen "!!!" ("angry", xpos="far_left", ypos="head")
 
-    if astoria_unlocked:
+    if states.ast.unlocked:
         # Tonks turns into Astoria
         play sound "sounds/magic4.ogg"
         play music "music/KMcL_OpenThoseBrightEyes.ogg" fadein 1 if_changed
diff --git a/game/scripts/characters/hermione/events/favors/talk_to_me.rpy b/game/scripts/characters/hermione/events/favors/talk_to_me.rpy
index 682c85bf..6ece46bd 100644
--- a/game/scripts/characters/hermione/events/favors/talk_to_me.rpy
+++ b/game/scripts/characters/hermione/events/favors/talk_to_me.rpy
@@ -953,7 +953,7 @@ label hg_pf_talk_tonks:
                         her "I know!" ("disgust", "narrow", "base", "down")
                     her "Even then, that doesn't compare to the things those Slytherins have been doing." ("angry", "narrow", "angry", "down")
 
-                block weight 0.9 if astoria_unlocked: # After Astoria got caught.
+                block weight 0.9 if states.ast.unlocked: # After Astoria got caught.
                     her "That Astoria girl, casting imperio on a student, and making her lift her top..." ("soft", "narrow", "angry", "R")
                     ton "Ah, yes that was unfortunate..." ("normal", "base", "worried", "R", hair="basic")
                     if states.gen.masturbating:
@@ -970,7 +970,7 @@ label hg_pf_talk_tonks:
                     her "Anyway..." ("open", "closed", "base", "mid")
                     her "She's not even the worst person amongst the Slytherins." ("angry", "narrow", "angry", "down")
 
-                block if not any(((states.cho.tier >= 2), (cc_pf_strip.counter >= 2), astoria_unlocked)):
+                block if not any(((states.cho.tier >= 2), (cc_pf_strip.counter >= 2), states.ast.unlocked)):
                     her "..." ("annoyed", "narrow", "worried", "down", cheeks="blush")
                     ton "Miss Granger?" ("normal", "base", "raised", "L")
                     her "*Ehm*..." ("annoyed", "base", "base", "R", cheeks="blush")
diff --git a/game/scripts/events/ending.rpy b/game/scripts/events/ending.rpy
index 080f7b11..1cecf4d7 100644
--- a/game/scripts/events/ending.rpy
+++ b/game/scripts/events/ending.rpy
@@ -2676,7 +2676,7 @@ label ball_ending_E2:
     gen "Goodbye, smart cumslut Hermione..." ("base", xpos="far_left", ypos="head")
     if states.cho.unlocked:
         gen "and my token asian Cho..." ("base", xpos="far_left", ypos="head")
-    if astoria_unlocked:
+    if states.ast.unlocked:
         gen "and my sassy blonde Astoria..." ("base", xpos="far_left", ypos="head")
     if luna_unlocked:
         gen "and my {i}wackspit-sucking{/i} queen Luna..." ("base", xpos="far_left", ypos="head")
diff --git a/game/scripts/events/event_class.rpy b/game/scripts/events/event_class.rpy
index d9d4c764..64173e40 100644
--- a/game/scripts/events/event_class.rpy
+++ b/game/scripts/events/event_class.rpy
@@ -155,8 +155,8 @@ init python:
             return status_list
 
         def is_complete(self, ignore_in_progress=False):
-            is_lstates.ast.tier = (self._tier == self._max_tiers - 1)
-            return is_lstates.ast.tier and self.is_tier_complete(ignore_in_progress=ignore_in_progress)
+            is_last_tier = (self._tier == self._max_tiers - 1)
+            return is_last_tier and self.is_tier_complete(ignore_in_progress=ignore_in_progress)
 
         def is_tier_complete(self, ignore_in_progress=False):
             event_count = len(self.events[self._tier])
diff --git a/game/scripts/interface/cheats.rpy b/game/scripts/interface/cheats.rpy
index 9f0b2f1c..9fa4ece0 100644
--- a/game/scripts/interface/cheats.rpy
+++ b/game/scripts/interface/cheats.rpy
@@ -171,7 +171,7 @@ label cheats:
                             jump cheats.characters
                     jump cheats.luna
 
-                "-Astoria-" (icon="interface/icons/small/astoria.webp") if astoria_unlocked:
+                "-Astoria-" (icon="interface/icons/small/astoria.webp") if states.ast.unlocked:
                     label .astoria:
                     menu:
                         "-Reset mood-" if states.ast.mood != 0:
@@ -336,7 +336,7 @@ label cheats:
                     $ tonks_unlocked = True
                     $ states.her.unlocked = True
                     $ states.cho.unlocked = True
-                    $ astoria_unlocked = True
+                    $ states.ast.unlocked = True
                     $ susan_unlocked = True
                     $ luna_unlocked = True
                     # ginny_unlocked = True
diff --git a/game/scripts/interface/door.rpy b/game/scripts/interface/door.rpy
index 18d093e6..4a4c1986 100644
--- a/game/scripts/interface/door.rpy
+++ b/game/scripts/interface/door.rpy
@@ -21,7 +21,7 @@ label summon_menu(xx=723, yy=90):
                     "Hermione": {"ico": "hermione", "flag": states.her.unlocked, "busy": states.her.busy, "loc": her_map_location},
                     "Cho": {"ico": "cho", "flag": states.cho.unlocked, "busy": states.cho.busy, "loc": cho_map_location},
                     "Luna": {"ico": "luna", "flag": luna_unlocked, "busy": luna_busy, "loc": lun_map_location},
-                    "Astoria": {"ico": "astoria", "flag": astoria_unlocked, "busy": states.ast.busy, "loc": ast_map_location},
+                    "Astoria": {"ico": "astoria", "flag": states.ast.unlocked, "busy": states.ast.busy, "loc": ast_map_location},
                     "Susan": {"ico": "susan", "flag": susan_unlocked, "busy": susan_busy, "loc": sus_map_location}
                     }
 
diff --git a/game/scripts/interface/letter.rpy b/game/scripts/interface/letter.rpy
index a4e9ec67..dc02a940 100644
--- a/game/scripts/interface/letter.rpy
+++ b/game/scripts/interface/letter.rpy
@@ -206,7 +206,7 @@ label letter(text, label):
     show screen letter(text)
     with d3
 
-    $ states.menu_pos = 0.5, 0.9
+    $ states.menu_pos = (0.5, 0.9)
 
     menu:
         "-Done reading-":
diff --git a/game/scripts/interface/map.rpy b/game/scripts/interface/map.rpy
index 0068cade..1a74ac08 100644
--- a/game/scripts/interface/map.rpy
+++ b/game/scripts/interface/map.rpy
@@ -436,7 +436,7 @@ screen map_screen_characters():
             action Return("luna")
 
     #Astoria
-    if astoria_unlocked:
+    if states.ast.unlocked:
         imagebutton:
             xpos UI_xpos_offset +ast_map_xpos
             ypos UI_ypos_offset +ast_map_ypos
diff --git a/game/scripts/interface/stats.rpy b/game/scripts/interface/stats.rpy
index d4432c6d..afa79b83 100644
--- a/game/scripts/interface/stats.rpy
+++ b/game/scripts/interface/stats.rpy
@@ -92,7 +92,7 @@ label stats_menu(xx=150, yy=90):
                     "Hermione": {"ico": "hermione", "flag": states.her.unlocked, "name": "Hermione Granger", "sex": "Female", "height": "5.2ft", "weight": "126lb", "job": "Student", "hates": "Slytherin", "likes": "Books"},
                     "Cho": {"ico": "cho", "flag": states.cho.unlocked, "name": "Cho Chang", "sex": "Female", "height": "5.1ft", "weight": "122lb", "job": "Student", "hates": "Hermione", "likes": "Winning"},
                     "Luna": {"ico": "luna", "flag": luna_unlocked, "name": "Luna Lovegood", "sex": "Female", "height": "5.2ft", "weight": "117lb", "job": "Student", "hates": "Wrackspurts", "likes": "{size=-2}Magical creatures{/size}"},
-                    "Astoria": {"ico": "astoria", "flag": astoria_unlocked, "name": "Astoria Greengrass", "sex": "Female", "height": "5.0ft", "weight": "102lb", "job": "Student", "hates": "Rules", "likes": "Breaking them"},
+                    "Astoria": {"ico": "astoria", "flag": states.ast.unlocked, "name": "Astoria Greengrass", "sex": "Female", "height": "5.0ft", "weight": "102lb", "job": "Student", "hates": "Rules", "likes": "Breaking them"},
                     "Susan": {"ico": "susan", "flag": susan_unlocked, "name": "Susan Bones", "sex": "Female", "height": "5.1ft", "weight": "135lb", "job": "Student", "hates": "Chores", "likes": "You {size=-4}Secretly..{/size}"}
                     }
 
diff --git a/game/scripts/script.rpy b/game/scripts/script.rpy
index 19f1f27c..44557a52 100644
--- a/game/scripts/script.rpy
+++ b/game/scripts/script.rpy
@@ -30,7 +30,7 @@ label start_dev:
         tonks_unlocked = True
         states.her.unlocked = True
         states.cho.unlocked = True
-        astoria_unlocked = True
+        states.ast.unlocked = True
         susan_unlocked = True
         luna_unlocked = True
         tonks_wardrobe_unlocked = True