Added some more JavaDocs