Get docs up to date

And in a few more places lower down in this file.