cleanup, central config, some new fun extras