swiping is back, also abandon no longer breaks, other minor