added more javadoc comments