small anhancements in mapping