Fixed some multithreading bugs

Yes, some popped up unfortunately. Hopefully I've killed them now.
I want some visual progress now, it feels like it's lacking.