JavaDoc added/fixed