Shortcut support and other improvements