Fixed a ton of crap