Minor tweaks
Minor tweaks
Improved data calls in map.pyj
Improved data calls in map.pyj
Minor tweaks