big changes to the swipe gesture. Also fixed some bugs