Fixing shortcuts
Merge pull request #24 from smeggingsmegger/master

Fixing some shortcut collisions and adding new things