added more command-line options