Some JavaDocs were added and corrected