More javadoc work