Javadoc and comments updated.