Further tweaks to headers and document structure