Added some more javadoc comments