Concurrent: Improve terminate() to non-blocking
Concurrent: Fix comments