global edits, almost final version