listeners small enhancements