bug fixes on restart_game