concurrency fixes + code clean up