Make error/warning notices consistent.
Minor refactorings.
Docstring changes, plus a fix to allow --help to work.