Edits during today's meeting

Primarily to the Equipment schema, but also elsewhere.