bug fixing and threading