small fixes to button control mode - STILL NOT RIGHT