Final changes.  Javadoc seems ok.  Works as well as I could get.