some up-to-the-wire edits