rework how link channels are tracked, and few other little bugfixes