More guide and javadoc tweaks