fixes to the forms