Updated some Javadocs