More javadoc and formatting.