fix some mistakes and commit some talking