Update TODO
Correct thread synchronisation issues