Merge of some little javadoc work