- Fixes and enhancements to the edit functionality