Java doc updates and bug fixes