few shortcut tweaks