Some cleaning and new features: long press and single Tap