add adjacent nodes to nodeinfo, general cleanup to reduce output
Merge branch 'cleanup'