refactor, misc, package.json updates