Some more javadocs