Improve clap.h
Fixes for the channels