Merge pull request #8 from sarkasm/map-blocks

TYPO
cleanup
fix more tests