Minor debug info added, simplify blocks method