improve two listeners, fix issues after last merging
Merge pull request #871 from ahilles107/speed_improvements

improve two listeners, fix issues after last merging