bugfixes, reordered config generator