few minor fixes
listeners replaced by c++11 features