Adding keybindings for issue #182. Also miscelaneous cleanups.