Enable/disable support... cleaning up some config stuff.