Some JavaDocs updates