2 fixes (saving/submitting and edit instance)