working on login - out in deps, some code cleanup