Add filtering of headers & footers
Add a bunch of enhancements