No functional changes, only modifications of documentation and code layout.
Also corrected a few error messages.