one last fix for channel->origin for naming of substrate channel reference; now globally 'origin'