Fix up comment alignment, make javadoc.