bug fixes with forms.
minor bug fixes
minor bug fix