fix some bugs with the new goal form