more form improvements