Fixing #125 and #126

This cleans up and fixes the OpenIn... functions as well as the keyboard shortcuts.