Handle long headings + optimizations