Add some javadoc comments