Updated JavaDoc to M2
Additional JavaDoc changes