Added command line arguments for finer control