form fixes and a few additions