several form fixes