Fix bug in hotkey option value storage
Include the final comments from Geoff