added some more javadocs