fixes to better handle swipe