Fixed a bunch of crap