Fixed some of the JavaDoc references and imports.