Change auto-detection of channels/pms to better reflect their function.
Resolves #32