Overall merge. 

This now solves [most of them] production problems, and decouples the tagging logic, and introduces the ``Dispatcher`` monitoring.