Updated JavaDoc comments, other small changes