More bug fixes

Did another round of fixes. Some broken passages and variables, hopefully it should all be in order now. If not, feel free to send me a report on tumblr! Thank you for your patience and I'll see you soon.