fixed a bunch of issues
Merge branch 'master' of https://github.com/zen-np/np-cli