Some edits to edit mode (#7)