Fixed concurrency issues and added garbling