Tweaks and javadoc