A few more javadoc