Improved command line tool.