some fixes
avatar saving logic. FINALLY