broadcast/listen cleanup and fixes