Some updates to edit, and plot