minor fixes and cleanup package.json