Further doc updates, and schema fixing