cleaning up bugs to switch connection up
cleaning up, up to link discovery