Fixed more gestures stuff

work in progress