more config changes
build fix
various fixes