fixed improper merge of form structure changes, whoops