remaining known race conditions addressed