Improve options.