Added a few javadoc comments