Last of the plot edits