add full login, some minor changes as well