lots of stuff now parameterized and cleaned up into one config file