add back in ben's changes to user controller and methods for user model