Nathan/cli improvements

Some CLI improvements (a few bugs, one addition)