Fixed a whole lot of shit