Fixed all the things I broke