Fixed a ton of shit