added avatars, added saving