javadoc'd some more