cleaned up userscontroller
merging shit