Fixed typo
Improved "map" feature