Fixed a lot of things, broken more things. One day I'll update my changelog.