all tests pass, Javadoc fixed