adds DefaultConfig; a few smaller fixes and adds