some minor changes and new config module