Improved the user interface, adding command line input args