add missing headers and avatar.