Standardised headers/footers, plus a couple of small fixes