attachments dir and minor changes on others