last changes: geomap working, not generic btw (working on that)