minor fixes for some function names
add support for map listener