Added MapStateManager to persiste the state of the map.
 -Few minor bug fixes.