Doc updates.

Manually merging @	Mithgol fixes