* More timely block import notifications

* Grumbles.

* More wrapping

* Fix build

* Fixes