Move CLI client code to a separate file; bug fixes
4 files changed