Improvements in the introduction of options and in the output.