minor fixes, added fields to user.rb
merge resolved