fix

major shortcut bug fixes