Changes to allow further additions to keyboard shortcut. Also reindented some comments which were upsetting my editor.