Fixed all concurrency issues (so far)