Add double-tap support and comments