Fix indentation and format a few subheadings