fixes attachments and adds some decorators