Fixed a bunch of things