Javadocs, refactoring, today's code cleanup.