minor change to support node renumbering
commented out some redundant call, pick works when nodes are given in order
Merge branch 'vdev' into develop
Merge branch 'sdev' into develop