more minor updates for attachments