Added internal command shortcut-list and shortcut-show and cleaner parsing