Some javadoc comments were added