Improve basic CLI

Ping @xaprb.