bugfixes, better swipes