better headings and org