FIXED A SHIT TON OF STUFF