Some final formatting of headers, etc