classification work mainly, adding new accounts
classification work and fixes