3.0 proof pt5

Another block of proofing and API doc inlining