updates to configuration, command line options, model, and getting ready for modules