Updated timing and tuning issues