cleaned/debugged up account selection