javadoc & lot of content updates