Added many additional javadoc comments