lotsa cleanup
config changes