Fixed a bunch of shit