JavaDoc

JavaDoc added (partially)