some form fixes