S2W: ensure single touch and add two finger option