More work on options, dispatching