add name and other entries where appropriate