[MOD] update to version 2.2
[NEW] cleaning up the listeners