Updates to fix concurrency issues

closes #13