Flar2's Gestures, and fixes