Added displayAvatar field to not display the avatar if the user does not want for more privacy. Some fixes.