JAR copy edits and comments

My comments are flagged with ????. You may want to change that, or address comments before merging. And of course look at each change I made to see whether you agree with it.