readded and tweaked gestures