Fixed a lot of shit!