Enhance blocking map
Minor fixes
Add BlockRectangle