more bonds.cpp changes