added command line arguments
Minor fixes