Added improved channel name support

Will now also support channels with an underscore in their name.