Gesture updates and misc fixups