improved swiping and a lot of other small fixes