Some comments and tweaks to swiping behavior