more fixes to swipe