add form fixes