added roles and accounts-admin-ui; had trouble getting the latter to work; added tokens collection