User log in log out now working well, squashed some bugs