finished up adding javadoc comments