Minor change to comment
Minor fix of threading