Formatting fixes (mostly headings)