Fix some / add more keyboard shortcuts

See commit messages for details.