code changes and javadoc updates