Trying to at least fix everything as soon as I read a comment. You are my beta testers <3 (I suck in bug-hunting...)
