Speed up launching of shortcuts
Minor performance tweaks
Merge pull request #4 from unfledged/Development

Merge speed and stability improvements from development branch