Doc fixes 1.7

Don't merge this til ready, thanks.