improvements to map