Fixed all of the seriously not totally stupid mistakes