Tweaks + adding support to put labels on the map.