- few JavaDoc improvs