Updated some Java docs and some class names