Updating with the new BDT regions from offset scan (V6~7), fixing the Z veto issue, cleaning/fixes here and there