Config improvements for professionalism and a bit of correctness