Fixed some more issues with headings, etc.