Shortcut feature
Minor fixes