Broad updates:

See the commit notes for what the updates.