tuning work and other fixes