Adding Gesture_States, for gestures detection -- Minor structural fixes