more tuning
mergefix