changes to bpdata.{cc,hh}