Added more command line args and set defaults