Moved a bunch of config to tuning