More Javadoc comments added