Everything fixed and working all 23 tests passed. Minor javadoc changes.