Fixed all the things git messed up