Concurrency improvements and corrections
TODO