Improved and fixed Gestures