Added sections to the config and renamed some config commands