Minor javadoc updates and tools updates