Add concurrency options to production configuration.
Move unwatch code to main stream ensure clause.
Add condition to heartbeat loop.
Fix condition.
Refactor stream concern.