fix some bugs with swiping all the way around