Add a footer
Misc cleanup