Neaten up package.json & resolve validation bug