fix some bugs in the command-line.
4 files changed