Patch 1

A little update on the BFS/BFQ checking part.