minor javadoc and code tweaks