more javadoc-ing