Javadoc, and some generic fixes.