update ThreadStrategy
some fixes