updated profile stuff
Merge branch 'profile'