improvements and edit/delete