small fixes on create/edit
merged