Improved command line user interface.