assorted minor adjustments (mostly comment and exception-related)
To limit the changes to be inspected for !73 (closed) (and to minimize further diffs) - here's a minor merge request.
To limit the changes to be inspected for !73 (closed) (and to minimize further diffs) - here's a minor merge request.