added in a few javadocs