Fixed buggy subscribers
Improved event listening and logging