Fixed the broadcast event handling, proper resetting and unregistering of the events so flow works right