Major fixes for forms.