broadcast/listen cleanup and fixes
Merge pull request #86 from secretrobotron/broadcast-listener-cleanup

broadcast/listen cleanup and fixes