Final changes.  Javadoc seems to be good.  Works as expected.