Gestures - some fixes/enhancements