Greatly improved addChannelLinks