some form improvements