shop cleanup, form2 fixes