Add gt/gT/J/K keybindings, minor clean up