some more config flags, some cleanup