many updates to config system