Tweaks to watching
Switch to a two-stage interrupt buffering system that's optimised for counting/logging applications