Minor tweaks and javadoccing madness