maps enhancements and fixes