more multi threading adjustments