various form fixes