small performance tweaks, simplified gestures (see enum comments)