Fixing filename stuff and adding ctrl-o hotkey.