update header and tweaks