Update docs

Some more doc updates.

We can wait merging this, and it could be used for discussion too.