improved command line client