improved command line runner