fixed the other two modules; re-fixed number of channels from last commits