Minor tweaks and updates in anticipation of npm publish