Better channel names and other copy changes