some changes towards reaching a solution for #6
Code has been cleaned up and we have also reworked the help parameters for the command line args