ported BondNode, bug fix and simplifications in Bond