Standardised headers/footers, plus a couple of small fixes
Merge pull request #1 from purcell/fixes

Standardised headers/footers, plus a couple of small fixes