Correctly added the shortcuts so they may be changed with the shortcut selection screen

Also made a few changes to increase the speed of the default use.