more form fixes