More refactoring and repair of forms.