Output mode aligned with documentation, fixed in 6b97796.

This this last commit, I think that everything in this comment is finished.