more work on issues in bg_checks
fix merge conflicts