Updated: More JavaDocs