More JavaDocs

Polishing