More work on options, #63