added command line options and config file