Bxref branch

Branch for the Bxref issues.