Add package.json and header tweaks