Update header / a couple of tweaks