cam13: tidyups to concurrency