[multithreaded]: Multiple fixes, reorganizes