more minor cleanup, improving javadocs