Lots of form2 fixes and tests.