CLI args and batch mode added.