added some more javadoc