Added some more javadocs!