More thorough header modifications
plus var
Merge pull request #5 from alanguir/heading-mods

Heading mods