Resolve #86 and improve headings