Improved the Swipe robustness and killed some bugs