Fixed channel descriptions and cleaned up Service code a bit