allow multi channel funneling as a scope
make changes as @tpitale requested
Fix typos so tests pass
Address pull request comments from @tpitale
Merge branch 'mcf'