minor tweaks to begin introduction of keyboard gesture handling