some style fixes and a typo fix
simpler and clear parametrization of configs