more small improvements to bonds