Fixes and updates

Fixes for changes in Balsa.

Change polling to use domain events, hopefully more stable