More updates to options-mode!