Block detector work + cleanup