Improvements to edit and new