new config system
some changes