more concurrency issues fixed