fixes and package.json