fix some bug and code style