fix some bug and format some file