WIP on auth server; small improvements