some fixes to edit