address some TODOs and some concurrency maybe-fixes