First cut at implementing Shortcuts.
Minor bugfixes to shortcuts.