Added some additional javadoc content and formatting