specify SCOPES in settings file
removed TODO
removed a bunch of TODOs, properly handle scopes, fixed tests