fix some bug and modify comment