fixed some bugs in the new form system