form bug fixes