fix grammer and some type