currected some mistakes