Fixed antoher thread issue
More thread fixes all bugs should be out
Small fixes