Fixed all the fuckups