added some javadoc
added more javadoc