more fixes to forms.