added some javadocs