Limit channels

Opening pull request so it's easier to review
Also constants should be all uppercase by convention