fix some config, re-introduce controller setting