added attachments and general updates