Fixed concurrency issues.
starting to apply reference concurrency fixes to tasmo