added support for avatars in comments