FIXED ALL THE THINGS!!! (but really. everything here should work)