threads... + minor fixs