Changed tuning for multiple measurements. A few tweaks and fixes.