things moved in config, and cleaned