refactored users/sessions
minor changes