some improvements for game mode