some JavaDocs added