fixed profile avatar saving stuff.
merging changes;