more login, small fixes