unit: fixes
unit: refactor Channel out of Unit