Some initial edits from the total phase.