Added Ctrl-Q and Ctrl-W shortcuts.