FIX - player button states, more color coding, various tweaks