Bug/Concurrency Issues Fixed