Amend headings mixing Closes #61