Fixed a lot of crap!