Fixes and tidy-up
Heading pattern