threading tweaks based on improved understanding