3.0 more proofing

Another batch or proofing I did. I'll do another block after this has been merged.
Space before returns