Fixed BQ and BQ_Finite. requires retesting.. :'-(