Fix output handling so it complies with the rest of the tools.  Fixes to
documentation.