Added good command-line options