cleaned up enum usage, added equality test for channel strings