fixes to creating shortcuts
Change set-shortcut name
final setshortcut fixes