Fixed some of the things I broke.