Add logged_in? + minor changes