Fixed JavaDoc comments
Several fixes