bugfixes, added API call for map