merge with conrads v13 changes, no more folders next
final and updates to nodeinfo 750 fix
backpropagate changes