additions and concurrency fixes