Misc tweaks; Added nvm