fixed info on map, group on api and naming.