various javadoc corrections, cleaning up a few contracts