Add a couple of extra option types, and implement show-options command.

14 files changed