add self and fix headings