I added more support for /options.