Latest changes/bug fixes for heading.