change authListener to loginListener, general tidy