avatars added and other improvements