Add a couple macros and fix up section headings