Small improvements to options.