One more opportunity to do better broadcast
Comment fixes
Merge pull request #477 from dbabokin/broadcast

One more opportunity to do better broadcast