Minor updates only.
All headers and footers will be created by dynamic insertion.