cleanup findGroups to include all valid nodes, add mechanisms to add nodes without branches