Corrected some really stupid mistakes