Fixed all of Josh's stupid mistakes