misc javadoc and comments