Added/Fixed JavaDocs