Mostly javadoc updates