fix logins, clean up a bit