Corrected some mistakes