Some more tuning and arranging.