header update and tweaks