Fixed a shitload of shit
Fixed more shit.