Added some additional JavaDocs