Misc. cleanups
Add last bit of channel message distribution