Javadoc cleaning out, some unused imports removed, and minor fixes