quick fix for _package.json and other minor refactoring