[UPDATE] Major javadoc enhancements