Latest code changes and new javadoc.