Better documentation and use of options.