Fixed errors that were breaking staging
Fixing problems seen on staging
commented some of the user.rb code
commented and formated code