More Javadoc comments added.