Avatars plus misc changes