Fixed some swipe deficiencies