Added some config tweaks for usability and config changes