Some javadoc, some cleanup.