Added some more command-line options