Fix bug where multiple small swipes would be considered as an actual swipe.
Improve listener handling