Add mapMapper, fix some errors

add MapMapper
fix errors related to finding