go go go ... some fixes in thread