Improved command line user interface
and interactive mode