Added some more Javadocs