Edits after test run-through.