fix #134, cleanups for channels
typo fix