More Blocks and Map Tools updates.