o Better alignment of usage() message.
o clarify doc.
o smallish code-conciseness changes.