updated and included JDoc comments