More Javadoc work