JavaDocs & tiny changes