some progress, and fix for tuning change bug