Fixed a bunch of stuff

Too lazy to write a changelog. Have fun!