header template fixes, and some post fixes