cleanup and more config options