Fix Wave Gestures and Add Stop Gesture