Fixed some known issue, and improve the pacing

Try to fix some known issues and improve the transition and pacing of the game.