removed some mistakes, some mistakes left