Fix bug with new channel selector
Refactor skynet to be disconnected from rivulet