more improvements to map