-Redo shortcut stuff to be better for all platforms
-Fix some bugs that got recently comitted
-A little cleanup of some things
-Update save shortcut and condense the code