header fixes round 1 + versioning