nice comments and fixed avatars