Finalish tweaks to code, bump npm again