More fussing with the auto-tuner (all minor changes)