lots of form fixes