Publish to NPM + other minor changes