Minor bug fixes with regards to command line arguements
Minor bug fixes with regards to command line arguements