Fixed some merge error stuff
Fixed all of the things with Johnny