Bug fix & simple map

Fixing minor bug and add a default simple map. The map is created as
block and can be configurable easily.