Fixed all of the things