small improvements, consolidating config file and command line arguments