Improved command line interface.