fix some bug and issue