javadoc and some import uncollapsing