more debugging; tweaked player state management