Tweak the wording of a comment.
Start of update to use new base classes, plus addition of numerous comments and Javadoc.