cleaning up TODOs, enforcing connections works now on more than 2 as well