fix some bug and some game logic modified