clean up and tweak bq