some fixes
Merge branch 't5_edit_form'